From 924e9994eda39ce41f2e7715247db2f90c74ef75 Mon Sep 17 00:00:00 2001 From: AL76 <735756072@qq.com> Date: Sat, 15 Mar 2025 15:20:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=BC=8F?= =?UTF-8?q?=E6=8E=89=E7=9A=84=E6=A8=A1=E5=9D=97=E5=AF=B9=E4=BA=8Elogger?= =?UTF-8?q?=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=B9=E5=BC=8F=EF=BC=88?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=B8=8D=E5=85=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/cq_code.py | 3 ++- src/plugins/chat/message_sender.py | 3 ++- src/plugins/config_reload/__init__.py | 3 ++- src/plugins/memory_system/memory_manual_build.py | 4 +++- src/plugins/memory_system/memory_test1.py | 4 +++- src/plugins/memory_system/offline_llm.py | 3 ++- src/plugins/utils/typo_generator.py | 3 ++- webui.py | 3 ++- 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/plugins/chat/cq_code.py b/src/plugins/chat/cq_code.py index 8967698dd..5a20b0479 100644 --- a/src/plugins/chat/cq_code.py +++ b/src/plugins/chat/cq_code.py @@ -7,7 +7,7 @@ from typing import Dict, List, Optional, Union import ssl import os import aiohttp -from loguru import logger +from src.common.logger import get_module_logger from nonebot import get_driver from ..models.utils_model import LLM_request @@ -24,6 +24,7 @@ config = driver.config ssl_context = ssl.create_default_context() ssl_context.set_ciphers("AES128-GCM-SHA256") +logger = get_module_logger("cq_code") @dataclass class CQCode: diff --git a/src/plugins/chat/message_sender.py b/src/plugins/chat/message_sender.py index 2debbb522..b88861ac3 100644 --- a/src/plugins/chat/message_sender.py +++ b/src/plugins/chat/message_sender.py @@ -2,7 +2,7 @@ import asyncio import time from typing import Dict, List, Optional, Union -from loguru import logger +from src.common.logger import get_module_logger from nonebot.adapters.onebot.v11 import Bot from ...common.database import db from .message_cq import MessageSendCQ @@ -12,6 +12,7 @@ from .storage import MessageStorage from .config import global_config from .utils import truncate_message +logger = get_module_logger("msg_sender") class Message_Sender: """发送器""" diff --git a/src/plugins/config_reload/__init__.py b/src/plugins/config_reload/__init__.py index ddb7fa754..932191878 100644 --- a/src/plugins/config_reload/__init__.py +++ b/src/plugins/config_reload/__init__.py @@ -1,10 +1,11 @@ from nonebot import get_app from .api import router -from loguru import logger +from src.common.logger import get_module_logger # 获取主应用实例并挂载路由 app = get_app() app.include_router(router, prefix="/api") # 打印日志,方便确认API已注册 +logger = get_module_logger("cfg_reload") logger.success("配置重载API已注册,可通过 /api/reload-config 访问") \ No newline at end of file diff --git a/src/plugins/memory_system/memory_manual_build.py b/src/plugins/memory_system/memory_manual_build.py index 2d16998e0..18a5fd2db 100644 --- a/src/plugins/memory_system/memory_manual_build.py +++ b/src/plugins/memory_system/memory_manual_build.py @@ -11,7 +11,7 @@ from pathlib import Path import matplotlib.pyplot as plt import networkx as nx from dotenv import load_dotenv -from loguru import logger +from src.common.logger import get_module_logger import jieba # from chat.config import global_config @@ -29,6 +29,8 @@ project_root = current_dir.parent.parent.parent # env.dev文件路径 env_path = project_root / ".env.dev" +logger = get_module_logger("mem_build") + # 加载环境变量 if env_path.exists(): logger.info(f"从 {env_path} 加载环境变量") diff --git a/src/plugins/memory_system/memory_test1.py b/src/plugins/memory_system/memory_test1.py index 245eb9b26..3918e7b66 100644 --- a/src/plugins/memory_system/memory_test1.py +++ b/src/plugins/memory_system/memory_test1.py @@ -12,9 +12,11 @@ import matplotlib.pyplot as plt import networkx as nx import pymongo from dotenv import load_dotenv -from loguru import logger +from src.common.logger import get_module_logger import jieba +logger = get_module_logger("mem_test") + ''' 该理论认为,当两个或多个事物在形态上具有相似性时, 它们在记忆中会形成关联。 diff --git a/src/plugins/memory_system/offline_llm.py b/src/plugins/memory_system/offline_llm.py index 4a80b3ecd..ac89ddb25 100644 --- a/src/plugins/memory_system/offline_llm.py +++ b/src/plugins/memory_system/offline_llm.py @@ -5,8 +5,9 @@ from typing import Tuple, Union import aiohttp import requests -from loguru import logger +from src.common.logger import get_module_logger +logger = get_module_logger("offline_llm") class LLMModel: def __init__(self, model_name="deepseek-ai/DeepSeek-V3", **kwargs): diff --git a/src/plugins/utils/typo_generator.py b/src/plugins/utils/typo_generator.py index f99a7ab20..1cf09bdf3 100644 --- a/src/plugins/utils/typo_generator.py +++ b/src/plugins/utils/typo_generator.py @@ -13,8 +13,9 @@ from pathlib import Path import jieba from pypinyin import Style, pinyin -from loguru import logger +from src.common.logger import get_module_logger +logger = get_module_logger("typo_gen") class ChineseTypoGenerator: def __init__(self, diff --git a/webui.py b/webui.py index e22f250ea..8f36b4394 100644 --- a/webui.py +++ b/webui.py @@ -2,11 +2,12 @@ import gradio as gr import os import sys import toml -from loguru import logger +from src.common.logger import get_module_logger import shutil import ast import json +logger = get_module_logger("webui") is_share = False debug = True