Merge branch 'dev' into HFC-para

src/plugins/heartFC_chat/heartFC_chat.py

@@ -1,37 +1,35 @@
 import asyncio
+import contextlib
+import json  # <--- 确保导入 json
+import random  # <--- 添加导入
 import time
 import traceback
-import random  # <--- 添加导入
-import json  # <--- 确保导入 json
-from typing import List, Optional, Dict, Any, Deque, Callable, Coroutine
 from collections import deque
+from typing import List, Optional, Dict, Any, Deque, Callable, Coroutine
+
+from rich.traceback import install
+
+from src.common.logger_manager import get_logger
+from src.config.config import global_config
+from src.heart_flow.observation import Observation
+from src.heart_flow.sub_mind import SubMind
+from src.heart_flow.utils_chat import get_chat_type_and_target_info
+from src.manager.mood_manager import mood_manager
 from src.plugins.chat.chat_stream import ChatStream
 from src.plugins.chat.chat_stream import chat_manager
-from src.common.logger_manager import get_logger
+from src.plugins.chat.message import MessageRecv, BaseMessageInfo, MessageThinking, MessageSending
+from src.plugins.chat.message import Seg  # Local import needed after move
+from src.plugins.chat.message import UserInfo
+from src.plugins.chat.utils import process_llm_response
+from src.plugins.chat.utils_image import image_path_to_base64  # Local import needed after move
+from src.plugins.emoji_system.emoji_manager import emoji_manager
+from src.plugins.heartFC_chat.heartFC_Cycleinfo import CycleInfo
+from src.plugins.heartFC_chat.heartflow_prompt_builder import global_prompt_manager, prompt_builder
 from src.plugins.models.utils_model import LLMRequest
-from src.config.config import global_config
-from src.plugins.utils.timer_calculator import Timer
-from src.heart_flow.observation.observation import Observation
-from src.plugins.heartFC_chat.heartflow_prompt_builder import prompt_builder
-import contextlib
-from src.plugins.heartFC_chat.heartFC_Cycleinfo import CycleDetail
-from src.heart_flow.observation.chatting_observation import ChattingObservation
-from src.heart_flow.utils_chat import get_chat_type_and_target_info
-from rich.traceback import install
-from src.heart_flow.info.info_base import InfoBase
-from src.heart_flow.info.obs_info import ObsInfo
-from src.heart_flow.info.cycle_info import CycleInfo
-from src.heart_flow.info.mind_info import MindInfo
-from src.heart_flow.info.structured_info import StructuredInfo
-from src.plugins.heartFC_chat.info_processors.chattinginfo_processor import ChattingInfoProcessor
-from src.plugins.heartFC_chat.info_processors.mind_processor import MindProcessor
-from src.heart_flow.observation.memory_observation import MemoryObservation
-from src.heart_flow.observation.hfcloop_observation import HFCloopObservation
-from src.heart_flow.observation.working_observation import WorkingObservation
-from src.plugins.heartFC_chat.info_processors.tool_processor import ToolProcessor
-from src.plugins.heartFC_chat.expressors.default_expressor import DefaultExpressor
-from src.plugins.heartFC_chat.hfc_utils import _create_empty_anchor_message
-from src.plugins.heartFC_chat.memory_activator import MemoryActivator
+from src.plugins.respon_info_catcher.info_catcher import info_catcher_manager
+from src.plugins.utils.chat_message_builder import num_new_messages_since
+from src.plugins.utils.timer_calculator import Timer  # <--- Import Timer
+from .heartFC_sender import HeartFCSender
 
 install(extra_lines=3)
 

src/plugins/heartFC_chat/heartflow_prompt_builder.py

@@ -10,7 +10,7 @@ import time
 from typing import Union, Optional, Dict, Any
 from ...common.database import db
 from ..chat.utils import get_recent_group_speaker
-from ..moods.moods import MoodManager
+from src.manager.mood_manager import mood_manager
 from ..memory_system.Hippocampus import HippocampusManager
 from ..schedule.schedule_generator import bot_schedule
 from ..knowledge.knowledge_lib import qa_manager
@@ -383,8 +383,7 @@ class PromptBuilder:
             else:
                 logger.warning(f"Invalid person tuple encountered for relationship prompt: {person}")
 
-        mood_manager = MoodManager.get_instance()
-        mood_prompt = mood_manager.get_prompt()
+        mood_prompt = mood_manager.get_mood_prompt()
         reply_styles1 = [
             ("然后给出日常且口语化的回复，平淡一些", 0.4),
             ("给出非常简短的回复", 0.4),

src/plugins/heartFC_chat/normal_chat.py

@@ -1,26 +1,26 @@
-import time
 import asyncio
-import traceback
 import statistics  # 导入 statistics 模块
+import time
+import traceback
 from random import random
 from typing import List, Optional  # 导入 Optional
 
-from ..moods.moods import MoodManager
-from ...config.config import global_config
-from ..emoji_system.emoji_manager import emoji_manager
-from .normal_chat_generator import NormalChatGenerator
-from ..chat.message import MessageSending, MessageRecv, MessageThinking, MessageSet
-from ..chat.message_sender import message_manager
-from ..chat.utils_image import image_path_to_base64
-from ..willing.willing_manager import willing_manager
 from maim_message import UserInfo, Seg
+
 from src.common.logger_manager import get_logger
+from src.heart_flow.utils_chat import get_chat_type_and_target_info
+from src.manager.mood_manager import mood_manager
 from src.plugins.chat.chat_stream import ChatStream, chat_manager
 from src.plugins.person_info.relationship_manager import relationship_manager
 from src.plugins.respon_info_catcher.info_catcher import info_catcher_manager
 from src.plugins.utils.timer_calculator import Timer
-from src.heart_flow.utils_chat import get_chat_type_and_target_info
-
+from .normal_chat_generator import NormalChatGenerator
+from ..chat.message import MessageSending, MessageRecv, MessageThinking, MessageSet
+from ..chat.message_sender import message_manager
+from ..chat.utils_image import image_path_to_base64
+from ..emoji_system.emoji_manager import emoji_manager
+from ..willing.willing_manager import willing_manager
+from ...config.config import global_config
 
 logger = get_logger("chat")
 
@@ -45,7 +45,7 @@ class NormalChat:
 
         # Other sync initializations
         self.gpt = NormalChatGenerator()
-        self.mood_manager = MoodManager.get_instance()
+        self.mood_manager = mood_manager
         self.start_time = time.time()
         self.last_speak_time = 0
         self._chat_task: Optional[asyncio.Task] = None