Merge remote-tracking branch 'upstream/debug' into debug

src/plugins/chat/__init__.py

@@ -4,7 +4,7 @@ import os
 
 from loguru import logger
 from nonebot import get_driver, on_message, require
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment,MessageEvent
 from nonebot.typing import T_State
 
 from ...common.database import Database
@@ -38,8 +38,8 @@ emoji_manager.initialize()
 logger.debug(f"正在唤醒{global_config.BOT_NICKNAME}......")
 # 创建机器人实例
 chat_bot = ChatBot()
-# 注册群消息处理器
-group_msg = on_message(priority=5)
+# 注册消息处理器
+msg_in = on_message(priority=5)
 # 创建定时任务
 scheduler = require("nonebot_plugin_apscheduler").scheduler
 
@@ -91,8 +91,8 @@ async def _(bot: Bot):
     asyncio.create_task(chat_manager._auto_save_task())
 
 
-@group_msg.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
+@msg_in.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
     await chat_bot.handle_message(event, bot)
 
 

src/plugins/chat/bot.py

@@ -2,12 +2,16 @@ import re
 import time
 from random import random
 from loguru import logger
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent
+from nonebot.adapters.onebot.v11 import (
+    Bot,
+    GroupMessageEvent,
+    MessageEvent,
+    PrivateMessageEvent,
+)
 
 from ..memory_system.memory import hippocampus
 from ..moods.moods import MoodManager  # 导入情绪管理器
 from .config import global_config
-from .cq_code import CQCode, cq_code_tool  # 导入CQCode模块
 from .emoji_manager import emoji_manager  # 导入表情包管理器
 from .llm_generator import ResponseGenerator
 from .message import MessageSending, MessageRecv, MessageThinking, MessageSet
@@ -42,39 +46,53 @@ class ChatBot:
         if not self._started:
             self._started = True
 
-    async def handle_message(self, event: GroupMessageEvent, bot: Bot) -> None:
-        """处理收到的群消息"""
+    async def handle_message(self, event: MessageEvent, bot: Bot) -> None:
+        """处理收到的消息"""
 
         self.bot = bot  # 更新 bot 实例
 
-        try:
-            group_info_api = await bot.get_group_info(group_id=event.group_id)
-            logger.info(f"成功获取群信息: {group_info_api}")
-            group_name = group_info_api["group_name"]
-        except Exception as e:
-            logger.error(f"获取群信息失败: {str(e)}")
-            group_name = None
-
-        # 白名单设定由nontbot侧完成
-        # 消息过滤，涉及到config有待更新
-        if event.group_id:
-            if event.group_id not in global_config.talk_allowed_groups:
-                return
+        # 用户屏蔽,不区分私聊/群聊
         if event.user_id in global_config.ban_user_id:
             return
 
-        user_info = UserInfo(
-            user_id=event.user_id,
-            user_nickname=event.sender.nickname,
-            user_cardname=event.sender.card or None,
-            platform="qq",
-        )
+        # 处理私聊消息
+        if isinstance(event, PrivateMessageEvent):
+            if not global_config.enable_friend_chat:  # 私聊过滤
+                return
+            else:
+                try:
+                    user_info = UserInfo(
+                        user_id=event.user_id,
+                        user_nickname=(await bot.get_stranger_info(user_id=event.user_id, no_cache=True))["nickname"],
+                        user_cardname=None,
+                        platform="qq",
+                    )
+                except Exception as e:
+                    logger.error(f"获取陌生人信息失败: {e}")
+                    return
+                logger.debug(user_info)
 
-        group_info = GroupInfo(
-            group_id=event.group_id,
-            group_name=group_name,  # 使用获取到的群名称或None
-            platform="qq",
-        )
+                # group_info = GroupInfo(group_id=0, group_name="私聊", platform="qq")
+                group_info = None
+
+        # 处理群聊消息
+        else:
+            # 白名单设定由nontbot侧完成
+            if event.group_id:
+                if event.group_id not in global_config.talk_allowed_groups:
+                    return
+
+            user_info = UserInfo(
+                user_id=event.user_id,
+                user_nickname=event.sender.nickname,
+                user_cardname=event.sender.card or None,
+                platform="qq",
+            )
+
+            group_info = GroupInfo(group_id=event.group_id, group_name=None, platform="qq")
+
+        # group_info = await bot.get_group_info(group_id=event.group_id)
+        # sender_info = await bot.get_group_member_info(group_id=event.group_id, user_id=event.user_id, no_cache=True)
 
         message_cq = MessageRecvCQ(
             message_id=event.message_id,
@@ -88,7 +106,6 @@ class ChatBot:
 
         # 进入maimbot
         message = MessageRecv(message_json)
-
         groupinfo = message.message_info.group_info
         userinfo = message.message_info.user_info
         messageinfo = message.message_info
@@ -108,7 +125,9 @@ class ChatBot:
         # 过滤词
         for word in global_config.ban_words:
             if word in message.processed_plain_text:
-                logger.info(f"[群{groupinfo.group_id}]{userinfo.user_nickname}:{message.processed_plain_text}")
+                logger.info(
+                    f"[{chat.group_info.group_name if chat.group_info.group_id else '私聊'}]{userinfo.user_nickname}:{message.processed_plain_text}"
+                )
                 logger.info(f"[过滤词识别]消息中含有{word}，filtered")
                 return
 
@@ -116,7 +135,7 @@ class ChatBot:
         for pattern in global_config.ban_msgs_regex:
             if re.search(pattern, message.raw_message):
                 logger.info(
-                    f"[群{message.message_info.group_info.group_id}]{message.user_nickname}:{message.raw_message}"
+                    f"[{chat.group_info.group_name if chat.group_info.group_id else '私聊'}]{message.user_nickname}:{message.raw_message}"
                 )
                 logger.info(f"[正则表达式过滤]消息匹配到{pattern}，filtered")
                 return
@@ -124,8 +143,8 @@ class ChatBot:
         current_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(messageinfo.time))
 
         # topic=await topic_identifier.identify_topic_llm(message.processed_plain_text)
+        
         topic = ""
-        interested_rate = 0
         interested_rate = await hippocampus.memory_activate_value(message.processed_plain_text) / 100
         logger.debug(f"对{message.processed_plain_text}的激活度:{interested_rate}")
         # logger.info(f"\033[1;32m[主题识别]\033[0m 使用{global_config.topic_extract}主题: {topic}")
@@ -144,7 +163,7 @@ class ChatBot:
         current_willing = willing_manager.get_willing(chat_stream=chat)
 
         logger.info(
-            f"[{current_time}][群{chat.group_info.group_id}]{chat.user_info.user_nickname}:"
+            f"[{current_time}][{chat.group_info.group_name if chat.group_info.group_id else '私聊'}]{chat.user_info.user_nickname}:"
             f"{message.processed_plain_text}[回复意愿:{current_willing:.2f}][概率:{reply_probability * 100:.1f}%]"
         )
 
@@ -152,12 +171,17 @@ class ChatBot:
 
         if random() < reply_probability:
             bot_user_info = UserInfo(
-                user_id=global_config.BOT_QQ, user_nickname=global_config.BOT_NICKNAME, platform=messageinfo.platform
+                user_id=global_config.BOT_QQ,
+                user_nickname=global_config.BOT_NICKNAME,
+                platform=messageinfo.platform,
             )
             thinking_time_point = round(time.time(), 2)
             think_id = "mt" + str(thinking_time_point)
             thinking_message = MessageThinking(
-                message_id=think_id, chat_stream=chat, bot_user_info=bot_user_info, reply=message
+                message_id=think_id,
+                chat_stream=chat,
+                bot_user_info=bot_user_info,
+                reply=message,
             )
 
             message_manager.add_message(thinking_message)
@@ -196,15 +220,16 @@ class ChatBot:
                 # print(f"\033[1;32m[回复内容]\033[0m {msg}")
                 # 通过时间改变时间戳
                 typing_time = calculate_typing_time(msg)
-                print(f"typing_time: {typing_time}")
+                logger.debug(f"typing_time: {typing_time}")
                 accu_typing_time += typing_time
                 timepoint = thinking_time_point + accu_typing_time
                 message_segment = Seg(type="text", data=msg)
-                print(f"message_segment: {message_segment}")
+                # logger.debug(f"message_segment: {message_segment}")
                 bot_message = MessageSending(
                     message_id=think_id,
                     chat_stream=chat,
                     bot_user_info=bot_user_info,
+                    sender_info=userinfo,
                     message_segment=message_segment,
                     reply=message,
                     is_head=not mark_head,
@@ -218,7 +243,9 @@ class ChatBot:
 
             # message_set 可以直接加入 message_manager
             # print(f"\033[1;32m[回复]\033[0m 将回复载入发送容器")
-            print(f"添加message_set到message_manager")
+
+            logger.debug("添加message_set到message_manager")
+
             message_manager.add_message(message_set)
 
             bot_response_time = thinking_time_point
@@ -242,6 +269,7 @@ class ChatBot:
                         message_id=think_id,
                         chat_stream=chat,
                         bot_user_info=bot_user_info,
+                        sender_info=userinfo,
                         message_segment=message_segment,
                         reply=message,
                         is_head=False,

src/plugins/chat/config.py

@@ -69,6 +69,7 @@ class BotConfig:
     enable_advance_output: bool = False  # 是否启用高级输出
     enable_kuuki_read: bool = True  # 是否启用读空气功能
     enable_debug_output: bool = False  # 是否启用调试输出
+    enable_friend_chat: bool = False  # 是否启用好友聊天
 
     mood_update_interval: float = 1.0  # 情绪更新间隔 单位秒
     mood_decay_rate: float = 0.95  # 情绪衰减率
@@ -327,7 +328,9 @@ class BotConfig:
             others_config = parent["others"]
             config.enable_advance_output = others_config.get("enable_advance_output", config.enable_advance_output)
             config.enable_kuuki_read = others_config.get("enable_kuuki_read", config.enable_kuuki_read)
-            config.enable_debug_output = others_config.get("enable_debug_output", config.enable_debug_output)
+            if config.INNER_VERSION in SpecifierSet(">=0.0.7"):
+                config.enable_debug_output = others_config.get("enable_debug_output", config.enable_debug_output)
+                config.enable_friend_chat = others_config.get("enable_friend_chat", config.enable_friend_chat)
 
         # 版本表达式：>=1.0.0,<2.0.0
         # 允许字段：func: method, support: str, notice: str, necessary: bool

src/plugins/chat/emoji_manager.py

@@ -161,6 +161,7 @@ class EmojiManager:
                         {'_id': selected_emoji['_id']},
                         {'$inc': {'usage_count': 1}}
                     )
+
                     logger.success(
                         f"找到匹配的表情包: {selected_emoji.get('description', '无描述')} (相似度: {similarity:.4f})")
                     # 稍微改一下文本描述，不然容易产生幻觉，描述已经包含 表情包 了
@@ -176,8 +177,10 @@ class EmojiManager:
             logger.error(f"获取表情包失败: {str(e)}")
             return None
 
+
     async def _get_emoji_discription(self, image_base64: str) -> str:
         """获取表情包的标签，使用image_manager的描述生成功能"""
+
         try:
             # 使用image_manager获取描述，去掉前后的方括号和"表情包："前缀
             description = await image_manager.get_emoji_description(image_base64)
@@ -272,11 +275,14 @@ class EmojiManager:
                     # 获取表情包的描述
                     description = await self._get_emoji_discription(image_base64)
                 
+
+
                 if global_config.EMOJI_CHECK:
                     check = await self._check_emoji(image_base64)
                     if '是' not in check:
                         os.remove(image_path)
                         logger.info(f"描述: {description}")
+
                         logger.info(f"描述: {description}")
                         logger.info(f"其不满足过滤规则，被剔除 {check}")
                         continue
@@ -287,6 +293,7 @@ class EmojiManager:
                 
                 if description is not None:
                     embedding = await get_embedding(description)
+
                     # 准备数据库记录
                     emoji_record = {
                         'filename': filename,
@@ -301,6 +308,7 @@ class EmojiManager:
                     self.db['emoji'].insert_one(emoji_record)
                     logger.success(f"注册新表情包: {filename}")
                     logger.info(f"描述: {description}")
+
                     
                     # 保存到images数据库
                     image_doc = {
@@ -389,5 +397,7 @@ class EmojiManager:
 
 
 # 创建全局单例
+
 emoji_manager = EmojiManager()
 
+

src/plugins/chat/llm_generator.py

@@ -8,7 +8,7 @@ from loguru import logger
 from ...common.database import Database
 from ..models.utils_model import LLM_request
 from .config import global_config
-from .message import MessageRecv, MessageThinking, MessageSending,Message
+from .message import MessageRecv, MessageThinking, Message
 from .prompt_builder import prompt_builder
 from .relationship_manager import relationship_manager
 from .utils import process_llm_response

src/plugins/chat/message.py

@@ -3,20 +3,23 @@ import html
 import re
 import json
 from dataclasses import dataclass
-from typing import Dict, ForwardRef, List, Optional, Union
+from typing import Dict, List, Optional
 
 import urllib3
 from loguru import logger
 
 from .utils_image import image_manager
+
 from .message_base import Seg, GroupInfo, UserInfo, BaseMessageInfo, MessageBase
 from .chat_stream import ChatStream, chat_manager
+
 # 禁用SSL警告
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-#这个类是消息数据类，用于存储和管理消息数据。
-#它定义了消息的属性，包括群组ID、用户ID、消息ID、原始消息内容、纯文本内容和时间戳。
-#它还定义了两个辅助属性：keywords用于提取消息的关键词，is_plain_text用于判断消息是否为纯文本。
+# 这个类是消息数据类，用于存储和管理消息数据。
+# 它定义了消息的属性，包括群组ID、用户ID、消息ID、原始消息内容、纯文本内容和时间戳。
+# 它还定义了两个辅助属性：keywords用于提取消息的关键词，is_plain_text用于判断消息是否为纯文本。
+
 
 @dataclass
 class Message(MessageBase):
@@ -64,10 +67,10 @@ class Message(MessageBase):
 @dataclass
 class MessageRecv(Message):
     """接收消息类，用于处理从MessageCQ序列化的消息"""
-    
+
     def __init__(self, message_dict: Dict):
         """从MessageCQ的字典初始化
-        
+
         Args:
             message_dict: MessageCQ序列化后的字典
         """
@@ -100,68 +103,74 @@ class MessageRecv(Message):
     
     async def process(self) -> None:
         """处理消息内容，生成纯文本和详细文本
-        
+
         这个方法必须在创建实例后显式调用，因为它包含异步操作。
         """
-        self.processed_plain_text = await self._process_message_segments(self.message_segment)
+        self.processed_plain_text = await self._process_message_segments(
+            self.message_segment
+        )
         self.detailed_plain_text = self._generate_detailed_text()
 
     async def _process_message_segments(self, segment: Seg) -> str:
         """递归处理消息段，转换为文字描述
-        
+
         Args:
             segment: 要处理的消息段
-            
+
         Returns:
             str: 处理后的文本
         """
-        if segment.type == 'seglist':
+        if segment.type == "seglist":
             # 处理消息段列表
             segments_text = []
             for seg in segment.data:
                 processed = await self._process_message_segments(seg)
                 if processed:
                     segments_text.append(processed)
-            return ' '.join(segments_text)
+            return " ".join(segments_text)
         else:
             # 处理单个消息段
             return await self._process_single_segment(segment)
 
     async def _process_single_segment(self, seg: Seg) -> str:
         """处理单个消息段
-        
+
         Args:
             seg: 要处理的消息段
-            
+
         Returns:
             str: 处理后的文本
         """
         try:
-            if seg.type == 'text':
+            if seg.type == "text":
                 return seg.data
-            elif seg.type == 'image':
+            elif seg.type == "image":
                 # 如果是base64图片数据
                 if isinstance(seg.data, str):
                     return await image_manager.get_image_description(seg.data)
-                return '[图片]'
-            elif seg.type == 'emoji':
-                self.is_emoji=True
+                return "[图片]"
+            elif seg.type == "emoji":
+                self.is_emoji = True
                 if isinstance(seg.data, str):
                     return await image_manager.get_emoji_description(seg.data)
-                return '[表情]'
+                return "[表情]"
             else:
                 return f"[{seg.type}:{str(seg.data)}]"
         except Exception as e:
-            logger.error(f"处理消息段失败: {str(e)}, 类型: {seg.type}, 数据: {seg.data}")
+            logger.error(
+                f"处理消息段失败: {str(e)}, 类型: {seg.type}, 数据: {seg.data}"
+            )
             return f"[处理失败的{seg.type}消息]"
 
     def _generate_detailed_text(self) -> str:
         """生成详细文本，包含时间和用户信息"""
-        time_str = time.strftime("%m-%d %H:%M:%S", time.localtime(self.message_info.time))
+        time_str = time.strftime(
+            "%m-%d %H:%M:%S", time.localtime(self.message_info.time)
+        )
         user_info = self.message_info.user_info
         name = (
             f"{user_info.user_nickname}(ta的昵称:{user_info.user_cardname},ta的id:{user_info.user_id})"
-            if user_info.user_cardname!=''
+            if user_info.user_cardname != ""
             else f"{user_info.user_nickname}(ta的id:{user_info.user_id})"
         )
         return f"[{time_str}] {name}: {self.processed_plain_text}\n"
@@ -170,14 +179,14 @@ class MessageRecv(Message):
 @dataclass
 class MessageProcessBase(Message):
     """消息处理基类，用于处理中和发送中的消息"""
-    
+
     def __init__(
         self,
         message_id: str,
         chat_stream: ChatStream,
         bot_user_info: UserInfo,
         message_segment: Optional[Seg] = None,
-        reply: Optional['MessageRecv'] = None
+        reply: Optional["MessageRecv"] = None,
     ):
         # 调用父类初始化
         super().__init__(
@@ -186,7 +195,7 @@ class MessageProcessBase(Message):
             chat_stream=chat_stream,
             user_info=bot_user_info,
             message_segment=message_segment,
-            reply=reply
+            reply=reply,
         )
 
         # 处理状态相关属性
@@ -200,78 +209,83 @@ class MessageProcessBase(Message):
 
     async def _process_message_segments(self, segment: Seg) -> str:
         """递归处理消息段，转换为文字描述
-        
+
         Args:
             segment: 要处理的消息段
-            
+
         Returns:
             str: 处理后的文本
         """
-        if segment.type == 'seglist':
+        if segment.type == "seglist":
             # 处理消息段列表
             segments_text = []
             for seg in segment.data:
                 processed = await self._process_message_segments(seg)
                 if processed:
                     segments_text.append(processed)
-            return ' '.join(segments_text)
+            return " ".join(segments_text)
         else:
             # 处理单个消息段
             return await self._process_single_segment(segment)
 
     async def _process_single_segment(self, seg: Seg) -> str:
         """处理单个消息段
-        
+
         Args:
             seg: 要处理的消息段
-            
+
         Returns:
             str: 处理后的文本
         """
         try:
-            if seg.type == 'text':
+            if seg.type == "text":
                 return seg.data
-            elif seg.type == 'image':
+            elif seg.type == "image":
                 # 如果是base64图片数据
                 if isinstance(seg.data, str):
                     return await image_manager.get_image_description(seg.data)
-                return '[图片]'
-            elif seg.type == 'emoji':
+                return "[图片]"
+            elif seg.type == "emoji":
                 if isinstance(seg.data, str):
                     return await image_manager.get_emoji_description(seg.data)
-                return '[表情]'
-            elif seg.type == 'at':
+                return "[表情]"
+            elif seg.type == "at":
                 return f"[@{seg.data}]"
-            elif seg.type == 'reply':
-                if self.reply and hasattr(self.reply, 'processed_plain_text'):
+            elif seg.type == "reply":
+                if self.reply and hasattr(self.reply, "processed_plain_text"):
                     return f"[回复：{self.reply.processed_plain_text}]"
             else:
                 return f"[{seg.type}:{str(seg.data)}]"
         except Exception as e:
-            logger.error(f"处理消息段失败: {str(e)}, 类型: {seg.type}, 数据: {seg.data}")
+            logger.error(
+                f"处理消息段失败: {str(e)}, 类型: {seg.type}, 数据: {seg.data}"
+            )
             return f"[处理失败的{seg.type}消息]"
 
     def _generate_detailed_text(self) -> str:
         """生成详细文本，包含时间和用户信息"""
-        time_str = time.strftime("%m-%d %H:%M:%S", time.localtime(self.message_info.time))
+        time_str = time.strftime(
+            "%m-%d %H:%M:%S", time.localtime(self.message_info.time)
+        )
         user_info = self.message_info.user_info
         name = (
             f"{user_info.user_nickname}(ta的昵称:{user_info.user_cardname},ta的id:{user_info.user_id})"
-            if user_info.user_cardname != ''
+            if user_info.user_cardname != ""
             else f"{user_info.user_nickname}(ta的id:{user_info.user_id})"
         )
         return f"[{time_str}] {name}: {self.processed_plain_text}\n"
 
+
 @dataclass
 class MessageThinking(MessageProcessBase):
     """思考状态的消息类"""
-    
+
     def __init__(
         self,
         message_id: str,
         chat_stream: ChatStream,
         bot_user_info: UserInfo,
-        reply: Optional['MessageRecv'] = None
+        reply: Optional["MessageRecv"] = None,
     ):
         # 调用父类初始化
         super().__init__(
@@ -279,25 +293,27 @@ class MessageThinking(MessageProcessBase):
             chat_stream=chat_stream,
             bot_user_info=bot_user_info,
             message_segment=None,  # 思考状态不需要消息段
-            reply=reply
+            reply=reply,
         )
-        
+
         # 思考状态特有属性
         self.interrupt = False
 
+
 @dataclass
 class MessageSending(MessageProcessBase):
     """发送状态的消息类"""
-    
+
     def __init__(
         self,
         message_id: str,
         chat_stream: ChatStream,
         bot_user_info: UserInfo,
+        sender_info: UserInfo,  # 用来记录发送者信息,用于私聊回复
         message_segment: Seg,
-        reply: Optional['MessageRecv'] = None,
+        reply: Optional["MessageRecv"] = None,
         is_head: bool = False,
-        is_emoji: bool = False
+        is_emoji: bool = False,
     ):
         # 调用父类初始化
         super().__init__(
@@ -305,28 +321,34 @@ class MessageSending(MessageProcessBase):
             chat_stream=chat_stream,
             bot_user_info=bot_user_info,
             message_segment=message_segment,
-            reply=reply
+            reply=reply,
         )
-        
+
         # 发送状态特有属性
+        self.sender_info = sender_info
         self.reply_to_message_id = reply.message_info.message_id if reply else None
         self.is_head = is_head
         self.is_emoji = is_emoji
-            
-    def set_reply(self, reply: Optional['MessageRecv']) -> None:
+
+    def set_reply(self, reply: Optional["MessageRecv"]) -> None:
         """设置回复消息"""
         if reply:
             self.reply = reply
             self.reply_to_message_id = self.reply.message_info.message_id
-            self.message_segment = Seg(type='seglist', data=[
-                    Seg(type='reply', data=reply.message_info.message_id),
-                    self.message_segment
-                ])
+            self.message_segment = Seg(
+                type="seglist",
+                data=[
+                    Seg(type="reply", data=reply.message_info.message_id),
+                    self.message_segment,
+                ],
+            )
 
     async def process(self) -> None:
         """处理消息内容，生成纯文本和详细文本"""
         if self.message_segment:
-            self.processed_plain_text = await self._process_message_segments(self.message_segment)
+            self.processed_plain_text = await self._process_message_segments(
+                self.message_segment
+            )
             self.detailed_plain_text = self._generate_detailed_text()
 
     @classmethod
@@ -335,8 +357,8 @@ class MessageSending(MessageProcessBase):
         thinking: MessageThinking,
         message_segment: Seg,
         is_head: bool = False,
-        is_emoji: bool = False
-    ) -> 'MessageSending':
+        is_emoji: bool = False,
+    ) -> "MessageSending":
         """从思考状态消息创建发送状态消息"""
         return cls(
             message_id=thinking.message_info.message_id,
@@ -345,41 +367,50 @@ class MessageSending(MessageProcessBase):
             bot_user_info=thinking.message_info.user_info,
             reply=thinking.reply,
             is_head=is_head,
-            is_emoji=is_emoji
+            is_emoji=is_emoji,
         )
-    
+
     def to_dict(self):
-        ret= super().to_dict()
-        ret['message_info']['user_info']=self.chat_stream.user_info.to_dict()
+        ret = super().to_dict()
+        ret["message_info"]["user_info"] = self.chat_stream.user_info.to_dict()
         return ret
 
+    def is_private_message(self) -> bool:
+        """判断是否为私聊消息"""
+        return (
+            self.message_info.group_info is None
+            or self.message_info.group_info.group_id is None
+        )
+
+
 @dataclass
 class MessageSet:
     """消息集合类，可以存储多个发送消息"""
+
     def __init__(self, chat_stream: ChatStream, message_id: str):
         self.chat_stream = chat_stream
         self.message_id = message_id
         self.messages: List[MessageSending] = []
         self.time = round(time.time(), 2)
-        
+
     def add_message(self, message: MessageSending) -> None:
         """添加消息到集合"""
         if not isinstance(message, MessageSending):
             raise TypeError("MessageSet只能添加MessageSending类型的消息")
         self.messages.append(message)
         self.messages.sort(key=lambda x: x.message_info.time)
-        
+
     def get_message_by_index(self, index: int) -> Optional[MessageSending]:
         """通过索引获取消息"""
         if 0 <= index < len(self.messages):
             return self.messages[index]
         return None
-        
+
     def get_message_by_time(self, target_time: float) -> Optional[MessageSending]:
         """获取最接近指定时间的消息"""
         if not self.messages:
             return None
-            
+
         left, right = 0, len(self.messages) - 1
         while left < right:
             mid = (left + right) // 2
@@ -387,25 +418,22 @@ class MessageSet:
                 left = mid + 1
             else:
                 right = mid
-                
+
         return self.messages[left]
-        
+
     def clear_messages(self) -> None:
         """清空所有消息"""
         self.messages.clear()
-        
+
     def remove_message(self, message: MessageSending) -> bool:
         """移除指定消息"""
         if message in self.messages:
             self.messages.remove(message)
             return True
         return False
-        
+
     def __str__(self) -> str:
         return f"MessageSet(id={self.message_id}, count={len(self.messages)})"
-        
+
     def __len__(self) -> int:
         return len(self.messages)
-        
-
-    

src/plugins/chat/message_base.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, asdict
-from typing import List, Optional, Union, Any, Dict
+from typing import List, Optional, Union, Dict
 
 @dataclass
 class Seg:

src/plugins/chat/message_cq.py

@@ -1,12 +1,12 @@
 import time
 from dataclasses import dataclass
-from typing import Dict, ForwardRef, List, Optional, Union
+from typing import Dict, Optional
 
 import urllib3
 
-from .cq_code import CQCode, cq_code_tool
+from .cq_code import cq_code_tool
 from .utils_cq import parse_cq_code
-from .utils_user import get_groupname, get_user_cardname, get_user_nickname
+from .utils_user import get_groupname
 from .message_base import Seg, GroupInfo, UserInfo, BaseMessageInfo, MessageBase
 # 禁用SSL警告
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -61,8 +61,12 @@ class MessageRecvCQ(MessageCQ):
     ):
         # 调用父类初始化
         super().__init__(message_id, user_info, group_info, platform)
+        
+        # 私聊消息不携带group_info
+        if group_info is None:
+            pass
 
-        if group_info.group_name is None:
+        elif group_info.group_name is None:
             group_info.group_name = get_groupname(group_info.group_id)
         
         # 解析消息段

src/plugins/chat/message_sender.py

@@ -5,12 +5,11 @@ from typing import Dict, List, Optional, Union
 from loguru import logger
 from nonebot.adapters.onebot.v11 import Bot
 
-from .cq_code import cq_code_tool
 from .message_cq import MessageSendCQ
-from .message import MessageSending, MessageThinking, MessageRecv,MessageSet
+from .message import MessageSending, MessageThinking, MessageRecv, MessageSet
+
 from .storage import MessageStorage
 from .config import global_config
-from .chat_stream import chat_manager
 
 
 class Message_Sender:
@@ -26,22 +25,24 @@ class Message_Sender:
         self._current_bot = bot
 
     async def send_message(
-            self,
-            message: MessageSending,
+        self,
+        message: MessageSending,
     ) -> None:
         """发送消息"""
+
         if isinstance(message, MessageSending):
             message_json = message.to_dict()
-            message_send=MessageSendCQ(
-                data=message_json
-            )
-
-            if message_send.message_info.group_info:
+            message_send = MessageSendCQ(data=message_json)
+            # logger.debug(message_send.message_info,message_send.raw_message)
+            if (
+                message_send.message_info.group_info
+                and message_send.message_info.group_info.group_id
+            ):
                 try:
                     await self._current_bot.send_group_msg(
                         group_id=message.message_info.group_info.group_id,
                         message=message_send.raw_message,
-                        auto_escape=False
+                        auto_escape=False,
                     )
                     logger.success(f"[调试] 发送消息{message.processed_plain_text}成功")
                 except Exception as e:
@@ -49,10 +50,11 @@ class Message_Sender:
                     logger.error(f"[调试] 发送消息{message.processed_plain_text}失败")
             else:
                 try:
+                    logger.debug(message.message_info.user_info)
                     await self._current_bot.send_private_msg(
-                        user_id=message.message_info.user_info.user_id,
+                        user_id=message.sender_info.user_id,
                         message=message_send.raw_message,
-                        auto_escape=False
+                        auto_escape=False,
                     )
                     logger.success(f"[调试] 发送消息{message.processed_plain_text}成功")
                 except Exception as e:
@@ -62,13 +64,14 @@ class Message_Sender:
 
 class MessageContainer:
     """单个聊天流的发送/思考消息容器"""
+
     def __init__(self, chat_id: str, max_size: int = 100):
         self.chat_id = chat_id
         self.max_size = max_size
         self.messages = []
         self.last_send_time = 0
         self.thinking_timeout = 20  # 思考超时时间（秒）
-        
+
     def get_timeout_messages(self) -> List[MessageSending]:
         """获取所有超时的Message_Sending对象（思考时间超过30秒），按thinking_start_time排序"""
         current_time = time.time()
@@ -83,12 +86,12 @@ class MessageContainer:
         timeout_messages.sort(key=lambda x: x.thinking_start_time)
 
         return timeout_messages
-        
+
     def get_earliest_message(self) -> Optional[Union[MessageThinking, MessageSending]]:
         """获取thinking_start_time最早的消息对象"""
         if not self.messages:
             return None
-        earliest_time = float('inf')
+        earliest_time = float("inf")
         earliest_message = None
         for msg in self.messages:
             msg_time = msg.thinking_start_time
@@ -96,7 +99,7 @@ class MessageContainer:
                 earliest_time = msg_time
                 earliest_message = msg
         return earliest_message
-        
+
     def add_message(self, message: Union[MessageThinking, MessageSending]) -> None:
         """添加消息到队列"""
         if isinstance(message, MessageSet):
@@ -104,7 +107,7 @@ class MessageContainer:
                 self.messages.append(single_message)
         else:
             self.messages.append(message)
-            
+
     def remove_message(self, message: Union[MessageThinking, MessageSending]) -> bool:
         """移除消息，如果消息存在则返回True，否则返回False"""
         try:
@@ -119,7 +122,7 @@ class MessageContainer:
     def has_messages(self) -> bool:
         """检查是否有待发送的消息"""
         return bool(self.messages)
-        
+
     def get_all_messages(self) -> List[Union[MessageSending, MessageThinking]]:
         """获取所有消息"""
         return list(self.messages)
@@ -127,72 +130,91 @@ class MessageContainer:
 
 class MessageManager:
     """管理所有聊天流的消息容器"""
+
     def __init__(self):
         self.containers: Dict[str, MessageContainer] = {}  # chat_id -> MessageContainer
         self.storage = MessageStorage()
         self._running = True
-        
+
     def get_container(self, chat_id: str) -> MessageContainer:
         """获取或创建聊天流的消息容器"""
         if chat_id not in self.containers:
             self.containers[chat_id] = MessageContainer(chat_id)
         return self.containers[chat_id]
-        
-    def add_message(self, message: Union[MessageThinking, MessageSending, MessageSet]) -> None:
+
+    def add_message(
+        self, message: Union[MessageThinking, MessageSending, MessageSet]
+    ) -> None:
         chat_stream = message.chat_stream
         if not chat_stream:
             raise ValueError("无法找到对应的聊天流")
         container = self.get_container(chat_stream.stream_id)
         container.add_message(message)
-        
+
     async def process_chat_messages(self, chat_id: str):
         """处理聊天流消息"""
         container = self.get_container(chat_id)
         if container.has_messages():
             # print(f"处理有message的容器chat_id: {chat_id}")
             message_earliest = container.get_earliest_message()
-            
+
             if isinstance(message_earliest, MessageThinking):
                 message_earliest.update_thinking_time()
                 thinking_time = message_earliest.thinking_time
-                print(f"消息正在思考中，已思考{int(thinking_time)}秒\r", end='', flush=True)
+                print(
+                    f"消息正在思考中，已思考{int(thinking_time)}秒\r",
+                    end="",
+                    flush=True,
+                )
 
                 # 检查是否超时
                 if thinking_time > global_config.thinking_timeout:
                     logger.warning(f"消息思考超时({thinking_time}秒)，移除该消息")
                     container.remove_message(message_earliest)
             else:
-                
-                if message_earliest.is_head and message_earliest.update_thinking_time() > 30:
+
+                if (
+                    message_earliest.is_head
+                    and message_earliest.update_thinking_time() > 30
+                    and not message_earliest.is_private_message()  # 避免在私聊时插入reply
+                ):
                     await message_sender.send_message(message_earliest.set_reply())
                 else:
                     await message_sender.send_message(message_earliest)
                 await message_earliest.process()
-                
-                print(f"\033[1;34m[调试]\033[0m 消息'{message_earliest.processed_plain_text}'正在发送中")
-                
-                await self.storage.store_message(message_earliest, message_earliest.chat_stream,None)
-                
+
+                print(
+                    f"\033[1;34m[调试]\033[0m 消息'{message_earliest.processed_plain_text}'正在发送中"
+                )
+
+                await self.storage.store_message(
+                    message_earliest, message_earliest.chat_stream, None
+                )
+
                 container.remove_message(message_earliest)
-            
+
             message_timeout = container.get_timeout_messages()
             if message_timeout:
                 logger.warning(f"发现{len(message_timeout)}条超时消息")
                 for msg in message_timeout:
                     if msg == message_earliest:
                         continue
-                        
+
                     try:
-                        if msg.is_head and msg.update_thinking_time() > 30:
+                        if (
+                            msg.is_head
+                            and msg.update_thinking_time() > 30
+                            and not message_earliest.is_private_message()  # 避免在私聊时插入reply
+                        ):
                             await message_sender.send_message(msg.set_reply())
                         else:
                             await message_sender.send_message(msg)
-                        
+
                         # if msg.is_emoji:
                         #     msg.processed_plain_text = "[表情包]"
                         await msg.process()
-                        await self.storage.store_message(msg,msg.chat_stream, None)
-                        
+                        await self.storage.store_message(msg, msg.chat_stream, None)
+
                         if not container.remove_message(msg):
                             logger.warning("尝试删除不存在的消息")
                     except Exception:
@@ -206,7 +228,7 @@ class MessageManager:
             tasks = []
             for chat_id in self.containers.keys():
                 tasks.append(self.process_chat_messages(chat_id))
-            
+
             await asyncio.gather(*tasks)
 
 

src/plugins/chat/prompt_builder.py

@@ -9,7 +9,7 @@ from ..moods.moods import MoodManager
 from ..schedule.schedule_generator import bot_schedule
 from .config import global_config
 from .utils import get_embedding, get_recent_group_detailed_plain_text
-from .chat_stream import ChatStream, chat_manager
+from .chat_stream import chat_manager
 
 
 class PromptBuilder:

src/plugins/chat/relationship_manager.py

@@ -1,6 +1,5 @@
 import asyncio
-from typing import Optional, Union
-from typing import Optional, Union
+from typing import Optional
 from loguru import logger
 
 from ...common.database import Database

src/plugins/chat/storage.py

@@ -1,8 +1,6 @@
 from typing import Optional, Union
-from typing import Optional, Union
 
 from ...common.database import Database
-from .message_base import MessageBase
 from .message import MessageSending, MessageRecv
 from .chat_stream import ChatStream
 from loguru import logger

src/plugins/chat/utils.py

@@ -12,8 +12,8 @@ from loguru import logger
 from ..models.utils_model import LLM_request
 from ..utils.typo_generator import ChineseTypoGenerator
 from .config import global_config
-from .message import MessageThinking, MessageRecv,MessageSending,MessageProcessBase,Message
-from .message_base import MessageBase,BaseMessageInfo,UserInfo,GroupInfo
+from .message import MessageRecv,Message
+from .message_base import UserInfo
 from .chat_stream import ChatStream
 from ..moods.moods import MoodManager
 

src/plugins/chat/utils_image.py

@@ -1,16 +1,12 @@
 import base64
-import io
 import os
 import time
-import zlib
 import aiohttp
 import hashlib
-from typing import Optional, Tuple, Union
-from urllib.parse import urlparse
+from typing import Optional, Union
 
 from loguru import logger
 from nonebot import get_driver
-from PIL import Image
 
 from ...common.database import Database
 from ..chat.config import global_config

src/plugins/chat/willing_manager.py

@@ -1,13 +1,9 @@
 import asyncio
 from typing import Dict
-from loguru import logger
 
-from typing import Dict
-from loguru import logger
 
 from .config import global_config
-from .message_base import UserInfo, GroupInfo
-from .chat_stream import chat_manager,ChatStream
+from .chat_stream import ChatStream
 
 
 class WillingManager: