From ab861d48549cf8fb3371ea7eb6e9e8bae35780d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Jun 2025 13:34:47 +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 | 15 +++++++-------- src/chat/focus_chat/planners/planner_simple.py | 3 --- src/chat/focus_chat/replyer/default_generator.py | 4 ++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/chat/focus_chat/heartFC_chat.py b/src/chat/focus_chat/heartFC_chat.py index a38a3ac14..e9bfa4b80 100644 --- a/src/chat/focus_chat/heartFC_chat.py +++ b/src/chat/focus_chat/heartFC_chat.py @@ -721,7 +721,7 @@ class HeartFChatting: relation_info = "" selected_expressions = [] structured_info = "" - + for info in all_post_plan_info: if isinstance(info, RelationInfo): relation_info = info.get_processed_info() @@ -729,25 +729,24 @@ class HeartFChatting: selected_expressions = info.get_expressions_for_action_data() elif isinstance(info, StructuredInfo): structured_info = info.get_processed_info() - + if relation_info: updated_action_data["relation_info_block"] = relation_info if selected_expressions: - updated_action_data["selected_expressions"] = selected_expressions - + updated_action_data["selected_expressions"] = selected_expressions + if structured_info: updated_action_data["structured_info"] = structured_info - - #特殊处理running_memorys + + # 特殊处理running_memorys if running_memorys: 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)} 个记忆" diff --git a/src/chat/focus_chat/planners/planner_simple.py b/src/chat/focus_chat/planners/planner_simple.py index 72a011eae..e891a9769 100644 --- a/src/chat/focus_chat/planners/planner_simple.py +++ b/src/chat/focus_chat/planners/planner_simple.py @@ -7,8 +7,6 @@ from src.config.config import global_config from src.chat.focus_chat.info.info_base import InfoBase from src.chat.focus_chat.info.obs_info import ObsInfo from src.chat.focus_chat.info.action_info import ActionInfo -from src.chat.focus_chat.info.structured_info import StructuredInfo -from src.chat.focus_chat.info.relation_info import RelationInfo from src.common.logger import get_logger from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.chat.focus_chat.planners.action_manager import ActionManager @@ -236,7 +234,6 @@ class ActionPlanner(BasePlanner): if key not in ["action", "reasoning"]: action_data[key] = value - action_data["loop_start_time"] = loop_start_time memory_str = "" diff --git a/src/chat/focus_chat/replyer/default_generator.py b/src/chat/focus_chat/replyer/default_generator.py index 9d008a1b6..7a0142dd8 100644 --- a/src/chat/focus_chat/replyer/default_generator.py +++ b/src/chat/focus_chat/replyer/default_generator.py @@ -285,7 +285,7 @@ class DefaultReplyer: relation_info_block = reply_data.get("relation_info_block", "") reply_to = reply_data.get("reply_to", "none") memory_block = reply_data.get("memory_block", "") - + # 优先使用 extra_info_block，没有则用 extra_info extra_info_block = reply_data.get("extra_info_block", "") or reply_data.get("extra_info", "") @@ -353,7 +353,7 @@ class DefaultReplyer: extra_info_block = f"以下是你在回复时需要参考的信息，现在请你阅读以下内容，进行决策\n{extra_info_block}\n以上是你在回复时需要参考的信息，现在请你阅读以下内容，进行决策" else: extra_info_block = "" - + # 关键词检测与反应 keywords_reaction_prompt = "" try: