#276 [Bug] Fixing the issue of OpenAI not running

[Bug] 修复openai无法运行的问题
pull/292/head
Physton 2023-11-27 16:55:33 +08:00
parent 459581d95c
commit 48cf8eb793
2 changed files with 20 additions and 2 deletions

View File

@ -4,6 +4,7 @@ from scripts.physton_prompt.get_translate_apis import unprotected_translate_api_
def gen_openai(messages, api_config):
import openai
from distutils.version import LooseVersion
api_config = unprotected_translate_api_config('chatgpt_key', api_config)
openai.api_base = api_config.get('api_base', 'https://api.openai.com/v1')
openai.api_key = api_config.get('api_key', '')
@ -12,7 +13,15 @@ def gen_openai(messages, api_config):
raise Exception(get_lang('is_required', {'0': 'API Key'}))
if not messages or len(messages) == 0:
raise Exception(get_lang('is_required', {'0': 'messages'}))
completion = openai.ChatCompletion.create(model=model, messages=messages, timeout=60)
if LooseVersion(openai.__version__) < LooseVersion('1.0.0'):
completion = openai.ChatCompletion.create(model=model, messages=messages, timeout=60)
else:
from openai import OpenAI
client = OpenAI(
base_url=openai.api_base,
api_key=openai.api_key,
)
completion = client.chat.completions.create(model=model, messages=messages, timeout=60)
if len(completion.choices) == 0:
raise Exception(get_lang('no_response_from', {'0': 'OpenAI'}))
content = completion.choices[0].message.content

View File

@ -14,6 +14,7 @@ class OpenaiTranslator(BaseTranslator):
else:
return ''
import openai
from distutils.version import LooseVersion
openai.api_base = self.api_config.get('api_base', 'https://api.openai.com/v1')
openai.api_key = self.api_config.get('api_key', '')
model = self.api_config.get('model', 'gpt-3.5-turbo')
@ -36,7 +37,15 @@ class OpenaiTranslator(BaseTranslator):
"content": f"You are a translator assistant. Please translate the following JSON data {self.to_lang}. Preserve the original format. Only return the translation result, without any additional content or annotations. If the prompt word is in the target language, please send it to me unchanged:\n{body_str}"
},
]
completion = openai.ChatCompletion.create(model=model, messages=messages, timeout=60)
if LooseVersion(openai.__version__) < LooseVersion('1.0.0'):
completion = openai.ChatCompletion.create(model=model, messages=messages, timeout=60)
else:
from openai import OpenAI
client = OpenAI(
base_url=openai.api_base,
api_key=openai.api_key,
)
completion = client.chat.completions.create(model=model, messages=messages, timeout=60)
if len(completion.choices) == 0:
raise Exception(get_lang('no_response_from', {'0': 'OpenAI'}))
content = completion.choices[0].message.content