pyxllib 0.3.144__tar.gz → 0.3.148__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.144
+Version: 0.3.148
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -39,32 +39,32 @@ 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: opsdroid-get-image-size; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: opencv-python; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
-Requires-Dist: pillow; extra == "xlai"
-Requires-Dist: pynvml; 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: flask-wtf; 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: zhconv; extra == "xlall"
-Requires-Dist: opencv-python; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
-Requires-Dist: flask; extra == "xlall"
-Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: opencv-python; extra == "xlall"
+Requires-Dist: zhconv; extra == "xlall"
 Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
 
 # 1 install
 

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

@@ -9,13 +9,17 @@
 """
 
 import os
+import sys
 import textwrap
 import time
 from typing import Iterable, Callable, List
+import subprocess
+import tempfile
 
 import psutil
 import pandas as pd
 
+from loguru import logger
 # ui组件大多是树形组织结构，auto库自带树形操作太弱。没有专业的树形结构库，能搞个毛线。
 from anytree import NodeMixin
 
@@ -236,22 +240,32 @@ class UiCtrlNode(NodeMixin):
         ctrl = find_ctrl(class_name=class_name, name=name, **kwargs)
         return cls(ctrl, build_depth=build_depth)
 
-    def activate(self):
+    def activate(self, check_seconds=2):
         """ 激活当前窗口
-
-        todo 修改的更稳定些？多些判断，重复测试，等待？
         """
-        if hwnd := win32gui.FindWindow(self.ctrl.ClassName, self.text):
-            # 恢复窗口
-            win32gui.ShowWindow(hwnd, win32con.SW_RESTORE)
-            # 检查窗口是否已在前
+        while True:
+            hwnd = win32gui.FindWindow(self.ctrl.ClassName, self.text)
+            # logger.info(hwnd)
+            if not hwnd:
+                return
+
             if win32gui.GetForegroundWindow() != hwnd:
-                # 尝试将窗口置前
+                win32gui.ShowWindow(hwnd, win32con.SW_RESTORE)
+
                 try:
-                    win32gui.SetForegroundWindow(hwnd)
+                    # 在这里执行SetForegroundWindow，只有程序的第1次运行有效，之后就会被很多全屏类的应用占用最前置，覆盖不了了
+                    # 为了解决这问题，就只能暴力每次都新开一个程序来执行这个SetForegroundWindow操作
+                    subprocess.run(
+                        [sys.executable, "-c", f"import win32gui; win32gui.SetForegroundWindow({hwnd})"],
+                        stdout=subprocess.PIPE,
+                    )
                 except Exception as e:
                     pass
-                    # print(f"尝试将窗口置前时出错: {e}")
+                # 理论上并不需要等待，但加个等待，有助于稳定性检测，如果当前窗口在check_seconds秒内频繁切换，
+                #   使用activate虽然激活了，但并不安全，只有check_seconds秒内维持稳定在这个窗口，再进行下游任务会更好
+                time.sleep(check_seconds)
+            else:
+                break
 
     def build_children(self, build_depth=-1, child_node_class=None):
         """ 创建并添加子节点到树中 """

{pyxllib-0.3.144 → 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
 
 
@@ -41,7 +35,7 @@ class WeChatConfig:
     WINDOW_CLASSNAME = 'WeChatMainWndForPC'
 
 
-WeChat = WeChatConfig
+# WeChat = WeChatConfig
 
 
 class IntervalConfig:
@@ -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():
     """ 别人的原版实现 """
 
@@ -496,8 +519,8 @@ class WxOperation:
 
     def locate_wechat_window(self):
         if not self.visible_flag:
-            wake_up_window(class_name=WeChat.WINDOW_CLASSNAME, name=WeChat.WINDOW_NAME)
-            self.wx_window = auto.WindowControl(Name=WeChat.WINDOW_NAME, ClassName=WeChat.WINDOW_CLASSNAME)
+            wake_up_window(class_name=WeChatConfig.WINDOW_CLASSNAME, name=WeChatConfig.WINDOW_NAME)
+            self.wx_window = auto.WindowControl(Name=WeChatConfig.WINDOW_NAME, ClassName=WeChatConfig.WINDOW_CLASSNAME)
             if not self.wx_window.Exists(Interval.MAX_SEARCH_SECOND,
                                          searchIntervalSeconds=Interval.MAX_SEARCH_INTERVAL):
                 raise Exception('微信似乎并没有登录!')

{pyxllib-0.3.144 → 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.144 → pyxllib-0.3.148}/pyxllib/prog/multiprogs.py

@@ -15,12 +15,18 @@ import subprocess
 import sys
 import time
 import textwrap
+import threading
 
 from deprecated import deprecated
 from loguru import logger
 from croniter import croniter
+import pandas as pd
+
+from fastapi import FastAPI
+from fastapi.responses import PlainTextResponse
 
 from pyxllib.prog.specialist import parse_datetime
+from pyxllib.algo.stat import print_full_dataframe
 from pyxllib.file.specialist import XlPath
 
 
@@ -259,6 +265,7 @@ class MultiProgramLauncher:
 
     def init_scheduler(self):
         from apscheduler.schedulers.background import BackgroundScheduler
+        # from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
         if self.scheduler is None:
             self.scheduler = BackgroundScheduler()
@@ -497,6 +504,8 @@ class MultiProgramLauncher:
             cmd.append(args)
         else:
             cmd += list(args)
+        if name is None:
+            name = module
         return self.add_program_cmd3(cmd, ports=ports, name=name, locations=locations, shell=shell, **kwargs)
 
     def add_prog(self, prog, extcmds='',
@@ -624,6 +633,23 @@ class MultiProgramLauncher:
     def __4_多程序管理(self):
         pass
 
+    def count_running(self):
+        return sum(1 for worker in self.workers if worker.is_running())
+
+    def list_workers(self):
+        """返回所有任务的状态 DataFrame"""
+        ls = []
+        for worker in self.workers:
+            ls.append({
+                'name': worker.name,
+                'pid': worker.program.pid if worker.program else None,
+                'poll': worker.program.poll() if worker.program else None,
+                'args': worker.raw_cmd,
+                'port': worker.port,
+                'locations': worker.locations,
+            })
+        return pd.DataFrame(ls)
+
     def cleanup_finished(self, exit_code=None):
         """
         清除已运行完的程序
@@ -654,50 +680,51 @@ class MultiProgramLauncher:
             worker.terminate()
         self.workers = []
 
-    def run_endless(self):
+    def proc_cmd(self, cmd):
+        if cmd == 'kill':
+            self.stop_all()
+            return False
+        elif cmd == 'count':
+            print(f'有{self.count_running()}个程序正在运行')
+        elif cmd.startswith('cleanup'):
+            args = cmd.split()
+            exit_code = int(args[1]) if len(args) > 1 else None
+            self.cleanup_finished(exit_code)
+            print("清理完成")
+        elif cmd == 'list':  # 列出所有程序（转df查看）
+            df = self.list_workers()
+            print_full_dataframe(df)
+        return True
+
+    def run_endless(self, cmd=True, wait_seconds=1, *, port=None):
         """
         一直运行，直到用户输入 kill 命令或 Ctrl+C
 
-		poll：
+        :param bool cmd: 是否支持命令行input输入指令监控状态的模式
+            默认支持，但在有scheduler调度的情况不建议开启，有input阻塞其他子程的风险
+        :param int|float wait_seconds: 每次循环之间停顿秒数，用来给其他子程等运行时间，避免阻塞
+        :param int port: 是否要开一个后端服务，支持查询程序运行状态
+
+    	poll：
             如果进程仍在运行，poll()方法返回None。
             如果进程已经结束，poll()方法返回进程的退出码（exit code）。
                 如果进程正常结束，退出码通常为0。
                 如果进程异常结束，退出码通常是一个非零值，表示异常的类型或错误码。
-		"""
-        import pandas as pd
-        from pyxllib.algo.stat import print_full_dataframe
-
+    	"""
         if self.scheduler:  # 如果有定时任务，启动调度器
             self.scheduler.start()
 
+        if port:
+            dashboard = LauncherDashboard(self)
+            threading.Thread(target=lambda: dashboard.run(port), daemon=True).start()
+
         try:
             while True:
-                cmd = input('>>>')
-                if cmd == 'kill':
-                    self.stop_all()
-                    break
-                elif cmd == 'count':
-                    # 需要实际检查现有程序
-                    m = sum([1 for worker in self.workers if worker.is_running()])
-                    print(f'有{m}个程序正在运行')
-                elif cmd.startswith('cleanup'):
-                    # 获取 exit_code 参数
-                    args = cmd.split()
-                    if len(args) > 1:  # 支持跟一个参数，删除制定状态的程序
-                        exit_code = int(args[1])
-                    else:
-                        exit_code = None
-                    self.cleanup_finished(exit_code)
-                    print("清理完成")
-                elif cmd == 'list':  # 列出所有程序（转df查看）
-                    ls = []
-                    for worker in self.workers:
-                        ls.append([worker.name,
-                                   worker.program and worker.program.pid,
-                                   worker.program and worker.program.poll(),
-                                   worker.raw_cmd])
-                    df = pd.DataFrame(ls, columns=['name', 'pid', 'poll', 'args'])
-                    print_full_dataframe(df)
+                if cmd:
+                    _cmd = input(">>> ")
+                    if not self.proc_cmd(_cmd):
+                        break
+                time.sleep(wait_seconds)
         except KeyboardInterrupt:
             print("\n检测到 Ctrl+C，正在终止所有程序...")
             self.stop_all()
@@ -714,6 +741,78 @@ class MultiProcessLauncher(MultiProgramLauncher):
     pass
 
 
+class LauncherDashboard:
+    def __init__(self, launcher):
+        self.launcher = launcher
+        self.app = FastAPI()
+        self.setup_routes()
+
+    def setup_routes(self):
+        @self.app.get("/", response_class=PlainTextResponse)
+        async def home():
+            """主页，展示所有任务状态"""
+            df = self.launcher.list_workers()
+            return self.render_text(df)
+
+        @self.app.get("/count", response_class=PlainTextResponse)
+        async def get_count():
+            """返回正在运行的任务数量"""
+            count = self.launcher.count_running()
+            return f"正在运行的任务数量: {count}\n"
+
+        @self.app.post("/stop", response_class=PlainTextResponse)
+        async def stop_all():
+            """停止所有任务"""
+            self.launcher.stop_all()
+            return "所有任务已停止。\n"
+
+        @self.app.post("/cleanup", response_class=PlainTextResponse)
+        async def cleanup(exit_code: int = None):
+            """清理已完成的任务"""
+            self.launcher.cleanup_finished(exit_code)
+            return "清理完成。\n"
+
+    def render_text(self, df):
+        """生成纯文本格式的任务状态"""
+        if df.empty:
+            return "没有任务正在运行。\n"
+
+        # 调整表头以显示新的属性：port 和 locations
+        output = ["当前任务状态:\n"]
+        output.append(f"{'编号':<5} {'名称':<15} {'PID':<10} {'状态':<10} {'端口':<10} {'位置':<20} {'命令'}")
+        output.append("-" * 120)
+
+        for idx, (_, row) in enumerate(df.iterrows(), start=1):
+            name = row['name']
+
+            # 更鲁棒地处理 pid，考虑 NaN 情况
+            pid = "N/A" if pd.isna(row['pid']) else int(row['pid'])
+
+            # 获取任务状态
+            status = "运行中" if row['poll'] is None else "已结束"
+
+            # 处理 args，确保路径展示更清晰
+            args = [a for a in row['args'] if a] if isinstance(row['args'], list) else []
+            args_str = "[" + ", ".join(
+                repr(arg).replace("\\\\", "\\") if '\\' in arg else repr(arg) for arg in args
+            ) + "]"
+
+            # 处理 port 和 locations
+            port = row['port'] if not pd.isna(row['port']) else "N/A"
+            locations = ", ".join(row['locations']) if isinstance(row['locations'], list) else "N/A"
+
+            # 格式化输出
+            output.append(f"{idx:<5} {name:<15} {pid:<10} {status:<10} {port:<10} {locations:<20} {args_str}")
+
+        output.append("\n")
+        return "\n".join(output)
+
+    def run(self, port=8080):
+        """启动 FastAPI 服务"""
+        import uvicorn
+        uvicorn.run(self.app, host="0.0.0.0", port=port, log_level="warning")
+
+
 def __3_装饰器工具():
     pass
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.144
+Version: 0.3.148
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -39,32 +39,32 @@ 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: opsdroid-get-image-size; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: opencv-python; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
-Requires-Dist: pillow; extra == "xlai"
-Requires-Dist: pynvml; 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: flask-wtf; 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: zhconv; extra == "xlall"
-Requires-Dist: opencv-python; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
-Requires-Dist: flask; extra == "xlall"
-Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: opencv-python; extra == "xlall"
+Requires-Dist: zhconv; extra == "xlall"
 Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.144 → pyxllib-0.3.148}/pyxllib.egg-info/SOURCES.txt

@@ -82,6 +82,7 @@ pyxllib/file/specialist/filelib.py
 pyxllib/prog/__init__.py
 pyxllib/prog/cachetools.py
 pyxllib/prog/deprecatedlib.py
+pyxllib/prog/filelock.py
 pyxllib/prog/ipyexec.py
 pyxllib/prog/multiprogs.py
 pyxllib/prog/newbie.py

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

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