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-07-07 12:01:49 +00:00
parent 26e14bd6b7
commit e64db2fbe5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/chat/normal_chat/normal_chat.py
View File

@@ -526,17 +526,13 @@ class NormalChat:
is_parallel = plan_result["action_result"].get("is_parallel", False) is_parallel = plan_result["action_result"].get("is_parallel", False)
if action_type == "no_action": if action_type == "no_action":
logger.info( logger.info(f"[{self.stream_name}] {global_config.bot.nickname} 决定进行回复")
f"[{self.stream_name}] {global_config.bot.nickname} 决定进行回复"
)
elif is_parallel: elif is_parallel:
logger.info( logger.info(
f"[{self.stream_name}] {global_config.bot.nickname} 决定进行回复, 同时执行{action_type}动作" f"[{self.stream_name}] {global_config.bot.nickname} 决定进行回复, 同时执行{action_type}动作"
) )
else: else:
logger.info( logger.info(f"[{self.stream_name}] {global_config.bot.nickname} 决定执行{action_type}动作")
f"[{self.stream_name}] {global_config.bot.nickname} 决定执行{action_type}动作"
)
self.action_type = action_type # 更新实例属性 self.action_type = action_type # 更新实例属性
self.is_parallel_action = is_parallel # 新增：保存并行执行标志 self.is_parallel_action = is_parallel # 新增：保存并行执行标志
@@ -637,7 +633,9 @@ class NormalChat:
if not response_set: if not response_set:
logger.warning(f"[{self.stream_name}] 模型未生成回复内容") logger.warning(f"[{self.stream_name}] 模型未生成回复内容")
elif self.enable_planner and self.action_type not in ["no_action"] and not self.is_parallel_action: elif self.enable_planner and self.action_type not in ["no_action"] and not self.is_parallel_action:
logger.info(f"[{self.stream_name}] {global_config.bot.nickname} 原本想要回复：{content}，但选择执行{self.action_type}，不发表回复") logger.info(
f"[{self.stream_name}] {global_config.bot.nickname} 原本想要回复：{content}，但选择执行{self.action_type}，不发表回复"
)
# 如果模型未生成回复，移除思考消息 # 如果模型未生成回复，移除思考消息
await self._cleanup_thinking_message_by_id(thinking_id) await self._cleanup_thinking_message_by_id(thinking_id)
return False return False

4
src/person_info/relationship_builder.py
View File

@@ -187,7 +187,9 @@ class RelationshipBuilder:
segments.append(new_segment) segments.append(new_segment)
person_info_manager = get_person_info_manager() person_info_manager = get_person_info_manager()
person_name = person_info_manager.get_value_sync(person_id, "person_name") or person_id person_name = person_info_manager.get_value_sync(person_id, "person_name") or person_id
logger.debug(f"{self.log_prefix} 重新眼熟用户 {person_name} 创建新消息段（超过10条消息间隔）: {new_segment}") logger.debug(
f"{self.log_prefix} 重新眼熟用户 {person_name} 创建新消息段（超过10条消息间隔）: {new_segment}"
)
self._save_cache() self._save_cache()