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

src/heart_flow/heartflow.py

@@ -43,11 +43,14 @@ def init_prompt():
 
 class CurrentState:
     def __init__(self):
-        self.willing = 0
+
         self.current_state_info = ""
 
         self.mood_manager = MoodManager()
         self.mood = self.mood_manager.get_prompt()
+        
+        self.attendance_factor = 0
+        self.engagement_factor = 0
 
     def update_current_state_info(self):
         self.current_state_info = self.mood_manager.get_current_mood()
@@ -63,7 +66,9 @@ class Heartflow:
         )
 
         self._subheartflows: Dict[Any, SubHeartflow] = {}
-        self.active_subheartflows_nums = 0
+        
+        
+        
 
     async def _cleanup_inactive_subheartflows(self):
         """定期清理不活跃的子心流"""
@@ -85,11 +90,8 @@ class Heartflow:
                 logger.info(f"已清理不活跃的子心流: {subheartflow_id}")
 
             await asyncio.sleep(30)  # 每分钟检查一次
-
-    async def heartflow_start_working(self):
-        # 启动清理任务
-        asyncio.create_task(self._cleanup_inactive_subheartflows())
-
+            
+    async def _sub_heartflow_update(self):
         while True:
             # 检查是否存在子心流
             if not self._subheartflows:
@@ -100,6 +102,17 @@ class Heartflow:
             await self.do_a_thinking()
             await asyncio.sleep(global_config.heart_flow_update_interval)  # 5分钟思考一次
 
+    async def heartflow_start_working(self):
+        
+        # 启动清理任务
+        asyncio.create_task(self._cleanup_inactive_subheartflows())
+
+        # 启动子心流更新任务
+        asyncio.create_task(self._sub_heartflow_update())
+        
+    async def _update_current_state(self):
+        print("TODO")
+
     async def do_a_thinking(self):
         logger.debug("麦麦大脑袋转起来了")
         self.current_state.update_current_state_info()
@@ -216,17 +229,13 @@ class Heartflow:
 
         try:
             if subheartflow_id not in self._subheartflows:
-                logger.debug(f"创建 subheartflow: {subheartflow_id}")
                 subheartflow = SubHeartflow(subheartflow_id)
                 # 创建一个观察对象，目前只可以用chat_id创建观察对象
                 logger.debug(f"创建 observation: {subheartflow_id}")
                 observation = ChattingObservation(subheartflow_id)
-
-                logger.debug("添加 observation ")
                 subheartflow.add_observation(observation)
                 logger.debug("添加 observation 成功")
                 # 创建异步任务
-                logger.debug("创建异步任务")
                 asyncio.create_task(subheartflow.subheartflow_start_working())
                 logger.debug("创建异步任务 成功")
                 self._subheartflows[subheartflow_id] = subheartflow

src/heart_flow/observation.py

@@ -4,8 +4,6 @@ from datetime import datetime
 from src.plugins.models.utils_model import LLM_request
 from src.plugins.config.config import global_config
 from src.common.database import db
-from src.individuality.individuality import Individuality
-import random
 
 
 # 所有观察的基类

src/heart_flow/sub_heartflow.py

@@ -5,18 +5,17 @@ from src.plugins.models.utils_model import LLM_request
 from src.plugins.config.config import global_config
 import re
 import time
-from src.plugins.schedule.schedule_generator import bot_schedule
-from src.plugins.memory_system.Hippocampus import HippocampusManager
+# from src.plugins.schedule.schedule_generator import bot_schedule
+# from src.plugins.memory_system.Hippocampus import HippocampusManager
 from src.common.logger import get_module_logger, LogConfig, SUB_HEARTFLOW_STYLE_CONFIG  # noqa: E402
-from src.plugins.chat.utils import get_embedding
-from src.common.database import db
-from typing import Union
+# from src.plugins.chat.utils import get_embedding
+# from src.common.database import db
+# from typing import Union
 from src.individuality.individuality import Individuality
 import random
 from src.plugins.chat.chat_stream import ChatStream
 from src.plugins.person_info.relationship_manager import relationship_manager
 from src.plugins.chat.utils import get_recent_group_speaker
-import json
 from src.do_tool.tool_use import ToolUser   
 
 subheartflow_config = LogConfig(