ascript 1.2.2__tar.gz → 1.2.4__tar.gz

{ascript-1.2.2 → ascript-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ascript
-Version: 1.2.2
+Version: 1.2.4
 Summary: Ascript Developer Library
 License: MIT
 Classifier: Operating System :: Microsoft :: Windows

{ascript-1.2.2 → ascript-1.2.4}/ascript/windows/__init__.py

@@ -7,4 +7,9 @@ _current_dir = os.path.dirname(os.path.abspath(__file__))
 # 关键：将 windows 目录加入搜索路径
 # 这样其下的子模块 license 就能直接 import 旁边的 pyarmor_runtime_000000
 if _current_dir not in sys.path:
-    sys.path.insert(0, _current_dir)
+    sys.path.insert(0, _current_dir)
+
+
+from ascript.windows.screen.ocr import  rapidocr_hook
+# 静默植入 rapidocr find方法
+rapidocr_hook.install()

ascript-1.2.4/ascript/windows/hardware/__init__.py

@@ -0,0 +1,5 @@
+
+from . import keyboard,mouse
+
+__all__ = ["keyboard","mouse"]
+

ascript-1.2.4/ascript/windows/hardware/keyboard.py

@@ -0,0 +1,34 @@
+import pyautogui
+import pyperclip
+import time
+from typing import Union, List, Optional
+
+def input(msg: str, interval: float = 0.0):
+    """自动识别中英文并输入"""
+    # 检查是否包含非 ASCII 字符（如中文）
+    if any(ord(c) > 127 for c in msg):
+        pyperclip.copy(msg)
+        time.sleep(0.1)  # 给剪贴板一点缓冲时间，防止粘贴失败
+        pyautogui.hotkey('ctrl', 'v')
+    else:
+        # typewrite 已逐步被 write 取代，推荐使用 write
+        pyautogui.write(msg, interval=interval)
+
+def key(keys: Union[str, List[str]], presses: int = 1, interval: float = 0.0):
+    """按下指定按键"""
+    pyautogui.press(keys, presses=presses, interval=interval)
+
+def key_hot(*args):
+    """
+    组合键操作，例如: key_hot('ctrl', 'c')
+    修正了原先参数传递的错误
+    """
+    pyautogui.hotkey(*args)
+
+def key_down(key_str: str):
+    """按下按键不松开"""
+    pyautogui.keyDown(key_str)
+
+def key_up(key_str: str):
+    """松开按键"""
+    pyautogui.keyUp(key_str)

{ascript-1.2.2/ascript/windows → ascript-1.2.4/ascript/windows/hardware}/mouse.py

@@ -1,7 +1,5 @@
 import pyautogui
-import pyperclip
-import time
-from typing import Union, List, Optional
+
 
 # 常量定义
 LEFT = "left"
@@ -48,32 +46,3 @@ def mouse_up(x: int = None, y: int = None, button: str = PRIMARY, duration: floa
     """松开鼠标按键"""
     pyautogui.mouseUp(x=x, y=y, button=button, duration=duration, tween=tween)
 
-def input(msg: str, interval: float = 0.0):
-    """自动识别中英文并输入"""
-    # 检查是否包含非 ASCII 字符（如中文）
-    if any(ord(c) > 127 for c in msg):
-        pyperclip.copy(msg)
-        time.sleep(0.1)  # 给剪贴板一点缓冲时间，防止粘贴失败
-        pyautogui.hotkey('ctrl', 'v')
-    else:
-        # typewrite 已逐步被 write 取代，推荐使用 write
-        pyautogui.write(msg, interval=interval)
-
-def key(keys: Union[str, List[str]], presses: int = 1, interval: float = 0.0):
-    """按下指定按键"""
-    pyautogui.press(keys, presses=presses, interval=interval)
-
-def key_hot(*args):
-    """
-    组合键操作，例如: key_hot('ctrl', 'c')
-    修正了原先参数传递的错误
-    """
-    pyautogui.hotkey(*args)
-
-def key_down(key_str: str):
-    """按下按键不松开"""
-    pyautogui.keyDown(key_str)
-
-def key_up(key_str: str):
-    """松开按键"""
-    pyautogui.keyUp(key_str)

{ascript-1.2.2 → ascript-1.2.4}/ascript/windows/resources/templates/windows/pyproject.toml

@@ -10,7 +10,9 @@ readme = "README.md"
 requires-python = ">=3.9"
 license = {text = "MIT"}
 dependencies = [
-    "ascript"
+    "ascript",
+#    "rapidocr==3.5.0",
+#    "onnxruntime==1.23.2"
 ]
 
 [tool.setuptools]

ascript-1.2.4/ascript/windows/screen/ocr/rapidocr_hook.py

@@ -0,0 +1,174 @@
+import sys
+import re
+import importlib.abc
+import importlib.util
+import importlib
+from dataclasses import dataclass, asdict
+from typing import List, Optional, Tuple, Union, TYPE_CHECKING
+
+# 假设你的硬件操作模块路径如下
+from ...hardware import mouse
+
+# --- 1. 类型存根 (仅用于 PyCharm 等 IDE 的代码补全提示) ---
+if TYPE_CHECKING:
+    try:
+        from rapidocr.utils.output import RapidOCROutput as BaseOutput
+    except ImportError:
+        class BaseOutput:
+            pass
+
+
+    class RapidOCROutput(BaseOutput):
+        """IDE 提示：使 RapidOCR 的返回结果具备 find 和 find_all 方法"""
+
+        def find(self, text_re: str = None, score: float = 0.85) -> 'OCRItem': ...
+
+        def find_all(self, text_re: str = None, score: float = 0.85) -> List['OCRItem']: ...
+
+
+# --- 2. 核心结果对象定义 ---
+
+@dataclass
+class OCRItem:
+    """真实的识别结果对象"""
+    txt: str
+    box: List[List[float]]
+    score: float
+    center: Tuple[int, int]  # 截图内的相对坐标
+    rect: List[int]  # [l, t, r, b]
+
+    def click(self, window=None):
+        """
+        点击目标
+        :param window: 可选，传入 ascript 的 Window 对象。
+                       如果传入，则调用 window.click(x, y) 进行窗口内相对点击；
+                       如果不传，则调用全局 mouse.click(x, y) 进行全屏点击。
+        """
+        x, y = self.center
+        if window:
+            # 让窗口对象处理相对坐标点击
+            print("窗口点击")
+            window.click(x, y)
+        else:
+            # 全屏绝对点击
+            mouse.click(x, y)
+        return self
+
+    def to_dict(self) -> dict:
+        """转换为字典格式"""
+        return asdict(self)
+
+    def __bool__(self):
+        """支持 if item: 语法"""
+        return True
+
+    def __repr__(self):
+        return f"<OCRItem txt='{self.txt}' score={self.score:.2f} center={self.center}>"
+
+
+class NullOCRItem:
+    """空对象：当 find 找不到结果时返回，防止链式调用报错"""
+
+    def __init__(self):
+        self.txt, self.box, self.score = "", [], 0.0
+        self.center, self.rect = (0, 0), [0, 0, 0, 0]
+
+    def click(self, window=None):
+        """静默处理，什么都不做"""
+        return self
+
+    def to_dict(self) -> dict:
+        return {}
+
+    def __bool__(self):
+        """支持 if not item: 语法"""
+        return False
+
+    def __repr__(self):
+        return "<NullOCRItem (Not Found)>"
+
+
+# --- 3. 运行时 Hook 逻辑 ---
+
+class RapidOCRHook(importlib.abc.MetaPathFinder):
+    def find_spec(self, fullname, path, target=None):
+        # 监听 RapidOCR 的核心输出模块
+        if fullname == "rapidocr.utils.output":
+            importlib.invalidate_caches()  # 动态感知新安装的包
+            try:
+                spec = importlib.util.find_spec(fullname)
+                if spec is None: return None
+
+                if self in sys.meta_path:
+                    sys.meta_path.remove(self)
+
+                module = importlib.util.module_from_spec(spec)
+                spec.loader.exec_module(module)
+                self._patch(module)
+                sys.modules[fullname] = module
+                return spec
+            except Exception:
+                return None
+        return None
+
+    def _patch(self, module):
+        """执行动态植入方法"""
+
+        def _build_item(txt, box, score) -> OCRItem:
+            """构建结果对象"""
+            l, t = float(box[0][0]), float(box[0][1])
+            r, b = float(box[2][0]), float(box[2][1])
+            center = (int((l + r) / 2), int((t + b) / 2))
+            rect = [int(l), int(t), int(r), int(b)]
+            return OCRItem(
+                txt=str(txt),
+                box=box.tolist() if hasattr(box, 'tolist') else box,
+                score=float(score),
+                center=center,
+                rect=rect
+            )
+
+        def find(self, text_re: str = None, score: float = 0.85) -> Union[OCRItem, NullOCRItem]:
+            """查找单个结果"""
+            txts, boxes, scores = getattr(self, 'txts', None), getattr(self, 'boxes', None), getattr(self, 'scores',
+                                                                                                     None)
+            if txts is not None and boxes is not None:
+                for i in range(len(txts)):
+                    if scores[i] >= score:
+                        if text_re is None or re.search(text_re, str(txts[i])):
+                            return _build_item(txts[i], boxes[i], scores[i])
+            return NullOCRItem()
+
+        def find_all(self, text_re: str = None, score: float = 0.85) -> List[OCRItem]:
+            """查找所有结果并按坐标排序"""
+            results = []
+            txts, boxes, scores = getattr(self, 'txts', None), getattr(self, 'boxes', None), getattr(self, 'scores',
+                                                                                                     None)
+            if txts is not None and boxes is not None:
+                for i in range(len(txts)):
+                    if scores[i] >= score:
+                        if text_re is None or re.search(text_re, str(txts[i])):
+                            results.append(_build_item(txts[i], boxes[i], scores[i]))
+
+            # 按从上到下、从左到右排序
+            results.sort(key=lambda x: (x.center[1], x.center[0]))
+            return results
+
+        # 将方法绑定到目标类
+        target_class = "RapidOCROutput"
+        if hasattr(module, target_class):
+            cls = getattr(module, target_class)
+            if not hasattr(cls, "find"):
+                cls.find = find
+                cls.find_all = find_all
+                print(f"✅ [RapidOCR-Hook] 成功注入 find/find_all 扩展")
+
+
+def install():
+    """入口函数：确保 Hook 被注册"""
+    target_mod = "rapidocr.utils.output"
+    if target_mod in sys.modules:
+        RapidOCRHook()._patch(sys.modules[target_mod])
+        return
+    if not any(isinstance(h, RapidOCRHook) for h in sys.meta_path):
+        sys.meta_path.insert(0, RapidOCRHook())

{ascript-1.2.2 → ascript-1.2.4}/ascript/windows/window/__init__.py

@@ -1,5 +1,8 @@
 from .Window import Window
 from .Selector import  Selector
 
+
+
+
 __all__ = ["Window", "Selector"]
 

{ascript-1.2.2 → ascript-1.2.4}/ascript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ascript
-Version: 1.2.2
+Version: 1.2.4
 Summary: Ascript Developer Library
 License: MIT
 Classifier: Operating System :: Microsoft :: Windows

{ascript-1.2.2 → ascript-1.2.4}/ascript.egg-info/SOURCES.txt

@@ -73,10 +73,11 @@ ascript/ios/wdapy/_wrap.py
 ascript/ios/wdapy/exceptions.py
 ascript/ios/wdapy/xcui_element_types.py
 ascript/windows/__init__.py
-ascript/windows/mouse.py
-ascript/windows/screen.py
 ascript/windows/daos/__init__.py
 ascript/windows/daos/screen.py
+ascript/windows/hardware/__init__.py
+ascript/windows/hardware/keyboard.py
+ascript/windows/hardware/mouse.py
 ascript/windows/license/__init__.py
 ascript/windows/license/achttp.cp310-win_amd64.pyd
 ascript/windows/license/achttp.cp311-win_amd64.pyd
@@ -100,6 +101,8 @@ ascript/windows/screen/as_cv.py
 ascript/windows/screen/find_colors.py
 ascript/windows/screen/find_images.py
 ascript/windows/screen/screen_core.py
+ascript/windows/screen/ocr/__init__.py
+ascript/windows/screen/ocr/rapidocr_hook.py
 ascript/windows/store/__init__.py
 ascript/windows/system/__init__.py
 ascript/windows/system/device.py

{ascript-1.2.2 → ascript-1.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ascript"
-version = "1.2.2"
+version = "1.2.4"
 description = "Ascript Developer Library"
 readme = "README.md"
 requires-python = ">=3.9"

ascript-1.2.2/ascript/windows/screen.py

@@ -1,314 +0,0 @@
-import re
-import sys
-from urllib.parse import unquote
-import pyautogui
-import win32gui
-from PIL import ImageGrab, Image
-
-from ascript.windows.daos.screen import Size, Point, OcrRes
-from ascript.windows.utils import screen_utils
-import numpy as np
-from ascript.windows.window import Window
-
-def size(hwnd: int = None, rect=None) -> Image:
-    temp_img = None
-    if hwnd != 0 and hwnd is not None:
-        psize = pyautogui.size()
-        return Size(psize.width, psize.height)
-    else:
-        win = Window(hwnd)
-        return Size(win.width, win.height)
-
-
-def capture(hwnd: int = None, rect=None) -> Image:
-    temp_img = None
-    if hwnd != 0 and hwnd is not None:
-        temp_rect = win32gui.GetWindowRect(hwnd)
-        temp_img = ImageGrab.grab(temp_rect)
-    else:
-        temp_img = ImageGrab.grab()
-
-    if rect:
-        temp_img = temp_img.crop(rect)
-    return temp_img
-
-
-def get_color(x, y):
-    img = capture()
-    return img.getpixel((x, y))
-
-
-def find_colors(colors: str = None, rect=[], sim: float = 0.9, ore: int = 2, space: int = 5, file: str = None,res_num:int=1):
-    if res_num>1:
-        return FindColors(colors, rect, sim, ore, space, file).find()
-    else:
-        return FindColors(colors, rect, sim, ore, space, file).find_all(res_num)
-
-
-def compare_colors( colors: str = None, sim: float = 0.9, img_file: str = None):
-        return CompareColors(colors,sim,img_file)
-
-def cor(rect=[], pattern: str = None, confidence: float = 0.1, img_file: str = None,res_num:int =0):
-    if res_num ==1:
-        return Ocr(rect,pattern=pattern,confidence= confidence,img_path= img_file).find()
-    else:
-        return Ocr(rect, pattern=pattern, confidence=confidence, img_path=img_file).find_all(res_num)
-
-def find_images(img_part: str = None, rect=None, source_file: str = None, confidence: float = 0.1,res_num:int=1):
-    findimg = FindImages(img_part= img_part,source_rect=rect,source_file=source_file,confidence=confidence)
-    if res_num==1:
-        return findimg.find()
-    else:
-        return findimg.find_all()
-
-def find_images_template(img_part: str = None, source_rect=None, source_file: str = None, confidence: float = 0.1,res_num:int=1, threshold=0.5, rgb=False, bgremove=False):
-    findimg = FindImages(img_part= img_part,source_rect=source_rect,source_file=source_file,confidence=confidence)
-    if res_num==1:
-        return findimg.find_template(threshold= threshold,bgremove=bgremove,rgb=rgb)
-    else:
-        return findimg.find_all_template(maxcnt=res_num)
-
-def find_images_sift(img_part: str = None, rect=None, source_file: str = None, confidence: float = 0.1,res_num:int=1, min_match_count: int = 4):
-    findimg = FindImages(img_part= img_part,source_rect=rect,source_file=source_file,confidence=confidence)
-    if res_num==1:
-        return findimg.find_sift(min_match_count= min_match_count)
-    else:
-        return findimg.find_all_sift(min_match_count= min_match_count)
-
-class FindColors:
-    def __init__(self, colors: str = None, rect=[], sim: float = 0.9, ore: int = 2, space: int = 5, file: str = None,
-                 dict_p: dict = None):
-        self.rect = rect
-        self.colors = colors
-        self.sim = sim
-        self.ore = ore
-        self.space = space
-        self.res_num = 1
-        self.file = file
-
-        if dict_p:
-            if 'colors' in dict_p:
-                self.colors = dict_p['colors']
-
-            if 'rect' in dict_p:
-                self.rect = dict_p['rect']
-
-            if 'sim' in dict_p:
-                self.sim = float(dict_p['sim'])
-
-            if 'ore' in dict_p:
-                self.ore = int(dict_p['ore'])
-
-            if 'space' in dict_p:
-                self.space = int(dict_p['space'])
-
-            if 'file' in dict_p:
-                self.file = unquote(dict_p['file'])
-
-            if 'res_num' in dict_p:
-                self.res_num = int(dict_p['res_num'])
-
-    def find(self):
-        self.res_num = 1
-        res = self.exec_find()
-        if res and len(res) > 0:
-            return res[0]
-        return None
-
-    def find_all(self, res_num=sys.maxsize):
-        self.res_num = res_num
-        res = self.exec_find()
-        if res or len(res) > 0:
-            return res
-        return None
-
-    def exec_find(self):
-        # 获取截图
-        img = None
-        if self.file:
-            img = Image.open(self.file)
-        else:
-            img = ImageGrab.grab()
-
-        if self.rect and len(self.rect) == 4:
-            img = img.crop(self.rect)
-
-        # 回填 坐标
-        ps = screen_utils.find_colors(self.colors, self.sim, self.res_num, self.ore, img, self.space)
-        if ps and self.rect and len(self.rect) == 4:
-            for i in range(len(ps)):
-                ps[i] = Point(ps[i].x + self.rect[0], ps[i].y + self.rect[1])
-
-        return ps
-
-
-class CompareColors:
-    def __init__(self, colors: str = None, sim: float = 0.9, img_file: str = None, dict_p: dict = None):
-        self.colors = colors
-        self.sim = sim
-        self.img_file = img_file
-        if dict_p:
-            if 'colors' in dict_p:
-                self.colors = dict_p['colors']
-
-            if 'sim' in dict_p:
-                self.sim = float(dict_p['sim'])
-
-            if 'path' in dict_p:
-                self.img_file = unquote(dict_p['path'])
-
-    def compare(self):
-        if self.img_file:
-            img = Image.open(self.img_file)
-        else:
-            img = capture()
-
-        return screen_utils.compare_colors(self.colors, self.sim, img)
-
-
-class Ocr:
-
-    easyOcr = None
-
-    def easyocr_find(rect=[], pattern: str = None, confidence: float = 0.1, img_path: str = None,
-                 dict_p: dict = None):
-
-        return None
-
-
-    def __init__(self, rect=[], pattern: str = None, confidence: float = 0.1, img_path: str = None,
-                 dict_p: dict = None):
-
-        self.rect = rect
-        self.pattern = pattern
-        self.confidence = confidence
-        self.img_path = img_path
-        # self.ocr = PaddleOCR(ocr_version='PP-OCRv3')
-
-        if dict_p:
-            if 'rect' in dict_p:
-                self.rect = dict_p['rect']
-
-            if 'pattern' in dict_p:
-                self.pattern = dict_p['pattern']
-
-            if 'img_path' in dict_p:
-                self.img_path = unquote(dict_p['img_path'])
-
-            if 'confidence' in dict_p:
-                self.sim = float(dict_p['confidence'])
-
-            if 'findtype' in dict_p:
-                if dict_p['findtype'] == 'find':
-                    self.res_num = 1
-                else:
-                    self.res_num = 0
-
-        # from easyocr import Reader
-        #
-        # self.ocr = Reader(['en', 'ch_sim'])
-
-        from paddleocr import PaddleOCR
-        self.ocr = PaddleOCR()
-
-    def find(self) -> OcrRes:
-        self.res_num = 1
-        res = self.exec_find_paddle()
-        if res:
-            return res[0]
-        return None
-
-    def find_all(self, res_num: int = 0) -> [OcrRes]:
-        self.res_num = res_num
-        res = self.exec_find_paddle()
-        return res
-
-    def exec_find(self):
-        if self.img_path:
-            img = Image.open(self.img_path)
-        else:
-            img = capture(rect=self.rect)
-
-        if self.rect and len(self.rect) == 4:
-            img = img.crop(self.rect)
-
-        # res_source = self.ocr.readtext(np.array(img))
-
-        res_source = self.ocr.ocr(np.array(img))
-
-        print(res_source)
-
-        res = []
-        if res_source:
-            for r in res_source:
-                if self.pattern:
-                    pattern = re.compile(self.pattern)
-                if r[2] >= self.confidence and (self.pattern is None or pattern.match(r[1])):
-
-                    offsetx = 0
-                    offsety = 0
-                    if self.rect:
-                        offsetx = self.rect[0]
-                        offsety = self.rect[1]
-
-                    region_position = r[0]
-                    region_position = [[int(region_position[0][0]) + offsetx, int(region_position[0][1]) + offsety],
-                                       [int(region_position[1][0]) + offsetx, int(region_position[1][1]) + offsety],
-                                       [int(region_position[2][0]) + offsetx, int(region_position[2][1]) + offsety],
-                                       [int(region_position[3][0]) + offsetx, int(region_position[3][1]) + offsety]]
-
-                    if self.res_num == 0:
-                        res.append(OcrRes(text=r[1], confidence=r[2], region_position=region_position))
-                    elif len(res) < self.res_num:
-                        res.append(OcrRes(text=r[1], confidence=r[2], region_position=region_position))
-                    else:
-                        return res
-
-        return res
-
-    def exec_find_paddle(self):
-        if self.img_path:
-            img = Image.open(self.img_path)
-        else:
-            img = capture(rect=self.rect)
-
-        if self.rect and len(self.rect) == 4:
-            img = img.crop(self.rect)
-
-        res_source = self.ocr.ocr(np.array(img))
-        res = []
-        if res_source and res_source[0]:
-            for r in res_source[0]:
-
-                if self.pattern:
-                    pattern = re.compile(self.pattern)
-                    # [ [[238.0, 12.0], [330.0, 12.0], [330.0, 40.0], [238.0, 40.0]], ('版本控制', 0.9998359680175781)]
-
-                if r[1][1] >= self.confidence and (self.pattern is None or pattern.match(r[1][0])):
-
-                    offsetx = 0
-                    offsety = 0
-                    if self.rect:
-                        offsetx = int(self.rect[0])
-                        offsety = int(self.rect[1])
-
-                    region_position = r[0]
-                    region_position = [[int(region_position[0][0]) + offsetx, int(region_position[0][1]) + offsety],
-                                       [int(region_position[1][0]) + offsetx, int(region_position[1][1]) + offsety],
-                                       [int(region_position[2][0]) + offsetx, int(region_position[2][1]) + offsety],
-                                       [int(region_position[3][0]) + offsetx, int(region_position[3][1]) + offsety]]
-
-                    if self.res_num == 0:
-                        res.append(OcrRes(text=r[1][0], confidence=r[1][1], region_position=region_position))
-                    elif len(res) < self.res_num:
-                        res.append(OcrRes(text=r[1][0], confidence=r[1][1], region_position=region_position))
-                    else:
-                        return res
-
-        return res
-
-    def to_dict(self):
-        pass
-
-
-