github/DB-GPT
1
0
Fork 0
mirror of https://github.com/csunny/DB-GPT.git synced 2025-08-28 12:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update chatgpt.py

Browse Source
This commit is contained in:
luchun 2023-11-17 10:55:26 +08:00 committed by GitHub
parent 1ad09c896f
commit 5eccf73f24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pilot/model/proxy/llms/chatgpt.py
View File

@ -8,7 +8,7 @@ import importlib.metadata as metadata
from pilot.model.proxy.llms.proxy_model import ProxyModel
from pilot.model.parameter import ProxyModelParameters
from pilot.scene.base_message import ModelMessage, ModelMessageRoleType
import httpx
logger = logging.getLogger(__name__)
@ -82,15 +82,13 @@ def _initialize_openai_v1(params: ProxyModelParameters):
# Adapt previous proxy_server_url configuration
base_url = params.proxy_server_url.split("/chat/completions")[0]
if params.http_proxy:
openai.proxies = params.http_proxy
proxies = params.http_proxy
openai_params = {
"api_key": api_key,
"base_url": base_url,
"proxies": params.http_proxy,
}
return openai_params, api_type, api_version
return openai_params, api_type, api_version, proxies
def _build_request(model: ProxyModel, params):
@ -130,7 +128,7 @@ def _build_request(model: ProxyModel, params):
proxyllm_backend = model_params.proxyllm_backend
if metadata.version("openai") >= "1.0.0":
openai_params, api_type, api_version = _initialize_openai_v1(model_params)
openai_params, api_type, api_version, proxies = _initialize_openai_v1(model_params)
proxyllm_backend = proxyllm_backend or "gpt-3.5-turbo"
payloads["model"] = proxyllm_backend
else:
@ -154,7 +152,7 @@ def chatgpt_generate_stream(
):
if metadata.version("openai") >= "1.0.0":
model_params = model.get_params()
openai_params, api_type, api_version = _initialize_openai_v1(model_params)
openai_params, api_type, api_version, proxies = _initialize_openai_v1(model_params)
history, payloads = _build_request(model, params)
if api_type == "azure":
from openai import AzureOpenAI
@ -164,12 +162,13 @@ def chatgpt_generate_stream(
api_version=api_version,
azure_endpoint=openai_params[
"base_url"
], # Your Azure OpenAI resource's endpoint value.
],
http_client=httpx.Client(proxies=proxies)
)
else:
from openai import OpenAI
client = OpenAI(**openai_params)
client = OpenAI(**openai_params,http_client=httpx.Client(proxies=proxies))
res = client.chat.completions.create(messages=history, **payloads)
text = ""
for r in res:
@ -186,7 +185,6 @@ def chatgpt_generate_stream(
res = openai.ChatCompletion.create(messages=history, **payloads)
text = ""
print("res", res)
for r in res:
if r["choices"][0]["delta"].get("content") is not None:
content = r["choices"][0]["delta"]["content"]
@ -199,7 +197,7 @@ async def async_chatgpt_generate_stream(
):
if metadata.version("openai") >= "1.0.0":
model_params = model.get_params()
openai_params, api_type, api_version = _initialize_openai_v1(model_params)
openai_params, api_type, api_version,proxies = _initialize_openai_v1(model_params)
history, payloads = _build_request(model, params)
if api_type == "azure":
from openai import AsyncAzureOpenAI
@ -209,12 +207,13 @@ async def async_chatgpt_generate_stream(
api_version=api_version,
azure_endpoint=openai_params[
"base_url"
], # Your Azure OpenAI resource's endpoint value.
],
http_client=httpx.AsyncClient(proxies=proxies)
)
else:
from openai import AsyncOpenAI
client = AsyncOpenAI(**openai_params)
client = AsyncOpenAI(**openai_params,http_client=httpx.AsyncClient(proxies=proxies))
res = await client.chat.completions.create(messages=history, **payloads)
text = ""