rafafawfa

src/plugins/heartFC_chat/heartFC_sender.py

@@ -1,13 +1,12 @@
 # src/plugins/heartFC_chat/heartFC_sender.py
-import asyncio # 重新导入 asyncio
-import time
-from typing import Dict, List, Optional, Union # 重新导入类型
+import asyncio  # 重新导入 asyncio
+from typing import Dict, Optional  # 重新导入类型
 
 from src.common.logger import get_module_logger
 from ..message.api import global_api
-from ..chat.message import MessageSending, MessageThinking # 只保留 MessageSending 和 MessageThinking
+from ..chat.message import MessageSending, MessageThinking  # 只保留 MessageSending 和 MessageThinking
 from ..storage.storage import MessageStorage
-from ..chat.utils import truncate_message 
+from ..chat.utils import truncate_message
 from src.common.logger import LogConfig, SENDER_STYLE_CONFIG
 from src.plugins.chat.utils import calculate_typing_time
 
@@ -28,17 +27,17 @@ class HeartFCSender:
         self.storage = MessageStorage()
         # 用于存储活跃的思考消息
         self.thinking_messages: Dict[str, Dict[str, MessageThinking]] = {}
-        self._thinking_lock = asyncio.Lock() # 保护 thinking_messages 的锁
+        self._thinking_lock = asyncio.Lock()  # 保护 thinking_messages 的锁
 
     async def send_message(self, message: MessageSending) -> None:
         """合并后的消息发送函数，包含WS发送和日志记录"""
         message_preview = truncate_message(message.processed_plain_text)
-        
+
         try:
             # 直接调用API发送消息
             await global_api.send_message(message)
             logger.success(f"发送消息   '{message_preview}'   成功")
-            
+
         except Exception as e:
             logger.error(f"发送消息   '{message_preview}'   失败: {str(e)}")
             if not message.message_info.platform:
@@ -82,7 +81,7 @@ class HeartFCSender:
             thinking_message = self.thinking_messages.get(chat_id, {}).get(message_id)
             return thinking_message.thinking_start_time if thinking_message else None
 
-    async def type_and_send_message(self, message: MessageSending, type = False):
+    async def type_and_send_message(self, message: MessageSending, type=False):
         """
         立即处理、发送并存储单个 MessageSending 消息。
         调用此方法前，应先调用 register_thinking 注册对应的思考消息。
@@ -102,17 +101,13 @@ class HeartFCSender:
             _ = message.update_thinking_time()
 
             # --- 条件应用 set_reply 逻辑 ---
-            if (
-                message.apply_set_reply_logic
-                and message.is_head
-                and not message.is_private_message()
-            ):
+            if message.apply_set_reply_logic and message.is_head and not message.is_private_message():
                 logger.debug(f"[{chat_id}] 应用 set_reply 逻辑: {message.processed_plain_text[:20]}...")
                 message.set_reply()
             # --- 结束条件 set_reply ---
 
             await message.process()
-            
+
             if type:
                 typing_time = calculate_typing_time(
                     input_string=message.processed_plain_text,
@@ -120,15 +115,12 @@ class HeartFCSender:
                     is_emoji=message.is_emoji,
                 )
                 await asyncio.sleep(typing_time)
-            
-            
+
             await self.send_message(message)
             await self.storage.store_message(message, message.chat_stream)
 
         except Exception as e:
-            logger.error(
-                f"[{chat_id}] 处理或存储消息 {message_id} 时出错: {e}"
-            )
+            logger.error(f"[{chat_id}] 处理或存储消息 {message_id} 时出错: {e}")
             raise e
         finally:
             await self.complete_thinking(chat_id, message_id)
@@ -139,23 +131,23 @@ class HeartFCSender:
             logger.error(f"[{message.message_info.platform or 'UnknownPlatform'}] 消息缺少 chat_stream，无法发送")
             return
         if not message.message_info or not message.message_info.message_id:
-            logger.error(f"[{message.chat_stream.stream_id if message.chat_stream else 'UnknownStream'}] 消息缺少 message_info 或 message_id，无法发送")
+            logger.error(
+                f"[{message.chat_stream.stream_id if message.chat_stream else 'UnknownStream'}] 消息缺少 message_info 或 message_id，无法发送"
+            )
             return
 
         chat_id = message.chat_stream.stream_id
-        message_id = message.message_info.message_id # 获取消息ID用于日志
+        message_id = message.message_info.message_id  # 获取消息ID用于日志
 
         try:
             await message.process()
-            
+
             await asyncio.sleep(0.5)
-            
-            await self.send_message(message) # 使用现有的发送方法
-            await self.storage.store_message(message, message.chat_stream) # 使用现有的存储方法
+
+            await self.send_message(message)  # 使用现有的发送方法
+            await self.storage.store_message(message, message.chat_stream)  # 使用现有的存储方法
 
         except Exception as e:
-            logger.error(
-                f"[{chat_id}] 处理或存储消息 {message_id} 时出错: {e}"
-            )
+            logger.error(f"[{chat_id}] 处理或存储消息 {message_id} 时出错: {e}")
             # 重新抛出异常，让调用者知道失败了
             raise e