gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🤖 自动格式化代码 [skip ci]

Browse Source
This commit is contained in:
github-actions[bot]
2025-06-21 10:01:17 +00:00
parent 3146bcbcf1
commit 611e47c14d
7 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/chat/focus_chat/heartFC_chat.py
View File

@@ -566,15 +566,11 @@ class HeartFChatting:
# 创建三个并行任务，为LLM调用添加超时保护
action_modify_task = asyncio.create_task(
asyncio.wait_for(
modify_actions_task(),
timeout=ACTION_MODIFICATION_TIMEOUT
)
asyncio.wait_for(modify_actions_task(), timeout=ACTION_MODIFICATION_TIMEOUT)
)
memory_task = asyncio.create_task(
asyncio.wait_for(
self.memory_activator.activate_memory(self.observations),
timeout=MEMORY_ACTIVATION_TIMEOUT
self.memory_activator.activate_memory(self.observations), timeout=MEMORY_ACTIVATION_TIMEOUT
)
)
processor_task = asyncio.create_task(self._process_processors(self.observations))
@@ -584,27 +580,26 @@ class HeartFChatting:
running_memorys = []
all_plan_info = []
processor_time_costs = {}
try:
action_modify_result, running_memorys, (all_plan_info, processor_time_costs) = await asyncio.gather(
action_modify_task, memory_task, processor_task,
return_exceptions=True
action_modify_task, memory_task, processor_task, return_exceptions=True
)
# 检查各个任务的结果
if isinstance(action_modify_result, Exception):
if isinstance(action_modify_result, asyncio.TimeoutError):
logger.error(f"{self.log_prefix} 动作修改任务超时")
else:
logger.error(f"{self.log_prefix} 动作修改任务失败: {action_modify_result}")
if isinstance(running_memorys, Exception):
if isinstance(running_memorys, asyncio.TimeoutError):
logger.error(f"{self.log_prefix} 记忆激活任务超时")
else:
logger.error(f"{self.log_prefix} 记忆激活任务失败: {running_memorys}")
running_memorys = []
processor_result = (all_plan_info, processor_time_costs)
if isinstance(processor_result, Exception):
if isinstance(processor_result, asyncio.TimeoutError):
@@ -615,7 +610,7 @@ class HeartFChatting:
processor_time_costs = {}
else:
all_plan_info, processor_time_costs = processor_result
except Exception as e:
logger.error(f"{self.log_prefix} 并行任务gather失败: {e}")
# 设置默认值以继续执行
@@ -628,7 +623,9 @@ class HeartFChatting:
"processor_time_costs": processor_time_costs,
}
logger.debug(f"{self.log_prefix} 并行阶段完成，准备进入规划器，plan_info数量: {len(all_plan_info)}, running_memorys数量: {len(running_memorys)}")
logger.debug(
f"{self.log_prefix} 并行阶段完成，准备进入规划器，plan_info数量: {len(all_plan_info)}, running_memorys数量: {len(running_memorys)}"
)
with Timer("规划器", cycle_timers):
plan_result = await self.action_planner.plan(all_plan_info, running_memorys, loop_start_time)

1
src/chat/focus_chat/info_processors/expression_selector_processor.py
View File

@@ -163,7 +163,6 @@ class ExpressionSelectorProcessor(BaseProcessor):
cache_size = len(selected_expressions) if selected_expressions else 0
mode_desc = f"LLM模式（已缓存{cache_size}个）"
if selected_expressions:
# 缓存选择的表达方式
self.cached_expressions = selected_expressions

8
src/chat/focus_chat/info_processors/relationship_processor.py
View File

@@ -706,7 +706,7 @@ class PersonImpressionpProcessor(BaseProcessor):
if self.info_fetched_cache:
persons_with_known_info = [] # 有已知信息的人员
persons_with_unknown_info = [] # 有未知信息的人员
for person_id in self.info_fetched_cache:
person_known_infos = []
person_unknown_infos = []
@@ -739,9 +739,11 @@ class PersonImpressionpProcessor(BaseProcessor):
for person_name, unknown_types in persons_with_unknown_info:
unknown_types_str = "、".join(unknown_types)
unknown_persons_details.append(f"{person_name}的[{unknown_types_str}]")
if len(unknown_persons_details) == 1:
persons_infos_str += f"你不了解{unknown_persons_details[0]}信息，不要胡乱回答，可以直接说不知道或忘记了；\n"
persons_infos_str += (
f"你不了解{unknown_persons_details[0]}信息，不要胡乱回答，可以直接说不知道或忘记了；\n"
)
else:
unknown_all_str = "、".join(unknown_persons_details)
persons_infos_str += f"你不了解{unknown_all_str}等信息，不要胡乱回答，可以直接说不知道或忘记了；\n"