🤖 自动格式化代码 [skip ci]

src/mais4u/mais4u_chat/s4u_chat.py

@@ -1,39 +1,15 @@
 import asyncio
 import time
-import traceback
 import random
-from typing import List, Optional, Dict  # 导入类型提示
-import os
-import pickle
+from typing import Optional, Dict  # 导入类型提示
 from maim_message import UserInfo, Seg
 from src.common.logger import get_logger
-from src.chat.heart_flow.utils_chat import get_chat_type_and_target_info
-from src.manager.mood_manager import mood_manager
 from src.chat.message_receive.chat_stream import ChatStream, get_chat_manager
-from src.chat.utils.timer_calculator import Timer
-from src.chat.utils.prompt_builder import global_prompt_manager
 from .s4u_stream_generator import S4UStreamGenerator
-from src.chat.message_receive.message import MessageSending, MessageRecv, MessageThinking, MessageSet
-from src.chat.message_receive.message_sender import message_manager
-from src.chat.normal_chat.willing.willing_manager import get_willing_manager
-from src.chat.normal_chat.normal_chat_utils import get_recent_message_stats
+from src.chat.message_receive.message import MessageSending, MessageRecv
 from src.config.config import global_config
-from src.chat.focus_chat.planners.action_manager import ActionManager
-from src.chat.normal_chat.normal_chat_planner import NormalChatPlanner
-from src.chat.normal_chat.normal_chat_action_modifier import NormalChatActionModifier
-from src.chat.normal_chat.normal_chat_expressor import NormalChatExpressor
-from src.chat.focus_chat.replyer.default_generator import DefaultReplyer
-from src.person_info.person_info import PersonInfoManager
-from src.person_info.relationship_manager import get_relationship_manager
-from src.chat.utils.chat_message_builder import (
-    get_raw_msg_by_timestamp_with_chat,
-    get_raw_msg_by_timestamp_with_chat_inclusive,
-    get_raw_msg_before_timestamp_with_chat,
-    num_new_messages_since,
-)
 from src.common.message.api import get_global_api
 from src.chat.message_receive.storage import MessageStorage
-from src.audio.mock_audio import MockAudioGenerator, MockAudioPlayer
 
 
 logger = get_logger("S4U_chat")
@@ -41,6 +17,7 @@ logger = get_logger("S4U_chat")
 
 class MessageSenderContainer:
     """一个简单的容器，用于按顺序发送消息并模拟打字效果。"""
+
     def __init__(self, chat_stream: ChatStream, original_message: MessageRecv):
         self.chat_stream = chat_stream
         self.original_message = original_message
@@ -71,7 +48,7 @@ class MessageSenderContainer:
         chars_per_second = 15.0
         min_delay = 0.2
         max_delay = 2.0
-        
+
         delay = len(text) / chars_per_second
         return max(min_delay, min(delay, max_delay))
 
@@ -98,7 +75,7 @@ class MessageSenderContainer:
 
                 current_time = time.time()
                 msg_id = f"{current_time}_{random.randint(1000, 9999)}"
-                
+
                 text_to_send = chunk
                 if global_config.experimental.debug_show_chat_mode:
                     text_to_send += "ⁿ"
@@ -117,19 +94,19 @@ class MessageSenderContainer:
                     reply=self.original_message,
                     is_emoji=False,
                     apply_set_reply_logic=True,
-                    reply_to=f"{self.original_message.message_info.user_info.platform}:{self.original_message.message_info.user_info.user_id}"
+                    reply_to=f"{self.original_message.message_info.user_info.platform}:{self.original_message.message_info.user_info.user_id}",
                 )
-                
+
                 await bot_message.process()
-                
+
                 await get_global_api().send_message(bot_message)
                 logger.info(f"已将消息 '{text_to_send}' 发往平台 '{bot_message.message_info.platform}'")
-                
+
                 await self.storage.store_message(bot_message, self.chat_stream)
-            
+
             except Exception as e:
                 logger.error(f"[{self.chat_stream.get_stream_name()}] 消息发送或存储时出现错误: {e}", exc_info=True)
-            
+
             finally:
                 # CRUCIAL: Always call task_done() for any item that was successfully retrieved.
                 self.queue.task_done()
@@ -138,7 +115,7 @@ class MessageSenderContainer:
         """启动发送任务。"""
         if self._task is None:
             self._task = asyncio.create_task(self._send_worker())
-    
+
     async def join(self):
         """等待所有消息发送完毕。"""
         if self._task:
@@ -156,8 +133,10 @@ class S4UChatManager:
             self.s4u_chats[chat_stream.stream_id] = S4UChat(chat_stream)
         return self.s4u_chats[chat_stream.stream_id]
 
+
 s4u_chat_manager = S4UChatManager()
 
+
 def get_s4u_chat_manager() -> S4UChatManager:
     return s4u_chat_manager
 
@@ -169,22 +148,19 @@ class S4UChat:
         self.chat_stream = chat_stream
         self.stream_id = chat_stream.stream_id
         self.stream_name = get_chat_manager().get_stream_name(self.stream_id) or self.stream_id
-        
+
         self._message_queue = asyncio.Queue()
         self._processing_task = asyncio.create_task(self._message_processor())
         self._current_generation_task: Optional[asyncio.Task] = None
         self._current_message_being_replied: Optional[MessageRecv] = None
-        
+
         self._is_replying = False
 
         self.gpt = S4UStreamGenerator()
         # self.audio_generator = MockAudioGenerator()
 
-
-
         logger.info(f"[{self.stream_name}] S4UChat")
 
-
     # 改为实例方法, 移除 chat 参数
     async def response(self, message: MessageRecv, is_mentioned: bool, interested_rate: float) -> None:
         """将消息放入队列并根据发信人决定是否中断当前处理。"""
@@ -226,8 +202,8 @@ class S4UChat:
                 # 如果因快速中断导致队列中积压了更多消息，则只处理最新的一条
                 while not self._message_queue.empty():
                     drained_msg = self._message_queue.get_nowait()
-                    self._message_queue.task_done() # 为取出的旧消息调用 task_done
-                    message = drained_msg # 始终处理最新消息
+                    self._message_queue.task_done()  # 为取出的旧消息调用 task_done
+                    message = drained_msg  # 始终处理最新消息
                     self._current_message_being_replied = message
                     logger.info(f"[{self.stream_name}] 丢弃过时消息，处理最新消息: {message.processed_plain_text}")
 
@@ -242,44 +218,40 @@ class S4UChat:
                 finally:
                     self._current_generation_task = None
                     self._current_message_being_replied = None
-            
+
             except asyncio.CancelledError:
                 logger.info(f"[{self.stream_name}] 消息处理器正在关闭。")
                 break
             except Exception as e:
                 logger.error(f"[{self.stream_name}] 消息处理器主循环发生未知错误: {e}", exc_info=True)
-                await asyncio.sleep(1) # 避免在未知错误下陷入CPU空转
+                await asyncio.sleep(1)  # 避免在未知错误下陷入CPU空转
             finally:
                 # 确保处理过的消息（无论是正常完成还是被丢弃）都被标记完成
-                if 'message' in locals():
+                if "message" in locals():
                     self._message_queue.task_done()
 
-
     async def _generate_and_send(self, message: MessageRecv):
         """为单个消息生成文本和音频回复。整个过程可以被中断。"""
         self._is_replying = True
         sender_container = MessageSenderContainer(self.chat_stream, message)
         sender_container.start()
-        
+
         try:
-            logger.info(
-                f"[S4U] 开始为消息生成文本和音频流: "
-                f"'{message.processed_plain_text[:30]}...'"
-            )
-            
+            logger.info(f"[S4U] 开始为消息生成文本和音频流: '{message.processed_plain_text[:30]}...'")
+
             # 1. 逐句生成文本、发送并播放音频
             gen = self.gpt.generate_response(message, "")
             async for chunk in gen:
                 # 如果任务被取消，await 会在此处引发 CancelledError
-                
+
                 # a. 发送文本块
                 await sender_container.add_message(chunk)
-                
+
                 # b. 为该文本块生成并播放音频
                 # if chunk.strip():
-                    # audio_data = await self.audio_generator.generate(chunk)
-                    # player = MockAudioPlayer(audio_data)
-                    # await player.play()
+                # audio_data = await self.audio_generator.generate(chunk)
+                # player = MockAudioPlayer(audio_data)
+                # await player.play()
 
             # 等待所有文本消息发送完成
             await sender_container.close()
@@ -300,20 +272,19 @@ class S4UChat:
                 await sender_container.join()
             logger.info(f"[{self.stream_name}] _generate_and_send 任务结束，资源已清理。")
 
-
     async def shutdown(self):
         """平滑关闭处理任务。"""
         logger.info(f"正在关闭 S4UChat: {self.stream_name}")
-        
+
         # 取消正在运行的任务
         if self._current_generation_task and not self._current_generation_task.done():
             self._current_generation_task.cancel()
-        
+
         if self._processing_task and not self._processing_task.done():
             self._processing_task.cancel()
-        
+
         # 等待任务响应取消
         try:
             await self._processing_task
         except asyncio.CancelledError:
-            logger.info(f"处理任务已成功取消: {self.stream_name}")
+            logger.info(f"处理任务已成功取消: {self.stream_name}")

src/mais4u/mais4u_chat/s4u_msg_processor.py

@@ -1,21 +1,10 @@
-from src.chat.memory_system.Hippocampus import hippocampus_manager
-from src.config.config import global_config
 from src.chat.message_receive.message import MessageRecv
 from src.chat.message_receive.storage import MessageStorage
-from src.chat.heart_flow.heartflow import heartflow
-from src.chat.message_receive.chat_stream import get_chat_manager, ChatStream
+from src.chat.message_receive.chat_stream import get_chat_manager
 from src.chat.utils.utils import is_mentioned_bot_in_message
-from src.chat.utils.timer_calculator import Timer
 from src.common.logger import get_logger
 from .s4u_chat import get_s4u_chat_manager
 
-import math
-import re
-import traceback
-from typing import Optional, Tuple
-from maim_message import UserInfo
-
-from src.person_info.relationship_manager import get_relationship_manager
 
 # from ..message_receive.message_buffer import message_buffer
 
@@ -44,7 +33,7 @@ class S4UMessageProcessor:
         """
 
         target_user_id_list = ["1026294844", "964959351"]
-        
+
         # 1. 消息解析与初始化
         groupinfo = message.message_info.group_info
         userinfo = message.message_info.user_info
@@ -60,7 +49,7 @@ class S4UMessageProcessor:
 
         is_mentioned = is_mentioned_bot_in_message(message)
         s4u_chat = get_s4u_chat_manager().get_or_create_chat(chat)
-        
+
         if userinfo.user_id in target_user_id_list:
             await s4u_chat.response(message, is_mentioned=is_mentioned, interested_rate=1.0)
         else:
@@ -68,4 +57,3 @@ class S4UMessageProcessor:
 
         # 7. 日志记录
         logger.info(f"[S4U]{userinfo.user_nickname}:{message.processed_plain_text}")
-

src/mais4u/mais4u_chat/s4u_prompt.py

@@ -1,10 +1,8 @@
-
 from src.config.config import global_config
 from src.common.logger import get_logger
 from src.individuality.individuality import get_individuality
 from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
 from src.chat.utils.chat_message_builder import build_readable_messages, get_raw_msg_before_timestamp_with_chat
-from src.chat.message_receive.message import MessageRecv
 import time
 from src.chat.utils.utils import get_recent_group_speaker
 from src.chat.memory_system.Hippocampus import hippocampus_manager
@@ -23,7 +21,6 @@ def init_prompt():
 
     Prompt("\n你有以下这些**知识**：\n{prompt_info}\n请你**记住上面的知识**，之后可能会用到。\n", "knowledge_prompt")
 
-
     Prompt(
         """
 你的名字叫{bot_name}，昵称是：{bot_other_names}，{prompt_personality}。
@@ -79,7 +76,6 @@ class PromptBuilder:
                 relationship_manager = get_relationship_manager()
                 relation_prompt += await relationship_manager.build_relationship_info(person)
 
-
         memory_prompt = ""
         related_memory = await hippocampus_manager.get_memory_from_text(
             text=message_txt, max_memory_num=2, max_memory_length=2, max_depth=3, fast_retrieval=False
@@ -98,23 +94,20 @@ class PromptBuilder:
             timestamp=time.time(),
             limit=100,
         )
-        
-        
+
         talk_type = message.message_info.platform + ":" + message.chat_stream.user_info.user_id
         print(f"talk_type: {talk_type}")
-        
 
         # 分别筛选核心对话和背景对话
         core_dialogue_list = []
         background_dialogue_list = []
         bot_id = str(global_config.bot.qq_account)
         target_user_id = str(message.chat_stream.user_info.user_id)
-        
 
         for msg_dict in message_list_before_now:
             try:
                 # 直接通过字典访问
-                msg_user_id = str(msg_dict.get('user_id'))
+                msg_user_id = str(msg_dict.get("user_id"))
                 if msg_user_id == bot_id:
                     if msg_dict.get("reply_to") and talk_type == msg_dict.get("reply_to"):
                         print(f"reply: {msg_dict.get('reply_to')}")
@@ -127,24 +120,24 @@ class PromptBuilder:
                     background_dialogue_list.append(msg_dict)
             except Exception as e:
                 logger.error(f"无法处理历史消息记录: {msg_dict}, 错误: {e}")
-                
+
         if background_dialogue_list:
             latest_25_msgs = background_dialogue_list[-25:]
             background_dialogue_prompt = build_readable_messages(
                 latest_25_msgs,
                 merge_messages=True,
-                timestamp_mode = "normal_no_YMD",
-                show_pic = False,
+                timestamp_mode="normal_no_YMD",
+                show_pic=False,
             )
             background_dialogue_prompt = f"这是其他用户的发言：\n{background_dialogue_prompt}"
         else:
             background_dialogue_prompt = ""
-                
+
         # 分别获取最新50条和最新25条（从message_list_before_now截取）
         core_dialogue_list = core_dialogue_list[-50:]
-        
+
         first_msg = core_dialogue_list[0]
-        start_speaking_user_id = first_msg.get('user_id')
+        start_speaking_user_id = first_msg.get("user_id")
         if start_speaking_user_id == bot_id:
             last_speaking_user_id = bot_id
             msg_seg_str = "你的发言：\n"
@@ -152,30 +145,33 @@ class PromptBuilder:
             start_speaking_user_id = target_user_id
             last_speaking_user_id = start_speaking_user_id
             msg_seg_str = "对方的发言：\n"
-        
+
         msg_seg_str += f"{time.strftime('%H:%M:%S', time.localtime(first_msg.get('time')))}: {first_msg.get('processed_plain_text')}\n"
 
         all_msg_seg_list = []
         for msg in core_dialogue_list[1:]:
-            speaker = msg.get('user_id')
+            speaker = msg.get("user_id")
             if speaker == last_speaking_user_id:
-                #还是同一个人讲话
-                msg_seg_str += f"{time.strftime('%H:%M:%S', time.localtime(msg.get('time')))}: {msg.get('processed_plain_text')}\n"
+                # 还是同一个人讲话
+                msg_seg_str += (
+                    f"{time.strftime('%H:%M:%S', time.localtime(msg.get('time')))}: {msg.get('processed_plain_text')}\n"
+                )
             else:
-                #换人了
+                # 换人了
                 msg_seg_str = f"{msg_seg_str}\n"
                 all_msg_seg_list.append(msg_seg_str)
-                
+
                 if speaker == bot_id:
                     msg_seg_str = "你的发言：\n"
                 else:
                     msg_seg_str = "对方的发言：\n"
-                
-                msg_seg_str += f"{time.strftime('%H:%M:%S', time.localtime(msg.get('time')))}: {msg.get('processed_plain_text')}\n"
-                last_speaking_user_id = speaker
-            
-        all_msg_seg_list.append(msg_seg_str)
 
+                msg_seg_str += (
+                    f"{time.strftime('%H:%M:%S', time.localtime(msg.get('time')))}: {msg.get('processed_plain_text')}\n"
+                )
+                last_speaking_user_id = speaker
+
+        all_msg_seg_list.append(msg_seg_str)
 
         core_msg_str = ""
         for msg in all_msg_seg_list:

src/mais4u/mais4u_chat/s4u_stream_generator.py

@@ -43,8 +43,8 @@ class S4UStreamGenerator:
         # 匹配常见的句子结束符，但会忽略引号内和数字中的标点
         self.sentence_split_pattern = re.compile(
             r'([^\s\w"\'([{]*["\'([{].*?["\'}\])][^\s\w"\'([{]*|'  # 匹配被引号/括号包裹的内容
-            r'[^.。!?？！\n\r]+(?:[.。!?？！\n\r](?![\'"])|$))'  # 匹配直到句子结束符
-            , re.UNICODE | re.DOTALL
+            r'[^.。!?？！\n\r]+(?:[.。!?？！\n\r](?![\'"])|$))',  # 匹配直到句子结束符
+            re.UNICODE | re.DOTALL,
         )
 
     async def generate_response(
@@ -68,7 +68,7 @@ class S4UStreamGenerator:
 
         # 构建prompt
         if previous_reply_context:
-             message_txt = f"""
+            message_txt = f"""
              你正在回复用户的消息，但中途被打断了。这是已有的对话上下文:
              [你已经对上一条消息说的话]: {previous_reply_context}
              ---
@@ -78,9 +78,8 @@ class S4UStreamGenerator:
         else:
             message_txt = message.processed_plain_text
 
-
         prompt = await prompt_builder.build_prompt_normal(
-            message = message,
+            message=message,
             message_txt=message_txt,
             sender_name=sender_name,
             chat_stream=message.chat_stream,
@@ -109,16 +108,16 @@ class S4UStreamGenerator:
         **kwargs,
     ) -> AsyncGenerator[str, None]:
         print(prompt)
-        
+
         buffer = ""
         delimiters = "，。！？,.!?\n\r"  # For final trimming
         punctuation_buffer = ""
-        
+
         async for content in client.get_stream_content(
             messages=[{"role": "user", "content": prompt}], model=model_name, **kwargs
         ):
             buffer += content
-            
+
             # 使用正则表达式匹配句子
             last_match_end = 0
             for match in self.sentence_split_pattern.finditer(buffer):
@@ -132,24 +131,23 @@ class S4UStreamGenerator:
                         else:
                             # 发送之前累积的标点和当前句子
                             to_yield = punctuation_buffer + sentence
-                            if to_yield.endswith((',', '，')):
-                                to_yield = to_yield.rstrip(',，')
-                            
+                            if to_yield.endswith((",", "，")):
+                                to_yield = to_yield.rstrip(",，")
+
                             yield to_yield
-                            punctuation_buffer = "" # 清空标点符号缓冲区
-                            await asyncio.sleep(0) # 允许其他任务运行
-                        
+                            punctuation_buffer = ""  # 清空标点符号缓冲区
+                            await asyncio.sleep(0)  # 允许其他任务运行
+
                         last_match_end = match.end(0)
-            
+
             # 从缓冲区移除已发送的部分
             if last_match_end > 0:
                 buffer = buffer[last_match_end:]
-        
+
         # 发送缓冲区中剩余的任何内容
         to_yield = (punctuation_buffer + buffer).strip()
         if to_yield:
-            if to_yield.endswith(('，', ',')):
-                to_yield = to_yield.rstrip('，,')
+            if to_yield.endswith(("，", ",")):
+                to_yield = to_yield.rstrip("，,")
             if to_yield:
                 yield to_yield
-