From bf782aed705a38bb13977dbb3f3210d595e9c622 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Jun 2025 05:28:14 +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 --- .../focus_chat/info_processors/relationship_processor.py | 4 +++- src/chat/focus_chat/memory_activator.py | 2 +- src/chat/focus_chat/planners/planner_simple.py | 8 ++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/chat/focus_chat/info_processors/relationship_processor.py b/src/chat/focus_chat/info_processors/relationship_processor.py index 9f99b33ec..e90c7fcff 100644 --- a/src/chat/focus_chat/info_processors/relationship_processor.py +++ b/src/chat/focus_chat/info_processors/relationship_processor.py @@ -664,7 +664,9 @@ class PersonImpressionpProcessor(BaseProcessor): person_info_manager = get_person_info_manager() for person_name, info_type in content_json.items(): - is_bot = person_name == global_config.bot.nickname or person_name in global_config.bot.alias_names + is_bot = ( + person_name == global_config.bot.nickname or person_name in global_config.bot.alias_names + ) if is_bot: person_id = person_info_manager.get_person_id("system", "bot_id") logger.info(f"{self.log_prefix} 检测到对bot自身({person_name})的信息查询,使用特殊ID。") diff --git a/src/chat/focus_chat/memory_activator.py b/src/chat/focus_chat/memory_activator.py index 4cc8b66f4..310fcda0e 100644 --- a/src/chat/focus_chat/memory_activator.py +++ b/src/chat/focus_chat/memory_activator.py @@ -106,7 +106,7 @@ class MemoryActivator: prompt = await global_prompt_manager.format_prompt( "memory_activator_prompt", - obs_info_text = obs_info_text, + obs_info_text=obs_info_text, cached_keywords=cached_keywords_str, ) diff --git a/src/chat/focus_chat/planners/planner_simple.py b/src/chat/focus_chat/planners/planner_simple.py index 885a38411..98fcef4b2 100644 --- a/src/chat/focus_chat/planners/planner_simple.py +++ b/src/chat/focus_chat/planners/planner_simple.py @@ -6,7 +6,6 @@ from src.llm_models.utils_model import LLMRequest 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.cycle_info import CycleInfo 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 @@ -60,7 +59,6 @@ def init_prompt(): "simple_planner_prompt_private", ) - Prompt( """ {action_require} @@ -116,7 +114,6 @@ class ActionPlanner(BasePlanner): # 获取观察信息 extra_info: list[str] = [] - cycle_info = "" structured_info = "" extra_info = [] observed_messages = [] @@ -136,7 +133,7 @@ class ActionPlanner(BasePlanner): # 从ObsInfo中获取chat_id chat_id = info.get_chat_id() # elif isinstance(info, CycleInfo): - # cycle_info = info.get_observe_info() + # cycle_info = info.get_observe_info() elif isinstance(info, RelationInfo): relation_info = info.get_processed_info() elif isinstance(info, StructuredInfo): @@ -275,8 +272,7 @@ class ActionPlanner(BasePlanner): logger.debug(f"{self.log_prefix} 传递{len(selected_expressions)}个选中的表达方式到action_data") action_data["loop_start_time"] = loop_start_time - - + memory_str = "" if running_memorys: memory_str = "以下是当前在聊天中,你回忆起的记忆:\n"