diff --git a/src/common/logger.py b/src/common/logger.py index 9f2dee455..61d4d3559 100644 --- a/src/common/logger.py +++ b/src/common/logger.py @@ -835,6 +835,23 @@ API_SERVER_STYLE_CONFIG = { }, } +# maim_message 消息服务样式配置 +MAIM_MESSAGE_STYLE_CONFIG = { + "advanced": { + "console_format": ( + "{time:YYYY-MM-DD HH:mm:ss} | " + "{level: <8} | " + "消息服务 | " + "{message}" + ), + "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 消息服务 | {message}", + }, + "simple": { + "console_format": "{time:HH:mm:ss} | 消息服务 | {message}", + "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 消息服务 | {message}", + }, +} + # 根据SIMPLE_OUTPUT选择配置 MAIN_STYLE_CONFIG = MAIN_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else MAIN_STYLE_CONFIG["advanced"] @@ -912,6 +929,9 @@ CHAT_MESSAGE_STYLE_CONFIG = ( CHAT_IMAGE_STYLE_CONFIG = CHAT_IMAGE_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else CHAT_IMAGE_STYLE_CONFIG["advanced"] INIT_STYLE_CONFIG = INIT_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else INIT_STYLE_CONFIG["advanced"] API_SERVER_STYLE_CONFIG = API_SERVER_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else API_SERVER_STYLE_CONFIG["advanced"] +MAIM_MESSAGE_STYLE_CONFIG = ( + MAIM_MESSAGE_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else MAIM_MESSAGE_STYLE_CONFIG["advanced"] +) INTEREST_CHAT_STYLE_CONFIG = ( INTEREST_CHAT_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else INTEREST_CHAT_STYLE_CONFIG["advanced"] ) diff --git a/src/common/logger_manager.py b/src/common/logger_manager.py index 48d415bd9..2b6f01ca0 100644 --- a/src/common/logger_manager.py +++ b/src/common/logger_manager.py @@ -45,6 +45,7 @@ from src.common.logger import ( INIT_STYLE_CONFIG, INTEREST_CHAT_STYLE_CONFIG, API_SERVER_STYLE_CONFIG, + MAIM_MESSAGE_STYLE_CONFIG, ) # 可根据实际需要补充更多模块配置 @@ -94,6 +95,7 @@ MODULE_LOGGER_CONFIGS = { "init": INIT_STYLE_CONFIG, # 初始化 "interest_chat": INTEREST_CHAT_STYLE_CONFIG, # 兴趣 "api": API_SERVER_STYLE_CONFIG, # API服务器 + "maim_message": MAIM_MESSAGE_STYLE_CONFIG, # 消息服务 # ...如有更多模块,继续添加... } diff --git a/src/common/message/api.py b/src/common/message/api.py index e82ab98fe..f11a78d30 100644 --- a/src/common/message/api.py +++ b/src/common/message/api.py @@ -1,6 +1,27 @@ from src.common.server import global_server import os +import importlib.metadata from maim_message import MessageServer +from src.common.logger_manager import get_logger -global_api = MessageServer(host=os.environ["HOST"], port=int(os.environ["PORT"]), app=global_server.get_app()) +# 检查maim_message版本 +try: + maim_message_version = importlib.metadata.version("maim_message") + version_compatible = [int(x) for x in maim_message_version.split(".")] >= [0, 3, 0] +except (importlib.metadata.PackageNotFoundError, ValueError): + version_compatible = False + +# 根据版本决定是否使用自定义logger +kwargs = { + "host": os.environ["HOST"], + "port": int(os.environ["PORT"]), + "app": global_server.get_app(), +} + +# 只有在版本 >= 0.3.0 时才使用自定义logger +if version_compatible: + maim_message_logger = get_logger("maim_message") + kwargs["custom_logger"] = maim_message_logger + +global_api = MessageServer(**kwargs)