xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-06-09 15:26:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: 更改 provider.json 格式

Browse Source
This commit is contained in:
RockChinQ
2024-03-16 22:12:13 +08:00
parent 82763f8ec5
commit 867093cc88
7 changed files with 68 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/provider/modelmgr/apis/chatcmpl.py
View File

@@ -17,8 +17,8 @@ from ... import entities as llm_entities
from ...tools import entities as tools_entities
@api.requester_class("openai-chat-completion")
class OpenAIChatCompletion(api.LLMAPIRequester):
@api.requester_class("openai-chat-completions")
class OpenAIChatCompletions(api.LLMAPIRequester):
"""OpenAI ChatCompletion API 请求器"""
client: openai.AsyncClient
@@ -26,8 +26,8 @@ class OpenAIChatCompletion(api.LLMAPIRequester):
async def initialize(self):
self.client = openai.AsyncClient(
api_key="",
base_url=self.ap.provider_cfg.data['openai-config']['base_url'],
timeout=self.ap.provider_cfg.data['openai-config']['request-timeout'],
base_url=self.ap.provider_cfg.data['requester']['openai-chat-completions']['base-url'],
timeout=self.ap.provider_cfg.data['requester']['openai-chat-completions']['timeout'],
http_client=httpx.AsyncClient(
proxies=self.ap.proxy_mgr.get_forward_proxies()
)
@@ -58,7 +58,7 @@ class OpenAIChatCompletion(api.LLMAPIRequester):
) -> llm_entities.Message:
self.client.api_key = use_model.token_mgr.get_token()
args = self.ap.provider_cfg.data['openai-config']['chat-completions-params'].copy()
args = self.ap.provider_cfg.data['requester']['openai-chat-completions']['args'].copy()
args["model"] = use_model.name if use_model.model_name is None else use_model.model_name
if use_model.tool_call_supported:

5
pkg/provider/modelmgr/modelmgr.py
View File

@@ -39,9 +39,8 @@ class ModelManager:
async def initialize(self):
# 初始化token_mgr, requester
self.token_mgrs = {
"openai": token.TokenManager("openai", list(self.ap.provider_cfg.data['openai-config']['api-keys']))
}
for k, v in self.ap.provider_cfg.data['keys'].items():
self.token_mgrs[k] = token.TokenManager(k, v)
for api_cls in api.preregistered_requesters:
api_inst = api_cls(self.ap)

2
pkg/provider/session/sessionmgr.py
View File

@@ -50,7 +50,7 @@ class SessionManager:
conversation = core_entities.Conversation(
prompt=await self.ap.prompt_mgr.get_prompt(session.use_prompt_name),
messages=[],
use_model=await self.ap.model_mgr.get_model_by_name(self.ap.provider_cfg.data['openai-config']['chat-completions-params']['model']),
use_model=await self.ap.model_mgr.get_model_by_name(self.ap.provider_cfg.data['model']),
use_funcs=await self.ap.tool_mgr.get_all_functions(),
)
session.conversations.append(conversation)