Merge remote-tracking branch 'upstream/main-fix' into refactor

src/plugins/chat/message_sender.py

@@ -8,8 +8,8 @@ from ..message.api import global_api
 from .message import MessageSending, MessageThinking, MessageSet
 
 from .storage import MessageStorage
-from .config import global_config
-from .utils import truncate_message
+from ..config.config import global_config
+from .utils import truncate_message, calculate_typing_time
 
 from src.common.logger import LogConfig, SENDER_STYLE_CONFIG
 
@@ -58,6 +58,9 @@ class Message_Sender:
                     logger.warning(f"消息“{message.processed_plain_text}”已被撤回，不发送")
                     break
             if not is_recalled:
+                typing_time = calculate_typing_time(message.processed_plain_text)
+                await asyncio.sleep(typing_time)
+
                 message_json = message.to_dict()
 
                 message_preview = truncate_message(message.processed_plain_text)
@@ -80,7 +83,7 @@ class MessageContainer:
         self.max_size = max_size
         self.messages = []
         self.last_send_time = 0
-        self.thinking_timeout = 20  # 思考超时时间（秒）
+        self.thinking_timeout = 10  # 思考超时时间（秒）
 
     def get_timeout_messages(self) -> List[MessageSending]:
         """获取所有超时的Message_Sending对象（思考时间超过30秒），按thinking_start_time排序"""
@@ -189,7 +192,7 @@ class MessageManager:
                 # print(thinking_time)
                 if (
                     message_earliest.is_head
-                    and message_earliest.update_thinking_time() > 15
+                    and message_earliest.update_thinking_time() > 20
                     and not message_earliest.is_private_message()  # 避免在私聊时插入reply
                 ):
                     logger.debug(f"设置回复消息{message_earliest.processed_plain_text}")
@@ -216,7 +219,7 @@ class MessageManager:
                         # print(msg.is_private_message())
                         if (
                             msg.is_head
-                            and msg.update_thinking_time() > 15
+                            and msg.update_thinking_time() > 25
                             and not msg.is_private_message()  # 避免在私聊时插入reply
                         ):
                             logger.debug(f"设置回复消息{msg.processed_plain_text}")