hap-cli 0.7.0__tar.gz → 0.7.1__tar.gz

{hap_cli-0.7.0 → hap_cli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0

{hap_cli-0.7.0 → hap_cli-0.7.1}/app_live_tests/__init__.py

@@ -1,4 +1,4 @@
-"""Repeatable live smoke tests for the hap-app-editor skill.
+"""Repeatable live smoke tests for the hap-cli-app-editor skill.
 
 This is a top-level, stdlib-only package (no ``test_*.py`` files, so the
 default pytest run never collects it — mirror of ``live_tests/``). It

{hap_cli-0.7.0 → hap_cli-0.7.1}/app_live_tests/config.py

@@ -12,7 +12,7 @@ PYTHON_BIN = os.environ.get("HAP_EDITOR_PYTHON", "")  # "" -> sys.executable
 
 _PKG_DIR = Path(__file__).resolve().parent
 REPO_ROOT = _PKG_DIR.parent
-SKILL_DIR = REPO_ROOT / "skills" / "hap-app-editor"
+SKILL_DIR = REPO_ROOT / "skills" / "hap-cli-app-editor"
 
 STATE_DIR = _PKG_DIR / "state"
 STATE_FILE = STATE_DIR / "current_app.json"

{hap_cli-0.7.0 → hap_cli-0.7.1}/hap_cli/__init__.py

@@ -1,3 +1,3 @@
 """CLI harness for MingDAO HAP (hap-cli)."""
 
-__version__ = "0.7.0"
+__version__ = "0.7.1"

{hap_cli-0.7.0 → hap_cli-0.7.1}/hap_cli/commands/instance_cmd.py

@@ -294,18 +294,24 @@ def instance_history_detail(ctx, instance_id):
 
 @instance.command("batch")
 @click.option("--action", "-a", required=True, type=int, help="4=batch approve, 5=batch reject")
-@click.option("--type", "type_", default=-1, type=int, help="Task type filter")
+@click.option("--type", "type_", default=4, type=int, help="Task type the selection came from (4=pending approval)")
 @click.option("--process-id", default="", help="Filter by process")
-@click.option("--select", "-s", multiple=True, help="Selected instance IDs")
+@click.option("--select", "-s", multiple=True, help="Task to act on, as TASK_ID:WORK_ID (repeatable)")
+@click.option("--opinion", default="", help="Comment applied to each task")
 @pass_context
-def instance_batch(ctx, action, type_, process_id, select):
-    """Batch approve or reject tasks."""
+def instance_batch(ctx, action, type_, process_id, select, opinion):
+    """Batch approve or reject tasks.
+
+    Pass each task as TASK_ID:WORK_ID (the IDs from the pending list); repeat
+    --select for more than one.
+    """
     try:
         session = ctx.get_session()
         data = inst_mod.batch_operation(
             session, action,
             type_=type_, process_id=process_id,
             selects=list(select) if select else None,
+            opinion=opinion,
         )
         ctx.output(data, lambda d: click.echo(f"Batch operation completed: {d}"))
     except Exception as e:

{hap_cli-0.7.0 → hap_cli-0.7.1}/hap_cli/core/instance.py

@@ -119,7 +119,8 @@ def get_instance_detail(
     data: dict[str, Any] = {"id": instance_id}
     if work_id:
         data["workId"] = work_id
-    return session.workflow_call("v2/instance/get", data)
+    # pd-openweb instanceVersion.js:30-34 (get2) pins type='GET'; POST returns 404.
+    return session.workflow_call("v2/instance/get", data, method="GET")
 
 
 def get_operation_detail(
@@ -140,7 +141,8 @@ def get_operation_detail(
     data: dict[str, Any] = {"id": instance_id}
     if work_id:
         data["workId"] = work_id
-    return session.workflow_call("instance/getOperationDetail", data)
+    # pd-openweb instance.js:101-105 pins type='GET'; POST returns 404.
+    return session.workflow_call("instance/getOperationDetail", data, method="GET")
 
 
 def get_operation_history(
@@ -156,9 +158,11 @@ def get_operation_history(
     Returns:
         List of operation records
     """
+    # pd-openweb instance.js:114-118 pins type='GET'; POST returns 404.
     result = session.workflow_call(
         "instance/getOperationHistoryList",
         {"instanceId": instance_id},
+        method="GET",
     )
     return result if isinstance(result, list) else result.get("list", [])
 
@@ -408,48 +412,52 @@ def urge(
 def batch_operation(
     session: Session,
     batch_operation_type: int,
-    instance_id: str = "",
-    work_id: str = "",
-    page_index: int = 1,
-    page_size: int = 50,
-    type_: int = -1,
-    apk_id: str = "",
+    type_: int = 4,
     process_id: str = "",
     selects: Optional[list] = None,
+    opinion: str = "",
 ) -> dict[str, Any]:
-    """Batch approve/reject/forward tasks.
+    """Batch approve/reject pending tasks.
 
     Args:
         session: Active session
-        batch_operation_type: 4=pass, 5=reject
-        instance_id: Instance ID (for single)
-        work_id: Work item ID
-        page_index: Page
-        page_size: Size
-        type_: Task type filter
-        apk_id: App filter
-        process_id: Process filter
-        selects: Selected item IDs for batch
+        batch_operation_type: 4=pass (approve), 5=overrule (reject)
+        type_: Task-type context the selection came from (4=pending approval).
+        process_id: Optional process filter (echoed back to the server).
+        selects: The work items to act on. Each entry is either a
+            ``{"id": <instanceId>, "workId": <workId>, "opinion": <str>}``
+            dict or an ``"<instanceId>:<workId>"`` string. The wire requires
+            one object per item carrying ``id``/``workId``/``opinion`` and
+            ``opinionType: 3`` (batch). A bare id list is rejected (HTTP 400).
+        opinion: Default opinion applied to items that don't carry their own.
 
     Returns:
         Batch result
     """
+    # pd-openweb instanceVersion.js batch2 (/v2/instance/batch, POST) — the
+    # payload is {type, batchOperationType, selects:[{id, workId, opinion,
+    # opinionType:3}]} (MyProcess/index.jsx). Paging fields are NOT part of
+    # the batch body; sending them (and bare-id selects) is what 400s.
+    sel: list[dict[str, Any]] = []
+    for s in selects or []:
+        if isinstance(s, dict):
+            item = {
+                "id": s.get("id", ""),
+                "workId": s.get("workId", ""),
+                "opinion": s.get("opinion", opinion),
+                "opinionType": 3,
+            }
+        else:
+            inst_id, _, w_id = str(s).partition(":")
+            item = {"id": inst_id, "workId": w_id, "opinion": opinion, "opinionType": 3}
+        sel.append(item)
     data: dict[str, Any] = {
-        "batchOperationType": batch_operation_type,
-        "pageIndex": page_index,
-        "pageSize": page_size,
         "type": type_,
+        "batchOperationType": batch_operation_type,
+        "selects": sel,
     }
-    if instance_id:
-        data["id"] = instance_id
-    if work_id:
-        data["workId"] = work_id
-    if apk_id:
-        data["apkId"] = apk_id
     if process_id:
         data["processId"] = process_id
-    if selects:
-        data["selects"] = selects
     return session.workflow_call("v2/instance/batch", data)
 
 
@@ -519,9 +527,11 @@ def get_history_detail(
     Returns:
         History detail with node execution info
     """
+    # pd-openweb instance.js:52-56 pins type='GET'; POST returns 404.
     return session.workflow_call(
         "instance/getHistoryDetail",
         {"instanceId": instance_id},
+        method="GET",
     )
 
 
@@ -538,8 +548,9 @@ def end_instance(session: Session, instance_id: str) -> dict[str, Any]:
     Returns:
         Termination result
     """
+    # pd-openweb instanceVersion.js:135-139 pins type='GET'; POST returns 404.
     return session.workflow_call(
-        "v1/instance/endInstance", {"instanceId": instance_id}
+        "v1/instance/endInstance", {"instanceId": instance_id}, method="GET"
     )
 
 
@@ -553,8 +564,9 @@ def reset_instance(session: Session, instance_id: str) -> dict[str, Any]:
     Returns:
         Reset result
     """
+    # pd-openweb instanceVersion.js:228-232 pins type='GET'; POST returns 404.
     return session.workflow_call(
-        "v1/instance/resetInstance", {"instanceId": instance_id}
+        "v1/instance/resetInstance", {"instanceId": instance_id}, method="GET"
     )
 
 
@@ -700,7 +712,8 @@ def get_work_item(
     data: dict[str, Any] = {"id": instance_id}
     if work_id:
         data["workId"] = work_id
-    return session.workflow_call("v1/instance/getWorkItem", data)
+    # pd-openweb instanceVersion.js:215-219 pins type='GET'; POST returns 404.
+    return session.workflow_call("v1/instance/getWorkItem", data, method="GET")
 
 
 def get_archived_list(session: Session) -> list[dict[str, Any]]:

{hap_cli-0.7.0 → hap_cli-0.7.1}/hap_cli/core/workflow_node_dsl.py

@@ -402,8 +402,16 @@ def translate_accounts(
                             "roleName": acc.get("roleName", ""),
                             "avatar": "", "count": 0})
         elif kind == "user":
-            out.append({"type": 2, "entityId": acc.get("userId", ""),
-                        "entityName": acc.get("userName", "")})
+            # A specific named member. Ground truth: pd-openweb's shared
+            # SelectUserDropDown (WorkflowSettings/.../SelectUserDropDown,
+            # USER_TYPE.USER) — a fixed user is **type 1** with the accountId
+            # in ``roleId`` (NOT type 2, and NOT in entityId). type 2 is a
+            # role; an accountId placed in entityId can't bind and the server
+            # renders the recipient "已删除", failing publish (warningType 105).
+            # Same shape for approve and cc/notice — the picker is shared.
+            out.append({"type": 1, "entityId": "", "entityName": "",
+                        "roleId": acc.get("userId", ""),
+                        "roleName": acc.get("userName", ""), "avatar": ""})
         elif kind in ("owner", "triggerUser"):
             # The record owner / trigger user: a type-6 ref keyed off a
             # node (default the trigger) with the special "uaid" roleId.

{hap_cli-0.7.0 → hap_cli-0.7.1}/hap_cli/tests/test_core.py

@@ -1184,11 +1184,16 @@ class TestInstance:
         result = inst_mod.get_todo_list(mock_session, type_=4)
         assert result["count"] == 1
 
+    @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
-    def test_get_instance_detail(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response({"id": "inst1", "status": 1})
+    def test_get_instance_detail(self, mock_post, mock_get, mock_session):
+        """v2/instance/get is GET (instanceVersion.js:30-34)."""
+        mock_get.return_value = _mock_response({"id": "inst1", "status": 1})
         result = inst_mod.get_instance_detail(mock_session, "inst1")
         assert result["status"] == 1
+        assert mock_get.called
+        assert not mock_post.called
+        assert mock_get.call_args[0][0].endswith("/v2/instance/get")
 
     @patch("hap_cli.core.session.requests.post")
     def test_approve(self, mock_post, mock_session):
@@ -1243,19 +1248,8 @@ class TestInstance:
         body = mock_post.call_args[1]["json"]
         assert body["operationType"] == 18
 
-    @patch("hap_cli.core.session.requests.post")
-    def test_end_instance(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response(True)
-        inst_mod.end_instance(mock_session, "inst1")
-        body = mock_post.call_args[1]["json"]
-        assert body["instanceId"] == "inst1"
-
-    @patch("hap_cli.core.session.requests.post")
-    def test_reset_instance(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response(True)
-        inst_mod.reset_instance(mock_session, "inst1")
-        body = mock_post.call_args[1]["json"]
-        assert body["instanceId"] == "inst1"
+    # end_instance / reset_instance GET-verb guards live in
+    # test_end_instance_is_get / test_reset_instance_is_get below.
 
     @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
@@ -1271,27 +1265,67 @@ class TestInstance:
         assert not mock_post.called
         assert mock_get.call_args[0][0].endswith("/instance/getHistoryList")
 
+    @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
-    def test_get_history_detail(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response({"instanceId": "inst1", "nodes": []})
+    def test_get_history_detail(self, mock_post, mock_get, mock_session):
+        """instance/getHistoryDetail is GET (instance.js:52-56)."""
+        mock_get.return_value = _mock_response({"instanceId": "inst1", "nodes": []})
         result = inst_mod.get_history_detail(mock_session, "inst1")
         assert result["instanceId"] == "inst1"
+        assert mock_get.called
+        assert not mock_post.called
+        assert mock_get.call_args[0][0].endswith("/instance/getHistoryDetail")
 
+    @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
-    def test_get_operation_history(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response([{"action": "pass", "time": "2024-01-01"}])
+    def test_get_operation_history(self, mock_post, mock_get, mock_session):
+        """instance/getOperationHistoryList is GET (instance.js:114-118)."""
+        mock_get.return_value = _mock_response([{"action": "pass", "time": "2024-01-01"}])
         result = inst_mod.get_operation_history(mock_session, "inst1")
         assert len(result) == 1
+        assert mock_get.called
+        assert not mock_post.called
+        assert mock_get.call_args[0][0].endswith("/instance/getOperationHistoryList")
 
     @patch("hap_cli.core.session.requests.post")
     def test_batch_operation(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response({"success": 5})
-        result = inst_mod.batch_operation(
-            mock_session, 4, process_id="wf1", selects=["s1", "s2"],
+        # v2/instance/batch wants {type, batchOperationType, selects:[{id,
+        # workId, opinion, opinionType:3}]}. Bare-id selects / paging fields
+        # are rejected (HTTP 400). "id:workId" strings normalise to objects.
+        mock_post.return_value = _mock_response({"success": [], "fail": []})
+        inst_mod.batch_operation(
+            mock_session, 4, process_id="wf1",
+            selects=["i1:w1", {"id": "i2", "workId": "w2", "opinion": "ok"}],
         )
         body = mock_post.call_args[1]["json"]
+        assert mock_post.call_args[0][0].endswith("/v2/instance/batch")
+        assert body["type"] == 4
         assert body["batchOperationType"] == 4
-        assert body["selects"] == ["s1", "s2"]
+        assert "pageIndex" not in body and "pageSize" not in body
+        assert body["selects"] == [
+            {"id": "i1", "workId": "w1", "opinion": "", "opinionType": 3},
+            {"id": "i2", "workId": "w2", "opinion": "ok", "opinionType": 3},
+        ]
+
+    @patch("hap_cli.core.session.requests.get")
+    @patch("hap_cli.core.session.requests.post")
+    def test_end_instance_is_get(self, mock_post, mock_get, mock_session):
+        """v1/instance/endInstance is GET (instanceVersion.js:135-139)."""
+        mock_get.return_value = _mock_response({"status": 4})
+        inst_mod.end_instance(mock_session, "i1")
+        assert mock_get.called and not mock_post.called
+        assert mock_get.call_args[0][0].endswith("/v1/instance/endInstance")
+        assert mock_get.call_args[1]["params"] == {"instanceId": "i1"}
+
+    @patch("hap_cli.core.session.requests.get")
+    @patch("hap_cli.core.session.requests.post")
+    def test_reset_instance_is_get(self, mock_post, mock_get, mock_session):
+        """v1/instance/resetInstance is GET (instanceVersion.js:228-232)."""
+        mock_get.return_value = _mock_response({"status": 1})
+        inst_mod.reset_instance(mock_session, "i1")
+        assert mock_get.called and not mock_post.called
+        assert mock_get.call_args[0][0].endswith("/v1/instance/resetInstance")
+        assert mock_get.call_args[1]["params"] == {"instanceId": "i1"}
 
 
 # ── Role Tests ───────────────────────────────────────────────────────────
@@ -5610,14 +5644,29 @@ class TestApprovalBatchLifecycle:
 class TestApprovalWorkItemAndArchive:
     """Wave 8 — single work-item + archived-service lookups."""
 
+    @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
-    def test_get_work_item_sends_id_and_workId(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response({"id": "i1", "workId": "w1"})
+    def test_get_work_item_sends_id_and_workId(self, mock_post, mock_get, mock_session):
+        """v1/instance/getWorkItem is GET (instanceVersion.js:215-219)."""
+        mock_get.return_value = _mock_response({"id": "i1", "workId": "w1"})
         inst_mod.get_work_item(mock_session, "i1", work_id="w1")
-        url = mock_post.call_args[0][0]
-        body = mock_post.call_args[1]["json"]
+        assert mock_get.called
+        assert not mock_post.called
+        url = mock_get.call_args[0][0]
         assert url.endswith("/v1/instance/getWorkItem")
-        assert body == {"id": "i1", "workId": "w1"}
+        assert mock_get.call_args[1]["params"] == {"id": "i1", "workId": "w1"}
+
+    @patch("hap_cli.core.session.requests.get")
+    @patch("hap_cli.core.session.requests.post")
+    def test_get_operation_detail_is_get(self, mock_post, mock_get, mock_session):
+        """instance/getOperationDetail is GET (instance.js:101-105)."""
+        mock_get.return_value = _mock_response({"workItems": [], "nextUserRange": []})
+        inst_mod.get_operation_detail(mock_session, "i1", work_id="w1")
+        assert mock_get.called
+        assert not mock_post.called
+        url = mock_get.call_args[0][0]
+        assert url.endswith("/instance/getOperationDetail")
+        assert mock_get.call_args[1]["params"] == {"id": "i1", "workId": "w1"}
 
     @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
@@ -6931,6 +6980,22 @@ class TestWorkflowNodeDslPrimitives:
         assert out[0]["type"] == 2 and out[0]["entityId"] == "app1"
         assert out[0]["roleId"] == "r1"
 
+    def test_user_account_is_type1_with_account_in_roleid(self):
+        # A specific named member: pd-openweb's shared SelectUserDropDown
+        # (USER_TYPE.USER) encodes a fixed user as type 1 with the accountId
+        # in roleId — NOT type 2, and NOT the accountId in entityId. type 2 is
+        # a role; a misplaced accountId can't bind and publish fails 105.
+        from hap_cli.core import workflow_node_dsl as dsl
+        for for_approve in (False, True):
+            out = dsl.translate_accounts(
+                [{"kind": "user", "userId": "acc-123", "userName": "田然"}],
+                for_approve=for_approve,
+            )
+            assert out[0]["type"] == 1, out[0]
+            assert out[0]["roleId"] == "acc-123", out[0]
+            assert out[0]["entityId"] == "", out[0]
+            assert out[0]["roleName"] == "田然"
+
     def test_operator_to_condition_id_matches_enum(self):
         from hap_cli.core import workflow_node_dsl as dsl
         # Spot-check against pd-openweb CONDITION_TYPE.

{hap_cli-0.7.0 → hap_cli-0.7.1}/hap_cli/tests/test_integration_approval.py

@@ -44,6 +44,23 @@ def _sample_process_id(integration_session, app_id):
     return items[0].get("id") or items[0].get("processId")
 
 
+@pytest.fixture(scope="module")
+def _sample_todo(integration_session):
+    """A real (instance_id, work_id) pair drawn from the pending-task list.
+
+    The per-instance read endpoints (``get`` / ``getOperationDetail`` /
+    ``getWorkItem`` …) only resolve for a live work item the current user can
+    see, so we pull one straight from ``getTodoList``. Skip the whole class
+    when the inbox is empty — there is nothing to read.
+    """
+    result = inst.get_todo_list(integration_session, page_size=5)
+    items = (result or {}).get("data") or []
+    if not items:
+        pytest.skip("no pending approval tasks in inbox — cannot test per-instance reads")
+    item = items[0]
+    return item.get("id"), item.get("workId", "")
+
+
 @pytest.fixture(scope="module")
 def _dummy_account_id(integration_session, project_id):
     """Pick any real accountId from the project directory for the delegation
@@ -128,6 +145,72 @@ class TestApproval:
         assert isinstance(result["count"], int)
 
 
+# ── Per-instance read-side tests ─────────────────────────────────────────────
+
+
+class TestInstanceRead:
+    """GET-vs-POST regression guards for the per-instance read endpoints.
+
+    All five 404'd in production because the wrappers issued POST while
+    pd-openweb pins ``base.ajaxOptions.type = 'GET'`` on each:
+
+      - ``v2/instance/get``                 (instanceVersion.js:30-34)
+      - ``instance/getOperationDetail``     (instance.js:101-105)
+      - ``instance/getOperationHistoryList``(instance.js:114-118)
+      - ``v1/instance/getWorkItem``         (instanceVersion.js:215-219)
+      - ``instance/getHistoryDetail``       (instance.js:52-56)
+
+    Each test exercises the wrapper end-to-end against a live work item so a
+    verb regression surfaces immediately as a 404.
+    """
+
+    def test_01_get_detail(self, integration_session, _sample_todo):
+        """v2/instance/get must be GET; returns the instance flow detail."""
+        instance_id, work_id = _sample_todo
+        result = inst.get_instance_detail(
+            integration_session, instance_id, work_id=work_id
+        )
+        assert_dict_like(result)
+        # Flow detail always carries the works array + a title.
+        assert "works" in result or "currentWork" in result, (
+            f"unexpected instance detail shape: {list(result)!r}"
+        )
+
+    def test_02_operations(self, integration_session, _sample_todo):
+        """instance/getOperationDetail must be GET; returns available ops."""
+        instance_id, work_id = _sample_todo
+        result = inst.get_operation_detail(
+            integration_session, instance_id, work_id=work_id
+        )
+        assert_dict_like(result)
+
+    def test_03_operation_history(self, integration_session, _sample_todo):
+        """instance/getOperationHistoryList must be GET; returns a list."""
+        instance_id, _ = _sample_todo
+        result = inst.get_operation_history(integration_session, instance_id)
+        assert_list_like(result, item_type=dict)
+
+    def test_04_work_item(self, integration_session, _sample_todo):
+        """v1/instance/getWorkItem must be GET; returns the work-item entity."""
+        instance_id, work_id = _sample_todo
+        result = inst.get_work_item(
+            integration_session, instance_id, work_id=work_id
+        )
+        # Endpoint returns a dict entity (or null for already-completed work).
+        assert result is None or isinstance(result, dict), (
+            f"work-item should be dict/None, got {type(result).__name__}"
+        )
+
+    def test_05_history_detail(self, integration_session, _sample_todo):
+        """instance/getHistoryDetail must be GET; returns execution detail."""
+        instance_id, _ = _sample_todo
+        result = inst.get_history_detail(integration_session, instance_id)
+        assert_dict_like(result)
+        assert "works" in result or "status" in result, (
+            f"unexpected history detail shape: {list(result)!r}"
+        )
+
+
 # ── Delegation CRUD ────────────────────────────────────────────────────────