pyxllib 0.3.147__tar.gz → 0.3.148__tar.gz

{pyxllib-0.3.147/pyxllib.egg-info → pyxllib-0.3.148}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.147
+Version: 0.3.148
 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: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: pillow; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
+Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: pynvml; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
-Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: opsdroid-get-image-size; extra == "xlai"
+Requires-Dist: pynvml; extra == "xlai"
+Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: opencv-python; extra == "xlai"
 Provides-Extra: xlall
-Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: flask; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: zhconv; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
-Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: flask-jwt-extended; extra == "xlall"
 Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
 Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: openai2; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: flask; extra == "xlall"
+Requires-Dist: ujson; extra == "xlall"
 Requires-Dist: fastapi; extra == "xlall"
+Requires-Dist: html2text; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
-Requires-Dist: sentencepiece; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: openai2; extra == "xlall"
 Requires-Dist: opencv-python; extra == "xlall"
+Requires-Dist: zhconv; extra == "xlall"
+Requires-Dist: flask-cors; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.147 → pyxllib-0.3.148}/pyxllib/autogui/uiautolib.py

@@ -14,6 +14,7 @@ import textwrap
 import time
 from typing import Iterable, Callable, List
 import subprocess
+import tempfile
 
 import psutil
 import pandas as pd

{pyxllib-0.3.147 → pyxllib-0.3.148}/pyxllib/autogui/wechat.py

@@ -10,21 +10,15 @@
 
 import time
 from copy import deepcopy
-from typing import Iterable
-import os
 from typing import (Iterable, Callable, List)
-import json
-import re
-import textwrap
+from typing import Optional
 
 import uiautomation as auto
-from anytree import NodeMixin, RenderTree
 
 import win32con
 import win32gui
 
-from pyxllib.prog.pupil import print2string
-from pyxllib.autogui.wechat_msg import msg_parsers
+from pyxllib.prog.filelock import get_autoui_lock
 from pyxllib.autogui.uiautolib import find_ctrl, UiCtrlNode, copy_files_to_clipboard
 
 
@@ -456,6 +450,35 @@ class WeChatMainWnd(UiCtrlNode):
             time.sleep(1)  # 等待发送动作完成
 
 
+class WeChatSingletonLock:
+    """ 基于 get_autoui_lock 的微信全局唯一单例控制器，确保同一时间仅有一个微信自动化程序在操作 """
+
+    def __init__(self, lock_timeout: Optional[float] = -1):
+        # 初始化全局锁
+        self.lock = get_autoui_lock(timeout=lock_timeout)
+        self.wechat = WeChatMainWnd()
+
+    def __enter__(self):
+        # 获取锁并激活微信窗口
+        self.lock.acquire()
+        self.wechat.activate()
+        return self.wechat
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        # 释放锁
+        self.lock.release()
+
+
+def wechat_lock_send(user, text=None, files=None, *, timeout=-1):
+    """ 使用全局唯一单例锁，确保同一时间仅有一个微信自动化程序在操作 """
+    with WeChatSingletonLock(timeout) as we:
+        we.set_chat_with(user)
+        if text:
+            we.send_text(user, text)
+        if files:
+            we.send_files(files)
+
+
 def __4_wx():
     """ 别人的原版实现 """
 

{pyxllib-0.3.147 → pyxllib-0.3.148}/pyxllib/autogui/wechat_msg.py

@@ -6,6 +6,8 @@
 
 """
 微信 消息框中不同消息结构的解析器 工具
+
+todo 这个文件很多值可以写成枚举类型更规范？
 """
 
 import re

pyxllib-0.3.148/pyxllib/prog/filelock.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2024/11/13
+
+import os
+import tempfile
+import time
+
+from filelock import FileLock, Timeout
+
+
+class XlFileLock(FileLock):
+    def __init__(self, lock_file: str, timeout: float = -1, **kwargs):
+        """
+        初始化 XlFileLock 实例，锁文件默认存储在系统临时目录中。
+
+        :param str filename: 锁文件的文件名（不包含路径）。
+        :param float timeout: 获取锁的超时时间（以秒为单位），默认值为 -1 表示无限等待。
+        """
+        lock_file_path = os.path.join(tempfile.gettempdir(), lock_file)
+        super().__init__(lock_file=lock_file_path, timeout=timeout, **kwargs)
+
+
+def get_autoui_lock(lock_file='autoui.lock', timeout=-1):
+    """
+    注意：XlFileLock中的lock_file无法设置默认值，这跟FileLock的底层有关
+        所以无法继承一个AutoUiLock类，但是可以通过这种函数的方式，绕开它特殊的初始化限制
+    """
+    lock = XlFileLock(lock_file=lock_file, timeout=timeout)
+    return lock
+
+
+if __name__ == "__main__":
+    try:
+        with get_autoui_lock(timeout=5):
+            print("Lock acquired, doing some work...")
+            time.sleep(3)
+            print("Work done.")
+    except Timeout:
+        print("Failed to acquire lock within the timeout.")

{pyxllib-0.3.147 → pyxllib-0.3.148/pyxllib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.147
+Version: 0.3.148
 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: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: pillow; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
+Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: pynvml; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
-Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: opsdroid-get-image-size; extra == "xlai"
+Requires-Dist: pynvml; extra == "xlai"
+Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: opencv-python; extra == "xlai"
 Provides-Extra: xlall
-Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: flask; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: zhconv; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
-Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: flask-jwt-extended; extra == "xlall"
 Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
 Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: openai2; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: flask; extra == "xlall"
+Requires-Dist: ujson; extra == "xlall"
 Requires-Dist: fastapi; extra == "xlall"
+Requires-Dist: html2text; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
-Requires-Dist: sentencepiece; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: openai2; extra == "xlall"
 Requires-Dist: opencv-python; extra == "xlall"
+Requires-Dist: zhconv; extra == "xlall"
+Requires-Dist: flask-cors; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.147 → pyxllib-0.3.148}/setup.py

@@ -50,7 +50,7 @@ _dir = Path(__file__).parent
 
 setup(
     name='pyxllib',  # pip 安装时用的名字
-    version='0.3.147',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
+    version='0.3.148',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
     author='code4101',
     author_email='877362867@qq.com',
     url='https://github.com/XLPRUtils/pyxllib',

pyxllib-0.3.147/pyxllib/prog/filelock.py

@@ -1,141 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# @Author : 陈坤泽
-# @Email  : 877362867@qq.com
-# @Date   : 2024/11/13
-
-import os
-import time
-import platform
-import tempfile
-
-if platform.system() == 'Windows':
-    import msvcrt
-else:
-    import fcntl
-
-
-class FileLock:
-    """
-    文件锁类，用于在不同进程之间实现互斥锁，确保同一时间只有一个程序实例可以访问共享资源。
-
-    适用于以下场景：
-    - 防止多个独立程序同时操作同一资源（如文件、窗口、数据库等）。
-    - 解决多个自动化脚本并发访问相同应用程序时的冲突问题。
-    - 跨平台支持：在 Windows 上使用 `msvcrt`，在 Unix 系统上使用 `fcntl`。
-
-    使用方式：
-    1. 作为上下文管理器：
-        >> with FileLock('wechat.lock'):
-        >>     # 执行独占的操作
-        >>     print("操作微信...")
-
-    2. 手动调用 acquire() 和 release()：
-        >> lock = FileLock('wechat.lock')
-        >> try:
-        >>     lock.acquire()
-        >>     print("正在执行任务...")
-        >> finally:
-        >>     lock.release()
-
-    属性：
-    :param bool locked: 指示当前是否已获得文件锁。
-
-    异常：
-    - TimeoutError: 如果在指定的超时时间内无法获取锁，则抛出此异常。
-    """
-
-    def __init__(self, lock_file='lockfile.lock', timeout=10, check_interval=0.1):
-        """
-
-        :param str lock_file: 锁文件的路径，默认值为 'lockfile.lock'。
-        :param int timeout: 获取锁的超时时间，单位为秒，默认值为 10 秒。
-        :param float check_interval: 重试获取锁的时间间隔，单位为秒，默认值为 0.1 秒。
-        """
-        # 如果 lock_file 没有提供绝对路径，则将其存储在临时目录下
-        if not os.path.isabs(lock_file):
-            lock_file = os.path.join(tempfile.gettempdir(), lock_file)
-
-        self.lock_file = lock_file
-        self.timeout = timeout
-        self.check_interval = check_interval
-        self.locked = False
-        self.file = None
-
-    def acquire(self):
-        """
-        手动获取文件锁。
-
-        如果文件已被其他进程锁定，则会阻塞，直到成功获取锁或者超时。
-        如果在指定的超时时间内无法获取锁，则抛出 TimeoutError。
-
-        Raises:
-            TimeoutError: 如果在指定的超时时间内无法获取锁。
-        """
-        start_time = time.time()
-        while True:
-            try:
-                self.file = open(self.lock_file, 'w')
-                if platform.system() == 'Windows':
-                    # Windows 系统使用 msvcrt.locking() 实现文件锁
-                    msvcrt.locking(self.file.fileno(), msvcrt.LK_NBLCK, 1)
-                else:
-                    # Unix 系统使用 fcntl.flock() 实现文件锁
-                    fcntl.flock(self.file, fcntl.LOCK_EX | fcntl.LOCK_NB)
-                self.locked = True
-                break
-            except (BlockingIOError, OSError):
-                if time.time() - start_time > self.timeout:
-                    raise TimeoutError(f"无法在 {self.timeout} 秒内获取文件锁：{self.lock_file}")
-                time.sleep(self.check_interval)
-
-    def release(self):
-        """
-        手动释放文件锁。
-
-        如果锁已被获取，则解锁并关闭文件句柄。
-        """
-        if self.locked and self.file:
-            if platform.system() == 'Windows':
-                # Windows 系统释放锁
-                msvcrt.locking(self.file.fileno(), msvcrt.LK_UNLCK, 1)
-            else:
-                # Unix 系统释放锁
-                fcntl.flock(self.file, fcntl.LOCK_UN)
-            self.file.close()
-            self.locked = False
-
-    def __enter__(self):
-        """
-        进入上下文管理器时自动获取文件锁。
-
-        Returns:
-            self: 返回当前 FileLock 实例。
-        """
-        self.acquire()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        """
-        退出上下文管理器时自动释放文件锁。
-        """
-        self.release()
-
-
-# 示例：如何使用 FileLock 类
-if __name__ == '__main__':
-    # 使用上下文管理器
-    with FileLock('wechat.lock') as lock:
-        print("通过上下文管理器获取锁，正在操作微信...")
-        time.sleep(3)
-        print("操作完成")
-
-    # 手动调用 acquire 和 release
-    lock = FileLock('wechat.lock')
-    try:
-        lock.acquire()
-        print("手动获取锁，正在执行任务...")
-        time.sleep(3)
-    finally:
-        lock.release()
-        print("任务完成并已释放锁")