重构跨多个模块的日志配置
- 将“get_module_logger”替换为新模块“logger_manager”中的“get_logger”,以实现一致的日志设置。 - 移除了单独的日志配置设置,转而采用集中式日志管理。 - 更新了多个文件中的日志初始化方法,包括“config.py”、“change_mood.py”、“change_relationship.py”等,以简化日志记录实践。 - 引入“logger_manager.py”,用于根据模块特定的样式处理日志配置。
This commit is contained in:
@@ -426,6 +426,24 @@ CHAT_STREAM_STYLE_CONFIG = {
|
||||
},
|
||||
}
|
||||
|
||||
CHAT_MESSAGE_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<light-blue>聊天消息</light-blue> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 聊天消息 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": (
|
||||
"<level>{time:MM-DD HH:mm}</level> | <light-blue>聊天消息</light-blue> | <light-blue>{message}</light-blue>"
|
||||
), # noqa: E501
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 聊天消息 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
PERSON_INFO_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
@@ -567,6 +585,42 @@ LPMM_STYLE_CONFIG = {
|
||||
},
|
||||
}
|
||||
|
||||
OBSERVATION_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<light-yellow>聊天观察</light-yellow> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 聊天观察 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": (
|
||||
"<level>{time:MM-DD HH:mm}</level> | <light-yellow>聊天观察</light-yellow> | <light-yellow>{message}</light-yellow>"
|
||||
), # noqa: E501
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 聊天观察 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
CHAT_IMAGE_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<light-yellow>聊天图片</light-yellow> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 聊天图片 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": (
|
||||
"<level>{time:MM-DD HH:mm}</level> | <light-yellow>聊天图片</light-yellow> | <light-yellow>{message}</light-yellow>"
|
||||
), # noqa: E501
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 聊天图片 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
# 兴趣log
|
||||
INTEREST_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
@@ -608,8 +662,140 @@ TIANYI_STYLE_CONFIG = {
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 天依 | {message}",
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
# 模型日志样式配置
|
||||
MODEL_UTILS_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<light-yellow>模型</light-yellow> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 模型 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": "<level>{time:MM-DD HH:mm}</level> | <light-green>模型</light-green> | {message}",
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 模型 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
MESSAGE_BUFFER_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<light-yellow>消息缓存</light-yellow> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 消息缓存 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": "<level>{time:MM-DD HH:mm}</level> | <light-green>消息缓存</light-green> | {message}",
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 消息缓存 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
PROMPT_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<light-yellow>提示词构建</light-yellow> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 提示词构建 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": "<level>{time:MM-DD HH:mm}</level> | <light-green>提示词构建</light-green> | {message}",
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 提示词构建 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
CHANGE_MOOD_TOOL_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<fg #3FC1C9>心情工具</fg #3FC1C9> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 心情工具 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": "<level>{time:MM-DD HH:mm}</level> | <light-green>心情工具</light-green> | {message}",
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 心情工具 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
CHANGE_RELATIONSHIP_TOOL_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<fg #3FC1C9>关系工具</fg #3FC1C9> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 关系工具 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": "<level>{time:MM-DD HH:mm}</level> | <light-green>关系工具</light-green> | {message}",
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 关系工具 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
GET_KNOWLEDGE_TOOL_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<fg #3FC1C9>获取知识</fg #3FC1C9> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 获取知识 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": "<level>{time:MM-DD HH:mm}</level> | <light-green>获取知识</light-green> | {message}",
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 获取知识 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
GET_TIME_DATE_TOOL_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<fg #3FC1C9>获取时间日期</fg #3FC1C9> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 获取时间日期 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": "<level>{time:MM-DD HH:mm}</level> | <light-green>获取时间日期</light-green> | {message}",
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 获取时间日期 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
LPMM_GET_KNOWLEDGE_TOOL_STYLE_CONFIG = {
|
||||
"advanced": {
|
||||
"console_format": (
|
||||
"<white>{time:YYYY-MM-DD HH:mm:ss}</white> | "
|
||||
"<level>{level: <8}</level> | "
|
||||
"<fg #3FC1C9>LPMM获取知识</fg #3FC1C9> | "
|
||||
"<level>{message}</level>"
|
||||
),
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | LPMM获取知识 | {message}",
|
||||
},
|
||||
"simple": {
|
||||
"console_format": "<level>{time:MM-DD HH:mm}</level> | <light-green>LPMM获取知识</light-green> | {message}",
|
||||
"file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | LPMM获取知识 | {message}",
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
|
||||
# 根据SIMPLE_OUTPUT选择配置
|
||||
MAIN_STYLE_CONFIG = MAIN_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else MAIN_STYLE_CONFIG["advanced"]
|
||||
EMOJI_STYLE_CONFIG = EMOJI_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else EMOJI_STYLE_CONFIG["advanced"]
|
||||
@@ -649,6 +835,37 @@ PFC_STYLE_CONFIG = PFC_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else PFC_STYLE_CO
|
||||
LPMM_STYLE_CONFIG = LPMM_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else LPMM_STYLE_CONFIG["advanced"]
|
||||
INTEREST_STYLE_CONFIG = INTEREST_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else INTEREST_STYLE_CONFIG["advanced"]
|
||||
TIANYI_STYLE_CONFIG = TIANYI_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else TIANYI_STYLE_CONFIG["advanced"]
|
||||
MODEL_UTILS_STYLE_CONFIG = (
|
||||
MODEL_UTILS_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else MODEL_UTILS_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
PROMPT_STYLE_CONFIG = PROMPT_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else PROMPT_STYLE_CONFIG["advanced"]
|
||||
CHANGE_MOOD_TOOL_STYLE_CONFIG = (
|
||||
CHANGE_MOOD_TOOL_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else CHANGE_MOOD_TOOL_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
CHANGE_RELATIONSHIP_TOOL_STYLE_CONFIG = (
|
||||
CHANGE_RELATIONSHIP_TOOL_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else CHANGE_RELATIONSHIP_TOOL_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
GET_KNOWLEDGE_TOOL_STYLE_CONFIG = (
|
||||
GET_KNOWLEDGE_TOOL_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else GET_KNOWLEDGE_TOOL_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
GET_TIME_DATE_TOOL_STYLE_CONFIG = (
|
||||
GET_TIME_DATE_TOOL_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else GET_TIME_DATE_TOOL_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
LPMM_GET_KNOWLEDGE_TOOL_STYLE_CONFIG = (
|
||||
LPMM_GET_KNOWLEDGE_TOOL_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else LPMM_GET_KNOWLEDGE_TOOL_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
OBSERVATION_STYLE_CONFIG = (
|
||||
OBSERVATION_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else OBSERVATION_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
MESSAGE_BUFFER_STYLE_CONFIG = (
|
||||
MESSAGE_BUFFER_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else MESSAGE_BUFFER_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
CHAT_MESSAGE_STYLE_CONFIG = (
|
||||
CHAT_MESSAGE_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else CHAT_MESSAGE_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
CHAT_IMAGE_STYLE_CONFIG = (
|
||||
CHAT_IMAGE_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else CHAT_IMAGE_STYLE_CONFIG["advanced"]
|
||||
)
|
||||
|
||||
|
||||
def is_registered_module(record: dict) -> bool:
|
||||
|
||||
99
src/common/logger_manager.py
Normal file
99
src/common/logger_manager.py
Normal file
@@ -0,0 +1,99 @@
|
||||
from src.common.logger import get_module_logger, LogConfig
|
||||
from src.common.logger import (
|
||||
BACKGROUND_TASKS_STYLE_CONFIG,
|
||||
MAIN_STYLE_CONFIG,
|
||||
MEMORY_STYLE_CONFIG,
|
||||
PFC_STYLE_CONFIG,
|
||||
MOOD_STYLE_CONFIG,
|
||||
TOOL_USE_STYLE_CONFIG,
|
||||
RELATION_STYLE_CONFIG,
|
||||
CONFIG_STYLE_CONFIG,
|
||||
HEARTFLOW_STYLE_CONFIG,
|
||||
SCHEDULE_STYLE_CONFIG,
|
||||
LLM_STYLE_CONFIG,
|
||||
CHAT_STYLE_CONFIG,
|
||||
EMOJI_STYLE_CONFIG,
|
||||
SUB_HEARTFLOW_STYLE_CONFIG,
|
||||
SUB_HEARTFLOW_MIND_STYLE_CONFIG,
|
||||
SUBHEARTFLOW_MANAGER_STYLE_CONFIG,
|
||||
BASE_TOOL_STYLE_CONFIG,
|
||||
CHAT_STREAM_STYLE_CONFIG,
|
||||
PERSON_INFO_STYLE_CONFIG,
|
||||
WILLING_STYLE_CONFIG,
|
||||
PFC_ACTION_PLANNER_STYLE_CONFIG,
|
||||
MAI_STATE_CONFIG,
|
||||
LPMM_STYLE_CONFIG,
|
||||
INTEREST_STYLE_CONFIG,
|
||||
TIANYI_STYLE_CONFIG,
|
||||
REMOTE_STYLE_CONFIG,
|
||||
TOPIC_STYLE_CONFIG,
|
||||
SENDER_STYLE_CONFIG,
|
||||
CONFIRM_STYLE_CONFIG,
|
||||
MODEL_UTILS_STYLE_CONFIG,
|
||||
PROMPT_STYLE_CONFIG,
|
||||
CHANGE_MOOD_TOOL_STYLE_CONFIG,
|
||||
CHANGE_RELATIONSHIP_TOOL_STYLE_CONFIG,
|
||||
GET_KNOWLEDGE_TOOL_STYLE_CONFIG,
|
||||
GET_TIME_DATE_TOOL_STYLE_CONFIG,
|
||||
LPMM_GET_KNOWLEDGE_TOOL_STYLE_CONFIG,
|
||||
OBSERVATION_STYLE_CONFIG,
|
||||
MESSAGE_BUFFER_STYLE_CONFIG,
|
||||
CHAT_MESSAGE_STYLE_CONFIG,
|
||||
CHAT_IMAGE_STYLE_CONFIG,
|
||||
)
|
||||
|
||||
# 可根据实际需要补充更多模块配置
|
||||
MODULE_LOGGER_CONFIGS = {
|
||||
"background_tasks": BACKGROUND_TASKS_STYLE_CONFIG, # 后台任务
|
||||
"main": MAIN_STYLE_CONFIG, # 主程序
|
||||
"memory": MEMORY_STYLE_CONFIG, # 海马体
|
||||
"pfc": PFC_STYLE_CONFIG, # PFC
|
||||
"mood": MOOD_STYLE_CONFIG, # 心情
|
||||
"tool_use": TOOL_USE_STYLE_CONFIG, # 工具使用
|
||||
"relation": RELATION_STYLE_CONFIG, # 关系
|
||||
"config": CONFIG_STYLE_CONFIG, # 配置
|
||||
"heartflow": HEARTFLOW_STYLE_CONFIG, # 麦麦大脑袋
|
||||
"schedule": SCHEDULE_STYLE_CONFIG, # 在干嘛
|
||||
"llm": LLM_STYLE_CONFIG, # 麦麦组织语言
|
||||
"chat": CHAT_STYLE_CONFIG, # 见闻
|
||||
"emoji": EMOJI_STYLE_CONFIG, # 表情包
|
||||
"sub_heartflow": SUB_HEARTFLOW_STYLE_CONFIG, # 麦麦水群
|
||||
"sub_heartflow_mind": SUB_HEARTFLOW_MIND_STYLE_CONFIG, # 麦麦小脑袋
|
||||
"subheartflow_manager": SUBHEARTFLOW_MANAGER_STYLE_CONFIG, # 麦麦水群[管理]
|
||||
"base_tool": BASE_TOOL_STYLE_CONFIG, # 工具使用
|
||||
"chat_stream": CHAT_STREAM_STYLE_CONFIG, # 聊天流
|
||||
"person_info": PERSON_INFO_STYLE_CONFIG, # 人物信息
|
||||
"willing": WILLING_STYLE_CONFIG, # 意愿
|
||||
"pfc_action_planner": PFC_ACTION_PLANNER_STYLE_CONFIG, # PFC私聊规划
|
||||
"mai_state": MAI_STATE_CONFIG, # 麦麦状态
|
||||
"lpmm": LPMM_STYLE_CONFIG, # LPMM
|
||||
"interest": INTEREST_STYLE_CONFIG, # 兴趣
|
||||
"tianyi": TIANYI_STYLE_CONFIG, # 天依
|
||||
"remote": REMOTE_STYLE_CONFIG, # 远程
|
||||
"topic": TOPIC_STYLE_CONFIG, # 话题
|
||||
"sender": SENDER_STYLE_CONFIG, # 消息发送
|
||||
"confirm": CONFIRM_STYLE_CONFIG, # EULA与PRIVACY确认
|
||||
"model_utils": MODEL_UTILS_STYLE_CONFIG, # 模型工具
|
||||
"prompt": PROMPT_STYLE_CONFIG, # 提示词
|
||||
"change_mood_tool": CHANGE_MOOD_TOOL_STYLE_CONFIG, # 改变心情工具
|
||||
"change_relationship": CHANGE_RELATIONSHIP_TOOL_STYLE_CONFIG, # 改变关系工具
|
||||
"get_knowledge_tool": GET_KNOWLEDGE_TOOL_STYLE_CONFIG, # 获取知识工具
|
||||
"get_time_date": GET_TIME_DATE_TOOL_STYLE_CONFIG, # 获取时间日期工具
|
||||
"lpm_get_knowledge_tool": LPMM_GET_KNOWLEDGE_TOOL_STYLE_CONFIG, # LPMM获取知识工具
|
||||
"observation": OBSERVATION_STYLE_CONFIG, # 聊天观察
|
||||
"message_buffer": MESSAGE_BUFFER_STYLE_CONFIG, # 消息缓冲
|
||||
"chat_message": CHAT_MESSAGE_STYLE_CONFIG, # 聊天消息
|
||||
"chat_image": CHAT_IMAGE_STYLE_CONFIG, # 聊天图片
|
||||
# ...如有更多模块,继续添加...
|
||||
}
|
||||
|
||||
def get_logger(module_name: str):
|
||||
style_config = MODULE_LOGGER_CONFIGS.get(module_name)
|
||||
if style_config:
|
||||
log_config = LogConfig(
|
||||
console_format=style_config["console_format"],
|
||||
file_format=style_config["file_format"],
|
||||
)
|
||||
return get_module_logger(module_name, config=log_config)
|
||||
# 若无特殊样式,使用默认
|
||||
return get_module_logger(module_name)
|
||||
Reference in New Issue
Block a user