diff --git a/changelogs/changelog.md b/changelogs/changelog.md index d77deaa67..00bdf2afc 100644 --- a/changelogs/changelog.md +++ b/changelogs/changelog.md @@ -27,6 +27,11 @@ - 表达器：装饰语言风格 - 可通过插件添加和自定义HFC部件（目前只支持action定义） +**插件系统** +- 添加示例插件 +- 示例插件：禁言插件 +- 示例插件：豆包绘图插件 + **新增表达方式学习** - 自主学习群聊中的表达方式，更贴近群友 - 可自定义的学习频率和开关 @@ -45,7 +50,6 @@ **优化** - 移除日程系统，减少幻觉（将会在未来版本回归） - 移除主心流思考和LLM进入聊天判定 - - ## [0.6.3-fix-4] - 2025-5-18 diff --git a/src/chat/__init__.py b/src/chat/__init__.py index 1e859ffb7..0caa0870b 100644 --- a/src/chat/__init__.py +++ b/src/chat/__init__.py @@ -5,7 +5,7 @@ MaiBot模块系统 from src.chat.message_receive.chat_stream import chat_manager from src.chat.emoji_system.emoji_manager import emoji_manager -from src.chat.person_info.relationship_manager import relationship_manager +from src.person_info.relationship_manager import relationship_manager from src.chat.normal_chat.willing.willing_manager import willing_manager # 导出主要组件供外部使用 diff --git a/src/chat/emoji_system/emoji_manager.py b/src/chat/emoji_system/emoji_manager.py index fda0a63fd..51275c9b7 100644 --- a/src/chat/emoji_system/emoji_manager.py +++ b/src/chat/emoji_system/emoji_manager.py @@ -12,11 +12,11 @@ import re # from gradio_client import file -from ...common.database.database_model import Emoji -from ...common.database.database import db as peewee_db -from ...config.config import global_config -from ..utils.utils_image import image_path_to_base64, image_manager -from ..models.utils_model import LLMRequest +from src.common.database.database_model import Emoji +from src.common.database.database import db as peewee_db +from src.config.config import global_config +from src.chat.utils.utils_image import image_path_to_base64, image_manager +from src.llm_models.utils_model import LLMRequest from src.common.logger_manager import get_logger from rich.traceback import install diff --git a/src/chat/focus_chat/expressors/default_expressor.py b/src/chat/focus_chat/expressors/default_expressor.py index 3b95b185c..2d0d1f35b 100644 --- a/src/chat/focus_chat/expressors/default_expressor.py +++ b/src/chat/focus_chat/expressors/default_expressor.py @@ -5,7 +5,7 @@ from src.chat.message_receive.message import Seg # Local import needed after mo from src.chat.message_receive.message import UserInfo from src.chat.message_receive.chat_stream import chat_manager from src.common.logger_manager import get_logger -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.chat.utils.utils_image import image_path_to_base64 # Local import needed after move from src.chat.utils.timer_calculator import Timer # <--- Import Timer diff --git a/src/chat/focus_chat/expressors/exprssion_learner.py b/src/chat/focus_chat/expressors/exprssion_learner.py index 348de9f09..31cb5d13b 100644 --- a/src/chat/focus_chat/expressors/exprssion_learner.py +++ b/src/chat/focus_chat/expressors/exprssion_learner.py @@ -2,7 +2,7 @@ import time import random from typing import List, Dict, Optional, Any, Tuple from src.common.logger_manager import get_logger -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.chat.utils.chat_message_builder import get_raw_msg_by_timestamp_random, build_anonymous_messages from src.chat.focus_chat.heartflow_prompt_builder import Prompt, global_prompt_manager diff --git a/src/chat/focus_chat/heartflow_message_revceiver.py b/src/chat/focus_chat/heartflow_message_revceiver.py index 0e5cc0534..57f133f7a 100644 --- a/src/chat/focus_chat/heartflow_message_revceiver.py +++ b/src/chat/focus_chat/heartflow_message_revceiver.py @@ -11,7 +11,7 @@ from ..message_receive.chat_stream import chat_manager # from ..message_receive.message_buffer import message_buffer from ..utils.timer_calculator import Timer -from src.chat.person_info.relationship_manager import relationship_manager +from src.person_info.relationship_manager import relationship_manager from typing import Optional, Tuple, Dict, Any logger = get_logger("chat") diff --git a/src/chat/focus_chat/heartflow_prompt_builder.py b/src/chat/focus_chat/heartflow_prompt_builder.py index b506b9066..e0be2d809 100644 --- a/src/chat/focus_chat/heartflow_prompt_builder.py +++ b/src/chat/focus_chat/heartflow_prompt_builder.py @@ -3,7 +3,7 @@ from src.common.logger_manager import get_logger from src.individuality.individuality import individuality from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.chat.utils.chat_message_builder import build_readable_messages, get_raw_msg_before_timestamp_with_chat -from src.chat.person_info.relationship_manager import relationship_manager +from src.person_info.relationship_manager import relationship_manager import time from typing import Optional from src.chat.utils.utils import get_recent_group_speaker diff --git a/src/chat/focus_chat/info_processors/action_processor.py b/src/chat/focus_chat/info_processors/action_processor.py index b53d45689..83eed5a40 100644 --- a/src/chat/focus_chat/info_processors/action_processor.py +++ b/src/chat/focus_chat/info_processors/action_processor.py @@ -6,7 +6,7 @@ from .base_processor import BaseProcessor from src.common.logger_manager import get_logger from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation from typing import Dict -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config import random diff --git a/src/chat/focus_chat/info_processors/chattinginfo_processor.py b/src/chat/focus_chat/info_processors/chattinginfo_processor.py index 5b46d16bb..1fcab5e44 100644 --- a/src/chat/focus_chat/info_processors/chattinginfo_processor.py +++ b/src/chat/focus_chat/info_processors/chattinginfo_processor.py @@ -9,7 +9,7 @@ from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservati from src.chat.focus_chat.info.cycle_info import CycleInfo from datetime import datetime from typing import Dict -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config logger = get_logger("processor") diff --git a/src/chat/focus_chat/info_processors/mind_processor.py b/src/chat/focus_chat/info_processors/mind_processor.py index 0457ea1e8..8e911acec 100644 --- a/src/chat/focus_chat/info_processors/mind_processor.py +++ b/src/chat/focus_chat/info_processors/mind_processor.py @@ -1,6 +1,6 @@ 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.llm_models.utils_model import LLMRequest from src.config.config import global_config import time import traceback @@ -9,7 +9,7 @@ from src.individuality.individuality import individuality from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.chat.utils.json_utils import safe_json_dumps from src.chat.message_receive.chat_stream import chat_manager -from src.chat.person_info.relationship_manager import relationship_manager +from src.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 diff --git a/src/chat/focus_chat/info_processors/self_processor.py b/src/chat/focus_chat/info_processors/self_processor.py index 881e6682f..692c5207e 100644 --- a/src/chat/focus_chat/info_processors/self_processor.py +++ b/src/chat/focus_chat/info_processors/self_processor.py @@ -1,6 +1,6 @@ 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.llm_models.utils_model import LLMRequest from src.config.config import global_config import time import traceback @@ -8,7 +8,7 @@ from src.common.logger_manager import get_logger from src.individuality.individuality import individuality from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.chat.message_receive.chat_stream import chat_manager -from src.chat.person_info.relationship_manager import relationship_manager +from src.person_info.relationship_manager import relationship_manager from .base_processor import BaseProcessor from typing import List, Optional from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation diff --git a/src/chat/focus_chat/info_processors/tool_processor.py b/src/chat/focus_chat/info_processors/tool_processor.py index 294f130e8..39ac8dc67 100644 --- a/src/chat/focus_chat/info_processors/tool_processor.py +++ b/src/chat/focus_chat/info_processors/tool_processor.py @@ -1,5 +1,5 @@ from src.chat.heart_flow.observation.chatting_observation import ChattingObservation -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config import time from src.common.logger_manager import get_logger @@ -7,7 +7,7 @@ from src.individuality.individuality import individuality from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.tools.tool_use import ToolUser from src.chat.utils.json_utils import process_llm_tool_calls -from src.chat.person_info.relationship_manager import relationship_manager +from src.person_info.relationship_manager import relationship_manager from .base_processor import BaseProcessor from typing import List, Optional, Dict from src.chat.heart_flow.observation.observation import Observation diff --git a/src/chat/focus_chat/info_processors/working_memory_processor.py b/src/chat/focus_chat/info_processors/working_memory_processor.py index c79c8363d..cceb16235 100644 --- a/src/chat/focus_chat/info_processors/working_memory_processor.py +++ b/src/chat/focus_chat/info_processors/working_memory_processor.py @@ -1,6 +1,6 @@ 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.llm_models.utils_model import LLMRequest from src.config.config import global_config import time import traceback diff --git a/src/chat/focus_chat/memory_activator.py b/src/chat/focus_chat/memory_activator.py index 4fcd37302..c3453d0ce 100644 --- a/src/chat/focus_chat/memory_activator.py +++ b/src/chat/focus_chat/memory_activator.py @@ -1,7 +1,7 @@ from src.chat.heart_flow.observation.chatting_observation import ChattingObservation from src.chat.heart_flow.observation.structure_observation import StructureObservation from src.chat.heart_flow.observation.hfcloop_observation import HFCloopObservation -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.common.logger_manager import get_logger from src.chat.utils.prompt_builder import Prompt diff --git a/src/chat/focus_chat/planners/actions/plugin_action.py b/src/chat/focus_chat/planners/actions/plugin_action.py index b84898fd9..7f4f40c55 100644 --- a/src/chat/focus_chat/planners/actions/plugin_action.py +++ b/src/chat/focus_chat/planners/actions/plugin_action.py @@ -4,7 +4,7 @@ from src.chat.focus_chat.planners.actions.base_action import BaseAction from src.chat.heart_flow.observation.chatting_observation import ChattingObservation from src.chat.focus_chat.hfc_utils import create_empty_anchor_message from src.common.logger_manager import get_logger -from src.chat.person_info.person_info import person_info_manager +from src.person_info.person_info import person_info_manager from abc import abstractmethod import os import inspect diff --git a/src/chat/focus_chat/planners/planner.py b/src/chat/focus_chat/planners/planner.py index 8e1e8a0a0..7ffafd1a9 100644 --- a/src/chat/focus_chat/planners/planner.py +++ b/src/chat/focus_chat/planners/planner.py @@ -2,7 +2,7 @@ import json # <--- 确保导入 json import traceback from typing import List, Dict, Any, Optional from rich.traceback import install -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.chat.focus_chat.info.info_base import InfoBase from src.chat.focus_chat.info.obs_info import ObsInfo diff --git a/src/chat/focus_chat/working_memory/memory_manager.py b/src/chat/focus_chat/working_memory/memory_manager.py index 7fda40239..2ee8a36de 100644 --- a/src/chat/focus_chat/working_memory/memory_manager.py +++ b/src/chat/focus_chat/working_memory/memory_manager.py @@ -3,7 +3,7 @@ import traceback from json_repair import repair_json from rich.traceback import install from src.common.logger_manager import get_logger -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.chat.focus_chat.working_memory.memory_item import MemoryItem import json # 添加json模块导入 diff --git a/src/chat/heart_flow/observation/chatting_observation.py b/src/chat/heart_flow/observation/chatting_observation.py index a1375f587..b43074fa0 100644 --- a/src/chat/heart_flow/observation/chatting_observation.py +++ b/src/chat/heart_flow/observation/chatting_observation.py @@ -1,5 +1,5 @@ from datetime import datetime -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config import traceback from src.chat.utils.chat_message_builder import ( diff --git a/src/chat/heart_flow/utils_chat.py b/src/chat/heart_flow/utils_chat.py index 68d5cb1bc..f796254c4 100644 --- a/src/chat/heart_flow/utils_chat.py +++ b/src/chat/heart_flow/utils_chat.py @@ -2,7 +2,7 @@ import asyncio from typing import Optional, Tuple, Dict from src.common.logger_manager import get_logger from src.chat.message_receive.chat_stream import chat_manager -from src.chat.person_info.person_info import person_info_manager +from src.person_info.person_info import person_info_manager logger = get_logger("heartflow_utils") diff --git a/src/chat/memory_system/Hippocampus.py b/src/chat/memory_system/Hippocampus.py index 68758e298..9c734c26e 100644 --- a/src/chat/memory_system/Hippocampus.py +++ b/src/chat/memory_system/Hippocampus.py @@ -11,7 +11,7 @@ import jieba import networkx as nx import numpy as np from collections import Counter -from ...chat.models.utils_model import LLMRequest +from ...llm_models.utils_model import LLMRequest from src.common.logger_manager import get_logger from src.chat.memory_system.sample_distribution import MemoryBuildScheduler # 分布生成器 from ..utils.chat_message_builder import ( diff --git a/src/chat/message_receive/__init__.py b/src/chat/message_receive/__init__.py index 39a1f2637..ba091bcb8 100644 --- a/src/chat/message_receive/__init__.py +++ b/src/chat/message_receive/__init__.py @@ -1,8 +1,8 @@ -from ..emoji_system.emoji_manager import emoji_manager -from ..person_info.relationship_manager import relationship_manager -from .chat_stream import chat_manager -from .message_sender import message_manager -from .storage import MessageStorage +from src.chat.emoji_system.emoji_manager import emoji_manager +from src.person_info.relationship_manager import relationship_manager +from src.chat.message_receive.chat_stream import chat_manager +from src.chat.message_receive.message_sender import message_manager +from src.chat.message_receive.storage import MessageStorage __all__ = [ diff --git a/src/chat/normal_chat/normal_chat.py b/src/chat/normal_chat/normal_chat.py index 9fe663b53..3264ab5bd 100644 --- a/src/chat/normal_chat/normal_chat.py +++ b/src/chat/normal_chat/normal_chat.py @@ -11,7 +11,7 @@ from src.common.logger_manager import get_logger 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 +from src.person_info.relationship_manager import relationship_manager from src.chat.utils.info_catcher import info_catcher_manager from src.chat.utils.timer_calculator import Timer from src.chat.utils.prompt_builder import global_prompt_manager diff --git a/src/chat/normal_chat/normal_chat_generator.py b/src/chat/normal_chat/normal_chat_generator.py index 631f7baa5..efa1ec54f 100644 --- a/src/chat/normal_chat/normal_chat_generator.py +++ b/src/chat/normal_chat/normal_chat_generator.py @@ -1,8 +1,8 @@ from typing import List, Optional, Tuple, Union import random -from ..models.utils_model import LLMRequest -from ...config.config import global_config -from ..message_receive.message import MessageThinking +from src.llm_models.utils_model import LLMRequest +from src.config.config import global_config +from src.chat.message_receive.message import MessageThinking from src.chat.focus_chat.heartflow_prompt_builder import prompt_builder from src.chat.utils.utils import process_llm_response from src.chat.utils.timer_calculator import Timer diff --git a/src/chat/normal_chat/willing/willing_manager.py b/src/chat/normal_chat/willing/willing_manager.py index bbc5dcc0a..4080ae8e8 100644 --- a/src/chat/normal_chat/willing/willing_manager.py +++ b/src/chat/normal_chat/willing/willing_manager.py @@ -3,7 +3,7 @@ from dataclasses import dataclass from src.config.config import global_config from src.chat.message_receive.chat_stream import ChatStream, GroupInfo from src.chat.message_receive.message import MessageRecv -from src.chat.person_info.person_info import person_info_manager, PersonInfoManager +from src.person_info.person_info import person_info_manager, PersonInfoManager from abc import ABC, abstractmethod import importlib from typing import Dict, Optional diff --git a/src/chat/utils/chat_message_builder.py b/src/chat/utils/chat_message_builder.py index d662d8c0a..4c66b7428 100644 --- a/src/chat/utils/chat_message_builder.py +++ b/src/chat/utils/chat_message_builder.py @@ -4,7 +4,7 @@ import time # 导入 time 模块以获取当前时间 import random import re from src.common.message_repository import find_messages, count_messages -from src.chat.person_info.person_info import person_info_manager +from src.person_info.person_info import person_info_manager from src.chat.utils.utils import translate_timestamp_to_human_readable diff --git a/src/chat/utils/utils.py b/src/chat/utils/utils.py index 25e0e6e12..19703ec40 100644 --- a/src/chat/utils/utils.py +++ b/src/chat/utils/utils.py @@ -10,7 +10,7 @@ from maim_message import UserInfo from src.common.logger import get_module_logger from src.manager.mood_manager import mood_manager from ..message_receive.message import MessageRecv -from ..models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from .typo_generator import ChineseTypoGenerator from ...config.config import global_config from ...common.message_repository import find_messages, count_messages diff --git a/src/chat/utils/utils_image.py b/src/chat/utils/utils_image.py index c317fbbd6..ca9f00aa9 100644 --- a/src/chat/utils/utils_image.py +++ b/src/chat/utils/utils_image.py @@ -8,10 +8,10 @@ import io import numpy as np -from ...common.database.database import db -from ...common.database.database_model import Images, ImageDescriptions -from ...config.config import global_config -from ..models.utils_model import LLMRequest +from src.common.database.database import db +from src.common.database.database_model import Images, ImageDescriptions +from src.config.config import global_config +from src.llm_models.utils_model import LLMRequest from src.common.logger_manager import get_logger from rich.traceback import install diff --git a/src/experimental/PFC/action_planner.py b/src/experimental/PFC/action_planner.py index 2726f9c8b..6ab4c2305 100644 --- a/src/experimental/PFC/action_planner.py +++ b/src/experimental/PFC/action_planner.py @@ -1,7 +1,7 @@ import time from typing import Tuple, Optional # 增加了 Optional from src.common.logger_manager import get_logger -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.experimental.PFC.chat_observer import ChatObserver from src.experimental.PFC.pfc_utils import get_items_from_json diff --git a/src/experimental/PFC/pfc.py b/src/experimental/PFC/pfc.py index ec34e8281..d487a1aad 100644 --- a/src/experimental/PFC/pfc.py +++ b/src/experimental/PFC/pfc.py @@ -1,6 +1,6 @@ from typing import List, Tuple, TYPE_CHECKING from src.common.logger import get_module_logger -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.experimental.PFC.chat_observer import ChatObserver from src.experimental.PFC.pfc_utils import get_items_from_json diff --git a/src/experimental/PFC/pfc_KnowledgeFetcher.py b/src/experimental/PFC/pfc_KnowledgeFetcher.py index 4c1d8c759..769d54da8 100644 --- a/src/experimental/PFC/pfc_KnowledgeFetcher.py +++ b/src/experimental/PFC/pfc_KnowledgeFetcher.py @@ -1,7 +1,7 @@ from typing import List, Tuple from src.common.logger import get_module_logger from src.chat.memory_system.Hippocampus import HippocampusManager -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.chat.message_receive.message import Message from src.chat.knowledge.knowledge_lib import qa_manager diff --git a/src/experimental/PFC/reply_checker.py b/src/experimental/PFC/reply_checker.py index 5bca9d601..a13618797 100644 --- a/src/experimental/PFC/reply_checker.py +++ b/src/experimental/PFC/reply_checker.py @@ -1,7 +1,7 @@ import json from typing import Tuple, List, Dict, Any from src.common.logger import get_module_logger -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.experimental.PFC.chat_observer import ChatObserver from maim_message import UserInfo diff --git a/src/experimental/PFC/reply_generator.py b/src/experimental/PFC/reply_generator.py index c2e770248..0fababc67 100644 --- a/src/experimental/PFC/reply_generator.py +++ b/src/experimental/PFC/reply_generator.py @@ -1,6 +1,6 @@ from typing import Tuple, List, Dict, Any from src.common.logger import get_module_logger -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.experimental.PFC.chat_observer import ChatObserver from src.experimental.PFC.reply_checker import ReplyChecker diff --git a/src/individuality/expression_style.py b/src/individuality/expression_style.py index c642a86c3..30906c450 100644 --- a/src/individuality/expression_style.py +++ b/src/individuality/expression_style.py @@ -1,6 +1,6 @@ import random from src.common.logger_manager import get_logger -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from typing import List, Tuple diff --git a/src/chat/models/utils_model.py b/src/llm_models/utils_model.py similarity index 99% rename from src/chat/models/utils_model.py rename to src/llm_models/utils_model.py index f6528856d..cda51b945 100644 --- a/src/chat/models/utils_model.py +++ b/src/llm_models/utils_model.py @@ -3,10 +3,8 @@ import json import re from datetime import datetime from typing import Tuple, Union, Dict, Any - import aiohttp from aiohttp.client import ClientResponse - from src.common.logger import get_module_logger import base64 from PIL import Image @@ -14,7 +12,7 @@ import io import os from src.common.database.database import db # 确保 db 被导入用于 create_tables from src.common.database.database_model import LLMUsage # 导入 LLMUsage 模型 -from ...config.config import global_config +from src.config.config import global_config from rich.traceback import install install(extra_lines=3) diff --git a/src/main.py b/src/main.py index fb138fd50..3b0cbf013 100644 --- a/src/main.py +++ b/src/main.py @@ -6,7 +6,7 @@ from .manager.async_task_manager import async_task_manager from .chat.utils.statistic import OnlineTimeRecordTask, StatisticOutputTask from .manager.mood_manager import MoodPrintTask, MoodUpdateTask from .chat.emoji_system.emoji_manager import emoji_manager -from .chat.person_info.person_info import person_info_manager +from .person_info.person_info import person_info_manager from .chat.normal_chat.willing.willing_manager import willing_manager from .chat.message_receive.chat_stream import chat_manager from src.chat.heart_flow.heartflow import heartflow diff --git a/src/chat/person_info/person_info.py b/src/person_info/person_info.py similarity index 99% rename from src/chat/person_info/person_info.py rename to src/person_info/person_info.py index de120c6a4..788781291 100644 --- a/src/chat/person_info/person_info.py +++ b/src/person_info/person_info.py @@ -1,13 +1,13 @@ from src.common.logger_manager import get_logger -from ...common.database.database import db -from ...common.database.database_model import PersonInfo # 新增导入 +from src.common.database.database import db +from src.common.database.database_model import PersonInfo # 新增导入 import copy import hashlib from typing import Any, Callable, Dict import datetime import asyncio import numpy as np -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config from src.individuality.individuality import individuality diff --git a/src/chat/person_info/relationship_manager.py b/src/person_info/relationship_manager.py similarity index 98% rename from src/chat/person_info/relationship_manager.py rename to src/person_info/relationship_manager.py index a23780c0e..5388ac622 100644 --- a/src/chat/person_info/relationship_manager.py +++ b/src/person_info/relationship_manager.py @@ -1,13 +1,13 @@ from src.common.logger_manager import get_logger -from ..message_receive.chat_stream import ChatStream +from src.chat.message_receive.chat_stream import ChatStream import math from bson.decimal128 import Decimal128 -from .person_info import person_info_manager +from src.person_info.person_info import person_info_manager import time import random from maim_message import UserInfo -from ...manager.mood_manager import mood_manager +from src.manager.mood_manager import mood_manager # import re # import traceback diff --git a/src/tools/tool_can_use/rename_person_tool.py b/src/tools/tool_can_use/rename_person_tool.py index c9914a4e4..e7f07a84e 100644 --- a/src/tools/tool_can_use/rename_person_tool.py +++ b/src/tools/tool_can_use/rename_person_tool.py @@ -1,5 +1,5 @@ from src.tools.tool_can_use.base_tool import BaseTool, register_tool -from src.chat.person_info.person_info import person_info_manager +from src.person_info.person_info import person_info_manager from src.common.logger_manager import get_logger import time diff --git a/src/tools/tool_use.py b/src/tools/tool_use.py index 9b62aa0e5..8ddc747da 100644 --- a/src/tools/tool_use.py +++ b/src/tools/tool_use.py @@ -1,4 +1,4 @@ -from src.chat.models.utils_model import LLMRequest +from src.llm_models.utils_model import LLMRequest from src.config.config import global_config import json from src.common.logger_manager import get_logger