refactor(chat): 迁移数据库操作为异步模式并修复相关调用

将同步数据库操作全面迁移为异步模式，主要涉及： - 将 `with get_db_session()` 改为 `async with get_db_session()` - 修复相关异步调用链，确保 await 正确传递 - 优化消息管理器、上下文管理器等核心组件的异步处理 - 移除同步的 person_id 获取方法，避免协程对象传递问题修复 deepcopy 在 StreamContext 中的序列化问题，跳过不可序列化的 asyncio.Task 对象删除无用的测试文件和废弃的插件清单文件
2025-09-28 20:40:46 +08:00
parent 08ef960947
commit fd76e36320
30 changed files with 481 additions and 625 deletions
--- a/src/plugins/built_in/affinity_flow_chatter/interest_scoring.py
+++ b/src/plugins/built_in/affinity_flow_chatter/interest_scoring.py
@@ -199,7 +199,7 @@ class ChatterInterestScoringSystem:
        # 如果内存中没有，尝试从关系追踪器获取
        if hasattr(self, "relationship_tracker") and self.relationship_tracker:
            try:
-                relationship_score = self.relationship_tracker.get_user_relationship_score(user_id)
+                relationship_score = await self.relationship_tracker.get_user_relationship_score(user_id)
                # 同时更新内存缓存
                self.user_relationships[user_id] = relationship_score
                return relationship_score
--- a/src/plugins/built_in/affinity_flow_chatter/plan_filter.py
+++ b/src/plugins/built_in/affinity_flow_chatter/plan_filter.py
@@ -182,7 +182,7 @@ class ChatterPlanFilter:
            if plan.mode == ChatMode.PROACTIVE:
                long_term_memory_block = await self._get_long_term_memory_context()

-                chat_content_block, message_id_list = build_readable_messages_with_id(
+                chat_content_block, message_id_list = await build_readable_messages_with_id(
                    messages=[msg.flatten() for msg in plan.chat_history],
                    timestamp_mode="normal",
                    truncate=False,
@@ -190,7 +190,7 @@ class ChatterPlanFilter:
                )

                prompt_template = await global_prompt_manager.get_prompt_async("proactive_planner_prompt")
-                actions_before_now = get_actions_by_timestamp_with_chat(
+                actions_before_now = await get_actions_by_timestamp_with_chat(
                    chat_id=plan.chat_id,
                    timestamp_start=time.time() - 3600,
                    timestamp_end=time.time(),
@@ -216,7 +216,7 @@ class ChatterPlanFilter:
            )

            # 为了兼容性，保留原有的chat_content_block
-            chat_content_block, _ = build_readable_messages_with_id(
+            chat_content_block, _ = await build_readable_messages_with_id(
                messages=[msg.flatten() for msg in plan.chat_history],
                timestamp_mode="normal",
                read_mark=self.last_obs_time_mark,
@@ -224,7 +224,7 @@ class ChatterPlanFilter:
                show_actions=True,
            )

-            actions_before_now = get_actions_by_timestamp_with_chat(
+            actions_before_now = await get_actions_by_timestamp_with_chat(
                chat_id=plan.chat_id,
                timestamp_start=time.time() - 3600,
                timestamp_end=time.time(),
@@ -319,7 +319,14 @@ class ChatterPlanFilter:
            from src.chat.utils.chat_message_builder import get_raw_msg_before_timestamp_with_chat

            # 获取聊天流的上下文
-            stream_context = message_manager.stream_contexts.get(plan.chat_id)
+            from src.plugin_system.apis.chat_api import get_chat_manager
+            chat_manager = get_chat_manager()
+            chat_stream = chat_manager.get_stream(plan.chat_id)
+            if not chat_stream:
+                logger.warning(f"[plan_filter] 聊天流 {plan.chat_id} 不存在")
+                return "最近没有聊天内容。", "没有未读消息。", []
+
+            stream_context = chat_stream.context_manager

            # 获取真正的已读和未读消息
            read_messages = stream_context.history_messages  # 已读消息存储在history_messages中
@@ -338,7 +345,7 @@ class ChatterPlanFilter:

            # 构建已读历史消息块
            if read_messages:
-                read_content, read_ids = build_readable_messages_with_id(
+                read_content, read_ids = await build_readable_messages_with_id(
                    messages=[msg.flatten() for msg in read_messages[-50:]],  # 限制数量
                    timestamp_mode="normal_no_YMD",
                    truncate=False,
--- a/src/plugins/built_in/affinity_flow_chatter/planner.py
+++ b/src/plugins/built_in/affinity_flow_chatter/planner.py
@@ -138,7 +138,7 @@ class ChatterActionPlanner:
                        # 更新StreamContext中的消息信息并刷新focus_energy
                        if context:
                            from src.chat.message_manager.message_manager import message_manager
-                            message_manager.update_message(
+                            await message_manager.update_message(
                                stream_id=self.chat_id,
                                message_id=message.message_id,
                                interest_value=message_interest,
@@ -148,7 +148,7 @@ class ChatterActionPlanner:
                        # 更新数据库中的消息记录
                        try:
                            from src.chat.message_receive.storage import MessageStorage
-                            MessageStorage.update_message_interest_value(message.message_id, message_interest)
+                            await MessageStorage.update_message_interest_value(message.message_id, message_interest)
                            logger.debug(f"已更新数据库中消息 {message.message_id} 的兴趣度为: {message_interest:.3f}")
                        except Exception as e:
                            logger.warning(f"更新数据库消息兴趣度失败: {e}")
--- a/src/plugins/built_in/core_actions/emoji.py
+++ b/src/plugins/built_in/core_actions/emoji.py
@@ -124,10 +124,10 @@ class EmojiAction(BaseAction):
                    emoji_base64, emoji_description = random.choice(all_emojis_data)
                else:
                    # 获取最近的5条消息内容用于判断
-                    recent_messages = message_api.get_recent_messages(chat_id=self.chat_id, limit=5)
+                    recent_messages = await message_api.get_recent_messages(chat_id=self.chat_id, limit=5)
                    messages_text = ""
                    if recent_messages:
-                        messages_text = message_api.build_readable_messages(
+                        messages_text = await message_api.build_readable_messages(
                            messages=recent_messages,
                            timestamp_mode="normal_no_YMD",
                            truncate=False,
@@ -185,10 +185,10 @@ class EmojiAction(BaseAction):
            elif global_config.emoji.emoji_selection_mode == "description":
                # --- 详细描述选择模式 ---
                # 获取最近的5条消息内容用于判断
-                recent_messages = message_api.get_recent_messages(chat_id=self.chat_id, limit=5)
+                recent_messages = await message_api.get_recent_messages(chat_id=self.chat_id, limit=5)
                messages_text = ""
                if recent_messages:
-                    messages_text = message_api.build_readable_messages(
+                    messages_text = await message_api.build_readable_messages(
                        messages=recent_messages,
                        timestamp_mode="normal_no_YMD",
                        truncate=False,
--- a/src/plugins/built_in/maizone_refactored/services/qzone_service.py
+++ b/src/plugins/built_in/maizone_refactored/services/qzone_service.py
@@ -118,7 +118,7 @@ class QZoneService:

    async def read_and_process_feeds(self, target_name: str, stream_id: Optional[str]) -> Dict[str, Any]:
        """读取并处理指定好友的说说"""
-        target_person_id = person_api.get_person_id_by_name(target_name)
+        target_person_id = await person_api.get_person_id_by_name(target_name)
        if not target_person_id:
            return {"success": False, "message": f"找不到名为'{target_name}'的好友"}
        target_qq = await person_api.get_person_value(target_person_id, "user_id")
--- a/src/plugins/built_in/napcat_adapter_plugin/src/recv_handler/notice_handler.py
+++ b/src/plugins/built_in/napcat_adapter_plugin/src/recv_handler/notice_handler.py
@@ -331,6 +331,7 @@ class NoticeHandler:

        like_emoji_id = raw_message.get("likes")[0].get("emoji_id")
        await event_manager.trigger_event(
+<<<<<<< HEAD
            NapcatEvent.ON_RECEIVED.EMOJI_LIEK,
            permission_group=PLUGIN_NAME,
            group_id=group_id,
@@ -342,6 +343,16 @@ class NoticeHandler:
            type="text",
            data=f"{user_name}使用Emoji表情{QQ_FACE.get(like_emoji_id, '')}回复了你的消息[{target_message_text}]",
        )
+=======
+                        NapcatEvent.ON_RECEIVED.EMOJI_LIEK, 
+                        permission_group=PLUGIN_NAME, 
+                        group_id=group_id,
+                        user_id=user_id,
+                        message_id=raw_message.get("message_id",""),
+                        emoji_id=like_emoji_id
+                        )     
+        seg_data = Seg(type="text",data=f"{user_name}使用Emoji表情{QQ_FACE.get(like_emoji_id, '')}回复了你的消息[{target_message_text}]")
+>>>>>>> 9912d7f643d347cbadcf1e3d618aa78bcbf89cc4
        return seg_data, user_info

    async def handle_ban_notify(self, raw_message: dict, group_id: int) -> Tuple[Seg, UserInfo] | Tuple[None, None]:
--- a/src/plugins/built_in/web_search_tool/_manifest.json
+++ b/src/plugins/built_in/web_search_tool/_manifest.json
@@ -1,25 +0,0 @@
-{
-  "manifest_version": 1,
-  "name": "web_search_tool",
-  "version": "1.0.0",
-  "description": "一个用于在互联网上搜索信息的工具",
-  "author": {
-    "name": "MoFox-Studio",
-    "url": "https://github.com/MoFox-Studio"
-  },
-  "license": "GPL-v3.0-or-later",
-  
-  "host_application": {
-    "min_version": "0.10.0"
-  },
-  "keywords": ["web_search", "url_parser"],
-  "categories": ["web_search", "url_parser"],
-  
-  "default_locale": "zh-CN",
-  "locales_path": "_locales",
-  
-  "plugin_info": {
-    "is_built_in": false,
-    "plugin_type": "web_search"
-  }
-}