PyClickerRPA 0.2.0__tar.gz → 0.3.1__tar.gz

{pyclickerrpa-0.2.0 → pyclickerrpa-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyClickerRPA
-Version: 0.2.0
+Version: 0.3.1
 Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, node flow editor, recorder, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
 Author: Equinox
 License-Expression: MIT
@@ -84,12 +84,15 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 - **~30+ step types**: click image/text/position, click-all, relative/offset
   clicks, wait / random / wait-stable, drag / long-press / pinch / scroll,
   key / type / hotkey, loop / goto / while / do-until, if image/text/color/
-  count/var, set-var, read-text→variable, HTTP request, run-Python-script,
-  call sub-task, groups — with retry / repeat / until policies.
+  count/var with **true/false branching** (if-else), set-var, read-text→variable,
+  activate-window, HTTP request, run-Python-script, call sub-task, groups, and a
+  **stop** step to end a run — with retry / repeat / until policies.
 
 ## Authoring (desktop GUI)
 
-Drag-and-drop **node flow graph** and an interoperable **step list** with a full
+Drag-and-drop **node flow graph** (condition nodes have **true/false branch
+ports** for visual if-else; a terminal **stop** node ends the flow) and an
+interoperable **step list** with a full
 per-step dialog; an action **recorder** (global hooks), snippet library, task
 packages (`.zip` with templates), on-preview coordinate/color picking, template
 crop, single-step test run; global hotkeys (F6 run/stop, ESC stop), scheduler,

{pyclickerrpa-0.2.0 → pyclickerrpa-0.3.1}/PyClickerRPA.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyClickerRPA
-Version: 0.2.0
+Version: 0.3.1
 Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, node flow editor, recorder, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
 Author: Equinox
 License-Expression: MIT
@@ -84,12 +84,15 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 - **~30+ step types**: click image/text/position, click-all, relative/offset
   clicks, wait / random / wait-stable, drag / long-press / pinch / scroll,
   key / type / hotkey, loop / goto / while / do-until, if image/text/color/
-  count/var, set-var, read-text→variable, HTTP request, run-Python-script,
-  call sub-task, groups — with retry / repeat / until policies.
+  count/var with **true/false branching** (if-else), set-var, read-text→variable,
+  activate-window, HTTP request, run-Python-script, call sub-task, groups, and a
+  **stop** step to end a run — with retry / repeat / until policies.
 
 ## Authoring (desktop GUI)
 
-Drag-and-drop **node flow graph** and an interoperable **step list** with a full
+Drag-and-drop **node flow graph** (condition nodes have **true/false branch
+ports** for visual if-else; a terminal **stop** node ends the flow) and an
+interoperable **step list** with a full
 per-step dialog; an action **recorder** (global hooks), snippet library, task
 packages (`.zip` with templates), on-preview coordinate/color picking, template
 crop, single-step test run; global hotkeys (F6 run/stop, ESC stop), scheduler,

{pyclickerrpa-0.2.0 → pyclickerrpa-0.3.1}/PyClickerRPA.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ autoclicker/app.py
 autoclicker/capture.py
 autoclicker/clicker.py
 autoclicker/dpi.py
+autoclicker/expr.py
 autoclicker/matcher.py
 autoclicker/models.py
 autoclicker/ocr.py
@@ -52,6 +53,7 @@ autoclicker/web/static/app.js
 autoclicker/web/static/index.html
 autoclicker/web/static/style.css
 tests/test_adb.py
+tests/test_flow_branch.py
 tests/test_matcher.py
 tests/test_models.py
 tests/test_runner.py

{pyclickerrpa-0.2.0 → pyclickerrpa-0.3.1}/README.md

@@ -46,12 +46,15 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 - **~30+ step types**: click image/text/position, click-all, relative/offset
   clicks, wait / random / wait-stable, drag / long-press / pinch / scroll,
   key / type / hotkey, loop / goto / while / do-until, if image/text/color/
-  count/var, set-var, read-text→variable, HTTP request, run-Python-script,
-  call sub-task, groups — with retry / repeat / until policies.
+  count/var with **true/false branching** (if-else), set-var, read-text→variable,
+  activate-window, HTTP request, run-Python-script, call sub-task, groups, and a
+  **stop** step to end a run — with retry / repeat / until policies.
 
 ## Authoring (desktop GUI)
 
-Drag-and-drop **node flow graph** and an interoperable **step list** with a full
+Drag-and-drop **node flow graph** (condition nodes have **true/false branch
+ports** for visual if-else; a terminal **stop** node ends the flow) and an
+interoperable **step list** with a full
 per-step dialog; an action **recorder** (global hooks), snippet library, task
 packages (`.zip` with templates), on-preview coordinate/color picking, template
 crop, single-step test run; global hotkeys (F6 run/stop, ESC stop), scheduler,

{pyclickerrpa-0.2.0 → pyclickerrpa-0.3.1}/autoclicker/capture.py

@@ -30,35 +30,51 @@ def _bitmap_to_bgr(bmp, width: int, height: int) -> np.ndarray:
 
 
 def capture_window(hwnd) -> np.ndarray:
-    """Capture the client area of *hwnd* as a BGR ndarray."""
+    """Capture the **client area** of *hwnd* as a BGR ndarray.
+
+    PrintWindow renders the whole window (title bar + borders + client) from the
+    window's top-left, so we render the full window and then crop to the client
+    rect. The result's (0, 0) is the client top-left — matching the Clicker's
+    ``ClientToScreen`` mapping, so match coords click the right spot (no offset
+    by the non-client area / title bar).
+    """
     if not _HAS_WIN32:
         raise RuntimeError("win32 modules unavailable")
+    import ctypes
 
-    left, top, right, bottom = win32gui.GetClientRect(hwnd)
-    width, height = right - left, bottom - top
-    if width <= 0 or height <= 0:
+    _, _, cw, ch = win32gui.GetClientRect(hwnd)     # client size
+    if cw <= 0 or ch <= 0:
+        return np.empty((0, 0, 3), dtype=np.uint8)
+
+    wl, wt, wr, wb = win32gui.GetWindowRect(hwnd)    # whole-window screen rect
+    ww, wh = wr - wl, wb - wt
+    csx, csy = win32gui.ClientToScreen(hwnd, (0, 0))  # client top-left in screen
+    ox, oy = csx - wl, csy - wt                       # client offset within window
+    if ww <= 0 or wh <= 0:
         return np.empty((0, 0, 3), dtype=np.uint8)
 
     hwnd_dc = win32gui.GetWindowDC(hwnd)
     mfc_dc = win32ui.CreateDCFromHandle(hwnd_dc)
     save_dc = mfc_dc.CreateCompatibleDC()
     bmp = win32ui.CreateBitmap()
-    bmp.CreateCompatibleBitmap(mfc_dc, width, height)
+    bmp.CreateCompatibleBitmap(mfc_dc, ww, wh)       # full-window sized bitmap
     save_dc.SelectObject(bmp)
 
     try:
-        import ctypes
         ok = ctypes.windll.user32.PrintWindow(hwnd, save_dc.GetSafeHdc(), PW_RENDERFULLCONTENT)
         if not ok:
-            # Fallback: BitBlt the window DC
-            save_dc.BitBlt((0, 0), (width, height), mfc_dc, (0, 0), win32con.SRCCOPY)
-        img = _bitmap_to_bgr(bmp, width, height)
+            save_dc.BitBlt((0, 0), (ww, wh), mfc_dc, (0, 0), win32con.SRCCOPY)
+        full = _bitmap_to_bgr(bmp, ww, wh)
     finally:
         win32gui.DeleteObject(bmp.GetHandle())
         save_dc.DeleteDC()
         mfc_dc.DeleteDC()
         win32gui.ReleaseDC(hwnd, hwnd_dc)
-    return img
+
+    ox = max(0, min(ox, max(0, ww - 1)))
+    oy = max(0, min(oy, max(0, wh - 1)))
+    client = full[oy:oy + ch, ox:ox + cw]
+    return np.ascontiguousarray(client)
 
 
 def capture_screen() -> np.ndarray:

pyclickerrpa-0.3.1/autoclicker/expr.py

@@ -0,0 +1,94 @@
+"""Safe arithmetic/string expression evaluator for the SetVar step.
+
+`SetVar` values starting with ``=`` are evaluated here (e.g. ``=count + 1``,
+``=max(a, b) * 2``, ``=upper(name)``). Variable names resolve against the
+runner's variable dict — numeric-looking values become numbers, everything
+else stays a string; unknown names default to 0.
+
+Security: this never calls the builtin ``eval``. It walks a whitelisted AST
+and rejects attribute access, subscripting, comprehensions, and any call to a
+function outside a fixed safe set — so ``__import__(...)`` / ``().__class__``
+style escapes raise ``ValueError`` instead of executing.
+"""
+from __future__ import annotations
+
+import ast
+import operator
+
+_BIN_OPS = {
+    ast.Add: operator.add, ast.Sub: operator.sub, ast.Mult: operator.mul,
+    ast.Div: operator.truediv, ast.FloorDiv: operator.floordiv,
+    ast.Mod: operator.mod, ast.Pow: operator.pow,
+}
+_UNARY_OPS = {ast.UAdd: operator.pos, ast.USub: operator.neg, ast.Not: operator.not_}
+_CMP_OPS = {
+    ast.Eq: operator.eq, ast.NotEq: operator.ne, ast.Lt: operator.lt,
+    ast.LtE: operator.le, ast.Gt: operator.gt, ast.GtE: operator.ge,
+}
+
+_FUNCS = {
+    "int": int, "float": float, "str": str, "round": round, "abs": abs,
+    "min": min, "max": max, "len": len,
+    "upper": lambda s: str(s).upper(), "lower": lambda s: str(s).lower(),
+}
+
+
+def _coerce(value: str):
+    """A variable value string → number when it looks numeric, else the string."""
+    try:
+        f = float(value)
+        return int(f) if f.is_integer() else f
+    except (TypeError, ValueError):
+        return value
+
+
+def _eval(node, variables):
+    if isinstance(node, ast.Expression):
+        return _eval(node.body, variables)
+    if isinstance(node, ast.Constant):  # numbers, strings, True/False/None
+        return node.value
+    if isinstance(node, ast.Name):
+        return _coerce(variables.get(node.id, "0"))
+    if isinstance(node, ast.BinOp) and type(node.op) in _BIN_OPS:
+        return _BIN_OPS[type(node.op)](_eval(node.left, variables), _eval(node.right, variables))
+    if isinstance(node, ast.UnaryOp) and type(node.op) in _UNARY_OPS:
+        return _UNARY_OPS[type(node.op)](_eval(node.operand, variables))
+    if isinstance(node, ast.BoolOp):
+        vals = [_eval(v, variables) for v in node.values]
+        result = vals[0]
+        for v in vals[1:]:
+            result = (result and v) if isinstance(node.op, ast.And) else (result or v)
+        return result
+    if isinstance(node, ast.Compare):
+        left = _eval(node.left, variables)
+        for op, comparator in zip(node.ops, node.comparators):
+            if type(op) not in _CMP_OPS:
+                raise ValueError(f"不支持的比较运算符: {type(op).__name__}")
+            right = _eval(comparator, variables)
+            if not _CMP_OPS[type(op)](left, right):
+                return False
+            left = right
+        return True
+    if isinstance(node, ast.Call):
+        if not isinstance(node.func, ast.Name) or node.func.id not in _FUNCS:
+            raise ValueError("只允许调用: " + ", ".join(sorted(_FUNCS)))
+        if node.keywords:
+            raise ValueError("函数不支持关键字参数")
+        args = [_eval(a, variables) for a in node.args]
+        return _FUNCS[node.func.id](*args)
+    raise ValueError(f"表达式包含不允许的语法: {type(node).__name__}")
+
+
+def safe_eval(expr: str, variables: dict) -> str:
+    """Evaluate `expr` against `variables`, returning a string result.
+
+    Integer-valued floats render without a trailing ``.0`` so counters stay clean.
+    Raises ``ValueError`` (or SyntaxError) on anything outside the whitelist.
+    """
+    tree = ast.parse(expr, mode="eval")
+    result = _eval(tree, variables)
+    if isinstance(result, float) and result.is_integer():
+        return str(int(result))
+    if isinstance(result, bool):
+        return "1" if result else "0"
+    return str(result)

{pyclickerrpa-0.2.0 → pyclickerrpa-0.3.1}/autoclicker/gui/flow_connection.py

@@ -65,7 +65,14 @@ class FlowConnection(QGraphicsPathItem):
             dy = end.y() - start.y()
             ctrl = min(dy * 0.5, 80.0)
             path.cubicTo(start.x(), start.y() + ctrl, end.x(), end.y() - ctrl, end.x(), end.y())
-            self.setPen(QPen(QColor(200, 200, 200), 2))
+            branch = getattr(self.from_port, "branch", None)
+            if branch == "true":
+                col = QColor(76, 175, 80)      # 真:绿
+            elif branch == "false":
+                col = QColor(229, 57, 53)      # 假:红
+            else:
+                col = QColor(200, 200, 200)
+            self.setPen(QPen(col, 2))
 
         self.setPath(path)
         mid = path.pointAtPercent(0.5)