Refactor chat stream handling to use BotChatSession

- Updated imports and references from ChatStream to BotChatSession across multiple files. - Adjusted method signatures and internal logic to accommodate the new session management. - Ensured compatibility with existing functionality while improving code clarity and maintainability.
2026-03-07 00:57:33 +08:00
parent 8712fc0d05
commit 2e3dd44ee9
43 changed files with 706 additions and 563 deletions
--- a/src/chat/brain_chat/PFC/conversation.py
+++ b/src/chat/brain_chat/PFC/conversation.py
@@ -7,7 +7,7 @@ from src.chat.utils.chat_message_builder import build_readable_messages, get_raw

 # from src.config.config import global_config
 from typing import Dict, Any, Optional
-from src.chat.message_receive.message import Message
+from src.common.data_models.mai_message_data_model import MaiMessage
 from .pfc_types import ConversationState
 from .pfc import ChatObserver, GoalAnalyzer
 from .message_sender import DirectMessageSender
@@ -16,9 +16,8 @@ from .action_planner import ActionPlanner
 from .observation_info import ObservationInfo
 from .conversation_info import ConversationInfo  # 确保导入 ConversationInfo
 from .reply_generator import ReplyGenerator
-from src.chat.message_receive.chat_stream import ChatStream
+from src.chat.message_receive.chat_manager import BotChatSession, chat_manager as _chat_manager
 from maim_message import UserInfo
-from src.chat.message_receive.chat_stream import get_chat_manager
 from .pfc_KnowledgeFetcher import KnowledgeFetcher
 from .waiter import Waiter

@@ -60,7 +59,7 @@ class Conversation:
            self.direct_sender = DirectMessageSender(self.private_name)

            # 获取聊天流信息
-            self.chat_stream = get_chat_manager().get_stream(self.stream_id)
+            self.chat_stream = _chat_manager.get_session_by_session_id(self.stream_id)

            self.stop_action_planner = False
        except Exception as e:
@@ -265,34 +264,34 @@ class Conversation:
            return True
        return False

-    def _convert_to_message(self, msg_dict: Dict[str, Any]) -> Message:
-        """将消息字典转换为Message对象"""
+    def _convert_to_message(self, msg_dict: Dict[str, Any]) -> MaiMessage:
+        """将消息字典转换为MaiMessage对象"""
+        from datetime import datetime as dt
+        from src.common.data_models.mai_message_data_model import UserInfo as MaiUserInfo, MessageInfo
+        from src.common.data_models.message_component_data_model import MessageSequence
+
        try:
-            # 尝试从 msg_dict 直接获取 chat_stream，如果失败则从全局 get_chat_manager 获取
-            chat_info = msg_dict.get("chat_info")
-            if chat_info and isinstance(chat_info, dict):
-                chat_stream = ChatStream.from_dict(chat_info)
-            elif self.chat_stream:  # 使用实例变量中的 chat_stream
-                chat_stream = self.chat_stream
-            else:  # Fallback: 尝试从 manager 获取 (可能需要 stream_id)
-                chat_stream = get_chat_manager().get_stream(self.stream_id)
-                if not chat_stream:
-                    raise ValueError(f"无法确定 ChatStream for stream_id {self.stream_id}")
-
-            user_info = UserInfo.from_dict(msg_dict.get("user_info", {}))
-
-            return Message(
-                message_id=msg_dict.get("message_id", f"gen_{time.time()}"),  # 提供默认 ID
-                chat_stream=chat_stream,  # 使用确定的 chat_stream
-                time=msg_dict.get("time", time.time()),  # 提供默认时间
-                user_info=user_info,
-                processed_plain_text=msg_dict.get("processed_plain_text", ""),
-                detailed_plain_text=msg_dict.get("detailed_plain_text", ""),
+            user_info_dict = msg_dict.get("user_info", {})
+            user_info = MaiUserInfo(
+                user_id=user_info_dict.get("user_id", ""),
+                user_nickname=user_info_dict.get("user_nickname", ""),
+                user_cardname=user_info_dict.get("user_cardname"),
            )
+
+            msg = MaiMessage(
+                message_id=msg_dict.get("message_id", f"gen_{time.time()}"),
+                timestamp=dt.fromtimestamp(msg_dict.get("time", time.time())),
+            )
+            msg.message_info = MessageInfo(user_info=user_info)
+            msg.platform = user_info_dict.get("platform", "")
+            msg.session_id = self.stream_id
+            msg.processed_plain_text = msg_dict.get("processed_plain_text", "")
+            msg.raw_message = MessageSequence(components=[])
+            msg.initialized = True
+            return msg
        except Exception as e:
            logger.warning(f"[私聊][{self.private_name}]转换消息时出错: {e}")
-            # 可以选择返回 None 或重新抛出异常，这里选择重新抛出以指示问题
-            raise ValueError(f"无法将字典转换为 Message 对象: {e}") from e
+            raise ValueError(f"无法将字典转换为 MaiMessage 对象: {e}") from e

    async def _handle_action(
        self, action: str, reason: str, observation_info: ObservationInfo, conversation_info: ConversationInfo
@@ -687,7 +686,7 @@ class Conversation:
                logger.error(f"[私聊][{self.private_name}]DirectMessageSender 未初始化，无法发送回复。")
                return
            if not self.chat_stream:
-                logger.error(f"[私聊][{self.private_name}]ChatStream 未初始化，无法发送回复。")
+                logger.error(f"[私聊][{self.private_name}]会话未初始化，无法发送回复。")
                return

            await self.direct_sender.send_message(chat_stream=self.chat_stream, content=reply_content)
--- a/src/chat/brain_chat/PFC/message_sender.py
+++ b/src/chat/brain_chat/PFC/message_sender.py
@@ -1,10 +1,12 @@
 import time
 from typing import Optional
 from src.common.logger import get_logger
-from src.chat.message_receive.chat_stream import ChatStream
-from src.chat.message_receive.message import Message, MessageSending
-from maim_message import UserInfo, Seg
-from src.chat.message_receive.storage import MessageStorage
+from maim_message import Seg
+
+from src.common.data_models.mai_message_data_model import MaiMessage, UserInfo
+from src.chat.message_receive.chat_manager import BotChatSession
+from src.chat.message_receive.message import MessageSending
+from src.chat.message_receive.uni_message_sender import UniversalMessageSender
 from src.config.config import global_config
 from rich.traceback import install

@@ -19,18 +21,17 @@ class DirectMessageSender:

    def __init__(self, private_name: str):
        self.private_name = private_name
-        self.storage = MessageStorage()

    async def send_message(
        self,
-        chat_stream: ChatStream,
+        chat_stream: BotChatSession,
        content: str,
-        reply_to_message: Optional[Message] = None,
+        reply_to_message: Optional[MaiMessage] = None,
    ) -> None:
        """发送消息到聊天流

        Args:
-            chat_stream: 聊天流
+            chat_stream: 聊天会话
            content: 消息内容
            reply_to_message: 要回复的消息（可选）
        """
@@ -42,18 +43,22 @@ class DirectMessageSender:
            bot_user_info = UserInfo(
                user_id=global_config.bot.qq_account,
                user_nickname=global_config.bot.nickname,
-                platform=chat_stream.platform,
            )

            # 用当前时间作为message_id，和之前那套sender一样
            message_id = f"dm{round(time.time(), 2)}"

+            # 构建发送者信息（私聊时为接收者）
+            sender_info = None
+            if reply_to_message and reply_to_message.message_info and reply_to_message.message_info.user_info:
+                sender_info = reply_to_message.message_info.user_info
+
            # 构建消息对象
            message = MessageSending(
                message_id=message_id,
-                chat_stream=chat_stream,
+                session=chat_stream,
                bot_user_info=bot_user_info,
-                sender_info=reply_to_message.message_info.user_info if reply_to_message else None,
+                sender_info=sender_info,
                message_segment=segments,
                reply=reply_to_message,
                is_head=True,
@@ -61,17 +66,11 @@ class DirectMessageSender:
                thinking_start_time=time.time(),
            )

-            # 处理消息
-            await message.process()
-
-            # 发送消息（直接调用底层 API）
-            from src.chat.message_receive.uni_message_sender import _send_message
-
-            sent = await _send_message(message, show_log=True)
+            # 发送消息
+            message_sender = UniversalMessageSender()
+            sent = await message_sender.send_message(message, typing=False, set_reply=False, storage_message=True)

            if sent:
-                # 存储消息
-                await self.storage.store_message(message, chat_stream)
                logger.info(f"[私聊][{self.private_name}]PFC消息已发送: {content}")
            else:
                logger.error(f"[私聊][{self.private_name}]PFC消息发送失败")
--- a/src/chat/brain_chat/brain_chat.py
+++ b/src/chat/brain_chat/brain_chat.py
@@ -9,7 +9,7 @@ from src.config.config import global_config
 from src.common.logger import get_logger
 from src.common.data_models.info_data_model import ActionPlannerInfo
 from src.common.data_models.message_data_model import ReplyContentType
-from src.chat.message_receive.chat_stream import ChatStream, get_chat_manager
+from src.chat.message_receive.chat_manager import BotChatSession, chat_manager as _chat_manager
 from src.chat.utils.prompt_builder import global_prompt_manager
 from src.chat.utils.timer_calculator import Timer
 from src.chat.brain_chat.brain_planner import BrainPlanner
@@ -73,10 +73,10 @@ class BrainChatting:
        """
        # 基础属性
        self.stream_id: str = chat_id  # 聊天流ID
-        self.chat_stream: ChatStream = get_chat_manager().get_stream(self.stream_id)  # type: ignore
+        self.chat_stream: BotChatSession = _chat_manager.get_session_by_session_id(self.stream_id)  # type: ignore
        if not self.chat_stream:
            raise ValueError(f"无法找到聊天流: {self.stream_id}")
-        self.log_prefix = f"[{get_chat_manager().get_stream_name(self.stream_id) or self.stream_id}]"
+        self.log_prefix = f"[{_chat_manager.get_session_name(self.stream_id) or self.stream_id}]"

        self.expression_learner = expression_learner_manager.get_expression_learner(self.stream_id)

--- a/src/chat/brain_chat/brain_planner.py
+++ b/src/chat/brain_chat/brain_planner.py
@@ -22,7 +22,7 @@ from src.chat.utils.chat_message_builder import (
 )
 from src.chat.utils.utils import get_chat_type_and_target_info
 from src.chat.planner_actions.action_manager import ActionManager
-from src.chat.message_receive.chat_stream import get_chat_manager
+from src.chat.message_receive.chat_manager import chat_manager as _chat_manager
 from src.plugin_system.base.component_types import ActionInfo, ComponentType, ActionActivationType
 from src.plugin_system.core.component_registry import component_registry

@@ -38,7 +38,7 @@ install(extra_lines=3)
 class BrainPlanner:
    def __init__(self, chat_id: str, action_manager: ActionManager):
        self.chat_id = chat_id
-        self.log_prefix = f"[{get_chat_manager().get_stream_name(chat_id) or chat_id}]"
+        self.log_prefix = f"[{_chat_manager.get_session_name(chat_id) or chat_id}]"
        self.action_manager = action_manager
        # LLM规划器配置
        self.planner_llm = LLMRequest(