From 2c81e89ee16992551ef51ab2176a02151e821584 Mon Sep 17 00:00:00 2001 From: Windpicker-owo <3431391539@qq.com> Date: Sun, 9 Nov 2025 11:26:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(affinity-chatter):=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE=E4=B8=AD=E7=9A=84=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=BC=BA=E8=A7=84=E5=88=92?= =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../built_in/affinity_flow_chatter/core/affinity_chatter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/built_in/affinity_flow_chatter/core/affinity_chatter.py b/src/plugins/built_in/affinity_flow_chatter/core/affinity_chatter.py index 2f24d458a..73a7a7680 100644 --- a/src/plugins/built_in/affinity_flow_chatter/core/affinity_chatter.py +++ b/src/plugins/built_in/affinity_flow_chatter/core/affinity_chatter.py @@ -16,6 +16,7 @@ from src.common.logger import get_logger from src.plugin_system.base.base_chatter import BaseChatter from src.plugin_system.base.component_types import ChatType from src.plugins.built_in.affinity_flow_chatter.planner.planner import ChatterActionPlanner +from src.config.config import global_config logger = get_logger("affinity_chatter") @@ -73,7 +74,7 @@ class AffinityChatter(BaseChatter): unread_messages = context.get_unread_messages() # 使用增强版规划器处理消息 - actions, target_message = await self.planner.plan(context=context) + actions, target_message = await asyncio.wait_for(self.planner.plan(context=context), global_config.chat.thinking_timeout) self.stats["plans_created"] += 1 # 执行动作（如果规划器返回了动作） From ac09046427981fa0810c171b8c509ddb17f917a7 Mon Sep 17 00:00:00 2001 From: Windpicker-owo <3431391539@qq.com> Date: Sun, 9 Nov 2025 11:28:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(distribution-manager):=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=BC=BA=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=A4=84=E7=90=86=20refactor(affinity-chatter):=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chat/message_manager/distribution_manager.py | 2 +- .../built_in/affinity_flow_chatter/core/affinity_chatter.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/chat/message_manager/distribution_manager.py b/src/chat/message_manager/distribution_manager.py index 16c1eeff8..a504f49d8 100644 --- a/src/chat/message_manager/distribution_manager.py +++ b/src/chat/message_manager/distribution_manager.py @@ -222,7 +222,7 @@ class StreamLoopManager: logger.debug(f"更新流能量失败 {stream_id}: {e}") # 4. 激活chatter处理 - success = await self._process_stream_messages(stream_id, context) + success = await asyncio.wait_for(self._process_stream_messages(stream_id, context), global_config.chat.thinking_timeout) # 更新统计 self.stats["total_process_cycles"] += 1 diff --git a/src/plugins/built_in/affinity_flow_chatter/core/affinity_chatter.py b/src/plugins/built_in/affinity_flow_chatter/core/affinity_chatter.py index 73a7a7680..2f24d458a 100644 --- a/src/plugins/built_in/affinity_flow_chatter/core/affinity_chatter.py +++ b/src/plugins/built_in/affinity_flow_chatter/core/affinity_chatter.py @@ -16,7 +16,6 @@ from src.common.logger import get_logger from src.plugin_system.base.base_chatter import BaseChatter from src.plugin_system.base.component_types import ChatType from src.plugins.built_in.affinity_flow_chatter.planner.planner import ChatterActionPlanner -from src.config.config import global_config logger = get_logger("affinity_chatter") @@ -74,7 +73,7 @@ class AffinityChatter(BaseChatter): unread_messages = context.get_unread_messages() # 使用增强版规划器处理消息 - actions, target_message = await asyncio.wait_for(self.planner.plan(context=context), global_config.chat.thinking_timeout) + actions, target_message = await self.planner.plan(context=context) self.stats["plans_created"] += 1 # 执行动作（如果规划器返回了动作）