Merge branch 'dev' of https://github.com/MoFox-Studio/MoFox_Bot into dev

src/chat/message_manager/__init__.py

@@ -13,4 +13,4 @@ __all__ = [
     "StreamLoopManager",
     "message_manager",
     "stream_loop_manager",
-]
+]

src/chat/message_manager/context_manager.py

@@ -82,7 +82,7 @@ class SingleStreamContextManager:
 
                 self.total_messages += 1
                 self.last_access_time = time.time()
-                
+
                 # 如果使用了缓存系统，输出调试信息
                 if cache_enabled and self.context.is_cache_enabled:
                     if self.context.is_chatter_processing:

src/chat/message_manager/distribution_manager.py

@@ -111,9 +111,9 @@ class StreamLoopManager:
         # 获取或创建该流的启动锁
         if stream_id not in self._stream_start_locks:
             self._stream_start_locks[stream_id] = asyncio.Lock()
-        
+
         lock = self._stream_start_locks[stream_id]
-        
+
         # 使用锁防止并发启动同一个流的多个循环任务
         async with lock:
             # 获取流上下文
@@ -148,7 +148,7 @@ class StreamLoopManager:
                     # 紧急取消
                     context.stream_loop_task.cancel()
                     await asyncio.sleep(0.1)
-                
+
                 loop_task = asyncio.create_task(self._stream_loop_worker(stream_id), name=f"stream_loop_{stream_id}")
 
                 # 将任务记录到 StreamContext 中
@@ -252,7 +252,7 @@ class StreamLoopManager:
                         self.stats["total_process_cycles"] += 1
                         if success:
                             logger.info(f"✅ [流工作器] stream={stream_id[:8]}, 任务ID={task_id}, 处理成功")
-                            
+
                             # 🔒 处理成功后，等待一小段时间确保清理操作完成
                             # 这样可以避免在 chatter_manager 清除未读消息之前就进入下一轮循环
                             await asyncio.sleep(0.1)
@@ -382,7 +382,7 @@ class StreamLoopManager:
                 self.chatter_manager.process_stream_context(stream_id, context),
                 name=f"chatter_process_{stream_id}"
             )
-         
+
             # 等待 chatter 任务完成
             results = await chatter_task
             success = results.get("success", False)
@@ -398,8 +398,8 @@ class StreamLoopManager:
             else:
                 logger.warning(f"流处理失败: {stream_id} - {results.get('error_message', '未知错误')}")
 
-            return success  
-        except asyncio.CancelledError:     
+            return success
+        except asyncio.CancelledError:
             if chatter_task and not chatter_task.done():
                 chatter_task.cancel()
             raise
@@ -709,4 +709,4 @@ class StreamLoopManager:
 
 
 # 全局流循环管理器实例
-stream_loop_manager = StreamLoopManager()
+stream_loop_manager = StreamLoopManager()

src/chat/message_manager/message_manager.py

@@ -417,7 +417,7 @@ class MessageManager:
                 return
 
             # 记录详细信息
-            msg_previews = [f"{str(msg.message_id)[:8] if msg.message_id else 'unknown'}:{msg.processed_plain_text[:20] if msg.processed_plain_text else '(空)'}" 
+            msg_previews = [f"{str(msg.message_id)[:8] if msg.message_id else 'unknown'}:{msg.processed_plain_text[:20] if msg.processed_plain_text else '(空)'}"
                           for msg in unread_messages[:3]]  # 只显示前3条
             logger.info(f"🧹 [清除未读] stream={stream_id[:8]}, 开始清除 {len(unread_messages)} 条未读消息, 示例: {msg_previews}")
 
@@ -446,15 +446,15 @@ class MessageManager:
             context = chat_stream.context_manager.context
             if hasattr(context, "unread_messages") and context.unread_messages:
                 unread_count = len(context.unread_messages)
-                
+
                 # 如果还有未读消息，说明 action_manager 可能遗漏了，标记它们
-                if unread_count > 0:   
+                if unread_count > 0:
                     # 获取所有未读消息的 ID
                     message_ids = [msg.message_id for msg in context.unread_messages]
-                    
+
                     # 标记为已读（会移到历史消息）
                     success = chat_stream.context_manager.mark_messages_as_read(message_ids)
-                    
+
                     if success:
                         logger.debug(f"✅ stream={stream_id[:8]}, 成功标记 {unread_count} 条消息为已读")
                     else:
@@ -481,7 +481,7 @@ class MessageManager:
                 try:
                     chat_manager = get_chat_manager()
                     chat_stream = await chat_manager.get_stream(stream_id)
-                    if chat_stream and hasattr(chat_stream.context_manager.context, 'is_chatter_processing'):
+                    if chat_stream and hasattr(chat_stream.context_manager.context, "is_chatter_processing"):
                         chat_stream.context_manager.context.is_chatter_processing = is_processing
                         logger.debug(f"设置StreamContext处理状态: stream={stream_id}, processing={is_processing}")
                 except Exception as e:
@@ -517,7 +517,7 @@ class MessageManager:
                 try:
                     chat_manager = get_chat_manager()
                     chat_stream = await chat_manager.get_stream(stream_id)
-                    if chat_stream and hasattr(chat_stream.context_manager.context, 'is_chatter_processing'):
+                    if chat_stream and hasattr(chat_stream.context_manager.context, "is_chatter_processing"):
                         return chat_stream.context_manager.context.is_chatter_processing
                 except Exception:
                     pass
@@ -677,4 +677,4 @@ class MessageManager:
 
 
 # 创建全局消息管理器实例
-message_manager = MessageManager()
+message_manager = MessageManager()