diff --git a/changelogs/changelog_dev.md b/changelogs/changelog_dev.md new file mode 100644 index 000000000..07db37e88 --- /dev/null +++ b/changelogs/changelog_dev.md @@ -0,0 +1,2 @@ +这里放置了测试版本的细节更新 + diff --git a/src/main.py b/src/main.py index 621014ae6..fc0a757e5 100644 --- a/src/main.py +++ b/src/main.py @@ -4,13 +4,13 @@ from .plugins.utils.statistic import LLMStatistics from .plugins.moods.moods import MoodManager from .plugins.schedule.schedule_generator import bot_schedule from .plugins.chat.emoji_manager import emoji_manager -from .plugins.chat.relationship_manager import relationship_manager +from .plugins.relationship.relationship_manager import relationship_manager from .plugins.willing.willing_manager import willing_manager from .plugins.chat.chat_stream import chat_manager from .heart_flow.heartflow import heartflow from .plugins.memory_system.Hippocampus import HippocampusManager from .plugins.chat.message_sender import message_manager -from .plugins.chat.storage import MessageStorage +from .plugins.storage.storage import MessageStorage from .plugins.config.config import global_config from .plugins.chat.bot import chat_bot from .common.logger import get_module_logger diff --git a/src/plugins/__init__.py b/src/plugins/__init__.py index e86da9f0f..186245417 100644 --- a/src/plugins/__init__.py +++ b/src/plugins/__init__.py @@ -5,7 +5,7 @@ MaiMBot插件系统 from .chat.chat_stream import chat_manager from .chat.emoji_manager import emoji_manager -from .chat.relationship_manager import relationship_manager +from .relationship.relationship_manager import relationship_manager from .moods.moods import MoodManager from .willing.willing_manager import willing_manager from .schedule.schedule_generator import bot_schedule diff --git a/src/plugins/chat/__init__.py b/src/plugins/chat/__init__.py index cace85253..0f4dada44 100644 --- a/src/plugins/chat/__init__.py +++ b/src/plugins/chat/__init__.py @@ -1,8 +1,8 @@ from .emoji_manager import emoji_manager -from .relationship_manager import relationship_manager +from ..relationship.relationship_manager import relationship_manager from .chat_stream import chat_manager from .message_sender import message_manager -from .storage import MessageStorage +from ..storage.storage import MessageStorage from .auto_speak import auto_speak_manager diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py index 0f28c81fe..9d97daec8 100644 --- a/src/plugins/chat/bot.py +++ b/src/plugins/chat/bot.py @@ -12,8 +12,8 @@ from .message import MessageSending, MessageRecv, MessageThinking, MessageSet from .chat_stream import chat_manager from .message_sender import message_manager # 导入新的消息管理器 -from .relationship_manager import relationship_manager -from .storage import MessageStorage +from ..relationship.relationship_manager import relationship_manager +from ..storage.storage import MessageStorage from .utils import is_mentioned_bot_in_message, get_recent_group_detailed_plain_text from .utils_image import image_path_to_base64 from ..willing.willing_manager import willing_manager # 导入意愿管理器 diff --git a/src/plugins/chat/message_sender.py b/src/plugins/chat/message_sender.py index 378ee6864..a12f7320b 100644 --- a/src/plugins/chat/message_sender.py +++ b/src/plugins/chat/message_sender.py @@ -7,7 +7,7 @@ from ...common.database import db from ..message.api import global_api from .message import MessageSending, MessageThinking, MessageSet -from .storage import MessageStorage +from ..storage.storage import MessageStorage from ..config.config import global_config from .utils import truncate_message, calculate_typing_time diff --git a/src/plugins/chat/relationship_manager.py b/src/plugins/relationship/relationship_manager.py similarity index 99% rename from src/plugins/chat/relationship_manager.py rename to src/plugins/relationship/relationship_manager.py index 9221817c3..f8a850cab 100644 --- a/src/plugins/chat/relationship_manager.py +++ b/src/plugins/relationship/relationship_manager.py @@ -4,7 +4,7 @@ from src.common.logger import get_module_logger, LogConfig, RELATION_STYLE_CONFI from ...common.database import db from ..message.message_base import UserInfo -from .chat_stream import ChatStream +from ..chat.chat_stream import ChatStream import math from bson.decimal128 import Decimal128 diff --git a/src/plugins/chat/storage.py b/src/plugins/storage/storage.py similarity index 95% rename from src/plugins/chat/storage.py rename to src/plugins/storage/storage.py index 7ff247b25..c35f55be5 100644 --- a/src/plugins/chat/storage.py +++ b/src/plugins/storage/storage.py @@ -1,8 +1,8 @@ from typing import Union from ...common.database import db -from .message import MessageSending, MessageRecv -from .chat_stream import ChatStream +from ..chat.message import MessageSending, MessageRecv +from ..chat.chat_stream import ChatStream from src.common.logger import get_module_logger logger = get_module_logger("message_storage") diff --git a/src/plugins/chat/topic_identifier.py b/src/plugins/topic_identify/topic_identifier.py similarity index 100% rename from src/plugins/chat/topic_identifier.py rename to src/plugins/topic_identify/topic_identifier.py