Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

src/chat/heart_flow/heartflow_message_processor.py

@@ -131,9 +131,7 @@ class HeartFCMessageReceiver:
             picid_pattern = r"\[picid:([^\]]+)\]"
             processed_plain_text = re.sub(picid_pattern, "[图片]", message.processed_plain_text)
 
-            logger.info(
+            logger.info(f"[{mes_name}]{userinfo.user_nickname}:{processed_plain_text}")
-                f"[{mes_name}]{userinfo.user_nickname}:{processed_plain_text}"
-            )
 
             logger.debug(f"[{mes_name}][当前时段回复频率: {current_talk_frequency}]")
 

src/chat/normal_chat/normal_chat.py

@@ -596,7 +596,9 @@ class NormalChat:
 
             timeout_source = " 和 ".join(timeout_details)
 
-            logger.warning(f"[{self.stream_name}] {timeout_source} 任务超时 ({global_config.chat.thinking_timeout}秒)，正在取消相关任务...")
+            logger.warning(
+                f"[{self.stream_name}] {timeout_source} 任务超时 ({global_config.chat.thinking_timeout}秒)，正在取消相关任务..."
+            )
             # print(f"111{self.timeout_count}")
             self.timeout_count += 1
             if self.timeout_count > 5:

src/person_info/relationship_manager.py

@@ -24,7 +24,6 @@ class RelationshipManager:
             request_type="relationship",  # 用于动作规划
         )
 
-
     @staticmethod
     async def is_known_some_one(platform, user_id):
         """判断是否认识某人"""
@@ -111,7 +110,6 @@ class RelationshipManager:
 
         return relation_prompt
 
-
     async def update_person_impression(self, person_id, timestamp, bot_engaged_messages=None):
         """更新用户印象
 
@@ -171,7 +169,7 @@ class RelationshipManager:
                     user_count += 1
                 name_mapping[replace_person_name] = f"用户{current_user}{user_count if user_count > 1 else ''}"
                 current_user = chr(ord(current_user) + 1)
-        
+
         readable_messages = build_readable_messages(
             messages=user_messages, replace_bot_name=True, timestamp_mode="normal_no_YMD", truncate=True
         )
@@ -341,7 +339,7 @@ class RelationshipManager:
         await person_info_manager.update_one_field(
             person_id, "points", json.dumps(current_points, ensure_ascii=False, indent=None)
         )
-        
+
         await person_info_manager.update_one_field(person_id, "know_times", know_times + 1)
         know_since = await person_info_manager.get_value(person_id, "know_since") or 0
         if know_since == 0:
@@ -349,17 +347,16 @@ class RelationshipManager:
         await person_info_manager.update_one_field(person_id, "last_know", timestamp)
 
         logger.debug(f"{person_name} 的印象更新完成")
-        
+
     async def _update_impression(self, person_id, current_points, timestamp):
         # 获取现有forgotten_points
         person_info_manager = get_person_info_manager()
-        
+
-        
         person_name = await person_info_manager.get_value(person_id, "person_name")
         nickname = await person_info_manager.get_value(person_id, "nickname")
         know_times = await person_info_manager.get_value(person_id, "know_times") or 0
         attitude = await person_info_manager.get_value(person_id, "attitude") or 50
-        
+
         # 根据熟悉度，调整印象和简短印象的最大长度
         if know_times > 300:
             max_impression_length = 2000
@@ -376,14 +373,12 @@ class RelationshipManager:
         else:
             max_impression_length = 100
             max_short_impression_length = 50
-            
+
         # 根据好感度，调整印象和简短印象的最大长度
-        attitude_multiplier = (abs(100-attitude) / 100) + 1
+        attitude_multiplier = (abs(100 - attitude) / 100) + 1
         max_impression_length = max_impression_length * attitude_multiplier
         max_short_impression_length = max_short_impression_length * attitude_multiplier
-        
+
-        
-        
         forgotten_points = await person_info_manager.get_value(person_id, "forgotten_points") or []
         if isinstance(forgotten_points, str):
             try:
@@ -553,9 +548,8 @@ class RelationshipManager:
         await person_info_manager.update_one_field(
             person_id, "forgotten_points", json.dumps(forgotten_points, ensure_ascii=False, indent=None)
         )
-        
-        return current_points
 
+        return current_points
 
     def calculate_time_weight(self, point_time: str, current_time: str) -> float:
         """计算基于时间的权重系数"""

src/plugins/built_in/core_actions/no_reply.py

@@ -103,7 +103,6 @@ class NoReplyAction(BaseAction):
 
             logger.info(f"{self.log_prefix} 选择不回复(第{count}次)，开始摸鱼，原因: {reason}")
 
-            
             # 进入等待状态
             while True:
                 current_time = time.time()
@@ -387,7 +386,9 @@ class NoReplyAction(BaseAction):
                         f"{self.log_prefix} 发言过多(超过{over_count}条)，随机决定跳过此次LLM判断(概率{skip_probability * 100:.0f}%)"
                     )
 
-                logger.info(f"{self.log_prefix} 过去10分钟发言{bot_message_count}条，超过阈值{talk_frequency_threshold}，添加疲惫提示")
+                logger.info(
+                    f"{self.log_prefix} 过去10分钟发言{bot_message_count}条，超过阈值{talk_frequency_threshold}，添加疲惫提示"
+                )
                 return frequency_block, should_skip_judge
             else:
                 # 回复次数少时的正向提示
@@ -398,7 +399,9 @@ class NoReplyAction(BaseAction):
                 elif under_count >= talk_frequency_threshold * 0.5:
                     frequency_block = "你感觉状态不错。\n"
 
-                logger.info(f"{self.log_prefix} 过去10分钟发言{bot_message_count}条，未超过阈值{talk_frequency_threshold}，添加正向提示")
+                logger.info(
+                    f"{self.log_prefix} 过去10分钟发言{bot_message_count}条，未超过阈值{talk_frequency_threshold}，添加正向提示"
+                )
                 return frequency_block, False
 
         except Exception as e:

src/plugins/built_in/tts_plugin/plugin.py

@@ -59,6 +59,11 @@ class TTSAction(BaseAction):
             # 发送TTS消息
             await self.send_custom(message_type="tts_text", content=processed_text)
 
+            # 记录动作信息
+            await self.store_action_info(
+                action_build_into_prompt=True, action_prompt_display="已经发送了语音消息。", action_done=True
+            )
+
             logger.info(f"{self.log_prefix} TTS动作执行成功，文本长度: {len(processed_text)}")
             return True, "TTS动作执行成功"
 

src/tools/tool_executor.py

@@ -187,7 +187,11 @@ class ToolExecutor:
                     tool_results.append(tool_info)
 
                     logger.info(f"{self.log_prefix}工具{tool_name}执行成功，类型: {tool_info['type']}")
-                    logger.debug(f"{self.log_prefix}工具{tool_name}结果内容: {tool_info['content'][:200]}...")
+                    content = tool_info["content"]
+                    if not isinstance(content, (str, list, tuple)):
+                        content = str(content)
+                    preview = content[:200]
+                    logger.debug(f"{self.log_prefix}工具{tool_name}结果内容: {preview}...")
 
             except Exception as e:
                 logger.error(f"{self.log_prefix}工具{tool_name}执行失败: {e}")