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

src/chat/chat_loop/heartFC_chat.py

@@ -21,8 +21,9 @@ from src.plugin_system.base.component_types import ActionInfo, ChatMode
 from src.plugin_system.apis import generator_api, send_api, message_api
 from src.chat.willing.willing_manager import get_willing_manager
 from src.chat.mai_thinking.mai_think import mai_thinking_manager
+from maim_message.message_base import GroupInfo,UserInfo
 
-ENABLE_THINKING = True
+ENABLE_THINKING = False
 
 ERROR_LOOP_INFO = {
     "loop_plan_info": {
@@ -256,6 +257,34 @@ class HeartFChatting:
         )
         person_name = await person_info_manager.get_value(person_id, "person_name")
         return f"{person_name}:{message_data.get('processed_plain_text')}"
+    
+    async def send_typing(self):
+        group_info = GroupInfo(platform = "amaidesu_default",group_id = 114514,group_name = "内心")
+        
+        chat =  await get_chat_manager().get_or_create_stream(
+            platform = "amaidesu_default",
+            user_info = None,
+            group_info = group_info
+        )
+        
+        
+        await send_api.custom_to_stream(
+            message_type="state", content="typing", stream_id=chat.stream_id, storage_message=False
+        )
+        
+    async def stop_typing(self):
+        group_info = GroupInfo(platform = "amaidesu_default",group_id = 114514,group_name = "内心")
+        
+        chat =  await get_chat_manager().get_or_create_stream(
+            platform = "amaidesu_default",
+            user_info = None,
+            group_info = group_info
+        )
+        
+        
+        await send_api.custom_to_stream(
+            message_type="state", content="stop_typing", stream_id=chat.stream_id, storage_message=False
+        )
 
     async def _observe(self, message_data: Optional[Dict[str, Any]] = None):
         # sourcery skip: hoist-statement-from-if, merge-comparisons, reintroduce-else
@@ -266,6 +295,8 @@ class HeartFChatting:
         cycle_timers, thinking_id = self.start_cycle()
 
         logger.info(f"{self.log_prefix} 开始第{self._cycle_counter}次思考[模式：{self.loop_mode}]")
+        
+        await self.send_typing()
 
         async with global_prompt_manager.async_message_scope(self.chat_stream.context.get_template_name()):
             loop_start_time = time.time()
@@ -335,6 +366,10 @@ class HeartFChatting:
                 # 发送回复 (不再需要传入 chat)
                 reply_text = await self._send_response(response_set, reply_to_str, loop_start_time,message_data)
                 
+                await self.stop_typing()
+                
+                
+                
                 if ENABLE_THINKING:
                     await mai_thinking_manager.get_mai_think(self.stream_id).do_think_after_response(reply_text)
                 

src/chat/mai_thinking/mai_think.py

@@ -5,7 +5,7 @@ from src.llm_models.utils_model import LLMRequest
 from src.config.config import global_config
 from src.chat.message_receive.message import MessageSending, MessageRecv, MessageRecvS4U
 from src.mais4u.mais4u_chat.s4u_msg_processor import S4UMessageProcessor
-
+from src.mais4u.mais4u_chat.internal_manager import internal_manager
 from src.common.logger import get_logger
 logger = get_logger(__name__)
 
@@ -90,12 +90,13 @@ class MaiThinking:
         self.mind = result
         
         logger.info(f"[{self.chat_id}] 思考前想法：{self.mind}")
-        logger.info(f"[{self.chat_id}] 思考前prompt：{prompt}")
+        # logger.info(f"[{self.chat_id}] 思考前prompt：{prompt}")
         logger.info(f"[{self.chat_id}] 思考后想法：{self.mind}")
         
         
         msg_recv = await self.build_internal_message_recv(self.mind)
         await self.s4u_message_processor.process_message(msg_recv)
+        internal_manager.set_internal_state(self.mind)
         
     
     async def do_think_when_receive_message(self):

src/chat/message_receive/bot.py

@@ -16,7 +16,7 @@ from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
 from src.plugin_system.core import component_registry, events_manager  # 导入新插件系统
 from src.plugin_system.base import BaseCommand, EventType
 from src.mais4u.mais4u_chat.s4u_msg_processor import S4UMessageProcessor
-
+from src.llm_models.utils_model import LLMRequest
 
 # 定义日志配置
 
@@ -135,7 +135,13 @@ class ChatBot:
         except Exception as e:
             logger.error(f"处理命令时出错: {e}")
             return False, None, True  # 出错时继续处理消息
-
+        
+    async def hanle_notice_message(self, message: MessageRecv):
+        if message.message_info.message_id == "notice":
+            logger.info("收到notice消息，暂时不支持处理")
+            return True
+    
+    
     async def do_s4u(self, message_data: Dict[str, Any]):
         message = MessageRecvS4U(message_data)
         group_info = message.message_info.group_info
@@ -157,6 +163,7 @@ class ChatBot:
 
         return
 
+
     async def message_process(self, message_data: Dict[str, Any]) -> None:
         """处理转化后的统一格式消息
         这个函数本质是预处理一些数据，根据配置信息和消息内容，预处理消息，并分发到合适的消息处理器中
@@ -172,6 +179,8 @@ class ChatBot:
         - 性能计时
         """
         try:
+
+            
             # 确保所有任务已启动
             await self._ensure_started()
 
@@ -192,6 +201,11 @@ class ChatBot:
             # print(message_data)
             # logger.debug(str(message_data))
             message = MessageRecv(message_data)
+            
+            if await self.hanle_notice_message(message):
+                return
+            
+            
             group_info = message.message_info.group_info
             user_info = message.message_info.user_info
             if message.message_info.additional_config:
@@ -215,6 +229,11 @@ class ChatBot:
 
             # 处理消息内容，生成纯文本
             await message.process()
+            
+            # if await self.check_ban_content(message):
+            #     logger.warning(f"检测到消息中含有违法，色情，暴力，反动，敏感内容，消息内容：{message.processed_plain_text}，发送者：{message.message_info.user_info.user_nickname}")
+            #     return
+            
 
             # 过滤检查
             if _check_ban_words(message.processed_plain_text, chat, user_info) or _check_ban_regex(  # type: ignore

src/chat/replyer/default_generator.py

@@ -98,6 +98,8 @@ def init_prompt():
 {relation_info_block}
 {extra_info_block}
 
+你是一个AI虚拟主播，正在直播QQ聊天，同时也在直播间回复弹幕，不过回复的时候不用过多提及这点
+
 {identity}
 
 {action_descriptions}