pyxllib 0.3.96__py3-none-any.whl → 0.3.197__py3-none-any.whl

pyxllib/prog/specialist/tictoc.py

@@ -8,10 +8,12 @@
 import time
 import timeit
 
+from loguru import logger
 from humanfriendly import format_timespan
 
 from pyxllib.algo.pupil import natural_sort, ValuesStat
 from pyxllib.text.pupil import shorten, listalign
+from pyxllib.prog.newbie import human_readable_number
 
 __tictoc = """
 基于 pytictoc 代码，做了些自定义扩展
@@ -40,13 +42,15 @@ class TicToc:
     TicToc.elapsed   #t.end - t.start; i.e., time elapsed from t.start when t.toc() or t.tocvalue() was last called
     """
 
-    def __init__(self, title='', *, disable=False):
+    def __init__(self, title='', *, disable=False, min_display_seconds=None):
         """Create instance of TicToc class."""
         self.start = timeit.default_timer()
         self.end = float('nan')
         self.elapsed = float('nan')
         self.title = title
         self.disable = disable
+        # 只有达到这个时间，才会显示耗时
+        self.min_display_seconds = min_display_seconds
 
     def tic(self):
         """Start the timer."""
@@ -64,13 +68,13 @@ class TicToc:
         self.elapsed = self.end - self.start
         if not self.disable:
             # print(f'{self.title} {msg} {self.elapsed:.3f} 秒.')
-            print(f'{self.title} {msg} elapsed {format_timespan(self.elapsed)}.')
+            print(f'{self.title} {msg} elapsed {human_readable_number(self.elapsed, "秒")}.')
         if restart:
             self.start = timeit.default_timer()
 
     def tocvalue(self, restart=False):
         """
-        Return time elapsed since last call to tic().
+        Return time elapsed seconds since last call to tic().
 
         Optional argument:
             restart - Boolean specifying whether to restart the timer
@@ -84,28 +88,23 @@ class TicToc:
     @staticmethod
     def process_time(msg='time.process_time():'):
         """计算从python程序启动到目前为止总用时"""
-        print(f'{msg} {format_timespan(time.process_time())}.')
+        print(f'{msg} {human_readable_number(time.process_time(), "秒")}.')
 
     def __enter__(self):
         """Start the timer when using TicToc in a context manager."""
-        from pyxllib.prog.specialist import get_xllog
-
         if self.title == '__main__' and not self.disable:
-            get_xllog().info(f'time.process_time(): {format_timespan(time.process_time())}.')
+            logger.info(f'time.process_time(): {human_readable_number(time.process_time(), "秒")}.')
         self.start = timeit.default_timer()
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         """On exit, print time elapsed since entering context manager."""
-        from pyxllib.prog.specialist import get_xllog
-
         elapsed = self.tocvalue()
-        xllog = get_xllog()
 
         if exc_tb is None:
-            if not self.disable:
-                xllog.info(f'{self.title} finished in {format_timespan(elapsed)}.')
+            if not self.disable and (self.min_display_seconds is None or elapsed >= self.min_display_seconds):
+                logger.info(f'{self.title} finished in {human_readable_number(elapsed, "秒")}.')
         else:
-            xllog.info(f'{self.title} interrupt in {format_timespan(elapsed)},')
+            logger.info(f'{self.title} interrupt in {human_readable_number(elapsed, "秒")},')
 
 
 __timer = """

pyxllib/prog/specialist/xllog.py

@@ -29,7 +29,8 @@ def get_xllog(name='xllog', *, log_file=None):
 
     TODO 增加输出到钉钉机器人、邮箱的Handler？
     """
-    import logging, coloredlogs
+    # import logging, coloredlogs
+    import logging
 
     # 1 判断是否已存在，直接返回
     if ('pyxllib.' + name) in logging.root.manager.loggerDict:
@@ -53,15 +54,14 @@ def get_xllog(name='xllog', *, log_file=None):
             xllog = logging.getLogger('pyxllib.xllog')
             fmt = '%(asctime)s %(message)s'
             if log_file:
-                # TODO 这里的格式设置是否能统一、精简？
-                file_handler = logging.FileHandler(f'{log_file}', 'w')
+                file_handler = logging.FileHandler(f'{log_file}', 'a')
                 file_handler.setLevel(logging.DEBUG)
                 file_handler.setFormatter(logging.Formatter(fmt))
                 xllog.addHandler(file_handler)
-            coloredlogs.install(level='DEBUG', logger=xllog, fmt=fmt)
+            # coloredlogs.install(level='DEBUG', logger=xllog, fmt=fmt)
     elif name == 'location':  # 附带代码所处位置信息
         loclog = logging.getLogger('pyxllib.location')
-        coloredlogs.install(level='DEBUG', logger=loclog, fmt='%(filename)s/%(lineno)d: %(message)s')
+        # coloredlogs.install(level='DEBUG', logger=loclog, fmt='%(filename)s/%(lineno)d: %(message)s')
     return logging.getLogger('pyxllib.' + name)
 
 

pyxllib/prog/xlosenv.py

@@ -1,3 +1,10 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2024/10/30
+
+
 import os
 import json
 import base64