From ef86838f628de8541f809fef70c5b8af2b062792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=B0=B8=E8=B5=AB?= <1259085392@qq.com> Date: Sat, 15 Mar 2025 12:15:05 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=B7=A5=E5=85=B7=E6=97=B6=E7=9A=84=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ astrbot/core/provider/func_tool_manager.py | 2 +- astrbot/core/star/register/star_handler.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a863e36ec..865b0596d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ venv/* packages/python_interpreter/workplace .venv/* .conda/ +.idea/ +pytest.ini diff --git a/astrbot/core/provider/func_tool_manager.py b/astrbot/core/provider/func_tool_manager.py index cdb1b3d6d..0f04628f7 100644 --- a/astrbot/core/provider/func_tool_manager.py +++ b/astrbot/core/provider/func_tool_manager.py @@ -73,7 +73,7 @@ class FuncCall: handler=handler, ) self.func_list.append(_func) - logger.info(f"添加了函数调用工具({len(self.func_list)}): {name} - {desc}") + logger.info(f"添加函数调用工具: {name}") def remove_func(self, name: str) -> None: """ diff --git a/astrbot/core/star/register/star_handler.py b/astrbot/core/star/register/star_handler.py index 77d7fb482..39e50c63d 100644 --- a/astrbot/core/star/register/star_handler.py +++ b/astrbot/core/star/register/star_handler.py @@ -358,7 +358,7 @@ def register_llm_tool(name: str = None): } ) md = get_handler_or_create(awaitable, EventType.OnCallingFuncToolEvent) - llm_tools.add_func(llm_tool_name, args, docstring.description, md.handler) + llm_tools.add_func(llm_tool_name, args, docstring.description.strip(), md.handler) return awaitable return decorator From 9d870092162cf888d1be9cc44616b70ac11d5182 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 15 Mar 2025 03:16:51 +0000 Subject: [PATCH 2/2] :balloon: auto fixes by pre-commit hooks --- astrbot/core/pipeline/process_stage/method/llm_request.py | 5 +++-- .../platform/sources/qqofficial_webhook/qo_webhook_server.py | 4 +++- astrbot/core/platform/sources/wecom/wecom_adapter.py | 4 +++- astrbot/core/star/register/star_handler.py | 4 +++- astrbot/dashboard/server.py | 4 +++- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/astrbot/core/pipeline/process_stage/method/llm_request.py b/astrbot/core/pipeline/process_stage/method/llm_request.py index d168d1fb0..e8246805e 100644 --- a/astrbot/core/pipeline/process_stage/method/llm_request.py +++ b/astrbot/core/pipeline/process_stage/method/llm_request.py @@ -150,8 +150,9 @@ class LLMRequestSubStage(Stage): # text completion if llm_response.result_chain: event.set_result( - MessageEventResult(chain=llm_response.result_chain.chain) - .set_result_content_type(ResultContentType.LLM_RESULT) + MessageEventResult( + chain=llm_response.result_chain.chain + ).set_result_content_type(ResultContentType.LLM_RESULT) ) else: event.set_result( diff --git a/astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py b/astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py index dcd160d27..a219e2492 100644 --- a/astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py +++ b/astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py @@ -96,7 +96,9 @@ class QQOfficialWebhook: return {"opcode": 12} async def start_polling(self): - logger.info(f"将在 {self.callback_server_host}:{self.port} 端口启动 QQ 官方机器人 webhook 适配器。") + logger.info( + f"将在 {self.callback_server_host}:{self.port} 端口启动 QQ 官方机器人 webhook 适配器。" + ) await self.server.run_task( host=self.callback_server_host, port=self.port, diff --git a/astrbot/core/platform/sources/wecom/wecom_adapter.py b/astrbot/core/platform/sources/wecom/wecom_adapter.py index 4237c2ebd..cef83b030 100644 --- a/astrbot/core/platform/sources/wecom/wecom_adapter.py +++ b/astrbot/core/platform/sources/wecom/wecom_adapter.py @@ -87,7 +87,9 @@ class WecomServer: return "success" async def start_polling(self): - logger.info(f"将在 {self.callback_server_host}:{self.port} 端口启动 企业微信 适配器。") + logger.info( + f"将在 {self.callback_server_host}:{self.port} 端口启动 企业微信 适配器。" + ) await self.server.run_task( host=self.callback_server_host, port=self.port, diff --git a/astrbot/core/star/register/star_handler.py b/astrbot/core/star/register/star_handler.py index 39e50c63d..0b9f7ad09 100644 --- a/astrbot/core/star/register/star_handler.py +++ b/astrbot/core/star/register/star_handler.py @@ -358,7 +358,9 @@ def register_llm_tool(name: str = None): } ) md = get_handler_or_create(awaitable, EventType.OnCallingFuncToolEvent) - llm_tools.add_func(llm_tool_name, args, docstring.description.strip(), md.handler) + llm_tools.add_func( + llm_tool_name, args, docstring.description.strip(), md.handler + ) return awaitable return decorator diff --git a/astrbot/dashboard/server.py b/astrbot/dashboard/server.py index c836ea576..072ded4ae 100644 --- a/astrbot/dashboard/server.py +++ b/astrbot/dashboard/server.py @@ -151,7 +151,9 @@ class AstrBotDashboard: display += " ➜ 默认用户名和密码: astrbot\n ✨✨✨\n" if not ip_addr: - display += "可在 data/cmd_config.json 中配置 dashboard.host 以便远程访问。\n" + display += ( + "可在 data/cmd_config.json 中配置 dashboard.host 以便远程访问。\n" + ) logger.info(display)