ygo 1.1.6__tar.gz → 1.2.1__tar.gz

{ygo-1.1.6 → ygo-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygo
-Version: 1.1.6
+Version: 1.2.1
 Summary: 一个轻量级 Python 工具包，支持 并发执行（带进度条）、延迟调用、链式绑定参数、函数信息获取、模块/函数动态加载。并结合 ylog 提供日志记录能力
 Project-URL: homepage, https://github.com/link-yundi/ygo
 Project-URL: repository, https://github.com/link-yundi/ygo
@@ -9,7 +9,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hydra-core>=1.3.2
 Requires-Dist: joblib>=1.5.0
-Requires-Dist: loguru>=0.7.3
+Requires-Dist: logair>=1.0.0
 Requires-Dist: tqdm>=4.67.1
 Dynamic: license-file
 

{ygo-1.1.6 → ygo-1.2.1}/pyproject.toml

@@ -4,20 +4,20 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ygo"
-version = "v1.1.6"
+version = "1.2.1"
 description = "一个轻量级 Python 工具包，支持 并发执行（带进度条）、延迟调用、链式绑定参数、函数信息获取、模块/函数动态加载。并结合 ylog 提供日志记录能力"
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
     "hydra-core>=1.3.2",
     "joblib>=1.5.0",
-    "loguru>=0.7.3",
+    "logair>=1.0.0",
     "tqdm>=4.67.1",
 ]
 
 [tool.setuptools.packages.find]
 where = ["."]
-include = ["ygo", "ygo.*", "ylog", "ylog.*", ]
+include = ["ygo", "ygo.*",]
 
 [project.urls]
 homepage = "https://github.com/link-yundi/ygo"

{ygo-1.1.6 → ygo-1.2.1}/ygo/__init__.py

@@ -21,7 +21,7 @@ from .utils import (
 )
 from .lazy import lazy_import
 
-__version__ = "v1.1.6"
+__version__ = "1.2.1"
 
 __all__ = [
     "FailTaskError",

{ygo-1.1.6 → ygo-1.2.1}/ygo/pool.py

@@ -12,8 +12,7 @@ import threading
 import warnings
 
 from joblib import Parallel, delayed
-
-import ylog
+import tolog
 from .exceptions import WarnException, FailTaskError
 from .delay import delay
 
@@ -21,16 +20,17 @@ with warnings.catch_warnings():
     warnings.simplefilter("ignore")
     from tqdm.auto import tqdm
 
+logger = tolog.get_logger("ygo")
 
 def run_job(job, task_id, queue):
     """执行任务并更新队列"""
     try:
         result = job()
     except WarnException as e:
-        ylog.warning(FailTaskError(task_name=job.task_name, error=e))
+        logger.warning(FailTaskError(task_name=job.task_name, error=e))
         result = None
     except Exception as e:
-        ylog.error(FailTaskError(task_name=job.task_name, error=e), exc_info=e)
+        logger.error(FailTaskError(task_name=job.task_name, error=e), exc_info=e)
         result = None
     queue.put((task_id, 1))
     return result
@@ -170,13 +170,13 @@ class pool:
             try:
                 self._parallel.__exit__(None, None, None)
             except Exception as e:
-                ylog.warning(f"Failed to close Parallel: {e}")
+                logger.warning(f"Failed to close Parallel: {e}")
 
         if hasattr(self, '_manager') and self._manager is not None:
             try:
                 self._manager.shutdown()
             except Exception as e:
-                ylog.warning(f"Failed to shutdown Manager: {e}")
+                logger.warning(f"Failed to shutdown Manager: {e}")
 
     def __enter__(self):
         return self

{ygo-1.1.6 → ygo-1.2.1}/ygo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygo
-Version: 1.1.6
+Version: 1.2.1
 Summary: 一个轻量级 Python 工具包，支持 并发执行（带进度条）、延迟调用、链式绑定参数、函数信息获取、模块/函数动态加载。并结合 ylog 提供日志记录能力
 Project-URL: homepage, https://github.com/link-yundi/ygo
 Project-URL: repository, https://github.com/link-yundi/ygo
@@ -9,7 +9,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: hydra-core>=1.3.2
 Requires-Dist: joblib>=1.5.0
-Requires-Dist: loguru>=0.7.3
+Requires-Dist: logair>=1.0.0
 Requires-Dist: tqdm>=4.67.1
 Dynamic: license-file
 

{ygo-1.1.6 → ygo-1.2.1}/ygo.egg-info/SOURCES.txt

@@ -13,6 +13,4 @@ ygo.egg-info/PKG-INFO
 ygo.egg-info/SOURCES.txt
 ygo.egg-info/dependency_links.txt
 ygo.egg-info/requires.txt
-ygo.egg-info/top_level.txt
-ylog/__init__.py
-ylog/core.py
+ygo.egg-info/top_level.txt

{ygo-1.1.6 → ygo-1.2.1}/ygo.egg-info/requires.txt

@@ -1,4 +1,4 @@
 hydra-core>=1.3.2
 joblib>=1.5.0
-loguru>=0.7.3
+logair>=1.0.0
 tqdm>=4.67.1

ygo-1.2.1/ygo.egg-info/top_level.txt

@@ -0,0 +1 @@
+ygo

ygo-1.1.6/ygo.egg-info/top_level.txt

@@ -1,2 +0,0 @@
-ygo
-ylog

ygo-1.1.6/ylog/__init__.py

@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
----------------------------------------------
-Created on 2025/5/14 15:37
-@author: ZhangYundi
-@email: yundi.xxii@outlook.com
----------------------------------------------
-"""
-
-from .core import trace, debug, info, warning, error, critical, update_config, get_logger
-
-__version__ = "v1.1.4"
-
-__all__ = [
-    "trace",
-    "debug",
-    "info",
-    "warning",
-    "error",
-    "critical",
-    "update_config",
-    "get_logger",
-]

ygo-1.1.6/ylog/core.py

@@ -1,259 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
----------------------------------------------
-Created on 2025/5/14 16:04
-@author: ZhangYundi
-@email: yundi.xxii@outlook.com
----------------------------------------------
-"""
-
-import sys
-from pathlib import Path
-from typing import Optional
-
-from loguru import logger
-
-
-class _Logger:
-    """
-    企业级日志类，基于Loguru封装
-
-    特性：
-    1. 高性能：异步写入日志，避免阻塞主线程
-    2. 易于管理：多级别日志分离存储，按日期和大小轮转
-    3. 分级明确：支持 TRACE/DEBUG/INFO/WARNING/ERROR/CRITICAL 级别
-    4. 全局异常捕获：自动记录未处理异常
-    """
-
-    def __new__(cls, *args, **kwargs):
-        """移除单例限制，允许自由创建多个实例"""
-        return super().__new__(cls)
-
-    def __init__(
-            self,
-            log_dir: str = "logs",
-            app_name: str | None = None,
-            retention_days: int = 7,
-            error_retention_days: int = 30,
-            enable_console: bool = True,
-            enable_file: bool = True,
-            debug_mode: bool = False
-    ):
-        """初始化日志系统"""
-        # 避免重复初始化
-        if hasattr(self, "_initialized"):
-            return
-        self._initialized = True
-
-        # 初始化参数
-        self.log_dir = Path(log_dir)
-        self.app_name = app_name
-        self.debug_mode = debug_mode
-        self._error_retention_days = error_retention_days
-        self._retention_days = retention_days
-
-        # 创建日志目录
-        self.log_dir.mkdir(parents=True, exist_ok=True)
-
-        # 移除默认sink
-        logger.remove()
-
-        # 配置控制台日志
-        if enable_console:
-            self._setup_console_logging()
-
-        # 配置文件日志
-        if enable_file:
-            self._setup_file_logging(retention_days, error_retention_days)
-
-        # 全局异常捕获
-        self._setup_global_exception_handling()
-
-    def _setup_console_logging(self):
-        """配置控制台日志"""
-        console_format = (
-            "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
-            "<level>{level: <8}</level> | "
-            "<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - "
-            "<level>{message}</level>"
-        )
-
-        logger.add(
-            sys.stderr,
-            level="TRACE",
-            format=console_format,
-            colorize=True,
-            backtrace=self.debug_mode,
-            diagnose=self.debug_mode,
-            # enqueue=True  # 异步写入
-        )
-
-    def _setup_file_logging(self, retention_days: int, error_retention_days: int):
-        """配置文件日志"""
-        # 通用日志格式
-        common_format = (
-            "{time:YYYY-MM-DD HH:mm:ss.SSS} | "
-            "{level: <8} | "
-            "{name}:{function}:{line} - {message}"
-        )
-
-        # 日志级别配置
-        levels = {
-            "TRACE": {"level": "TRACE", "retention": f"{retention_days} days", "rotation": "daily"},
-            "DEBUG": {"level": "DEBUG", "retention": f"{retention_days} days", "rotation": "daily"},
-            "INFO": {"level": "INFO", "retention": f"{retention_days} days", "rotation": "daily"},
-            "WARNING": {"level": "WARNING", "retention": f"{error_retention_days} days", "rotation": "daily"},
-            "ERROR": {"level": "ERROR", "retention": f"{error_retention_days} days", "rotation": "daily"},
-            "CRITICAL": {"level": "CRITICAL", "retention": f"{error_retention_days} days", "rotation": "daily"}
-        }
-
-        # 错误级别以上的日志
-        error_levels = ("ERROR", "CRITICAL")
-        _error_log_file = f"{self.app_name}_{{time:YYYYMMDD}}.err.log" if self.app_name is not None else f"{{time:YYYYMMDD}}.err.log"
-        error_log_file = self.log_dir / _error_log_file
-        info_levels = ("INFO", "DEBUG", "TRACE", "WARNING")
-        _info_log_file = f"{self.app_name}_{{time:YYYYMMDD}}.log" if self.app_name is not None else f"{{time:YYYYMMDD}}.log"
-        info_log_file = self.log_dir / _info_log_file
-        # 错误级别以上的日志
-        logger.add(
-            str(error_log_file),
-            level="ERROR",
-            format=common_format,
-            rotation=levels["ERROR"]["rotation"],
-            retention=levels["ERROR"]["retention"],
-            compression="zip",
-            backtrace=True,
-            diagnose=self.debug_mode,
-            # enqueue=True,  # 异步写入
-            filter=lambda record: record["level"].name in error_levels,
-            catch=True  # 捕获格式化异常
-        )
-        # 错误级别以下的日志
-        logger.add(
-            str(info_log_file),
-            level="TRACE",
-            format=common_format,
-            rotation=levels["INFO"]["rotation"],
-            retention=levels["INFO"]["retention"],
-            compression="zip",
-            backtrace=True,
-            diagnose=self.debug_mode,
-            # enqueue=True,  # 异步写入
-            filter=lambda record: record["level"].name in info_levels,
-            catch=True  # 捕获格式化异常
-        )
-
-    def _setup_global_exception_handling(self):
-        """配置全局异常捕获"""
-
-        def handle_exception(exc_type, exc_value, exc_traceback):
-            """全局异常处理函数"""
-            logger.opt(exception=(exc_type, exc_value, exc_traceback)).critical(
-                "Unhandled exception occurred"
-            )
-
-        sys.excepthook = handle_exception
-
-    def _msgs_to_str(self, *msg: str) -> str:
-        return " ".join([str(m) for m in msg])
-
-    def trace(self, *msg: str, **kwargs) -> None:
-        """TRACE级别日志"""
-        logger.opt(depth=1).trace(self._msgs_to_str(*msg), **kwargs)
-
-    def debug(self, *msg: str, **kwargs) -> None:
-        """DEBUG级别日志"""
-        logger.opt(depth=1).debug(self._msgs_to_str(*msg), **kwargs)
-
-    def info(self, *msg: str, **kwargs) -> None:
-        """INFO级别日志"""
-        logger.opt(depth=1).info(self._msgs_to_str(*msg), **kwargs)
-
-    def warning(self, *msg: str, **kwargs) -> None:
-        """WARNING级别日志"""
-        logger.opt(depth=1).warning(self._msgs_to_str(*msg), **kwargs)
-
-    def error(self, *msg: str, exc_info: Optional[BaseException] = None, **kwargs) -> None:
-        """ERROR级别日志"""
-        if exc_info:
-            logger.opt(depth=1, exception=exc_info).error(self._msgs_to_str(*msg), **kwargs)
-        else:
-            logger.opt(depth=1).error(self._msgs_to_str(*msg), **kwargs)
-
-    def critical(self, *msg: str, exc_info: Optional[BaseException] = None, **kwargs) -> None:
-        """CRITICAL级别日志"""
-        if exc_info:
-            logger.opt(depth=1, exception=exc_info).critical(self._msgs_to_str(*msg), **kwargs)
-        else:
-            logger.opt(depth=1).critical(self._msgs_to_str(*msg), **kwargs)
-
-    def update_config(
-            self,
-            log_dir: str = None,
-            app_name: str = None,
-            retention_days: int = None,
-            error_retention_days: int = None,
-            enable_console: bool = None,
-            enable_file: bool = None,
-            debug_mode: bool = None
-    ):
-        """
-        动态更新日志配置并重新加载日志系统
-        注意：这会清除已有的sink并重新创建日志文件
-        """
-
-        # 更新配置
-        if log_dir is not None:
-            self.log_dir = Path(log_dir)
-        if app_name is not None:
-            self.app_name = app_name
-        if retention_days is not None:
-            self._retention_days = retention_days
-        if error_retention_days is not None:
-            self._error_retention_days = error_retention_days
-        if debug_mode is not None:
-            self.debug_mode = debug_mode
-
-        # 重建日志目录
-        self.log_dir.mkdir(parents=True, exist_ok=True)
-
-        # 清除现有sink
-        logger.remove()
-
-        # 重新配置控制台和文件日志
-        if enable_console is not False:
-            self._setup_console_logging()
-        if enable_file is not False:
-            self._setup_file_logging(self._retention_days, self._error_retention_days)
-
-
-# 初始化默认实例
-_default_logger = _Logger()
-
-# 将日志方法绑定到模块级别
-trace = _default_logger.trace
-debug = _default_logger.debug
-info = _default_logger.info
-warning = _default_logger.warning
-error = _default_logger.error
-critical = _default_logger.critical
-update_config = _default_logger.update_config
-
-
-def get_logger(app_name: str,
-               log_dir: str = "logs",
-               retention_days: int = 7,
-               error_retention_days: int = 30,
-               enable_console: bool = True,
-               enable_file: bool = True,
-               debug_mode: bool = False):
-    """获取指定应用的日志实例"""
-    return _Logger(
-        app_name=app_name,
-        log_dir=log_dir,
-        retention_days=retention_days,
-        error_retention_days=error_retention_days,
-        enable_console=enable_console,
-        enable_file=enable_file,
-        debug_mode=debug_mode
-    )