From 914fa273fad459d845df01cdd4a09d9d710b77a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Jun 2025 13:05:37 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chat/focus_chat/heartFC_chat.py | 66 +++++++++++++++-------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/src/chat/focus_chat/heartFC_chat.py b/src/chat/focus_chat/heartFC_chat.py index ea5bc8040..6e37c7eae 100644 --- a/src/chat/focus_chat/heartFC_chat.py +++ b/src/chat/focus_chat/heartFC_chat.py @@ -270,9 +270,13 @@ class HeartFChatting: ) if self.post_planning_processors: - logger.info(f"{self.log_prefix} 已注册后期处理器: {[p.__class__.__name__ for p in self.post_planning_processors]}") + logger.info( + f"{self.log_prefix} 已注册后期处理器: {[p.__class__.__name__ for p in self.post_planning_processors]}" + ) else: - logger.warning(f"{self.log_prefix} 没有注册任何后期处理器。这可能是由于配置错误或所有后期处理器都被禁用了。") + logger.warning( + f"{self.log_prefix} 没有注册任何后期处理器。这可能是由于配置错误或所有后期处理器都被禁用了。" + ) async def start(self): """检查是否需要启动主循环，如果未激活则启动。""" @@ -560,7 +564,7 @@ class HeartFChatting: ) task = asyncio.create_task(run_with_timeout()) - + processor_tasks.append(task) task_to_name_map[task] = processor_name logger.debug(f"{self.log_prefix} 启动处理器任务: {processor_name}") @@ -618,66 +622,66 @@ class HeartFChatting: """ 处理后期处理器（规划后执行的处理器） 包括：关系处理器、表达选择器、记忆激活器 - + 参数: observations: 观察器列表 action_data: 原始动作数据 - + 返回: dict: 更新后的动作数据 """ logger.info(f"{self.log_prefix} 开始执行后期处理器") - + # 创建所有后期任务 task_list = [] task_to_name_map = {} - + # 添加后期处理器任务 for processor in self.post_planning_processors: processor_name = processor.__class__.__name__ - + async def run_processor_with_timeout(proc=processor): return await asyncio.wait_for( proc.process_info(observations=observations), timeout=global_config.focus_chat.processor_max_time, ) - + task = asyncio.create_task(run_processor_with_timeout()) task_list.append(task) task_to_name_map[task] = ("processor", processor_name) logger.info(f"{self.log_prefix} 启动后期处理器任务: {processor_name}") - + # 添加记忆激活器任务 async def run_memory_with_timeout(): return await asyncio.wait_for( self.memory_activator.activate_memory(observations), timeout=MEMORY_ACTIVATION_TIMEOUT, ) - + memory_task = asyncio.create_task(run_memory_with_timeout()) task_list.append(memory_task) task_to_name_map[memory_task] = ("memory", "MemoryActivator") logger.info(f"{self.log_prefix} 启动记忆激活器任务") - + # 如果没有任何后期任务，直接返回 if not task_list: logger.info(f"{self.log_prefix} 没有启用的后期处理器或记忆激活器") return action_data - + # 等待所有任务完成 pending_tasks = set(task_list) all_post_plan_info = [] running_memorys = [] - + while pending_tasks: done, pending_tasks = await asyncio.wait(pending_tasks, return_when=asyncio.FIRST_COMPLETED) - + for task in done: task_type, task_name = task_to_name_map[task] - + try: result = await task - + if task_type == "processor": logger.info(f"{self.log_prefix} 后期处理器 {task_name} 已完成!") if result is not None: @@ -691,7 +695,7 @@ class HeartFChatting: else: logger.warning(f"{self.log_prefix} 记忆激活器返回了 None") running_memorys = [] - + except asyncio.TimeoutError: if task_type == "processor": logger.warning( @@ -709,10 +713,10 @@ class HeartFChatting: elif task_type == "memory": logger.error(f"{self.log_prefix} 记忆激活器执行失败. 错误: {e}", exc_info=True) running_memorys = [] - + # 将后期处理器的结果整合到 action_data 中 updated_action_data = action_data.copy() - + relation_info = "" selected_expressions = [] @@ -721,30 +725,32 @@ class HeartFChatting: relation_info = info.get_processed_info() elif isinstance(info, ExpressionSelectionInfo): selected_expressions = info.get_expressions_for_action_data() - + if relation_info: updated_action_data["relation_info_block"] = relation_info # 将选中的表达方式传递给action_data if selected_expressions: updated_action_data["selected_expressions"] = selected_expressions - logger.info(f"{self.log_prefix} 传递{len(selected_expressions)}个选中的表达方式到action_data") - + logger.info(f"{self.log_prefix} 传递{len(selected_expressions)}个选中的表达方式到action_data") + # 将记忆信息也添加到action_data中 if running_memorys: updated_action_data["running_memories"] = running_memorys - + # 生成兼容的memory_block格式 memory_str = "以下是当前在聊天中，你回忆起的记忆：\n" for running_memory in running_memorys: memory_str += f"{running_memory['content']}\n" updated_action_data["memory_block"] = memory_str - + logger.info(f"{self.log_prefix} 添加了 {len(running_memorys)} 个激活的记忆到action_data") - + if all_post_plan_info or running_memorys: - logger.info(f"{self.log_prefix} 后期处理完成，产生了 {len(all_post_plan_info)} 个信息项和 {len(running_memorys)} 个记忆") - + logger.info( + f"{self.log_prefix} 后期处理完成，产生了 {len(all_post_plan_info)} 个信息项和 {len(running_memorys)} 个记忆" + ) + return updated_action_data async def _observe_process_plan_action_loop(self, cycle_timers: dict, thinking_id: str) -> dict: @@ -819,9 +825,7 @@ class HeartFChatting: "processor_time_costs": processor_time_costs, } - logger.debug( - f"{self.log_prefix} 并行阶段完成，准备进入规划器，plan_info数量: {len(all_plan_info)}" - ) + logger.debug(f"{self.log_prefix} 并行阶段完成，准备进入规划器，plan_info数量: {len(all_plan_info)}") with Timer("规划器", cycle_timers): plan_result = await self.action_planner.plan(all_plan_info, [], loop_start_time)