From 307d5a73a69f83b854b7bdc87433c2e50a36df9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E6=A2=93=E6=9F=92?= <1787882683@qq.com>
Date: Wed, 14 May 2025 19:42:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=AF=BC=E5=85=A5=E8=B7=AF=E5=BE=84=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=97=A7=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/chat/emoji_system/emoji_manager.py          | 2 +-
 src/chat/focus_chat/heartflow_prompt_builder.py | 2 +-
 src/chat/memory_system/Hippocampus.py           | 2 +-
 src/chat/memory_system/manually_alter_memory.py | 2 +-
 src/chat/message_receive/chat_stream.py         | 2 +-
 src/chat/message_receive/storage.py             | 2 +-
 src/chat/models/utils_model.py                  | 2 +-
 src/chat/person_info/person_info.py             | 2 +-
 src/chat/utils/info_catcher.py                  | 2 +-
 src/chat/utils/statistic.py                     | 2 +-
 src/chat/utils/utils.py                         | 2 +-
 src/chat/utils/utils_image.py                   | 2 +-
 src/chat/zhishi/knowledge_library.py            | 2 +-
 src/common/{ => database}/database.py           | 0
 src/common/database/database_model.py           | 2 ++
 src/common/message_repository.py                | 2 +-
 src/experimental/PFC/message_storage.py         | 2 +-
 src/tools/tool_can_use/get_knowledge.py         | 2 +-
 18 files changed, 18 insertions(+), 16 deletions(-)
 rename src/common/{ => database}/database.py (100%)
 create mode 100644 src/common/database/database_model.py

diff --git a/src/chat/emoji_system/emoji_manager.py b/src/chat/emoji_system/emoji_manager.py
index 5d800866f..076dbf5a4 100644
--- a/src/chat/emoji_system/emoji_manager.py
+++ b/src/chat/emoji_system/emoji_manager.py
@@ -10,7 +10,7 @@ from PIL import Image
 import io
 import re
 
-from ...common.database import db
+from ...common.database.database import db
 from ...config.config import global_config
 from ..utils.utils_image import image_path_to_base64, image_manager
 from ..models.utils_model import LLMRequest
diff --git a/src/chat/focus_chat/heartflow_prompt_builder.py b/src/chat/focus_chat/heartflow_prompt_builder.py
index 55fb79b46..d8babe2e5 100644
--- a/src/chat/focus_chat/heartflow_prompt_builder.py
+++ b/src/chat/focus_chat/heartflow_prompt_builder.py
@@ -7,7 +7,7 @@ from src.chat.person_info.relationship_manager import relationship_manager
 from src.chat.utils.utils import get_embedding
 import time
 from typing import Union, Optional, Dict, Any
-from src.common.database import db
+from common.database.database import db
 from src.chat.utils.utils import get_recent_group_speaker
 from src.manager.mood_manager import mood_manager
 from src.chat.memory_system.Hippocampus import HippocampusManager
diff --git a/src/chat/memory_system/Hippocampus.py b/src/chat/memory_system/Hippocampus.py
index 70eb679c9..e64475126 100644
--- a/src/chat/memory_system/Hippocampus.py
+++ b/src/chat/memory_system/Hippocampus.py
@@ -10,7 +10,7 @@ import jieba
 import networkx as nx
 import numpy as np
 from collections import Counter
-from ...common.database import db
+from ...common.database.database import db
 from ...chat.models.utils_model import LLMRequest
 from src.common.logger_manager import get_logger
 from src.chat.memory_system.sample_distribution import MemoryBuildScheduler  # 分布生成器
diff --git a/src/chat/memory_system/manually_alter_memory.py b/src/chat/memory_system/manually_alter_memory.py
index ce5abbba7..9bbf59f5b 100644
--- a/src/chat/memory_system/manually_alter_memory.py
+++ b/src/chat/memory_system/manually_alter_memory.py
@@ -34,7 +34,7 @@ root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../.."))
 sys.path.append(root_path)
 
 from src.common.logger import get_module_logger  # noqa E402
-from src.common.database import db  # noqa E402
+from common.database.database import db  # noqa E402
 
 logger = get_module_logger("mem_alter")
 console = Console()
diff --git a/src/chat/message_receive/chat_stream.py b/src/chat/message_receive/chat_stream.py
index 53ebd5026..7f41ac96b 100644
--- a/src/chat/message_receive/chat_stream.py
+++ b/src/chat/message_receive/chat_stream.py
@@ -5,7 +5,7 @@ import copy
 from typing import Dict, Optional
 
 
-from ...common.database import db
+from ...common.database.database import db
 from maim_message import GroupInfo, UserInfo
 
 from src.common.logger_manager import get_logger
diff --git a/src/chat/message_receive/storage.py b/src/chat/message_receive/storage.py
index cae029a11..eb6ea73df 100644
--- a/src/chat/message_receive/storage.py
+++ b/src/chat/message_receive/storage.py
@@ -1,7 +1,7 @@
 import re
 from typing import Union
 
-from ...common.database import db
+from ...common.database.database import db
 from .message import MessageSending, MessageRecv
 from .chat_stream import ChatStream
 from src.common.logger import get_module_logger
diff --git a/src/chat/models/utils_model.py b/src/chat/models/utils_model.py
index e662a8e33..9ca4e56d0 100644
--- a/src/chat/models/utils_model.py
+++ b/src/chat/models/utils_model.py
@@ -12,7 +12,7 @@ import base64
 from PIL import Image
 import io
 import os
-from ...common.database import db
+from ...common.database.database import db
 from ...config.config import global_config
 from rich.traceback import install
 
diff --git a/src/chat/person_info/person_info.py b/src/chat/person_info/person_info.py
index 605b86b23..00cbe86f1 100644
--- a/src/chat/person_info/person_info.py
+++ b/src/chat/person_info/person_info.py
@@ -1,5 +1,5 @@
 from src.common.logger_manager import get_logger
-from ...common.database import db
+from ...common.database.database import db
 import copy
 import hashlib
 from typing import Any, Callable, Dict
diff --git a/src/chat/utils/info_catcher.py b/src/chat/utils/info_catcher.py
index 174bb5b49..b7f59c661 100644
--- a/src/chat/utils/info_catcher.py
+++ b/src/chat/utils/info_catcher.py
@@ -1,6 +1,6 @@
 from src.config.config import global_config
 from src.chat.message_receive.message import MessageRecv, MessageSending, Message
-from src.common.database import db
+from common.database.database import db
 import time
 import traceback
 from typing import List
diff --git a/src/chat/utils/statistic.py b/src/chat/utils/statistic.py
index 3f9832926..4bcf6fea0 100644
--- a/src/chat/utils/statistic.py
+++ b/src/chat/utils/statistic.py
@@ -5,7 +5,7 @@ from typing import Any, Dict, Tuple, List
 from src.common.logger import get_module_logger
 from src.manager.async_task_manager import AsyncTask
 
-from ...common.database import db
+from ...common.database.database import db
 from src.manager.local_store_manager import local_storage
 
 logger = get_module_logger("maibot_statistic")
diff --git a/src/chat/utils/utils.py b/src/chat/utils/utils.py
index 8fe8334b8..f78a0c114 100644
--- a/src/chat/utils/utils.py
+++ b/src/chat/utils/utils.py
@@ -13,7 +13,7 @@ from src.manager.mood_manager import mood_manager
 from ..message_receive.message import MessageRecv
 from ..models.utils_model import LLMRequest
 from .typo_generator import ChineseTypoGenerator
-from ...common.database import db
+from ...common.database.database import db
 from ...config.config import global_config
 
 logger = get_module_logger("chat_utils")
diff --git a/src/chat/utils/utils_image.py b/src/chat/utils/utils_image.py
index 455038246..6fbafc905 100644
--- a/src/chat/utils/utils_image.py
+++ b/src/chat/utils/utils_image.py
@@ -8,7 +8,7 @@ import io
 import numpy as np
 
 
-from ...common.database import db
+from ...common.database.database import db
 from ...config.config import global_config
 from ..models.utils_model import LLMRequest
 
diff --git a/src/chat/zhishi/knowledge_library.py b/src/chat/zhishi/knowledge_library.py
index 6fa1d3e1a..0068a153c 100644
--- a/src/chat/zhishi/knowledge_library.py
+++ b/src/chat/zhishi/knowledge_library.py
@@ -16,7 +16,7 @@ root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../.."))
 sys.path.append(root_path)
 
 # 现在可以导入src模块
-from src.common.database import db  # noqa E402
+from common.database.database import db  # noqa E402
 
 
 # 加载根目录下的env.edv文件
diff --git a/src/common/database.py b/src/common/database/database.py
similarity index 100%
rename from src/common/database.py
rename to src/common/database/database.py
diff --git a/src/common/database/database_model.py b/src/common/database/database_model.py
new file mode 100644
index 000000000..45cecfed6
--- /dev/null
+++ b/src/common/database/database_model.py
@@ -0,0 +1,2 @@
+from peewee import *
+
diff --git a/src/common/message_repository.py b/src/common/message_repository.py
index 03f192cea..03eaba332 100644
--- a/src/common/message_repository.py
+++ b/src/common/message_repository.py
@@ -1,4 +1,4 @@
-from src.common.database import db
+from common.database.database import db
 from src.common.logger import get_module_logger
 import traceback
 from typing import List, Any, Optional
diff --git a/src/experimental/PFC/message_storage.py b/src/experimental/PFC/message_storage.py
index cd6a01e34..24866e38c 100644
--- a/src/experimental/PFC/message_storage.py
+++ b/src/experimental/PFC/message_storage.py
@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 from typing import List, Dict, Any
-from src.common.database import db
+from common.database.database import db
 
 
 class MessageStorage(ABC):
diff --git a/src/tools/tool_can_use/get_knowledge.py b/src/tools/tool_can_use/get_knowledge.py
index 65acd55c0..2a4922f9f 100644
--- a/src/tools/tool_can_use/get_knowledge.py
+++ b/src/tools/tool_can_use/get_knowledge.py
@@ -1,6 +1,6 @@
 from src.tools.tool_can_use.base_tool import BaseTool
 from src.chat.utils.utils import get_embedding
-from src.common.database import db
+from common.database.database import db
 from src.common.logger_manager import get_logger
 from typing import Any, Union