From 412efe79d2dae5cb24b16b5d58bf6f7ac166cd1b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 27 Apr 2025 16:22:32 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 1 + src/common/logger.py | 22 ++++++++----------- src/common/logger_manager.py | 1 + src/plugins/PFC/action_planner.py | 1 - src/plugins/chat/chat_stream.py | 1 - src/plugins/emoji_system/emoji_manager.py | 1 - src/plugins/heartFC_chat/heartFC_generator.py | 1 - src/plugins/heartFC_chat/heartFC_sender.py | 1 - src/plugins/heartFC_chat/normal_chat.py | 1 - .../heartFC_chat/normal_chat_generator.py | 1 - src/plugins/memory_system/Hippocampus.py | 2 -- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/bot.py b/bot.py index 39cdee98d..d547c360e 100644 --- a/bot.py +++ b/bot.py @@ -9,6 +9,7 @@ import platform import traceback from dotenv import load_dotenv from src.common.logger_manager import get_logger + # from src.common.logger import LogConfig, CONFIRM_STYLE_CONFIG from src.common.crash_logger import install_crash_handler from src.main import MainSystem diff --git a/src/common/logger.py b/src/common/logger.py index f139b4993..5b909744b 100644 --- a/src/common/logger.py +++ b/src/common/logger.py @@ -662,7 +662,6 @@ TIANYI_STYLE_CONFIG = { ), "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | 天依 | {message}", }, - } # 模型日志样式配置 @@ -795,7 +794,6 @@ LPMM_GET_KNOWLEDGE_TOOL_STYLE_CONFIG = { } - # 根据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"] @@ -835,15 +833,15 @@ 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"] -) +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"] + 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"] @@ -852,20 +850,18 @@ 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"] + 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"] -) +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: diff --git a/src/common/logger_manager.py b/src/common/logger_manager.py index 89e4d1701..b93f56d7e 100644 --- a/src/common/logger_manager.py +++ b/src/common/logger_manager.py @@ -87,6 +87,7 @@ MODULE_LOGGER_CONFIGS = { # ...如有更多模块，继续添加... } + def get_logger(module_name: str): style_config = MODULE_LOGGER_CONFIGS.get(module_name) if style_config: diff --git a/src/plugins/PFC/action_planner.py b/src/plugins/PFC/action_planner.py index 8956c86d0..f3e47e375 100644 --- a/src/plugins/PFC/action_planner.py +++ b/src/plugins/PFC/action_planner.py @@ -11,7 +11,6 @@ from .conversation_info import ConversationInfo from src.plugins.utils.chat_message_builder import build_readable_messages - logger = get_logger("pfc_action_planner") diff --git a/src/plugins/chat/chat_stream.py b/src/plugins/chat/chat_stream.py index 2d1334fce..14d02a81f 100644 --- a/src/plugins/chat/chat_stream.py +++ b/src/plugins/chat/chat_stream.py @@ -11,7 +11,6 @@ from maim_message import GroupInfo, UserInfo from src.common.logger_manager import get_logger - logger = get_logger("chat_stream") diff --git a/src/plugins/emoji_system/emoji_manager.py b/src/plugins/emoji_system/emoji_manager.py index 20ba2b5b7..2055c5ef2 100644 --- a/src/plugins/emoji_system/emoji_manager.py +++ b/src/plugins/emoji_system/emoji_manager.py @@ -17,7 +17,6 @@ from ..models.utils_model import LLMRequest from src.common.logger_manager import get_logger - logger = get_logger("emoji") BASE_DIR = os.path.join("data") diff --git a/src/plugins/heartFC_chat/heartFC_generator.py b/src/plugins/heartFC_chat/heartFC_generator.py index bd7eb2e84..9ad5f90c7 100644 --- a/src/plugins/heartFC_chat/heartFC_generator.py +++ b/src/plugins/heartFC_chat/heartFC_generator.py @@ -13,7 +13,6 @@ from ..utils.timer_calculator import Timer from src.plugins.moods.moods import MoodManager - logger = get_logger("llm") diff --git a/src/plugins/heartFC_chat/heartFC_sender.py b/src/plugins/heartFC_chat/heartFC_sender.py index bfa14f46b..9e65edcfb 100644 --- a/src/plugins/heartFC_chat/heartFC_sender.py +++ b/src/plugins/heartFC_chat/heartFC_sender.py @@ -9,7 +9,6 @@ from src.common.logger_manager import get_logger from src.plugins.chat.utils import calculate_typing_time - logger = get_logger("sender") diff --git a/src/plugins/heartFC_chat/normal_chat.py b/src/plugins/heartFC_chat/normal_chat.py index ff3371642..e97cbcd2e 100644 --- a/src/plugins/heartFC_chat/normal_chat.py +++ b/src/plugins/heartFC_chat/normal_chat.py @@ -21,7 +21,6 @@ from src.plugins.respon_info_catcher.info_catcher import info_catcher_manager from src.plugins.utils.timer_calculator import Timer - logger = get_logger("chat") diff --git a/src/plugins/heartFC_chat/normal_chat_generator.py b/src/plugins/heartFC_chat/normal_chat_generator.py index 862453c78..0ad9707f9 100644 --- a/src/plugins/heartFC_chat/normal_chat_generator.py +++ b/src/plugins/heartFC_chat/normal_chat_generator.py @@ -10,7 +10,6 @@ from src.common.logger_manager import get_logger from src.plugins.respon_info_catcher.info_catcher import info_catcher_manager - logger = get_logger("llm") diff --git a/src/plugins/memory_system/Hippocampus.py b/src/plugins/memory_system/Hippocampus.py index e69524dcc..106773173 100644 --- a/src/plugins/memory_system/Hippocampus.py +++ b/src/plugins/memory_system/Hippocampus.py @@ -83,8 +83,6 @@ def cosine_similarity(v1, v2): return dot_product / (norm1 * norm2) - - logger = get_logger("memory")