diff --git a/src/common/logger.py b/src/common/logger.py index 8f5e3cbf..4a497ca8 100644 --- a/src/common/logger.py +++ b/src/common/logger.py @@ -330,6 +330,26 @@ CONFIRM_STYLE_CONFIG = { "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | EULA与PRIVACY确认 | {message}", } +# LPMM配置 +LPMM_STYLE_CONFIG = { + "advanced": { + "console_format": ( + "{time:YYYY-MM-DD HH:mm:ss} | " + "{level: <8} | " + "{extra[module]: <12} | " + "LPMM | " + "{message}" + ), + "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | LPMM | {message}", + }, + "simple": { + "console_format": ( + "{time:MM-DD HH:mm} | LPMM | {message}" + ), + "file_format": "{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | LPMM | {message}", + }, +} + # 根据SIMPLE_OUTPUT选择配置 MEMORY_STYLE_CONFIG = MEMORY_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else MEMORY_STYLE_CONFIG["advanced"] TOPIC_STYLE_CONFIG = TOPIC_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else TOPIC_STYLE_CONFIG["advanced"] @@ -347,7 +367,7 @@ WILLING_STYLE_CONFIG = WILLING_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else WILL CONFIG_STYLE_CONFIG = CONFIG_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else CONFIG_STYLE_CONFIG["advanced"] TOOL_USE_STYLE_CONFIG = TOOL_USE_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else TOOL_USE_STYLE_CONFIG["advanced"] PFC_STYLE_CONFIG = PFC_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else PFC_STYLE_CONFIG["advanced"] - +LPMM_STYLE_CONFIG = LPMM_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else LPMM_STYLE_CONFIG["advanced"] def is_registered_module(record: dict) -> bool: """检查是否为已注册的模块""" diff --git a/src/plugins/knowledge/src/global_logger.py b/src/plugins/knowledge/src/global_logger.py index f7d8297e..d970a133 100644 --- a/src/plugins/knowledge/src/global_logger.py +++ b/src/plugins/knowledge/src/global_logger.py @@ -1,12 +1,10 @@ # Configure logger -import logging +from src.common.logger import get_module_logger, LogConfig, LPMM_STYLE_CONFIG +lpmm_log_config = LogConfig( + console_format = LPMM_STYLE_CONFIG["console_format"], + file_format=LPMM_STYLE_CONFIG["file_format"], +) -logger = logging.getLogger(__name__) -logger.setLevel(logging.DEBUG) - -console_logging_handler = logging.StreamHandler() -console_logging_handler.setFormatter(logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")) -console_logging_handler.setLevel(logging.DEBUG) -logger.addHandler(console_logging_handler) +logger = get_module_logger("LPMM", config=lpmm_log_config) \ No newline at end of file diff --git a/src/plugins/knowledge/src/utils/data_loader.py b/src/plugins/knowledge/src/utils/data_loader.py deleted file mode 100644 index 3b5e8d2e..00000000 --- a/src/plugins/knowledge/src/utils/data_loader.py +++ /dev/null @@ -1,54 +0,0 @@ -import jsonlines -from pathlib import Path -from typing import List, Dict, Any, Union, Optional -from src.config import global_config as config - - -class DataLoader: - """数据加载工具类,用于从/data目录下加载各种格式的数据文件""" - - def __init__(self, custom_data_dir: Optional[Union[str, Path]] = None): - """ - 初始化数据加载器 - - Args: - custom_data_dir: 可选的自定义数据目录路径,如果不提供则使用配置文件中的默认路径 - """ - self.data_dir = Path(custom_data_dir) if custom_data_dir else Path(config["persistence"]["data_root_path"]) - if not self.data_dir.exists(): - raise FileNotFoundError(f"数据目录 {self.data_dir} 不存在") - - def _resolve_file_path(self, filename: str) -> Path: - """ - 解析文件路径 - - Args: - filename: 文件名 - - Returns: - 完整的文件路径 - - Raises: - FileNotFoundError: 当文件不存在时抛出 - """ - file_path = self.data_dir / filename - if not file_path.exists(): - raise FileNotFoundError(f"文件 {filename} 不存在") - return file_path - - def load_jsonl(self, filename: str) -> List[Dict[str, Any]]: - """ - 加载JSONL格式的文件 - - Args: - filename: 文件名 - - Returns: - 包含所有数据的列表 - """ - file_path = self._resolve_file_path(filename) - data = [] - with jsonlines.open(file_path) as reader: - for obj in reader: - data.append(obj) - return data