pyxllib 0.3.131__tar.gz → 0.3.132__tar.gz

{pyxllib-0.3.131/pyxllib.egg-info → pyxllib-0.3.132}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.131
+Version: 0.3.132
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -38,33 +38,33 @@ Requires-Dist: Jinja2
 Requires-Dist: pandas>=0.23.4
 Requires-Dist: pillow
 Provides-Extra: xlcv
+Requires-Dist: pillow; extra == "xlcv"
 Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
-Requires-Dist: pillow; extra == "xlcv"
 Provides-Extra: xlai
+Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: pynvml; extra == "xlai"
+Requires-Dist: opsdroid-get-image-size; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
 Requires-Dist: opencv-python; extra == "xlai"
-Requires-Dist: pillow; extra == "xlai"
-Requires-Dist: opsdroid-get-image-size; extra == "xlai"
 Provides-Extra: xlall
+Requires-Dist: flask; extra == "xlall"
 Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: openai2; extra == "xlall"
-Requires-Dist: opencv-python; extra == "xlall"
+Requires-Dist: flask-jwt-extended; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
-Requires-Dist: sentencepiece; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: flask; extra == "xlall"
-Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
 Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: zhconv; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
+Requires-Dist: html2text; extra == "xlall"
 Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
+Requires-Dist: openai2; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
 Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: zhconv; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: opencv-python; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
+Requires-Dist: flask-wtf; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.131 → pyxllib-0.3.132}/pyxllib/algo/stat.py

@@ -261,7 +261,9 @@ def xlpivot(df, index=None, columns=None, values=None):
     def func(items):  # 输入匹配的多行数据
         x = items.iloc[0]
         return f'{x["precision"]:.0f}，{x["recall"]:.0f}，{x["hmean"]:.2f}，{x["fps"]}'  # 返回显示的值
-    >> df2 = xlpivot(df, ['model_type'], ['dataset', 'total_frame'], {'precision，recall，hmean，fps': func})
+
+    >> df2 = xlpivot(df, ['model_type'], ['dataset', 'total_frame'],
+                        {'precision，recall，hmean，fps': func})
 
     注意技巧：如果要在分组后约束特定顺序，可以使用特殊前缀进行编号对齐
     """

pyxllib-0.3.132/pyxllib/ext/autogui/__init__.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2021/08/01 15:26

pyxllib-0.3.132/pyxllib/ext/autogui/activewin.py

@@ -0,0 +1,234 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2024/10/29
+
+import platform
+import sys
+
+import cv2
+import psutil
+import numpy as np
+
+from pyxllib.prog.cachetools import xlcache
+from pyxllib.cv.xlcvlib import CvImg
+
+if sys.platform == 'win32':
+    import pyautogui
+    import win32gui
+    import win32process
+    from pywinauto import Desktop
+
+# 根据平台扩展相应的类
+if platform.system().lower() == "darwin":
+    from mss.darwin import MSS as OriginalMSS
+elif platform.system().lower() == "linux":
+    from mss.linux import MSS as OriginalMSS
+elif platform.system().lower() == "windows":
+    from mss.windows import MSS as OriginalMSS
+else:
+    raise RuntimeError("Unsupported platform")
+
+
+def adjust_monitors(monitors, scale_factor):
+    # 调整所有物理显示器的尺寸和位置
+    for i in range(1, len(monitors)):
+        monitors[i]['width'] = int(monitors[i]['width'] / scale_factor)
+        monitors[i]['height'] = int(monitors[i]['height'] / scale_factor)
+        monitors[i]['top'] = int(monitors[i]['top'] / scale_factor)
+        monitors[i]['left'] = int(monitors[i]['left'] / scale_factor)
+
+    # 计算虚拟桌面的边界
+    left_bound = min(monitor['left'] for monitor in monitors[1:])
+    top_bound = min(monitor['top'] for monitor in monitors[1:])
+    right_bound = max(monitor['left'] + monitor['width'] for monitor in monitors[1:])
+    bottom_bound = max(monitor['top'] + monitor['height'] for monitor in monitors[1:])
+
+    # 设置虚拟桌面的尺寸和位置
+    monitors[0]['width'] = right_bound - left_bound
+    monitors[0]['height'] = bottom_bound - top_bound
+    monitors[0]['top'] = top_bound
+    monitors[0]['left'] = left_bound
+
+    return monitors
+
+
+class ActiveWindowCapture(OriginalMSS):
+    """
+    基于`MSS`库的一个扩展，用于实现跨平台的多屏幕截图，并添加了以下独特功能：
+    1. 实时窗口捕获：能够获取当前激活的窗口信息，并关联到对应的进程对象。
+        这一特性使得该类在需要实时监控、分析特定应用窗口时尤为实用。
+    2. 缓存机制：该类采用了缓存策略，通过`xlcache`装饰器缓存截取的屏幕和窗口数据，避免频繁重复捕获，提升性能。
+        缓存机制同时确保在多窗口环境中，当前获取的窗口信息是实际的活动窗口，防止数据滞后或错位。
+    3. 多屏幕拼接与坐标调整：支持多屏幕拼接功能，能够调整不同显示器的坐标和尺寸，以生成全屏拼接的截图画布。
+        对于分辨率缩放和多屏偏移，也可以进行自适应调整。
+    4. 标记窗口功能：在截屏时，可以选择性地标记当前激活窗口的位置，支持自定义标记的颜色、厚度和偏移量，便于在截图中直观地显示当前活跃窗口。
+
+    适合需要频繁截图、实时监控活动窗口和对应进程的场景，尤其在多屏和分辨率适配方面提供了便捷的解决方案。
+    """
+
+    def __1_动态成员变量(self):
+        pass
+
+    def __init__(self, *, scale=1):
+        """
+        :param scale: 可适当兼容主屏幕做了缩放处理的情景，但太复杂的情况下也不一定对
+        """
+        super().__init__()
+        self.scale = scale
+
+    @xlcache(property=True)
+    def monitors2(self):
+        """ 修正后的各个屏幕坐标 """
+        monitors = self.monitors
+        if self.scale != 1:
+            monitors = adjust_monitors(monitors, self.scale)
+        return monitors
+
+    @xlcache(property=True)
+    def window(self):
+        """ 当前激活窗口 """
+        hwnd = win32gui.GetForegroundWindow()
+        return Desktop(backend="win32").window(handle=hwnd)
+
+    @xlcache(property=True)
+    def process(self):
+        """ 当前激活窗口 """
+        hwnd = self.window.handle
+        thread_id, process_id = win32process.GetWindowThreadProcessId(hwnd)
+        return psutil.Process(process_id)
+
+    def __2_截图数据(self):
+        pass
+
+    @xlcache()
+    def _capture_single_monitor(self, order):
+        """ 缓存单个屏幕的截图 """
+        if order == 0:
+            # order=0时，拼接所有屏幕图像。虽然mss其实可以直接提供，但是这样就没有每个屏幕缓存的图片了，还是我自己处理一遍更好。
+
+            # 计算坐标偏移量，将所有坐标调整至非负
+            min_left = min(monitor['left'] for monitor in self.monitors2)
+            min_top = min(monitor['top'] for monitor in self.monitors2)
+
+            # 获取总画布大小（根据所有屏幕的范围计算）
+            max_right = max(monitor['left'] + monitor['width'] for monitor in self.monitors2)
+            max_bottom = max(monitor['top'] + monitor['height'] for monitor in self.monitors2)
+            canvas_width = max_right - min_left
+            canvas_height = max_bottom - min_top
+
+            # 使用numpy创建空白画布 (BGR格式)
+            img_canvas = np.zeros((canvas_height, canvas_width, 3), dtype=np.uint8)
+
+            # 获取并缓存每个子屏幕截图，按调整后的坐标拼接到总画布
+            for i in range(1, len(self.monitors2)):
+                monitor = self.monitors2[i]
+                single_img = self._capture_single_monitor(i)  # 获取单屏截图 (cv2格式)
+                # 将子屏幕截图粘贴到总画布的指定位置，应用坐标偏移
+                x_offset = monitor['left'] - min_left
+                y_offset = monitor['top'] - min_top
+                img_canvas[y_offset:y_offset + single_img.shape[0],
+                x_offset:x_offset + single_img.shape[1]] = single_img
+
+            img_cv2 = img_canvas
+        else:
+            if order == -1:
+                # 截取当前活动窗口的截图
+                active_window = self.window
+                rect = active_window.rectangle()  # 获取窗口的矩形区域
+                monitor = {
+                    'left': int(rect.left),
+                    'top': int(rect.top),
+                    'width': int(rect.width()),
+                    'height': int(rect.height()),
+                }
+                sct_img = self.grab(monitor)
+            else:
+                sct_img = self.grab(self.monitors2[order])
+
+            # 将截图的原始数据转换成numpy数组
+            img_np = np.frombuffer(sct_img.bgra, dtype=np.uint8)
+            img_np = img_np.reshape((sct_img.height, sct_img.width, 4))  # 高、宽、4通道
+            # 转换成BGR通道顺序
+            img_cv2 = cv2.cvtColor(img_np, cv2.COLOR_BGRA2BGR)
+
+        return img_cv2
+
+    def _mark_window_on_screenshot(self, screenshot, window_rect, order=0, mark_params=None):
+        """
+        在截图中标记窗口，并根据 order 参数自动调整坐标偏移。
+
+        :param screenshot: 要标记的截图图像
+        :param window_rect: 当前激活窗口的原始坐标 (left, top, right, bottom)
+        :param order: 屏幕索引 (0 表示拼接所有屏幕，全图模式)
+        :param mark_params: 标记参数字典，包含 color, base, thickness 等
+        :return: 标记后的截图
+        """
+        # 1 设定默认标记参数，若传入 mark_params 则进行更新
+        default_params = {
+            "color": (0, 255, 0),  # 默认绿色
+            "base": 10,  # 默认缩进 10 像素
+            "thickness": 3  # 默认厚度 3 像素
+        }
+        mark_params = mark_params if isinstance(mark_params, dict) else None
+        if mark_params:
+            default_params.update(mark_params)
+
+        color = default_params["color"]
+        base = default_params["base"]
+        thickness = default_params["thickness"]
+
+        # 2 获取对应 order 的屏幕原点坐标进行偏差修正
+        if order == 0:
+            origin_x = self.monitors2[0]['left']
+            origin_y = self.monitors2[0]['top']
+        else:
+            origin_x = self.monitors2[order]['left']
+            origin_y = self.monitors2[order]['top']
+
+        # 计算相对于指定屏幕或全图的窗口坐标
+        adjusted_coords = (
+            int(window_rect.left) - origin_x,
+            int(window_rect.top) - origin_y,
+            int(window_rect.right) - origin_x,
+            int(window_rect.bottom) - origin_y,
+        )
+
+        # 3 绘制矩形标记
+        cv2.rectangle(
+            screenshot,
+            (adjusted_coords[0] + base, adjusted_coords[1] + base),
+            (adjusted_coords[2] - base, adjusted_coords[3] - base),
+            color,  # 使用自定义颜色
+            thickness  # 使用自定义厚度
+        )
+
+        return screenshot
+
+    @xlcache()
+    def screenshot(self, order=0, *, to_pil=False, mark_active_window=False):
+        """ 截屏
+
+        :param int order:
+            -1, 截取当前激活窗口
+            0，默认值，截取全部屏幕
+            1，截取第1个屏幕
+            2，截取第2个屏幕
+            ...
+        :param to_pil: 是否转换成 PIL 格式
+        :param mark_active_window: 是否标记当前激活窗口，若为字典可设置颜色、厚度等参数
+        :return: np矩阵或PIL图片，取决于to_cv2参数
+        """
+        assert order < len(self.monitors), '屏幕下标越界'
+        img = self._capture_single_monitor(order)  # 调用子函数处理所有屏幕拼接
+
+        # 若需要标记当前激活窗口
+        if mark_active_window:
+            img = self._mark_window_on_screenshot(img, self.window.rectangle(), order,
+                                                  mark_params=mark_active_window)
+
+        if to_pil:
+            img = CvImg.read(img).to_pil_image()  # 转成pil矩阵格式
+
+        return img

pyxllib-0.3.131/pyxllib/ext/autogui/__init__.py → pyxllib-0.3.132/pyxllib/ext/autogui/all.py

@@ -2,7 +2,8 @@
 # -*- coding: utf-8 -*-
 # @Author : 陈坤泽
 # @Email  : 877362867@qq.com
-# @Date   : 2021/08/01 15:26
+# @Date   : 2024/10/29
 
 from pyxllib.ext.autogui.autogui import *
 from pyxllib.ext.autogui.virtualkey import *
+from pyxllib.ext.autogui.activewin import *

{pyxllib-0.3.131 → pyxllib-0.3.132}/pyxllib/ext/autogui/autogui.py

@@ -3,17 +3,8 @@
 # @Author : 陈坤泽
 # @Email  : 877362867@qq.com
 # @Date   : 2020/06/06
-import sys
-
-from pyxllib.prog.pupil import check_install_package
-
-if sys.platform == 'win32':
-    check_install_package('pyautogui')
-
-check_install_package('keyboard')
-check_install_package('klembord')
-check_install_package('mss')  # 多屏幕截图
 
+import sys
 from collections import defaultdict
 import json
 import os
@@ -26,6 +17,7 @@ from pandas.api.types import is_list_like
 
 if sys.platform == 'win32':
     import pyautogui
+    import win32gui
 
 try:
     import pyscreeze  # NOQA pyautogui安装的时候会自动安装依赖的pyscreeze
@@ -42,6 +34,10 @@ from pyxllib.cv.expert import xlcv, xlpil
 from pyxlpr.data.labelme import LabelmeDict
 
 
+def __20210531():
+    """ 以前设想的一个跟labelme结合的自动化操作类 """
+
+
 class AutoGuiLabelData:
     """ AutoGuiLabelData """
 
@@ -773,6 +769,9 @@ def grab_monitor(order=0, to_cv2=True):
         1，截取第1个屏幕
         2，截取第2个屏幕
         ...
+    :param to_cv2:
+        True, 转成cv2格式的图片
+        False, 使用pil格式的图片
     """
     from PIL import Image
     from pyxllib.xlcv import PilImg

{pyxllib-0.3.131 → pyxllib-0.3.132}/pyxllib/file/docxlib.py

@@ -6,7 +6,7 @@
 
 from pyxllib.prog.pupil import check_install_package
 
-check_install_package('win32com', 'pypiwin32')
+check_install_package('win32com', 'pywin32')
 check_install_package('docx', 'python-docx')
 
 import json

{pyxllib-0.3.131 → pyxllib-0.3.132}/pyxllib/file/packlib/__init__.py

@@ -8,8 +8,11 @@ import os
 import shutil
 from tarfile import TarFile
 # 这个包里的ZipFile是拷贝后修改过的，不影响标准库zipfile里的功能
-import pyxllib.file.packlib.zipfile as zipfile
-from pyxllib.file.packlib.zipfile import ZipFile
+# import pyxllib.file.packlib.zipfile as zipfile
+# from pyxllib.file.packlib.zipfile import ZipFile
+import zipfile
+from zipfile import ZipFile
+import tempfile
 
 from pyxllib.file.specialist import XlPath, reduce_dir_depth
 from pyxllib.prog.pupil import inject_members
@@ -126,6 +129,25 @@ def _unpack_base(packfile, namelist, format=None, extract_dir=None, wrap=0):
         shutil.unpack_archive(packfile, extract_dir, format)
 
 
+def zip_filter_rule(path):
+    p = XlPath(path)
+
+    # 排除特定目录或文件
+    if set(p.parts) & {'__pycache__', '.git', '.idea', 'dist', 'build', '.pytest_cache', '.venv'}:
+        return 0
+
+    # 排除特定文件扩展名
+    if p.suffix in {'.egg-info', '.lock'}:
+        return 0
+
+    # 精细检查内部文件
+    if p.is_dir():
+        return 1
+
+    # 全部包含其他情况
+    return 2
+
+
 class XlZipFile(ZipFile):
 
     def infolist2(self, prefix=None, zipinfo=True):
@@ -151,6 +173,94 @@ class XlZipFile(ZipFile):
     def unpack(self, extract_dir=None, format='zip', wrap=0):
         _unpack_base(self.filename, self.namelist(), format, extract_dir, wrap)
 
+    def write_dir(self, directory, arcname=None, filter_rule=None):
+        """
+        将指定目录（包含子目录）添加到 zip 文件中，并可自定义在 zip 中的存储路径。
+
+        :param directory: 要压缩的目录路径
+        :param arcname: 在 zip 文件中存储的根目录名，
+            None, 默认跟ZipFile.write的arcname一样，直接取输入的目录名
+        :param filter_rule: 过滤规则函数，用于排除不需要的文件。函数应接受文件路径作为参数，
+                           返回0, 1, 或 2，分别表示排除、递归检查、全部包括。
+        """
+        if arcname is None:
+            arcname = directory
+
+        if filter_rule is True:
+            filter_rule = zip_filter_rule
+
+        for root, dirs, files in os.walk(directory):
+            for file in files:
+                file_path = os.path.join(root, file)
+
+                # 调用过滤函数获取过滤状态
+                if filter_rule:
+                    result = filter_rule(file_path)
+                    if result == 0:  # 明确不要
+                        continue
+                    elif result == 1:  # 需要递归精细检查
+                        pass  # 继续执行文件写入逻辑
+                    elif result == 2:  # 全部包含
+                        # 计算文件在 zip 文件中的相对路径
+                        zip_path = os.path.join(arcname, os.path.relpath(file_path, directory))
+                        self.write(file_path, zip_path)
+                        continue
+
+                # 默认情况下，递归处理
+                zip_path = os.path.join(arcname, os.path.relpath(file_path, directory))
+                self.write(file_path, zip_path)
+
+            for dir in dirs[:]:
+                dir_path = os.path.join(root, dir)
+
+                if filter_rule:
+                    result = filter_rule(dir_path)
+                    if result == 0:  # 明确不要
+                        dirs.remove(dir)  # 排除整个目录
+                    elif result == 2:  # 全部包含
+                        # 添加整个目录
+                        for root2, _, files2 in os.walk(dir_path):
+                            for file2 in files2:
+                                file_path = os.path.join(root2, file2)
+                                zip_path = os.path.join(arcname, os.path.relpath(file_path, directory))
+                                self.write(file_path, zip_path)
+                        dirs.remove(dir)  # 递归中不再处理此目录
+
+    def write_path(self, path, arcname=None, filter_rule=None):
+        """ 封装的同时支持文件或目录的操作 """
+        if XlPath(path).is_dir():
+            self.write_dir(path, arcname, filter_rule)
+        elif XlPath(path).is_file():
+            self.write(path, arcname)
+        else:
+            raise ValueError
+
+    def xlwrite(self, path, arcname=None, filter_rule=True):
+        self.write_path(path, arcname, filter_rule)
+
+    @classmethod
+    def create(cls, name=None):
+        """ 在临时目录下新建一个目录，然后放一个压缩包文件 """
+        # 如果没有提供 name，则生成一个临时的文件名
+        if name is None:
+            name = tempfile.mktemp(suffix=".zip").split('/')[-1]  # 提取生成的文件名
+
+        # 创建临时目录（因为可能有并发操作，每个处理都建立一个目录更安全）
+        temp_dir = tempfile.mkdtemp()
+        temp_zip_path = f"{temp_dir}/{name}"
+
+        # 创建 ZipFile 对象
+        zipf = ZipFile(temp_zip_path, 'w')
+        return zipf
+
+    def fastapi_resp(self):
+        """ 返回供fastapi后端使用的文件接口 """
+        from fastapi.responses import FileResponse
+
+        self.close()
+        return FileResponse(self.filename, media_type='application/zip',
+                            filename=XlPath(self.filename).name)
+
 
 class XlTarFile(TarFile):
 
@@ -218,76 +328,3 @@ def compress_to_zip(source_path, target_zip_path=None, wrap=None,
             zipf.write(source_path, arcname)
 
     return target_zip_path
-
-
-def smart_compress_zip(root, paths, check_func=None):
-    """ 智能压缩，比compress_to_zip功能会更强些
-
-    :param root: 要有个根目录，才知道paths里添加到压缩包的时候存储到怎样的相对目录下
-    :param paths: 所有待添加到压缩包的文件或目录
-    :param check_func: 规则判断函数，输入文件或目录的路径
-        return
-            0，明确不要
-            1，要使用，但要递归内部文件精细检查
-            2，全部都要
-    """
-
-    if check_func is None:
-        def check_func(path):
-            p = XlPath(path)
-
-            if set(p.parts) & {'__pycache__', '.git', '.idea', 'dist', 'build', '.pytest_cache'}:
-                return 0
-
-            if p.parts[-1].endswith('.egg-info'):
-                return 0
-
-            return 1
-
-    def add_dir(dir):
-        for subroot, _, names in os.walk(dir):
-            for name in names:
-                file = XlPath(subroot) / name
-                zipf.write(file, file.relpath(root))
-
-    def add_path(path):
-        tag = check_func(path)
-
-        if path.is_file():
-            if tag:
-                zipf.write(path, path.relpath(root))
-        elif path.is_dir():
-            if tag == 2:
-                add_dir(path)
-            elif tag == 1:
-                for subroot, _, names in os.walk(path):
-                    tag2 = check_func(subroot)
-                    if tag2 == 2:
-                        add_dir(subroot)
-                    elif tag2 == 1:
-                        for name in names:
-                            file = XlPath(subroot) / name
-                            if check_func(file):
-                                zipf.write(file, file.relpath(root))
-
-    # 工作目录会自动切换的，这里取工作目录名即可
-    if not isinstance(paths, list):
-        paths = [paths]
-
-    root = XlPath(root)
-    num = len(paths)
-    outfile = None
-    if num > 1:
-        outfile = root / XlPath(root.name + '.zip')
-    elif num == 1:
-        outfile = root / (XlPath(paths[0]).name + '.zip')
-    else:
-        return
-    zipf = XlZipFile(outfile, 'w', zipfile.ZIP_DEFLATED)
-
-    for subroot in paths:
-        add_path(XlPath(subroot))
-
-    zipf.close()
-
-    return outfile

{pyxllib-0.3.131 → pyxllib-0.3.132}/pyxllib/file/xlsxlib.py

@@ -14,7 +14,7 @@ import time
 from pyxllib.prog.pupil import check_install_package, run_once
 
 check_install_package('openpyxl')
-check_install_package('premailer')
+# check_install_package('premailer')
 # check_install_package('xlrd2')
 check_install_package('yattag')
 check_install_package('jsonpickle')

{pyxllib-0.3.131 → pyxllib-0.3.132}/pyxllib/prog/specialist/__init__.py

@@ -343,3 +343,49 @@ class BitMaskTool:
         html_content.append(df2.to_html())
 
         return '\n'.join(html_content)
+
+
+def loguru_setup_jsonl_logfile(logger, log_dir, rotation_size="10 MB"):
+    """
+    给loguru的日志器添加导出文件的功能，使用jsonl格式
+
+    :param logger: 日志记录器，一般是from loguru import logger的logger
+    :param log_dir: 存储日志的目录，因为有多个文件，这里要输入的是所在的目录
+    :param rotation_size: 文件多大后分割
+    :return:
+    """
+    from datetime import datetime
+
+    os.makedirs(log_dir, exist_ok=True)  # 自动创建日志目录
+
+    # 日志文件名匹配的正则表达式，格式为 年月日_时分秒.log
+    log_filename_pattern = re.compile(r"(\d{8}_\d{6})\.jsonl")
+
+    # 找到最新的日志文件
+    def find_latest_log_file(log_dir):
+        log_files = []
+        for file in os.listdir(log_dir):
+            if log_filename_pattern.match(file):
+                log_files.append(file)
+
+        if log_files:
+            # 根据时间排序，选择最新的日志文件
+            log_files.sort(reverse=True)
+            return os.path.join(log_dir, log_files[0])
+        return None
+
+    # 检查是否有未写满的日志文件
+    latest_log_file = find_latest_log_file(log_dir)
+
+    if latest_log_file:
+        log_path = latest_log_file
+    else:
+        # 生成新的日志文件名
+        log_filename = datetime.now().strftime("%Y%m%d_%H%M%S") + ".jsonl"
+        log_path = os.path.join(log_dir, log_filename)
+
+    # 配置 logger，写入日志文件，设置旋转条件，使用 JSON 序列化
+    logger.add(log_path, rotation=rotation_size, serialize=True)
+
+    # 输出初始化成功信息
+    logger.info(f"日志系统已初始化，日志文件路径：{log_path}")

{pyxllib-0.3.131 → pyxllib-0.3.132}/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:
@@ -57,10 +58,10 @@ def get_xllog(name='xllog', *, log_file=None):
                 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)