diff --git a/src/api/apiforgui.py b/src/api/apiforgui.py index a266f8e86..d6f223297 100644 --- a/src/api/apiforgui.py +++ b/src/api/apiforgui.py @@ -1,5 +1,5 @@ -from src.heart_flow.heartflow import heartflow -from src.heart_flow.sub_heartflow import ChatState +from src.chat.heart_flow.heartflow import heartflow +from src.chat.heart_flow.sub_heartflow import ChatState from src.common.logger_manager import get_logger logger = get_logger("api") diff --git a/src/api/main.py b/src/api/main.py index 48b03b586..5e9322827 100644 --- a/src/api/main.py +++ b/src/api/main.py @@ -3,7 +3,7 @@ from strawberry.fastapi import GraphQLRouter import os import sys -# from src.heart_flow.heartflow import heartflow +# from src.chat.heart_flow.heartflow import heartflow sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))) # from src.config.config import BotConfig from src.common.logger_manager import get_logger @@ -15,7 +15,7 @@ from src.api.apiforgui import ( get_subheartflow_cycle_info, get_all_states, ) -from src.heart_flow.sub_heartflow import ChatState +from src.chat.heart_flow.sub_heartflow import ChatState from src.api.basic_info_api import get_all_basic_info # 新增导入 # import uvicorn diff --git a/src/chat/focus_chat/expressors/default_expressor.py b/src/chat/focus_chat/expressors/default_expressor.py index dad20546b..28b80929e 100644 --- a/src/chat/focus_chat/expressors/default_expressor.py +++ b/src/chat/focus_chat/expressors/default_expressor.py @@ -16,7 +16,7 @@ from src.chat.focus_chat.heartFC_sender import HeartFCSender from src.chat.utils.utils import process_llm_response from src.chat.utils.info_catcher import info_catcher_manager from src.manager.mood_manager import mood_manager -from src.heart_flow.utils_chat import get_chat_type_and_target_info +from src.chat.heart_flow.utils_chat import get_chat_type_and_target_info from src.chat.message_receive.chat_stream import ChatStream logger = get_logger("expressor") diff --git a/src/chat/focus_chat/heartFC_chat.py b/src/chat/focus_chat/heartFC_chat.py index 5bc0cddad..641a45b47 100644 --- a/src/chat/focus_chat/heartFC_chat.py +++ b/src/chat/focus_chat/heartFC_chat.py @@ -13,11 +13,11 @@ from src.common.logger_manager import get_logger from src.chat.models.utils_model import LLMRequest from src.config.config import global_config from src.chat.utils.timer_calculator import Timer -from src.heart_flow.observation.observation import Observation +from src.chat.heart_flow.observation.observation import Observation from src.chat.focus_chat.heartflow_prompt_builder import prompt_builder from src.chat.focus_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 src.chat.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.heart_flow.utils_chat import get_chat_type_and_target_info from src.chat.focus_chat.info.info_base import InfoBase from src.chat.focus_chat.info.obs_info import ObsInfo from src.chat.focus_chat.info.cycle_info import CycleInfo @@ -25,9 +25,9 @@ from src.chat.focus_chat.info.mind_info import MindInfo from src.chat.focus_chat.info.structured_info import StructuredInfo from src.chat.focus_chat.info_processors.chattinginfo_processor import ChattingInfoProcessor from src.chat.focus_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.chat.heart_flow.observation.memory_observation import MemoryObservation +from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation +from src.chat.heart_flow.observation.working_observation import WorkingObservation from src.chat.focus_chat.info_processors.tool_processor import ToolProcessor from src.chat.focus_chat.expressors.default_expressor import DefaultExpressor from src.chat.focus_chat.hfc_utils import _create_empty_anchor_message diff --git a/src/chat/focus_chat/heartflow_processor.py b/src/chat/focus_chat/heartflow_processor.py index ed377edb1..0b7500a3a 100644 --- a/src/chat/focus_chat/heartflow_processor.py +++ b/src/chat/focus_chat/heartflow_processor.py @@ -6,7 +6,7 @@ from ..message_receive.message import MessageRecv from ..message_receive.storage import MessageStorage from ..utils.utils import is_mentioned_bot_in_message from maim_message import Seg -from src.heart_flow.heartflow import heartflow +from src.chat.heart_flow.heartflow import heartflow from src.common.logger_manager import get_logger from ..message_receive.chat_stream import chat_manager from ..message_receive.message_buffer import message_buffer diff --git a/src/chat/focus_chat/info_processors/base_processor.py b/src/chat/focus_chat/info_processors/base_processor.py index e8f285a3a..e11ec9596 100644 --- a/src/chat/focus_chat/info_processors/base_processor.py +++ b/src/chat/focus_chat/info_processors/base_processor.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod from typing import List, Any, Optional, Dict from src.chat.focus_chat.info.info_base import InfoBase -from src.heart_flow.observation.observation import Observation +from src.chat.heart_flow.observation.observation import Observation from src.common.logger_manager import get_logger logger = get_logger("base_processor") diff --git a/src/chat/focus_chat/info_processors/chattinginfo_processor.py b/src/chat/focus_chat/info_processors/chattinginfo_processor.py index 4f38cb641..bc722b90e 100644 --- a/src/chat/focus_chat/info_processors/chattinginfo_processor.py +++ b/src/chat/focus_chat/info_processors/chattinginfo_processor.py @@ -1,11 +1,11 @@ from typing import List, Optional, Any from src.chat.focus_chat.info.obs_info import ObsInfo -from src.heart_flow.observation.observation import Observation +from src.chat.heart_flow.observation.observation import Observation from src.chat.focus_chat.info.info_base import InfoBase from .base_processor import BaseProcessor from src.common.logger_manager import get_logger -from src.heart_flow.observation.chatting_observation import ChattingObservation -from src.heart_flow.observation.hfcloop_observation import HFCloopObservation +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation from src.chat.focus_chat.info.cycle_info import CycleInfo from datetime import datetime from typing import Dict diff --git a/src/chat/focus_chat/info_processors/mind_processor.py b/src/chat/focus_chat/info_processors/mind_processor.py index 8162760d5..ec32ea7e9 100644 --- a/src/chat/focus_chat/info_processors/mind_processor.py +++ b/src/chat/focus_chat/info_processors/mind_processor.py @@ -1,5 +1,5 @@ -from src.heart_flow.observation.chatting_observation import ChattingObservation -from src.heart_flow.observation.observation import Observation +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.heart_flow.observation.observation import Observation from src.chat.models.utils_model import LLMRequest from src.config.config import global_config import time @@ -15,7 +15,7 @@ from src.chat.person_info.relationship_manager import relationship_manager from .base_processor import BaseProcessor from src.chat.focus_chat.info.mind_info import MindInfo from typing import List, Optional -from src.heart_flow.observation.hfcloop_observation import HFCloopObservation +from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation from src.chat.focus_chat.info_processors.processor_utils import ( calculate_similarity, calculate_replacement_probability, diff --git a/src/chat/focus_chat/info_processors/tool_processor.py b/src/chat/focus_chat/info_processors/tool_processor.py index 5c0c58207..79dba4cd3 100644 --- a/src/chat/focus_chat/info_processors/tool_processor.py +++ b/src/chat/focus_chat/info_processors/tool_processor.py @@ -1,4 +1,4 @@ -from src.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation from src.chat.models.utils_model import LLMRequest from src.config.config import global_config import time @@ -10,8 +10,8 @@ from src.chat.utils.json_utils import process_llm_tool_calls from src.chat.person_info.relationship_manager import relationship_manager from .base_processor import BaseProcessor from typing import List, Optional, Dict -from src.heart_flow.observation.observation import Observation -from src.heart_flow.observation.working_observation import WorkingObservation +from src.chat.heart_flow.observation.observation import Observation +from src.chat.heart_flow.observation.working_observation import WorkingObservation from src.chat.focus_chat.info.structured_info import StructuredInfo logger = get_logger("tool_use") diff --git a/src/chat/focus_chat/memory_activator.py b/src/chat/focus_chat/memory_activator.py index 80a062499..76be3e5d7 100644 --- a/src/chat/focus_chat/memory_activator.py +++ b/src/chat/focus_chat/memory_activator.py @@ -1,6 +1,6 @@ -from src.heart_flow.observation.chatting_observation import ChattingObservation -from src.heart_flow.observation.working_observation import WorkingObservation -from src.heart_flow.observation.hfcloop_observation import HFCloopObservation +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.heart_flow.observation.working_observation import WorkingObservation +from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation from src.chat.models.utils_model import LLMRequest from src.config.config import global_config from src.common.logger_manager import get_logger diff --git a/src/heart_flow/background_tasks.py b/src/chat/heart_flow/background_tasks.py similarity index 98% rename from src/heart_flow/background_tasks.py rename to src/chat/heart_flow/background_tasks.py index 5ed664e0e..d9fa1c9d3 100644 --- a/src/heart_flow/background_tasks.py +++ b/src/chat/heart_flow/background_tasks.py @@ -5,9 +5,9 @@ from typing import Optional, Coroutine, Callable, Any, List from src.common.logger_manager import get_logger # Need manager types for dependency injection -from src.heart_flow.mai_state_manager import MaiStateManager, MaiStateInfo -from src.heart_flow.subheartflow_manager import SubHeartflowManager -from src.heart_flow.interest_logger import InterestLogger +from src.chat.heart_flow.mai_state_manager import MaiStateManager, MaiStateInfo +from src.chat.heart_flow.subheartflow_manager import SubHeartflowManager +from src.chat.heart_flow.interest_logger import InterestLogger logger = get_logger("background_tasks") diff --git a/src/heart_flow/chat_state_info.py b/src/chat/heart_flow/chat_state_info.py similarity index 100% rename from src/heart_flow/chat_state_info.py rename to src/chat/heart_flow/chat_state_info.py diff --git a/src/heart_flow/heartflow.py b/src/chat/heart_flow/heartflow.py similarity index 90% rename from src/heart_flow/heartflow.py rename to src/chat/heart_flow/heartflow.py index d9cc6196b..ad876bcf0 100644 --- a/src/heart_flow/heartflow.py +++ b/src/chat/heart_flow/heartflow.py @@ -1,14 +1,14 @@ -from src.heart_flow.sub_heartflow import SubHeartflow, ChatState +from src.chat.heart_flow.sub_heartflow import SubHeartflow, ChatState from src.chat.models.utils_model import LLMRequest from src.config.config import global_config from src.common.logger_manager import get_logger from typing import Any, Optional from src.tools.tool_use import ToolUser from src.chat.person_info.relationship_manager import relationship_manager # Module instance -from src.heart_flow.mai_state_manager import MaiStateInfo, MaiStateManager -from src.heart_flow.subheartflow_manager import SubHeartflowManager -from src.heart_flow.interest_logger import InterestLogger # Import InterestLogger -from src.heart_flow.background_tasks import BackgroundTaskManager # Import BackgroundTaskManager +from src.chat.heart_flow.mai_state_manager import MaiStateInfo, MaiStateManager +from src.chat.heart_flow.subheartflow_manager import SubHeartflowManager +from src.chat.heart_flow.interest_logger import InterestLogger # Import InterestLogger +from src.chat.heart_flow.background_tasks import BackgroundTaskManager # Import BackgroundTaskManager logger = get_logger("heartflow") diff --git a/src/heart_flow/interest_chatting.py b/src/chat/heart_flow/interest_chatting.py similarity index 100% rename from src/heart_flow/interest_chatting.py rename to src/chat/heart_flow/interest_chatting.py diff --git a/src/heart_flow/interest_logger.py b/src/chat/heart_flow/interest_logger.py similarity index 97% rename from src/heart_flow/interest_logger.py rename to src/chat/heart_flow/interest_logger.py index 7428b8a7b..b33f449db 100644 --- a/src/heart_flow/interest_logger.py +++ b/src/chat/heart_flow/interest_logger.py @@ -11,9 +11,9 @@ from src.common.logger_manager import get_logger from src.chat.message_receive.chat_stream import chat_manager if TYPE_CHECKING: - from src.heart_flow.subheartflow_manager import SubHeartflowManager - from src.heart_flow.sub_heartflow import SubHeartflow - from src.heart_flow.heartflow import Heartflow # 导入 Heartflow 类型 + from src.chat.heart_flow.subheartflow_manager import SubHeartflowManager + from src.chat.heart_flow.sub_heartflow import SubHeartflow + from src.chat.heart_flow.heartflow import Heartflow # 导入 Heartflow 类型 logger = get_logger("interest") diff --git a/src/heart_flow/mai_state_manager.py b/src/chat/heart_flow/mai_state_manager.py similarity index 100% rename from src/heart_flow/mai_state_manager.py rename to src/chat/heart_flow/mai_state_manager.py diff --git a/src/heart_flow/observation/chatting_observation.py b/src/chat/heart_flow/observation/chatting_observation.py similarity index 98% rename from src/heart_flow/observation/chatting_observation.py rename to src/chat/heart_flow/observation/chatting_observation.py index f4fd4dd17..af45dc934 100644 --- a/src/heart_flow/observation/chatting_observation.py +++ b/src/chat/heart_flow/observation/chatting_observation.py @@ -13,9 +13,9 @@ from src.chat.utils.prompt_builder import global_prompt_manager from typing import Optional import difflib from src.chat.message_receive.message import MessageRecv # 添加 MessageRecv 导入 -from src.heart_flow.observation.observation import Observation +from src.chat.heart_flow.observation.observation import Observation from src.common.logger_manager import get_logger -from src.heart_flow.utils_chat import get_chat_type_and_target_info +from src.chat.heart_flow.utils_chat import get_chat_type_and_target_info from src.chat.utils.prompt_builder import Prompt diff --git a/src/heart_flow/observation/hfcloop_observation.py b/src/chat/heart_flow/observation/hfcloop_observation.py similarity index 100% rename from src/heart_flow/observation/hfcloop_observation.py rename to src/chat/heart_flow/observation/hfcloop_observation.py diff --git a/src/heart_flow/observation/memory_observation.py b/src/chat/heart_flow/observation/memory_observation.py similarity index 96% rename from src/heart_flow/observation/memory_observation.py rename to src/chat/heart_flow/observation/memory_observation.py index 213de89cd..1938a47d3 100644 --- a/src/heart_flow/observation/memory_observation.py +++ b/src/chat/heart_flow/observation/memory_observation.py @@ -1,4 +1,4 @@ -from src.heart_flow.observation.observation import Observation +from src.chat.heart_flow.observation.observation import Observation from datetime import datetime from src.common.logger_manager import get_logger import traceback diff --git a/src/heart_flow/observation/observation.py b/src/chat/heart_flow/observation/observation.py similarity index 100% rename from src/heart_flow/observation/observation.py rename to src/chat/heart_flow/observation/observation.py diff --git a/src/heart_flow/observation/working_observation.py b/src/chat/heart_flow/observation/working_observation.py similarity index 100% rename from src/heart_flow/observation/working_observation.py rename to src/chat/heart_flow/observation/working_observation.py diff --git a/src/heart_flow/sub_heartflow.py b/src/chat/heart_flow/sub_heartflow.py similarity index 98% rename from src/heart_flow/sub_heartflow.py rename to src/chat/heart_flow/sub_heartflow.py index 9dd1067ae..157c1c957 100644 --- a/src/heart_flow/sub_heartflow.py +++ b/src/chat/heart_flow/sub_heartflow.py @@ -1,5 +1,5 @@ from .observation.observation import Observation -from src.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation import asyncio import time from typing import Optional, List, Dict, Tuple, Callable, Coroutine @@ -9,8 +9,8 @@ from src.chat.message_receive.message import MessageRecv from src.chat.message_receive.chat_stream import chat_manager from src.chat.focus_chat.heartFC_chat import HeartFChatting from src.chat.normal_chat.normal_chat import NormalChat -from src.heart_flow.mai_state_manager import MaiStateInfo -from src.heart_flow.chat_state_info import ChatState, ChatStateInfo +from src.chat.heart_flow.mai_state_manager import MaiStateInfo +from src.chat.heart_flow.chat_state_info import ChatState, ChatStateInfo from .utils_chat import get_chat_type_and_target_info from .interest_chatting import InterestChatting diff --git a/src/heart_flow/subheartflow_manager.py b/src/chat/heart_flow/subheartflow_manager.py similarity index 99% rename from src/heart_flow/subheartflow_manager.py rename to src/chat/heart_flow/subheartflow_manager.py index 0aa21c19d..a4bff8338 100644 --- a/src/heart_flow/subheartflow_manager.py +++ b/src/chat/heart_flow/subheartflow_manager.py @@ -12,9 +12,9 @@ from src.common.logger_manager import get_logger from src.chat.message_receive.chat_stream import chat_manager # 导入心流相关类 -from src.heart_flow.sub_heartflow import SubHeartflow, ChatState -from src.heart_flow.mai_state_manager import MaiStateInfo -from src.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.heart_flow.sub_heartflow import SubHeartflow, ChatState +from src.chat.heart_flow.mai_state_manager import MaiStateInfo +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation # 导入LLM请求工具 from src.chat.models.utils_model import LLMRequest diff --git a/src/heart_flow/utils_chat.py b/src/chat/heart_flow/utils_chat.py similarity index 100% rename from src/heart_flow/utils_chat.py rename to src/chat/heart_flow/utils_chat.py diff --git a/src/chat/normal_chat/normal_chat.py b/src/chat/normal_chat/normal_chat.py index 906c515a6..9dc2454ff 100644 --- a/src/chat/normal_chat/normal_chat.py +++ b/src/chat/normal_chat/normal_chat.py @@ -8,7 +8,7 @@ from typing import List, Optional # 导入 Optional 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.chat.heart_flow.utils_chat import get_chat_type_and_target_info from src.manager.mood_manager import mood_manager from src.chat.message_receive.chat_stream import ChatStream, chat_manager from src.chat.person_info.relationship_manager import relationship_manager diff --git a/src/tools/tool_use.py b/src/tools/tool_use.py index 8d3c991d2..c55170b88 100644 --- a/src/tools/tool_use.py +++ b/src/tools/tool_use.py @@ -7,7 +7,7 @@ import traceback from src.chat.person_info.relationship_manager import relationship_manager from src.chat.utils.utils import parse_text_timestamps from src.chat.message_receive.chat_stream import ChatStream -from src.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation logger = get_logger("tool_use")