重构跨多个模块的日志配置

- 将“get_module_logger”替换为新模块“logger_manager”中的“get_logger”,以实现一致的日志设置。
- 移除了单独的日志配置设置,转而采用集中式日志管理。
- 更新了多个文件中的日志初始化方法,包括“config.py”、“change_mood.py”、“change_relationship.py”等,以简化日志记录实践。
- 引入“logger_manager.py”,用于根据模块特定的样式处理日志配置。
This commit is contained in:
墨梓柒
2025-04-28 00:22:05 +08:00
parent 6bac8bee13
commit 12b03ecb8d
43 changed files with 411 additions and 230 deletions

View File

@@ -2,19 +2,15 @@ import asyncio
import traceback
from typing import Optional, Coroutine, Callable, Any, List
from src.common.logger import get_module_logger, LogConfig, BACKGROUND_TASKS_STYLE_CONFIG
from src.common.logger_manager import get_logger
# Need manager types for dependency injection
from src.heart_flow.mai_state_manager import MaiStateManager, MaiStateInfo
from src.heart_flow.subheartflow_manager import SubHeartflowManager
from src.heart_flow.interest_logger import InterestLogger
background_tasks_log_config = LogConfig(
console_format=BACKGROUND_TASKS_STYLE_CONFIG["console_format"],
file_format=BACKGROUND_TASKS_STYLE_CONFIG["file_format"],
)
logger = get_module_logger("background_tasks", config=background_tasks_log_config)
logger = get_logger("background_tasks")
# 新增随机停用间隔 (5 分钟)
RANDOM_DEACTIVATION_INTERVAL_SECONDS = 300

View File

@@ -2,7 +2,7 @@ from src.heart_flow.sub_heartflow import SubHeartflow
from src.plugins.models.utils_model import LLMRequest
from src.config.config import global_config
from src.plugins.schedule.schedule_generator import bot_schedule
from src.common.logger import get_module_logger, LogConfig, HEARTFLOW_STYLE_CONFIG
from src.common.logger_manager import get_logger
from typing import Any, Optional
from src.do_tool.tool_use import ToolUser
from src.plugins.person_info.relationship_manager import relationship_manager # Module instance
@@ -13,11 +13,7 @@ from src.heart_flow.interest_logger import InterestLogger # Import InterestLogg
from src.heart_flow.background_tasks import BackgroundTaskManager # Import BackgroundTaskManager
# --- End import ---
heartflow_config = LogConfig(
console_format=HEARTFLOW_STYLE_CONFIG["console_format"],
file_format=HEARTFLOW_STYLE_CONFIG["file_format"],
)
logger = get_module_logger("heartflow", config=heartflow_config)
logger = get_logger("heartflow")
# Task Intervals (should be in BackgroundTaskManager or config)

View File

@@ -5,7 +5,7 @@ import os
import traceback
from typing import TYPE_CHECKING, Dict, List
from src.common.logger import get_module_logger, LogConfig, INTEREST_STYLE_CONFIG
from src.common.logger_manager import get_logger
# Need chat_manager to get stream names
from src.plugins.chat.chat_stream import chat_manager
@@ -15,11 +15,8 @@ if TYPE_CHECKING:
from src.heart_flow.sub_heartflow import SubHeartflow
from src.heart_flow.heartflow import Heartflow # 导入 Heartflow 类型
interest_logger_config = LogConfig(
console_format=INTEREST_STYLE_CONFIG["console_format"],
file_format=INTEREST_STYLE_CONFIG["file_format"],
)
logger = get_module_logger("interest_logger", config=interest_logger_config)
logger = get_logger("interest")
# Consider moving log directory/filename constants here
LOG_DIRECTORY = "logs/interest"

View File

@@ -2,15 +2,10 @@ import enum
import time
import random
from typing import List, Tuple, Optional
from src.common.logger import get_module_logger, LogConfig, MAI_STATE_CONFIG
from src.common.logger_manager import get_logger
from src.plugins.moods.moods import MoodManager
mai_state_config = LogConfig(
# 使用海马体专用样式
console_format=MAI_STATE_CONFIG["console_format"],
file_format=MAI_STATE_CONFIG["file_format"],
)
logger = get_module_logger("mai_state_manager", config=mai_state_config)
logger = get_logger("mai_state")
# enable_unlimited_hfc_chat = True

View File

@@ -1,7 +1,7 @@
import traceback
from typing import TYPE_CHECKING
from src.common.logger import get_module_logger, LogConfig, SUB_HEARTFLOW_MIND_STYLE_CONFIG
from src.common.logger_manager import get_logger
from src.plugins.models.utils_model import LLMRequest
from src.individuality.individuality import Individuality
from src.plugins.utils.prompt_builder import global_prompt_manager
@@ -12,12 +12,8 @@ if TYPE_CHECKING:
from src.heart_flow.subheartflow_manager import SubHeartflowManager
from src.heart_flow.mai_state_manager import MaiStateInfo
mind_log_config = LogConfig(
console_format=SUB_HEARTFLOW_MIND_STYLE_CONFIG["console_format"],
file_format=SUB_HEARTFLOW_MIND_STYLE_CONFIG["file_format"],
)
logger = get_module_logger("mind", config=mind_log_config)
logger = get_logger("sub_heartflow_mind")
class Mind:

View File

@@ -3,7 +3,7 @@
from datetime import datetime
from src.plugins.models.utils_model import LLMRequest
from src.config.config import global_config
from src.common.logger import get_module_logger
from src.common.logger_manager import get_logger
import traceback
from src.plugins.utils.chat_message_builder import (
get_raw_msg_before_timestamp_with_chat,
@@ -12,7 +12,7 @@ from src.plugins.utils.chat_message_builder import (
num_new_messages_since,
)
logger = get_module_logger("observation")
logger = get_logger("observation")
# 所有观察的基类

View File

@@ -4,7 +4,7 @@ from src.config.config import global_config
import time
from typing import Optional, List, Dict, Tuple, Callable, Coroutine
import traceback
from src.common.logger import get_module_logger, LogConfig, SUB_HEARTFLOW_STYLE_CONFIG # noqa: E402
from src.common.logger_manager import get_logger
import random
from src.plugins.chat.message import MessageRecv
from src.plugins.chat.chat_stream import chat_manager
@@ -24,12 +24,7 @@ from src.heart_flow.sub_mind import SubMind
# 定义常量 (从 interest.py 移动过来)
MAX_INTEREST = 15.0
subheartflow_config = LogConfig(
# 使用海马体专用样式
console_format=SUB_HEARTFLOW_STYLE_CONFIG["console_format"],
file_format=SUB_HEARTFLOW_STYLE_CONFIG["file_format"],
)
logger = get_module_logger("subheartflow", config=subheartflow_config)
logger = get_logger("subheartflow")
base_reply_probability = 0.05
probability_increase_rate_per_second = 0.08

View File

@@ -3,7 +3,7 @@ from src.plugins.models.utils_model import LLMRequest
from src.config.config import global_config
import time
import traceback
from src.common.logger import get_module_logger, LogConfig, SUB_HEARTFLOW_STYLE_CONFIG # noqa: E402
from src.common.logger_manager import get_logger
from src.individuality.individuality import Individuality
import random
from ..plugins.utils.prompt_builder import Prompt, global_prompt_manager
@@ -13,11 +13,8 @@ from src.heart_flow.chat_state_info import ChatStateInfo
from src.plugins.chat.chat_stream import chat_manager
from src.plugins.heartFC_chat.heartFC_Cycleinfo import CycleInfo
subheartflow_config = LogConfig(
console_format=SUB_HEARTFLOW_STYLE_CONFIG["console_format"],
file_format=SUB_HEARTFLOW_STYLE_CONFIG["file_format"],
)
logger = get_module_logger("subheartflow", config=subheartflow_config)
logger = get_logger("sub_heartflow")
def init_prompt():

View File

@@ -6,7 +6,7 @@ import json # 导入 json 模块
import functools # <-- 新增导入
# 导入日志模块
from src.common.logger import get_module_logger, LogConfig, SUBHEARTFLOW_MANAGER_STYLE_CONFIG
from src.common.logger_manager import get_logger
# 导入聊天流管理模块
from src.plugins.chat.chat_stream import chat_manager
@@ -25,11 +25,7 @@ import traceback
# 初始化日志记录器
subheartflow_manager_log_config = LogConfig(
console_format=SUBHEARTFLOW_MANAGER_STYLE_CONFIG["console_format"],
file_format=SUBHEARTFLOW_MANAGER_STYLE_CONFIG["file_format"],
)
logger = get_module_logger("subheartflow_manager", config=subheartflow_manager_log_config)
logger = get_logger("subheartflow_manager")
# 子心流管理相关常量
INACTIVE_THRESHOLD_SECONDS = 3600 # 子心流不活跃超时时间(秒)