feat: 重构数据库导入路径,移除旧的数据库模块并添加新的数据库实现
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 # 分布生成器
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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文件
|
||||
|
||||
2
src/common/database/database_model.py
Normal file
2
src/common/database/database_model.py
Normal file
@@ -0,0 +1,2 @@
|
||||
from peewee import *
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user