From 6facdd2a76bd56beaf416828d5be0f9d41914e6c Mon Sep 17 00:00:00 2001 From: tcmofashi Date: Tue, 3 Jun 2025 16:07:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8normal=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0change=5Fto=5Ffocus=5Fchat=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chat/normal_chat/normal_chat.py | 17 +++++++++++++++-- src/chat/normal_chat/normal_chat_planner.py | 18 ++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/chat/normal_chat/normal_chat.py b/src/chat/normal_chat/normal_chat.py index 840672a1c..8c724c83a 100644 --- a/src/chat/normal_chat/normal_chat.py +++ b/src/chat/normal_chat/normal_chat.py @@ -362,6 +362,9 @@ class NormalChat: if action_type == "no_action": logger.debug(f"[{self.stream_name}] Planner决定不执行任何额外动作") return None + elif action_type == "change_to_focus_chat": + logger.info(f"[{self.stream_name}] Planner决定切换到focus聊天模式") + return None # 执行额外的动作（不影响回复生成） action_result = await self._execute_action(action_type, action_data, message, thinking_id) @@ -396,7 +399,9 @@ class NormalChat: elif plan_result: logger.debug(f"[{self.stream_name}] 额外动作处理完成: {plan_result['action_type']}") - if not response_set or (self.enable_planner and self.action_type != "no_action"): + if not response_set or ( + self.enable_planner and self.action_type not in ["no_action", "change_to_focus_chat"] + ): logger.info(f"[{self.stream_name}] 模型未生成回复内容") # 如果模型未生成回复，移除思考消息 container = await message_manager.get_container(self.stream_id) # 使用 self.stream_id @@ -445,7 +450,15 @@ class NormalChat: # 检查是否需要切换到focus模式 if global_config.chat.chat_mode == "auto": - await self._check_switch_to_focus() + if self.action_type == "change_to_focus_chat": + logger.info(f"[{self.stream_name}] 检测到切换到focus聊天模式的请求") + if self.on_switch_to_focus_callback: + await self.on_switch_to_focus_callback() + else: + logger.warning(f"[{self.stream_name}] 没有设置切换到focus聊天模式的回调函数，无法执行切换") + return + else: + await self._check_switch_to_focus() info_catcher.done_catch() diff --git a/src/chat/normal_chat/normal_chat_planner.py b/src/chat/normal_chat/normal_chat_planner.py index 634bf5c77..3829ced47 100644 --- a/src/chat/normal_chat/normal_chat_planner.py +++ b/src/chat/normal_chat/normal_chat_planner.py @@ -28,6 +28,7 @@ def init_prompt(): 重要说明： - "no_action" 表示只进行普通聊天回复，不执行任何额外动作 +- "change_to_focus_chat" 表示当聊天变得热烈、自己回复条数很多或需要深入交流时，正常回复消息并切换到focus_chat模式进行更深入的对话 - 其他action表示在普通回复的基础上，执行相应的额外动作 你必须从上面列出的可用action中选择一个，并说明原因。 @@ -156,8 +157,8 @@ class NormalChatPlanner: # 提取其他参数作为action_data action_data = {k: v for k, v in action_result.items() if k not in ["action", "reasoning"]} - # 验证动作是否在可用动作列表中 - if action not in current_available_actions: + # 验证动作是否在可用动作列表中，或者是特殊动作 + if action not in current_available_actions and action != "change_to_focus_chat": logger.warning(f"{self.log_prefix}规划器选择了不可用的动作: {action}, 回退到no_action") action = "no_action" reasoning = f"选择的动作{action}不在可用列表中，回退到no_action" @@ -211,6 +212,19 @@ class NormalChatPlanner: try: # 构建动作选项文本 action_options_text = "" + + # 添加特殊的change_to_focus_chat动作 + action_options_text += "action_name: change_to_focus_chat\n" + action_options_text += ( + " 描述：当聊天变得热烈、自己回复条数很多或需要深入交流时使用，正常回复消息并切换到focus_chat模式\n" + ) + action_options_text += " 参数：\n" + action_options_text += " 动作要求：\n" + action_options_text += " - 聊天上下文中自己的回复条数较多（超过3-4条）\n" + action_options_text += " - 对话进行得非常热烈活跃\n" + action_options_text += " - 用户表现出深入交流的意图\n" + action_options_text += " - 话题需要更专注和深入的讨论\n\n" + for action_name, action_info in current_available_actions.items(): action_description = action_info.get("description", "") action_parameters = action_info.get("parameters", {})