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

src/chat/focus_chat/info_processors/notused_mind_processor.py

@@ -12,10 +12,9 @@ from src.chat.message_receive.chat_stream import get_chat_manager
 from src.person_info.relationship_manager import get_relationship_manager
 from .base_processor import BaseProcessor
 from src.chat.focus_chat.info.mind_info import MindInfo
-from typing import List, Optional
+from typing import List
 from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation
 from src.chat.heart_flow.observation.actions_observation import ActionObservation
-from typing import Dict
 from src.chat.focus_chat.info.info_base import InfoBase
 
 logger = get_logger("processor")
@@ -110,7 +109,8 @@ class MindProcessor(BaseProcessor):
         logger.debug(f"{self.log_prefix} 更新 structured_info_str: \n{self.structured_info_str}")
 
     async def process_info(
-        self, observations: List[Observation] = None, 
+        self,
+        observations: List[Observation] = None,
     ) -> List[InfoBase]:
         """处理信息对象
 
@@ -127,9 +127,7 @@ class MindProcessor(BaseProcessor):
 
         return [mind_info]
 
-    async def do_thinking_before_reply(
+    async def do_thinking_before_reply(self, observations: List[Observation] = None):
-        self, observations: List[Observation] = None
-    ):
         """
         在回复前进行思考，生成内心想法并收集工具调用结果
 

src/chat/focus_chat/info_processors/relationship_processor.py

@@ -9,7 +9,7 @@ from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
 from src.chat.message_receive.chat_stream import get_chat_manager
 from src.person_info.relationship_manager import get_relationship_manager
 from .base_processor import BaseProcessor
-from typing import List, Optional
+from typing import List
 from typing import Dict
 from src.chat.focus_chat.info.info_base import InfoBase
 from src.chat.focus_chat.info.relation_info import RelationInfo
@@ -114,9 +114,7 @@ class RelationshipProcessor(BaseProcessor):
         name = get_chat_manager().get_stream_name(self.subheartflow_id)
         self.log_prefix = f"[{name}] "
 
-    async def process_info(
+    async def process_info(self, observations: List[Observation] = None, *infos) -> List[InfoBase]:
-        self, observations: List[Observation] = None, *infos
-    ) -> List[InfoBase]:
         """处理信息对象
 
         Args:

src/chat/focus_chat/info_processors/self_processor.py

@@ -9,9 +9,8 @@ from src.individuality.individuality import get_individuality
 from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
 from src.chat.message_receive.chat_stream import get_chat_manager
 from .base_processor import BaseProcessor
-from typing import List, Optional
+from typing import List
 from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation
-from typing import Dict
 from src.chat.focus_chat.info.info_base import InfoBase
 from src.chat.focus_chat.info.self_info import SelfInfo
 
@@ -62,9 +61,7 @@ class SelfProcessor(BaseProcessor):
         name = get_chat_manager().get_stream_name(self.subheartflow_id)
         self.log_prefix = f"[{name}] "
 
-    async def process_info(
+    async def process_info(self, observations: List[Observation] = None, *infos) -> List[InfoBase]:
-        self, observations: List[Observation] = None, *infos
-    ) -> List[InfoBase]:
         """处理信息对象
 
         Args:
@@ -85,7 +82,8 @@ class SelfProcessor(BaseProcessor):
         return [self_info]
 
     async def self_indentify(
-        self, observations: List[Observation] = None, 
+        self,
+        observations: List[Observation] = None,
     ):
         """
         在回复前进行思考，生成内心想法并收集工具调用结果

src/chat/focus_chat/info_processors/tool_processor.py

@@ -47,9 +47,7 @@ class ToolProcessor(BaseProcessor):
         )
         self.structured_info = []
 
-    async def process_info(
+    async def process_info(self, observations: Optional[List[Observation]] = None) -> List[StructuredInfo]:
-        self, observations: Optional[List[Observation]] = None
-    ) -> List[StructuredInfo]:
         """处理信息对象
 
         Args:

src/chat/focus_chat/info_processors/working_memory_processor.py

@@ -9,10 +9,9 @@ from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
 from src.chat.message_receive.chat_stream import get_chat_manager
 from .base_processor import BaseProcessor
 from src.chat.focus_chat.info.mind_info import MindInfo
-from typing import List, Optional
+from typing import List
 from src.chat.heart_flow.observation.working_observation import WorkingMemoryObservation
 from src.chat.focus_chat.working_memory.working_memory import WorkingMemory
-from typing import Dict
 from src.chat.focus_chat.info.info_base import InfoBase
 from json_repair import repair_json
 from src.chat.focus_chat.info.workingmemory_info import WorkingMemoryInfo
@@ -67,9 +66,7 @@ class WorkingMemoryProcessor(BaseProcessor):
         name = get_chat_manager().get_stream_name(self.subheartflow_id)
         self.log_prefix = f"[{name}] "
 
-    async def process_info(
+    async def process_info(self, observations: List[Observation] = None, *infos) -> List[InfoBase]:
-        self, observations: List[Observation] = None, *infos
-    ) -> List[InfoBase]:
         """处理信息对象
 
         Args: