PyClickerRPA 0.5.0__tar.gz → 0.6.0__tar.gz

{pyclickerrpa-0.5.0 → pyclickerrpa-0.6.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: PyClickerRPA
-Version: 0.5.0
-Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, node flow editor, a smart recorder that records images instead of coordinates, task health checks and failure attribution, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
+Version: 0.6.0
+Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, structured conditions and loops with array iteration, node flow editor, smart recorder, task health checks and failure attribution, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
 Author: Equinox
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/Equinox/PyClickerRPA
@@ -44,8 +44,8 @@ ADB) input — then turn those flows into a **visual test framework** with
 assertions, visual-regression baselines, HTML/JUnit reports, and a **web console**
 for remote runs.
 
-Python/PySide6, started as a port of a Qt/C++ AutoClicker (still reads/writes the
-same `.json` task format).
+Python/PySide6, started as a port of a Qt/C++ AutoClicker. Legacy `.json` tasks
+remain supported; structured control-flow blocks are a Python-only extension.
 
 ## Install
 
@@ -91,14 +91,24 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 
 ## Authoring (desktop GUI)
 
-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; 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,
-and an image/color **monitor/trigger** with tray icon; a **Test** tab to load and
-run visual test suites.
+Drag-and-drop **node flow graph** and an interoperable **step list**, with
+nested **If/Else**, **While**, fixed-count loops, **ForEach** arrays, and
+**Break/Continue** — no step numbers required. Double-click a block to edit its
+body or branches. Legacy condition nodes retain their true/false ports.
+
+Select consecutive steps and choose **包进… → 遍历数组** to reuse them for each
+item. Enter a custom JSON array or generate a numeric range, then reference the
+current item in text actions, assignments, and conditions. For example, iterate
+`[1,2,3,4,5,6,7,8,9,10]` with variable `server`, click **`{server}服`**, perform
+the actions, and return to the server-selection screen inside the same body.
+Enable exact text matching so `1服` does not also match `11服`. A failed action
+inside a block stops execution unless its failure policy explicitly skips it.
+
+Also includes a snippet library, task packages (`.zip` with nested templates),
+on-preview coordinate/color picking, template crop, single-step test run;
+global hotkeys (F6 run/stop, ESC stop), scheduler, and an image/color
+**monitor/trigger** with tray icon; a **Test** tab to load and run visual test
+suites.
 
 ### Smart recorder
 

{pyclickerrpa-0.5.0 → pyclickerrpa-0.6.0}/PyClickerRPA.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: PyClickerRPA
-Version: 0.5.0
-Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, node flow editor, a smart recorder that records images instead of coordinates, task health checks and failure attribution, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
+Version: 0.6.0
+Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, structured conditions and loops with array iteration, node flow editor, smart recorder, task health checks and failure attribution, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
 Author: Equinox
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/Equinox/PyClickerRPA
@@ -44,8 +44,8 @@ ADB) input — then turn those flows into a **visual test framework** with
 assertions, visual-regression baselines, HTML/JUnit reports, and a **web console**
 for remote runs.
 
-Python/PySide6, started as a port of a Qt/C++ AutoClicker (still reads/writes the
-same `.json` task format).
+Python/PySide6, started as a port of a Qt/C++ AutoClicker. Legacy `.json` tasks
+remain supported; structured control-flow blocks are a Python-only extension.
 
 ## Install
 
@@ -91,14 +91,24 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 
 ## Authoring (desktop GUI)
 
-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; 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,
-and an image/color **monitor/trigger** with tray icon; a **Test** tab to load and
-run visual test suites.
+Drag-and-drop **node flow graph** and an interoperable **step list**, with
+nested **If/Else**, **While**, fixed-count loops, **ForEach** arrays, and
+**Break/Continue** — no step numbers required. Double-click a block to edit its
+body or branches. Legacy condition nodes retain their true/false ports.
+
+Select consecutive steps and choose **包进… → 遍历数组** to reuse them for each
+item. Enter a custom JSON array or generate a numeric range, then reference the
+current item in text actions, assignments, and conditions. For example, iterate
+`[1,2,3,4,5,6,7,8,9,10]` with variable `server`, click **`{server}服`**, perform
+the actions, and return to the server-selection screen inside the same body.
+Enable exact text matching so `1服` does not also match `11服`. A failed action
+inside a block stops execution unless its failure policy explicitly skips it.
+
+Also includes a snippet library, task packages (`.zip` with nested templates),
+on-preview coordinate/color picking, template crop, single-step test run;
+global hotkeys (F6 run/stop, ESC stop), scheduler, and an image/color
+**monitor/trigger** with tray icon; a **Test** tab to load and run visual test
+suites.
 
 ### Smart recorder
 

{pyclickerrpa-0.5.0 → pyclickerrpa-0.6.0}/PyClickerRPA.egg-info/SOURCES.txt

@@ -65,6 +65,8 @@ tests/test_matcher.py
 tests/test_models.py
 tests/test_recorder_gui.py
 tests/test_runner.py
+tests/test_structured_flow.py
+tests/test_structured_gui.py
 tests/test_templatize.py
 tests/test_testkit.py
 tests/test_testkit_gui.py

{pyclickerrpa-0.5.0 → pyclickerrpa-0.6.0}/README.md

@@ -6,8 +6,8 @@ ADB) input — then turn those flows into a **visual test framework** with
 assertions, visual-regression baselines, HTML/JUnit reports, and a **web console**
 for remote runs.
 
-Python/PySide6, started as a port of a Qt/C++ AutoClicker (still reads/writes the
-same `.json` task format).
+Python/PySide6, started as a port of a Qt/C++ AutoClicker. Legacy `.json` tasks
+remain supported; structured control-flow blocks are a Python-only extension.
 
 ## Install
 
@@ -53,14 +53,24 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 
 ## Authoring (desktop GUI)
 
-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; 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,
-and an image/color **monitor/trigger** with tray icon; a **Test** tab to load and
-run visual test suites.
+Drag-and-drop **node flow graph** and an interoperable **step list**, with
+nested **If/Else**, **While**, fixed-count loops, **ForEach** arrays, and
+**Break/Continue** — no step numbers required. Double-click a block to edit its
+body or branches. Legacy condition nodes retain their true/false ports.
+
+Select consecutive steps and choose **包进… → 遍历数组** to reuse them for each
+item. Enter a custom JSON array or generate a numeric range, then reference the
+current item in text actions, assignments, and conditions. For example, iterate
+`[1,2,3,4,5,6,7,8,9,10]` with variable `server`, click **`{server}服`**, perform
+the actions, and return to the server-selection screen inside the same body.
+Enable exact text matching so `1服` does not also match `11服`. A failed action
+inside a block stops execution unless its failure policy explicitly skips it.
+
+Also includes a snippet library, task packages (`.zip` with nested templates),
+on-preview coordinate/color picking, template crop, single-step test run;
+global hotkeys (F6 run/stop, ESC stop), scheduler, and an image/color
+**monitor/trigger** with tray icon; a **Test** tab to load and run visual test
+suites.
 
 ### Smart recorder
 

{pyclickerrpa-0.5.0 → pyclickerrpa-0.6.0}/autoclicker/gui/flow_editor.py

@@ -13,10 +13,10 @@ from collections import deque
 from PySide6.QtCore import QLineF, QPointF, Qt, Signal
 from PySide6.QtGui import QColor, QKeySequence, QPainter, QPen
 from PySide6.QtWidgets import (
-    QDialog, QGraphicsScene, QGraphicsView, QInputDialog, QMenu,
+    QDialog, QGraphicsScene, QGraphicsView, QInputDialog, QMenu, QMessageBox,
 )
 
-from autoclicker.models import Step, StepType, Task
+from autoclicker.models import Step, StepType, Task, BLOCK_TYPES, iter_steps
 from autoclicker.gui.flow_node import FlowNode, FlowPort
 from autoclicker.gui.flow_connection import FlowConnection
 
@@ -29,16 +29,13 @@ _ADD_MENU = {
     "手势": [("拖拽", StepType.Drag), ("多点拖拽", StepType.MultiDrag),
              ("捏合", StepType.Pinch), ("滚轮", StepType.Scroll)],
     "识别/变量": [("读取文字→变量", StepType.ReadText), ("设置变量", StepType.SetVar)],
-    "条件": [("条件(图片)", StepType.IfImageFound), ("条件(文字)", StepType.IfTextFound),
-             ("条件(颜色)", StepType.IfColorMatch), ("条件(图片数量)", StepType.IfImageCount),
-             ("条件(变量)", StepType.IfVar), ("If/Else", StepType.IfElse)],
+    "条件/循环": [("如果 / 否则", StepType.IfBlock), ("遍历数组", StepType.ForEach),
+                  ("重复指定次数", StepType.RepeatBlock), ("条件循环 (While)", StepType.WhileBlock),
+                  ("退出当前循环", StepType.Break), ("进入下一轮", StepType.Continue)],
     "流程": [("等待", StepType.Wait), ("随机等待", StepType.RandomWait),
              ("等待画面稳定", StepType.WaitStable),
              ("等待图片出现", StepType.WaitImage), ("等待图片消失", StepType.WaitImageGone),
-             ("循环直到", StepType.DoUntil), ("While 条件", StepType.WhileCondition),
-             ("跳转", StepType.Goto), ("调用子任务", StepType.CallSub),
-             ("分组开始", StepType.GroupBegin), ("分组结束", StepType.GroupEnd),
-             ("结束任务", StepType.Stop)],
+             ("调用子任务", StepType.CallSub), ("结束任务", StepType.Stop)],
     "窗口/高级": [("刷新/激活窗口", StepType.ActivateWindow), ("合成拖拽", StepType.MergeImage),
                   ("HTTP 请求", StepType.HttpRequest), ("运行脚本(Python)", StepType.RunScript)],
 }
@@ -143,14 +140,12 @@ class FlowEditor(QGraphicsView):
                 self._drag_line = None
             item = self.itemAt(event.position().toPoint())
             if isinstance(item, FlowPort) and item.port_type == FlowPort.INPUT and item is not self._drag_start_port:
-                conn = self.connect_nodes(self._drag_start_port, item)
-                if conn:
-                    from_node = self._drag_start_port.parentItem()
-                    to_node = item.parentItem()
-                    if to_node.pos().y() < from_node.pos().y():  # back-edge
-                        count, ok = QInputDialog.getInt(self, "循环次数", "重复次数 (-1 = 无限):", -1, -1, 99999, 1)
-                        if ok:
-                            conn.set_repeat_count(count)
+                from_node = self._drag_start_port.parentItem()
+                to_node = item.parentItem()
+                if from_node in self._reachable(to_node, set()):
+                    QMessageBox.information(self, "使用循环块", "无需连接回线：选中需要重复的步骤，右键选择「将选中步骤包进…」。")
+                else:
+                    self.connect_nodes(self._drag_start_port, item)
             self._drag_start_port = None
             return
         super().mouseReleaseEvent(event)
@@ -237,6 +232,10 @@ class FlowEditor(QGraphicsView):
             menu.addAction("删除", self._delete_selected)
         if self.selected_nodes():
             menu.addAction("复制选中节点 (Ctrl+C)", self._copy_selected)
+            wrap_menu = menu.addMenu("将选中步骤包进…")
+            for label, st in [("遍历数组", StepType.ForEach), ("重复指定次数", StepType.RepeatBlock),
+                              ("条件循环", StepType.WhileBlock), ("如果 / 否则", StepType.IfBlock)]:
+                wrap_menu.addAction(label, lambda st=st: self.wrap_selection(st))
         if self._clip and self._clip["steps"]:
             menu.addAction("粘贴 (Ctrl+V)", self._paste_clip)
         if node or conn or self.selected_nodes() or self._clip:
@@ -246,9 +245,68 @@ class FlowEditor(QGraphicsView):
         for group, items in _ADD_MENU.items():
             sub = add_menu.addMenu(group)
             for label, st in items:
-                sub.addAction(label, lambda st=st, p=scene_pos: self.add_node(Step(type=st), p))
+                sub.addAction(label, lambda st=st, p=scene_pos: self._add_configured_node(st, p))
         menu.exec(event.globalPos())
 
+    def _add_configured_node(self, step_type, pos):
+        from autoclicker.gui.task_widget import StepEditorDialog, new_step
+        dlg = StepEditorDialog(new_step(step_type), self)
+        if dlg.exec() == QDialog.Accepted:
+            self.add_node(dlg.result_step(), pos)
+
+    def wrap_selection(self, step_type):
+        from autoclicker.gui.task_widget import StepEditorDialog, new_step
+        selected = set(self.selected_nodes())
+        if not selected or step_type not in BLOCK_TYPES:
+            return
+        starts = [n for n in selected if not any(
+            c.from_port.parentItem() in selected for c in n.input_port.connections)]
+        ordered = []
+        node = starts[0] if len(starts) == 1 else None
+        while node is not None and node not in ordered:
+            ordered.append(node)
+            edges = [c for p in node.output_ports() for c in p.connections
+                     if c.to_port.parentItem() in selected]
+            node = edges[0].to_port.parentItem() if len(edges) == 1 else None
+        incoming = [c for n in selected for c in n.input_port.connections
+                    if c.from_port.parentItem() not in selected]
+        outgoing = [c for n in selected for p in n.output_ports() for c in p.connections
+                    if c.to_port.parentItem() not in selected]
+        internal = [c for n in selected for p in n.output_ports() for c in p.connections
+                    if c.to_port.parentItem() in selected]
+        linear = (len(ordered) == len(selected) and len(internal) == len(selected) - 1
+                  and all(c.to_port.parentItem() is ordered[0] for c in incoming)
+                  and all(c.from_port.parentItem() is ordered[-1] for c in outgoing)
+                  and all(c.repeat_count == 1 for c in internal + incoming + outgoing)
+                  and not any(n.is_condition() for n in selected))
+        legacy = {StepType.Loop, StepType.Goto, StepType.DoUntil, StepType.WhileCondition,
+                  StepType.IfImageFound, StepType.IfTextFound, StepType.IfColorMatch,
+                  StepType.IfImageCount, StepType.IfVar, StepType.IfElse,
+                  StepType.GroupBegin, StepType.GroupEnd}
+        if not linear or any(s.type in legacy or s.failGoto >= 0
+                             for s in iter_steps([n.step() for n in self.nodes])):
+            QMessageBox.warning(self, "无法包进块", "请选择连续、无分叉的步骤；流程中的旧式步骤号跳转须先改为条件/循环块。")
+            return
+        block = new_step(step_type)
+        block.body = [copy.deepcopy(n.step()) for n in ordered]
+        dlg = StepEditorDialog(block, self)
+        if dlg.exec() != QDialog.Accepted:
+            return
+        block = dlg.result_step()
+        pos = ordered[0].pos()
+        sources = [c.from_port for c in incoming]
+        targets = [c.to_port for c in outgoing]
+        self._scene.clearSelection()
+        for n in selected:
+            n.setSelected(True)
+        self._delete_selected()
+        wrapped = self.add_node(block, pos)
+        for source in sources:
+            self.connect_nodes(source, wrapped.input_port)
+        for target in targets:
+            self.connect_nodes(wrapped.output_port, target)
+        wrapped.setSelected(True)
+
     # ---- helpers ----
     def _node_at(self, view_pos) -> FlowNode | None:
         item = self.itemAt(view_pos)

{pyclickerrpa-0.5.0 → pyclickerrpa-0.6.0}/autoclicker/gui/flow_node.py

@@ -7,9 +7,15 @@ from PySide6.QtCore import QRectF, Qt
 from PySide6.QtGui import QColor, QPen
 from PySide6.QtWidgets import QGraphicsEllipseItem, QGraphicsItem, QGraphicsTextItem
 
-from autoclicker.models import Step, StepType
+from autoclicker.models import Step, StepType, BLOCK_TYPES
 
 _COLORS = {
+    StepType.IfBlock: (123, 65, 156),
+    StepType.ForEach: (0, 121, 107),
+    StepType.RepeatBlock: (192, 92, 40),
+    StepType.WhileBlock: (192, 92, 40),
+    StepType.Break: (96, 125, 139),
+    StepType.Continue: (96, 125, 139),
     StepType.ClickImage: (66, 133, 244),
     StepType.ClickText: (52, 168, 83),
     StepType.ClickPosition: (251, 188, 4),
@@ -141,7 +147,20 @@ class FlowNode(QGraphicsItem):
         painter.drawRoundedRect(QRectF(0, 0, self.WIDTH, self.HEIGHT), 8, 8)
 
     def _update_label(self):
-        self._label.setPlainText(self._step.display_name())
+        label = self._step.display_name()
+        if self._step.type in BLOCK_TYPES:
+            title = {StepType.IfBlock: "如果 / 否则", StepType.ForEach: "遍历数组",
+                     StepType.RepeatBlock: "重复指定次数", StepType.WhileBlock: "条件循环"}[self._step.type]
+            count = len(self._step.body) + len(self._step.elseBody)
+            self._label.setPlainText(f"{title} · {count} 步\n双击编辑块内步骤")
+            body = "\n".join(f"  {s.display_name()}" for s in self._step.body)
+            other = "\n".join(f"  {s.display_name()}" for s in self._step.elseBody)
+            label += f"\n执行步骤:\n{body or '  (空)'}"
+            if self._step.type == StepType.IfBlock:
+                label += f"\n否则:\n{other or '  (空)'}"
+        else:
+            self._label.setPlainText(label)
+        self.setToolTip(label)
         self._label.setPos(8, 8)
 
     def _color(self) -> QColor:

{pyclickerrpa-0.5.0 → pyclickerrpa-0.6.0}/autoclicker/gui/main_window.py

@@ -955,7 +955,8 @@ class MainWindow(QMainWindow):
     # ---- task package (.zip: task.json + images/) ----
     def _iter_image_slots(self, task: Task):
         """Yield (get, set) callables for every image path field in the task."""
-        for s in task.steps:
+        from autoclicker.models import iter_steps
+        for s in iter_steps(task.steps):
             if s.imagePath:
                 yield (lambda s=s: s.imagePath), (lambda v, s=s: setattr(s, "imagePath", v))
             for i in range(len(s.imagePaths)):