pyxllib 0.3.134__tar.gz → 0.3.136__tar.gz

{pyxllib-0.3.134/pyxllib.egg-info → pyxllib-0.3.136}/PKG-INFO

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

{pyxllib-0.3.134 → pyxllib-0.3.136}/pyxllib/algo/newbie.py

@@ -164,57 +164,3 @@ def cvsecs(time):
         return time
 
     return sum(mult * part for mult, part in zip(factors, reversed(time)))
-
-
-def find_optimal_page_size(total_items, page_sizes, seen_items=0):
-    """
-    找到最优的分页大小，使得最后一页的新样本数尽可能多，已见样本数尽可能少。
-    本函数由gpt-o1生成。
-
-    :param int total_items: 总的条目数（样本数）。
-    :param List[int] page_sizes: 可供选择的分页大小列表。
-    :param int seen_items: 已经看过的样本数，默认为0。
-    :return: Tuple[int, int, int], 包含最优的分页大小、最后一页的新样本数、最后一页的已见样本数。
-
-    >>> find_optimal_page_size(64, [2, 5, 10, 14, 20, 50, 100])
-    (100, 64, 0)
-    >>> find_optimal_page_size(64, [2, 5, 10, 14, 20, 50, 100], seen_items=55)
-    (50, 9, 5)
-    """
-    page_sizes = sorted(set(page_sizes), reverse=True)  # 去重并从大到小排序
-    max_new_items = -1
-    min_seen_items_in_page = total_items + 1  # 初始化为一个大于可能的最大值
-    optimal_page_size = None
-    total_new_items = total_items - seen_items  # 总的新样本数
-
-    for page_size in page_sizes:
-        if page_size <= 0:
-            continue  # 跳过非正整数的分页大小
-
-        total_pages = -(-total_items // page_size)  # 等价于 math.ceil(total_items / page_size)
-        start_index = (total_pages - 1) * page_size + 1
-        end_index = min(total_pages * page_size, total_items)
-        last_page_indices = range(start_index, end_index + 1)
-
-        # 计算新样本数和已见样本数
-        new_items_in_page = len([i for i in last_page_indices if i > seen_items])
-        seen_items_in_page = len([i for i in last_page_indices if i <= seen_items])
-
-        # 更新最优分页大小
-        if new_items_in_page > max_new_items:
-            max_new_items = new_items_in_page
-            min_seen_items_in_page = seen_items_in_page
-            optimal_page_size = page_size
-            # 如果已达到最大可能的新样本数且已见样本数为 0，提前退出
-            if max_new_items == total_new_items and min_seen_items_in_page == 0:
-                break
-        elif new_items_in_page == max_new_items and seen_items_in_page < min_seen_items_in_page:
-            min_seen_items_in_page = seen_items_in_page
-            optimal_page_size = page_size
-            if min_seen_items_in_page == 0:
-                break
-        # 如果当前的 page_size 已经小于或等于最大新样本数，后续的 page_size 不会有更好的结果，可以退出循环
-        elif page_size <= max_new_items:
-            break
-
-    return optimal_page_size, max_new_items, min_seen_items_in_page

{pyxllib-0.3.134 → pyxllib-0.3.136}/pyxllib/autogui/activewin.py

@@ -12,10 +12,10 @@ import psutil
 import numpy as np
 
 if sys.platform == 'win32':
-    import pyautogui
     import win32gui
     import win32process
-    from pywinauto import Desktop
+    # from pywinauto import Desktop
+    import uiautomation
 
 from pyxllib.prog.cachetools import xlcache
 from pyxllib.cv.xlcvlib import CvImg
@@ -90,13 +90,13 @@ class ActiveWindowCapture(OriginalMSS):
     @xlcache(property=True)
     def window(self):
         """ 当前激活窗口 """
-        hwnd = win32gui.GetForegroundWindow()
-        return Desktop(backend="win32").window(handle=hwnd)
+        win = uiautomation.GetForegroundControl()
+        return win
 
     @xlcache(property=True)
     def process(self):
         """ 当前激活窗口 """
-        hwnd = self.window.handle
+        hwnd = self.window.NativeWindowHandle
         thread_id, process_id = win32process.GetWindowThreadProcessId(hwnd)
         return psutil.Process(process_id)
 
@@ -141,12 +141,12 @@ class ActiveWindowCapture(OriginalMSS):
             if order == -1:
                 # 截取当前活动窗口的截图
                 active_window = self.window
-                rect = active_window.rectangle()  # 获取窗口的矩形区域
+                rect = active_window.BoundingRectangle
                 monitor = {
                     'left': int(rect.left),
                     'top': int(rect.top),
-                    'width': int(rect.width()),
-                    'height': int(rect.height()),
+                    'width': int(rect.right - rect.left),
+                    'height': int(rect.bottom - rect.top),
                 }
                 sct_img = self.grab(monitor)
             else:
@@ -230,7 +230,7 @@ class ActiveWindowCapture(OriginalMSS):
 
         # 若需要标记当前激活窗口
         if mark_active_window:
-            img = self._mark_window_on_screenshot(img, self.window.rectangle(), order,
+            img = self._mark_window_on_screenshot(img, self.window.BoundingRectangle, order,
                                                   mark_params=mark_active_window)
 
         if to_pil: