mirror of
https://github.com/arc53/DocsGPT.git
synced 2025-11-29 08:33:20 +00:00
fix openai
This commit is contained in:
@@ -5,40 +5,38 @@ class OpenAILLM(BaseLLM):
|
|||||||
|
|
||||||
def __init__(self, api_key):
|
def __init__(self, api_key):
|
||||||
global openai
|
global openai
|
||||||
import openai
|
from openai import OpenAI
|
||||||
openai.api_key = api_key
|
|
||||||
self.api_key = api_key # Save the API key to be used later
|
self.client = OpenAI(
|
||||||
|
api_key=api_key,
|
||||||
|
)
|
||||||
|
self.api_key = api_key
|
||||||
|
|
||||||
def _get_openai(self):
|
def _get_openai(self):
|
||||||
# Import openai when needed
|
# Import openai when needed
|
||||||
import openai
|
import openai
|
||||||
# Set the API key every time you import openai
|
|
||||||
openai.api_key = self.api_key
|
|
||||||
return openai
|
return openai
|
||||||
|
|
||||||
def gen(self, model, engine, messages, stream=False, **kwargs):
|
def gen(self, model, engine, messages, stream=False, **kwargs):
|
||||||
response = openai.ChatCompletion.create(
|
response = self.client.chat.completions.create(model=model,
|
||||||
model=model,
|
|
||||||
engine=engine,
|
|
||||||
messages=messages,
|
messages=messages,
|
||||||
stream=stream,
|
stream=stream,
|
||||||
**kwargs
|
**kwargs)
|
||||||
)
|
|
||||||
|
|
||||||
return response["choices"][0]["message"]["content"]
|
return response.choices[0].message.content
|
||||||
|
|
||||||
def gen_stream(self, model, engine, messages, stream=True, **kwargs):
|
def gen_stream(self, model, engine, messages, stream=True, **kwargs):
|
||||||
response = openai.ChatCompletion.create(
|
response = self.client.chat.completions.create(model=model,
|
||||||
model=model,
|
|
||||||
engine=engine,
|
|
||||||
messages=messages,
|
messages=messages,
|
||||||
stream=stream,
|
stream=stream,
|
||||||
**kwargs
|
**kwargs)
|
||||||
)
|
|
||||||
|
|
||||||
for line in response:
|
for line in response:
|
||||||
if "content" in line["choices"][0]["delta"]:
|
# import sys
|
||||||
yield line["choices"][0]["delta"]["content"]
|
# print(line.choices[0].delta.content, file=sys.stderr)
|
||||||
|
if line.choices[0].delta.content is not None:
|
||||||
|
yield line.choices[0].delta.content
|
||||||
|
|
||||||
|
|
||||||
class AzureOpenAILLM(OpenAILLM):
|
class AzureOpenAILLM(OpenAILLM):
|
||||||
@@ -48,10 +46,15 @@ class AzureOpenAILLM(OpenAILLM):
|
|||||||
self.api_base = settings.OPENAI_API_BASE,
|
self.api_base = settings.OPENAI_API_BASE,
|
||||||
self.api_version = settings.OPENAI_API_VERSION,
|
self.api_version = settings.OPENAI_API_VERSION,
|
||||||
self.deployment_name = settings.AZURE_DEPLOYMENT_NAME,
|
self.deployment_name = settings.AZURE_DEPLOYMENT_NAME,
|
||||||
|
from openai import AzureOpenAI
|
||||||
|
self.client = AzureOpenAI(
|
||||||
|
api_key=openai_api_key,
|
||||||
|
api_version=settings.OPENAI_API_VERSION,
|
||||||
|
api_base=settings.OPENAI_API_BASE,
|
||||||
|
deployment_name=settings.AZURE_DEPLOYMENT_NAME,
|
||||||
|
)
|
||||||
|
|
||||||
def _get_openai(self):
|
def _get_openai(self):
|
||||||
openai = super()._get_openai()
|
openai = super()._get_openai()
|
||||||
openai.api_base = self.api_base
|
|
||||||
openai.api_version = self.api_version
|
|
||||||
openai.api_type = "azure"
|
|
||||||
return openai
|
return openai
|
||||||
|
|||||||
Reference in New Issue
Block a user