From 2f25ed1d963bc3c1241f866c4db6f2cadddc14ac Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Sat, 21 Jun 2025 17:27:36 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=B8=BAfocus=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BF=9D=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chat/express/exprssion_learner.py | 1 + src/chat/focus_chat/heartFC_chat.py | 77 ++++++++++++++++--- .../info_processors/relationship_processor.py | 2 +- src/config/official_configs.py | 2 +- template/bot_config_template.toml | 2 +- 5 files changed, 70 insertions(+), 14 deletions(-) diff --git a/src/chat/express/exprssion_learner.py b/src/chat/express/exprssion_learner.py index 57eee7d29..63f2e5241 100644 --- a/src/chat/express/exprssion_learner.py +++ b/src/chat/express/exprssion_learner.py @@ -88,6 +88,7 @@ class ExpressionLearner: current_chat_type = "group" typed_chat_id = f"{platform}:{chat_stream.group_info.group_id}:{current_chat_type}" else: + current_chat_type = "private" typed_chat_id = f"{platform}:{chat_stream.user_info.user_id}:{current_chat_type}" logger.info(f"正在为 {typed_chat_id} 查找互通组...") diff --git a/src/chat/focus_chat/heartFC_chat.py b/src/chat/focus_chat/heartFC_chat.py index 88a87565c..2fb18b292 100644 --- a/src/chat/focus_chat/heartFC_chat.py +++ b/src/chat/focus_chat/heartFC_chat.py @@ -13,7 +13,7 @@ from src.chat.heart_flow.observation.observation import Observation from src.chat.focus_chat.heartFC_Cycleinfo import CycleDetail from src.chat.focus_chat.info.info_base import InfoBase from src.chat.focus_chat.info_processors.chattinginfo_processor import ChattingInfoProcessor -from src.chat.focus_chat.info_processors.relationship_processor import RelationshipProcessor +from src.chat.focus_chat.info_processors.relationship_processor import PersonImpressionpProcessor from src.chat.focus_chat.info_processors.working_memory_processor import WorkingMemoryProcessor from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation from src.chat.heart_flow.observation.working_observation import WorkingMemoryObservation @@ -31,6 +31,10 @@ from src.config.config import global_config install(extra_lines=3) +# 超时常量配置 +MEMORY_ACTIVATION_TIMEOUT = 5.0 # 记忆激活任务超时时限（秒） +ACTION_MODIFICATION_TIMEOUT = 15.0 # 动作修改任务超时时限（秒） + # 定义观察器映射：键是观察器名称，值是 (观察器类, 初始化参数) OBSERVATION_CLASSES = { "ChattingObservation": (ChattingObservation, "chat_id"), @@ -44,7 +48,7 @@ PROCESSOR_CLASSES = { "ChattingInfoProcessor": (ChattingInfoProcessor, None), "ToolProcessor": (ToolProcessor, "tool_use_processor"), "WorkingMemoryProcessor": (WorkingMemoryProcessor, "working_memory_processor"), - "RelationshipProcessor": (RelationshipProcessor, "relation_processor"), + "PersonImpressionpProcessor": (PersonImpressionpProcessor, "person_impression_processor"), "ExpressionSelectorProcessor": (ExpressionSelectorProcessor, "expression_selector_processor"), } @@ -106,7 +110,7 @@ class HeartFChatting: for proc_name, (_proc_class, config_key) in PROCESSOR_CLASSES.items(): # 对于关系处理器，需要同时检查两个配置项 - if proc_name == "RelationshipProcessor": + if proc_name == "PersonImpressionpProcessor": if global_config.relationship.enable_relationship and getattr( config_processor_settings, config_key, True ): @@ -182,7 +186,7 @@ class HeartFChatting: if name in [ "ToolProcessor", "WorkingMemoryProcessor", - "RelationshipProcessor", + "PersonImpressionpProcessor", "ExpressionSelectorProcessor", ]: self.processors.append(processor_actual_class(subheartflow_id=self.stream_id)) @@ -560,21 +564,72 @@ class HeartFChatting: self.observations.append(self.action_observation) return True - # 创建三个并行任务 - action_modify_task = asyncio.create_task(modify_actions_task()) - memory_task = asyncio.create_task(self.memory_activator.activate_memory(self.observations)) + # 创建三个并行任务，为LLM调用添加超时保护 + action_modify_task = asyncio.create_task( + asyncio.wait_for( + modify_actions_task(), + timeout=ACTION_MODIFICATION_TIMEOUT + ) + ) + memory_task = asyncio.create_task( + asyncio.wait_for( + self.memory_activator.activate_memory(self.observations), + timeout=MEMORY_ACTIVATION_TIMEOUT + ) + ) processor_task = asyncio.create_task(self._process_processors(self.observations)) - # 等待三个任务完成 - _, running_memorys, (all_plan_info, processor_time_costs) = await asyncio.gather( - action_modify_task, memory_task, processor_task - ) + # 等待三个任务完成，使用超时保护和详细错误处理 + action_modify_result = None + running_memorys = [] + all_plan_info = [] + processor_time_costs = {} + + try: + action_modify_result, running_memorys, (all_plan_info, processor_time_costs) = await asyncio.gather( + action_modify_task, memory_task, processor_task, + return_exceptions=True + ) + + # 检查各个任务的结果 + if isinstance(action_modify_result, Exception): + if isinstance(action_modify_result, asyncio.TimeoutError): + logger.error(f"{self.log_prefix} 动作修改任务超时") + else: + logger.error(f"{self.log_prefix} 动作修改任务失败: {action_modify_result}") + + if isinstance(running_memorys, Exception): + if isinstance(running_memorys, asyncio.TimeoutError): + logger.error(f"{self.log_prefix} 记忆激活任务超时") + else: + logger.error(f"{self.log_prefix} 记忆激活任务失败: {running_memorys}") + running_memorys = [] + + processor_result = (all_plan_info, processor_time_costs) + if isinstance(processor_result, Exception): + if isinstance(processor_result, asyncio.TimeoutError): + logger.error(f"{self.log_prefix} 处理器任务超时") + else: + logger.error(f"{self.log_prefix} 处理器任务失败: {processor_result}") + all_plan_info = [] + processor_time_costs = {} + else: + all_plan_info, processor_time_costs = processor_result + + except Exception as e: + logger.error(f"{self.log_prefix} 并行任务gather失败: {e}") + # 设置默认值以继续执行 + running_memorys = [] + all_plan_info = [] + processor_time_costs = {} loop_processor_info = { "all_plan_info": all_plan_info, "processor_time_costs": processor_time_costs, } + logger.debug(f"{self.log_prefix} 并行阶段完成，准备进入规划器，plan_info数量: {len(all_plan_info)}, running_memorys数量: {len(running_memorys)}") + with Timer("规划器", cycle_timers): plan_result = await self.action_planner.plan(all_plan_info, running_memorys, loop_start_time) diff --git a/src/chat/focus_chat/info_processors/relationship_processor.py b/src/chat/focus_chat/info_processors/relationship_processor.py index a455c9e4f..6f3c48c14 100644 --- a/src/chat/focus_chat/info_processors/relationship_processor.py +++ b/src/chat/focus_chat/info_processors/relationship_processor.py @@ -137,7 +137,7 @@ def init_prompt(): Prompt(fetch_bot_info_prompt, "fetch_bot_info_prompt") -class RelationshipProcessor(BaseProcessor): +class PersonImpressionpProcessor(BaseProcessor): log_prefix = "关系" def __init__(self, subheartflow_id: str): diff --git a/src/config/official_configs.py b/src/config/official_configs.py index ecdc546e8..45d281250 100644 --- a/src/config/official_configs.py +++ b/src/config/official_configs.py @@ -167,7 +167,7 @@ class FocusChatConfig(ConfigBase): class FocusChatProcessorConfig(ConfigBase): """专注聊天处理器配置类""" - relation_processor: bool = True + person_impression_processor: bool = True """是否启用关系识别处理器""" tool_use_processor: bool = True diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 529aaab28..9b2781417 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -108,7 +108,7 @@ compressed_length = 8 # 不能大于observation_context_size,心流上下文压 compress_length_limit = 4 #最多压缩份数，超过该数值的压缩上下文会被删除 [focus_chat_processor] # 专注聊天处理器，打开可以实现更多功能，但是会增加token消耗 -relation_processor = true # 是否启用关系识别处理器 +person_impression_processor = true # 是否启用关系识别处理器 tool_use_processor = false # 是否启用工具使用处理器 working_memory_processor = false # 是否启用工作记忆处理器，消耗量大 expression_selector_processor = true # 是否启用表达方式选择处理器