Skip to content

Commit 6d1f5be

Browse files
authored
Merge pull request #1035 from MaiM-with-u/dev-refactor-logger
重构日志系统:使用 structlog 替代 loguru
2 parents 0cb5952 + 61d6672 commit 6d1f5be

132 files changed

Lines changed: 317 additions & 1816 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bot.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import platform
88
import traceback
99
from dotenv import load_dotenv
10-
from src.common.logger_manager import get_logger
10+
from src.common.logger import get_logger
1111

1212
# from src.common.logger import LogConfig, CONFIRM_STYLE_CONFIG
1313
from src.common.crash_logger import install_crash_handler
@@ -69,10 +69,9 @@ def load_env():
6969
# 直接加载生产环境变量配置
7070
if os.path.exists(".env"):
7171
load_dotenv(".env", override=True)
72-
logger.success("成功加载环境变量配置")
72+
logger.info("成功加载环境变量配置")
7373
else:
74-
logger.error("未找到.env文件,请确保文件存在")
75-
raise FileNotFoundError("未找到.env文件,请确保文件存在")
74+
logger.warning("未找到.env文件,请确保程序所需的环境变量被正确设置")
7675

7776

7877
def scan_provider(env_config: dict):
@@ -199,6 +198,7 @@ def check_eula():
199198

200199

201200
def raw_main():
201+
load_env()
202202
# 利用 TZ 环境变量设定程序工作的时区
203203
if platform.system().lower() != "windows":
204204
time.tzset()
@@ -211,8 +211,6 @@ def raw_main():
211211

212212
easter_egg()
213213

214-
load_env()
215-
216214
env_config = {key: os.getenv(key) for key in os.environ}
217215
scan_provider(env_config)
218216

@@ -235,7 +233,7 @@ def raw_main():
235233
loop.run_until_complete(main_system.initialize())
236234
loop.run_until_complete(main_system.schedule_tasks())
237235
except KeyboardInterrupt:
238-
# loop.run_until_complete(global_api.stop())
236+
# loop.run_until_complete(get_global_api().stop())
239237
logger.warning("收到中断信号,正在优雅关闭...")
240238
if loop and not loop.is_closed():
241239
try:

docs/plugin_quick_start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ from src.plugin_system import (
3939
BasePlugin, register_plugin, BaseAction, BaseCommand,
4040
ComponentInfo, ActionInfo, CommandInfo, ActionActivationType, ChatMode
4141
)
42-
from src.common.logger_manager import get_logger
42+
from src.common.logger import get_logger
4343

4444
logger = get_logger("my_first_plugin")
4545

requirements.txt

-452 Bytes
Binary file not shown.

scripts/import_openie.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
from src.chat.knowledge.llm_client import LLMClient
1616
from src.chat.knowledge.open_ie import OpenIE
1717
from src.chat.knowledge.kg_manager import KGManager
18-
from src.common.logger import get_module_logger
18+
from src.common.logger import get_logger
1919
from src.chat.knowledge.utils.hash import get_sha256
2020

2121

2222
# 添加项目根目录到 sys.path
2323
ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
2424
OPENIE_DIR = global_config["persistence"]["openie_data_path"] or os.path.join(ROOT_PATH, "data/openie")
2525

26-
logger = get_module_logger("OpenIE导入")
26+
logger = get_logger("OpenIE导入")
2727

2828

2929
def hash_deduplicate(

scripts/info_extraction.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from rich.progress import Progress # 替换为 rich 进度条
1414

15-
from src.common.logger import get_module_logger
15+
from src.common.logger import get_logger
1616
from src.chat.knowledge.lpmmconfig import global_config
1717
from src.chat.knowledge.ie_process import info_extract_from_str
1818
from src.chat.knowledge.llm_client import LLMClient
@@ -28,7 +28,7 @@
2828
TextColumn,
2929
)
3030

31-
logger = get_module_logger("LPMM知识库-信息提取")
31+
logger = get_logger("LPMM知识库-信息提取")
3232

3333

3434
ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))

scripts/message_retrieval_script.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
from src.chat.utils.chat_message_builder import build_readable_messages
3434
from src.common.database.database_model import Messages
35-
from src.common.logger_manager import get_logger
35+
from src.common.logger import get_logger
3636
from src.common.database.database import db
3737
from src.config.config import global_config
3838
from src.llm_models.utils_model import LLMRequest

scripts/mongodb_to_sqlite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
GraphNodes,
4343
GraphEdges,
4444
)
45-
from src.common.logger_manager import get_logger
45+
from src.common.logger import get_logger
4646

4747
logger = get_logger("mongodb_to_sqlite")
4848

scripts/raw_data_preprocessor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import datetime # 新增导入
66

77
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
8-
from src.common.logger_manager import get_logger
8+
from src.common.logger import get_logger
99
from src.chat.knowledge.lpmmconfig import global_config
1010

1111
logger = get_logger("lpmm")

src/api/apiforgui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from src.chat.heart_flow.heartflow import heartflow
22
from src.chat.heart_flow.sub_heartflow import ChatState
3-
from src.common.logger_manager import get_logger
3+
from src.common.logger import get_logger
44
import time
55

66
logger = get_logger("api")

src/api/maigraphql/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from fastapi import FastAPI
44
from strawberry.fastapi import GraphQLRouter
55

6-
from src.common.server import global_server
6+
from src.common.server import get_global_server
77

88

99
@strawberry.type
@@ -17,6 +17,6 @@ def hello(self) -> str:
1717

1818
graphql_app = GraphQLRouter(schema)
1919

20-
fast_api_app: FastAPI = global_server.get_app()
20+
fast_api_app: FastAPI = get_global_server().get_app()
2121

2222
fast_api_app.include_router(graphql_app, prefix="/graphql")

0 commit comments

Comments
 (0)