Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

src/plugins/chat_module/only_process/only_message_process.py

@@ -1,7 +1,7 @@
 from src.common.logger import get_module_logger
 from src.plugins.chat.message import MessageRecv
 from src.plugins.storage.storage import MessageStorage
-from src.plugins.config.config import global_config
+from src.config.config import global_config
 from datetime import datetime
 
 logger = get_module_logger("pfc_message_processor")

src/plugins/chat_module/reasoning_chat/reasoning_chat.py

@@ -4,7 +4,7 @@ import traceback
 from typing import List
 from ...memory_system.Hippocampus import HippocampusManager
 from ...moods.moods import MoodManager
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.emoji_manager import emoji_manager
 from .reasoning_generator import ResponseGenerator
 from ...chat.message import MessageSending, MessageRecv, MessageThinking, MessageSet
@@ -192,11 +192,21 @@ class ReasoningChat:
         if not buffer_result:
             await willing_manager.bombing_buffer_message_handle(message.message_info.message_id)
             willing_manager.delete(message.message_info.message_id)
-            if message.message_segment.type == "text":
+            F_type = "seglist"
+            if message.message_segment.type != "seglist":
+                F_type = message.message_segment.type
+            else:
+                if (
+                    isinstance(message.message_segment.data, list)
+                    and all(isinstance(x, Seg) for x in message.message_segment.data)
+                    and len(message.message_segment.data) == 1
+                ):
+                    F_type = message.message_segment.data[0].type
+            if F_type == "text":
                 logger.info(f"触发缓冲，已炸飞消息：{message.processed_plain_text}")
-            elif message.message_segment.type == "image":
+            elif F_type == "image":
                 logger.info("触发缓冲，已炸飞表情包/图片")
-            elif message.message_segment.type == "seglist":
+            elif F_type == "seglist":
                 logger.info("触发缓冲，已炸飞消息列")
             return
 

src/plugins/chat_module/reasoning_chat/reasoning_generator.py

@@ -2,7 +2,7 @@ from typing import List, Optional, Tuple, Union
 import random
 
 from ...models.utils_model import LLMRequest
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.message import MessageThinking
 from .reasoning_prompt_builder import prompt_builder
 from ...chat.utils import process_llm_response

src/plugins/chat_module/reasoning_chat/reasoning_prompt_builder.py

@@ -9,7 +9,7 @@ from ...moods.moods import MoodManager
 from ....individuality.individuality import Individuality
 from ...memory_system.Hippocampus import HippocampusManager
 from ...schedule.schedule_generator import bot_schedule
-from ...config.config import global_config
+from ....config.config import global_config
 from ...person_info.relationship_manager import relationship_manager
 from src.common.logger import get_module_logger
 from src.plugins.utils.prompt_builder import Prompt, global_prompt_manager

src/plugins/chat_module/think_flow_chat/think_flow_chat.py

@@ -4,7 +4,7 @@ import traceback
 from typing import List
 from ...memory_system.Hippocampus import HippocampusManager
 from ...moods.moods import MoodManager
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.emoji_manager import emoji_manager
 from .think_flow_generator import ResponseGenerator
 from ...chat.message import MessageSending, MessageRecv, MessageThinking, MessageSet
@@ -204,11 +204,21 @@ class ThinkFlowChat:
         if not buffer_result:
             await willing_manager.bombing_buffer_message_handle(message.message_info.message_id)
             willing_manager.delete(message.message_info.message_id)
-            if message.message_segment.type == "text":
+            F_type = "seglist"
+            if message.message_segment.type != "seglist":
+                F_type = message.message_segment.type
+            else:
+                if (
+                    isinstance(message.message_segment.data, list)
+                    and all(isinstance(x, Seg) for x in message.message_segment.data)
+                    and len(message.message_segment.data) == 1
+                ):
+                    F_type = message.message_segment.data[0].type
+            if F_type == "text":
                 logger.info(f"触发缓冲，已炸飞消息：{message.processed_plain_text}")
-            elif message.message_segment.type == "image":
+            elif F_type == "image":
                 logger.info("触发缓冲，已炸飞表情包/图片")
-            elif message.message_segment.type == "seglist":
+            elif F_type == "seglist":
                 logger.info("触发缓冲，已炸飞消息列")
             return
 

src/plugins/chat_module/think_flow_chat/think_flow_generator.py

@@ -3,7 +3,7 @@ import random
 
 
 from ...models.utils_model import LLMRequest
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.message import MessageRecv
 from .think_flow_prompt_builder import prompt_builder
 from ...chat.utils import process_llm_response

src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py

@@ -1,7 +1,7 @@
 import random
 from typing import Optional
 
-from ...config.config import global_config
+from ....config.config import global_config
 from ...chat.utils import get_recent_group_detailed_plain_text
 from ...chat.chat_stream import chat_manager
 from src.common.logger import get_module_logger