From 1518251cc312f03bb2f646d9ee5810f14505c9ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 6 Jul 2025 13:45:57 +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/normal_chat/normal_chat.py | 1 - src/chat/planner_actions/planner.py | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/chat/normal_chat/normal_chat.py b/src/chat/normal_chat/normal_chat.py index 7f1788591..6a8c73b34 100644 --- a/src/chat/normal_chat/normal_chat.py +++ b/src/chat/normal_chat/normal_chat.py @@ -18,7 +18,6 @@ from src.chat.planner_actions.action_manager import ActionManager from src.person_info.relationship_builder_manager import relationship_builder_manager from .priority_manager import PriorityManager import traceback -from src.chat.planner_actions.planner_normal import NormalChatPlanner from src.chat.planner_actions.planner_focus import ActionPlanner from src.chat.planner_actions.action_modifier import ActionModifier diff --git a/src/chat/planner_actions/planner.py b/src/chat/planner_actions/planner.py index 2c2fcf007..11d69935e 100644 --- a/src/chat/planner_actions/planner.py +++ b/src/chat/planner_actions/planner.py @@ -156,7 +156,7 @@ class ActionPlanner: if action == "no_action": action = "no_reply" reasoning = "决定不使用额外动作" - + if action not in current_available_actions and action != "no_action": logger.warning( f"{self.log_prefix}LLM 返回了当前不可用或无效的动作: '{action}' (可用: {list(current_available_actions.keys())}),将强制使用 'no_reply'" @@ -176,7 +176,6 @@ class ActionPlanner: action = "no_reply" reasoning = f"Planner 内部处理错误: {outer_e}" - is_parallel = False if action in current_available_actions: action_info = current_available_actions[action] @@ -220,7 +219,6 @@ class ActionPlanner: ) self.last_obs_time_mark = time.time() - if self.mode == "focus": by_what = "聊天内容" @@ -230,7 +228,7 @@ class ActionPlanner: no_action_block = """重要说明: - 'no_action' 表示只进行普通聊天回复,不执行任何额外动作 - 其他action表示在普通回复的基础上,执行相应的额外动作""" - + chat_context_description = "你现在正在一个群聊中" chat_target_name = None # Only relevant for private if not is_group_chat and chat_target_info: @@ -239,7 +237,6 @@ class ActionPlanner: ) chat_context_description = f"你正在和 {chat_target_name} 私聊" - action_options_block = "" for using_actions_name, using_actions_info in current_available_actions.items():