diff --git a/pkg/core/bootutils/deps.py b/pkg/core/bootutils/deps.py index db3c12a0..cf41a7b2 100644 --- a/pkg/core/bootutils/deps.py +++ b/pkg/core/bootutils/deps.py @@ -39,6 +39,7 @@ required_deps = { 'mcp': 'mcp', 'sqlmodel': 'sqlmodel', 'telegramify_markdown': 'telegramify-markdown', + 'slack_sdk': 'slack_sdk', } diff --git a/pkg/provider/modelmgr/requesters/chatcmpl.py b/pkg/provider/modelmgr/requesters/chatcmpl.py index 757a9825..de350739 100644 --- a/pkg/provider/modelmgr/requesters/chatcmpl.py +++ b/pkg/provider/modelmgr/requesters/chatcmpl.py @@ -26,7 +26,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester): async def initialize(self): self.client = openai.AsyncClient( api_key='', - base_url=self.requester_cfg['base-url'].replace(' ', ''), + base_url=self.requester_cfg['base_url'].replace(' ', ''), timeout=self.requester_cfg['timeout'], http_client=httpx.AsyncClient( trust_env=True, timeout=self.requester_cfg['timeout'] @@ -79,7 +79,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester): ) -> llm_entities.Message: self.client.api_key = use_model.token_mgr.get_token() - args = extra_args.copy() + args = {} args['model'] = use_model.model_entity.name if use_funcs: @@ -103,7 +103,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester): args['messages'] = messages # 发送请求 - resp = await self._req(args, extra_body=self.requester_cfg['args']) + resp = await self._req(args, extra_body=extra_args) # 处理请求结果 message = await self._make_msg(resp) diff --git a/pkg/provider/runners/localagent.py b/pkg/provider/runners/localagent.py index d6b6f6cd..175f06db 100644 --- a/pkg/provider/runners/localagent.py +++ b/pkg/provider/runners/localagent.py @@ -24,7 +24,11 @@ class LocalAgentRunner(runner.RequestRunner): # 首次请求 msg = await query.use_llm_model.requester.invoke_llm( - query, query.use_llm_model, req_messages, query.use_funcs + query, + query.use_llm_model, + req_messages, + query.use_funcs, + extra_args=query.use_llm_model.model_entity.extra_args, ) yield msg @@ -66,7 +70,11 @@ class LocalAgentRunner(runner.RequestRunner): # 处理完所有调用,再次请求 msg = await query.use_llm_model.requester.invoke_llm( - query, query.use_llm_model, req_messages, query.use_funcs + query, + query.use_llm_model, + req_messages, + query.use_funcs, + extra_args=query.use_llm_model.model_entity.extra_args, ) yield msg