diff --git a/src/chat/focus_chat/planners/action_manager.py b/src/chat/focus_chat/planners/action_manager.py index d2e4adc7c..bb7da652e 100644 --- a/src/chat/focus_chat/planners/action_manager.py +++ b/src/chat/focus_chat/planners/action_manager.py @@ -442,6 +442,8 @@ class ActionManager: """ filtered_actions = {} + print(self._using_actions) + for action_name, action_info in self._using_actions.items(): print(f"action_info: {action_info}") print(f"action_name: {action_name}") diff --git a/src/chat/focus_chat/planners/modify_actions.py b/src/chat/focus_chat/planners/modify_actions.py index e714830f2..56b07d6ca 100644 --- a/src/chat/focus_chat/planners/modify_actions.py +++ b/src/chat/focus_chat/planners/modify_actions.py @@ -80,6 +80,9 @@ class ActionModifier: obs = hfc_obs # 获取适用于FOCUS模式的动作 all_actions = self.action_manager.get_using_actions_for_mode("focus") + print("=======================") + print(all_actions) + print("=======================") action_changes = await self.analyze_loop_actions(obs) if action_changes["add"] or action_changes["remove"]: # 合并动作变更 diff --git a/src/chat/focus_chat/planners/planner_factory.py b/src/chat/focus_chat/planners/planner_factory.py index e0215776b..8552dcd20 100644 --- a/src/chat/focus_chat/planners/planner_factory.py +++ b/src/chat/focus_chat/planners/planner_factory.py @@ -2,7 +2,6 @@ from typing import Dict, Type from src.chat.focus_chat.planners.base_planner import BasePlanner from src.chat.focus_chat.planners.planner_simple import ActionPlanner as SimpleActionPlanner from src.chat.focus_chat.planners.action_manager import ActionManager -from src.config.config import global_config from src.common.logger import get_logger logger = get_logger("planner_factory") @@ -40,12 +39,7 @@ class PlannerFactory: Returns: BasePlanner: 规划器实例 """ - planner_type = global_config.focus_chat.planner_type - if planner_type not in cls._planner_types: - logger.warning(f"{log_prefix} 未知的规划器类型: {planner_type},使用默认规划器") - planner_type = "complex" - - planner_class = cls._planner_types[planner_type] - logger.info(f"{log_prefix} 使用{planner_type}规划器") + planner_class = cls._planner_types["simple"] + logger.info(f"{log_prefix} 使用simple规划器") return planner_class(log_prefix=log_prefix, action_manager=action_manager) diff --git a/src/chat/focus_chat/planners/planner_simple.py b/src/chat/focus_chat/planners/planner_simple.py index 3806d1e84..ad3fcf098 100644 --- a/src/chat/focus_chat/planners/planner_simple.py +++ b/src/chat/focus_chat/planners/planner_simple.py @@ -263,10 +263,7 @@ class ActionPlanner(BasePlanner): action = "no_reply" reasoning = f"Planner 内部处理错误: {outer_e}" - # logger.debug( - # f"{self.log_prefix}规划器Prompt:\n{prompt}\n\n决策动作:{action},\n动作信息: '{action_data}'\n理由: {reasoning}" - # ) - + # 恢复到默认动作集 self.action_manager.restore_actions() logger.debug( diff --git a/src/config/official_configs.py b/src/config/official_configs.py index 34da536db..a98180d57 100644 --- a/src/config/official_configs.py +++ b/src/config/official_configs.py @@ -159,9 +159,6 @@ class FocusChatConfig(ConfigBase): processor_max_time: int = 25 """处理器最大时间,单位秒,如果超过这个时间,处理器会自动停止""" - planner_type: str = "simple" - """规划器类型,可选值:default(默认规划器), simple(简单规划器)""" - @dataclass class FocusChatProcessorConfig(ConfigBase): diff --git a/src/plugin_system/apis/plugin_api.py b/src/plugin_system/apis/plugin_api.py index fe2475d8a..a80165bb8 100644 --- a/src/plugin_system/apis/plugin_api.py +++ b/src/plugin_system/apis/plugin_api.py @@ -71,8 +71,6 @@ class PluginAPI(MessageAPI, LLMAPI, DatabaseAPI, ConfigAPI, UtilsAPI, StreamAPI, # 存储插件配置 self._plugin_config = plugin_config or {} - logger.debug(f"{self.log_prefix} PluginAPI 初始化完成") - def set_chat_stream(self, chat_stream): """设置聊天流对象""" self._services["chat_stream"] = chat_stream