fix:try to fix
This commit is contained in:
@@ -442,6 +442,8 @@ class ActionManager:
|
|||||||
"""
|
"""
|
||||||
filtered_actions = {}
|
filtered_actions = {}
|
||||||
|
|
||||||
|
print(self._using_actions)
|
||||||
|
|
||||||
for action_name, action_info in self._using_actions.items():
|
for action_name, action_info in self._using_actions.items():
|
||||||
print(f"action_info: {action_info}")
|
print(f"action_info: {action_info}")
|
||||||
print(f"action_name: {action_name}")
|
print(f"action_name: {action_name}")
|
||||||
|
|||||||
@@ -80,6 +80,9 @@ class ActionModifier:
|
|||||||
obs = hfc_obs
|
obs = hfc_obs
|
||||||
# 获取适用于FOCUS模式的动作
|
# 获取适用于FOCUS模式的动作
|
||||||
all_actions = self.action_manager.get_using_actions_for_mode("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)
|
action_changes = await self.analyze_loop_actions(obs)
|
||||||
if action_changes["add"] or action_changes["remove"]:
|
if action_changes["add"] or action_changes["remove"]:
|
||||||
# 合并动作变更
|
# 合并动作变更
|
||||||
|
|||||||
@@ -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.base_planner import BasePlanner
|
||||||
from src.chat.focus_chat.planners.planner_simple import ActionPlanner as SimpleActionPlanner
|
from src.chat.focus_chat.planners.planner_simple import ActionPlanner as SimpleActionPlanner
|
||||||
from src.chat.focus_chat.planners.action_manager import ActionManager
|
from src.chat.focus_chat.planners.action_manager import ActionManager
|
||||||
from src.config.config import global_config
|
|
||||||
from src.common.logger import get_logger
|
from src.common.logger import get_logger
|
||||||
|
|
||||||
logger = get_logger("planner_factory")
|
logger = get_logger("planner_factory")
|
||||||
@@ -40,12 +39,7 @@ class PlannerFactory:
|
|||||||
Returns:
|
Returns:
|
||||||
BasePlanner: 规划器实例
|
BasePlanner: 规划器实例
|
||||||
"""
|
"""
|
||||||
planner_type = global_config.focus_chat.planner_type
|
|
||||||
|
|
||||||
if planner_type not in cls._planner_types:
|
planner_class = cls._planner_types["simple"]
|
||||||
logger.warning(f"{log_prefix} 未知的规划器类型: {planner_type},使用默认规划器")
|
logger.info(f"{log_prefix} 使用simple规划器")
|
||||||
planner_type = "complex"
|
|
||||||
|
|
||||||
planner_class = cls._planner_types[planner_type]
|
|
||||||
logger.info(f"{log_prefix} 使用{planner_type}规划器")
|
|
||||||
return planner_class(log_prefix=log_prefix, action_manager=action_manager)
|
return planner_class(log_prefix=log_prefix, action_manager=action_manager)
|
||||||
|
|||||||
@@ -263,10 +263,7 @@ class ActionPlanner(BasePlanner):
|
|||||||
action = "no_reply"
|
action = "no_reply"
|
||||||
reasoning = f"Planner 内部处理错误: {outer_e}"
|
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()
|
self.action_manager.restore_actions()
|
||||||
logger.debug(
|
logger.debug(
|
||||||
|
|||||||
@@ -159,9 +159,6 @@ class FocusChatConfig(ConfigBase):
|
|||||||
processor_max_time: int = 25
|
processor_max_time: int = 25
|
||||||
"""处理器最大时间,单位秒,如果超过这个时间,处理器会自动停止"""
|
"""处理器最大时间,单位秒,如果超过这个时间,处理器会自动停止"""
|
||||||
|
|
||||||
planner_type: str = "simple"
|
|
||||||
"""规划器类型,可选值:default(默认规划器), simple(简单规划器)"""
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class FocusChatProcessorConfig(ConfigBase):
|
class FocusChatProcessorConfig(ConfigBase):
|
||||||
|
|||||||
@@ -71,8 +71,6 @@ class PluginAPI(MessageAPI, LLMAPI, DatabaseAPI, ConfigAPI, UtilsAPI, StreamAPI,
|
|||||||
# 存储插件配置
|
# 存储插件配置
|
||||||
self._plugin_config = plugin_config or {}
|
self._plugin_config = plugin_config or {}
|
||||||
|
|
||||||
logger.debug(f"{self.log_prefix} PluginAPI 初始化完成")
|
|
||||||
|
|
||||||
def set_chat_stream(self, chat_stream):
|
def set_chat_stream(self, chat_stream):
|
||||||
"""设置聊天流对象"""
|
"""设置聊天流对象"""
|
||||||
self._services["chat_stream"] = chat_stream
|
self._services["chat_stream"] = chat_stream
|
||||||
|
|||||||
Reference in New Issue
Block a user