hap-cli 0.8.2__tar.gz → 0.8.3__tar.gz

{hap_cli-0.8.2 → hap_cli-0.8.3}/PKG-INFO

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

{hap_cli-0.8.2 → hap_cli-0.8.3}/hap_cli/__init__.py

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

{hap_cli-0.8.2 → hap_cli-0.8.3}/hap_cli/commands/node_cmd.py

@@ -372,12 +372,16 @@ def node_form_property(ctx, process_id, node_id):
 
 @node.command("sub-processes")
 @click.argument("process_id")
+@click.argument("node_id")
 @pass_context
-def node_sub_processes(ctx, process_id):
-    """List available sub-processes."""
+def node_sub_processes(ctx, process_id, node_id):
+    """List sub-processes available to a sub-process node.
+
+    NODE_ID is the node being configured.
+    """
     try:
         session = ctx.get_session()
-        data = node_mod.get_sub_process_list(session, process_id)
+        data = node_mod.get_sub_process_list(session, process_id, select_node_id=node_id)
         ctx.output(data, lambda d: output_json(d))
     except Exception as e:
         ctx.handle_error(e)

{hap_cli-0.8.2 → hap_cli-0.8.3}/hap_cli/core/flow_node.py

@@ -274,7 +274,9 @@ def get_node_detail(
         data["appId"] = app_id
     if instance_id:
         data["instanceId"] = instance_id
-    return session.workflow_call("flowNode/getNodeDetail", data)
+    # Evidence: pd-openweb flowNode.js pins ``base.ajaxOptions.type = 'GET'``
+    # for this action; POSTing it returns 404 Not Found.
+    return session.workflow_call("flowNode/getNodeDetail", data, method="GET")
 
 
 # ── Node Update ──────────────────────────────────────────────────────────
@@ -572,7 +574,9 @@ def get_webhook_data(
     data: dict[str, Any] = {"processId": process_id, "nodeId": node_id}
     if select_node_id:
         data["selectNodeId"] = select_node_id
-    return session.workflow_call("flowNode/getWebHookData", data)
+    # Evidence: pd-openweb flowNode.js pins ``base.ajaxOptions.type = 'GET'``
+    # for this action; POSTing it returns 404 Not Found.
+    return session.workflow_call("flowNode/getWebHookData", data, method="GET")
 
 
 # ── Utilities ────────────────────────────────────────────────────────────
@@ -617,7 +621,9 @@ def get_node_form_property(
     data: dict[str, Any] = {"processId": process_id, "nodeId": node_id}
     if select_node_id:
         data["selectNodeId"] = select_node_id
-    return session.workflow_call("flowNode/getNodeFormProperty", data)
+    # Evidence: pd-openweb flowNode.js pins ``base.ajaxOptions.type = 'GET'``
+    # for this action; POSTing it returns 404 Not Found.
+    return session.workflow_call("flowNode/getNodeFormProperty", data, method="GET")
 
 
 def get_sub_process_list(
@@ -630,7 +636,9 @@ def get_sub_process_list(
     Args:
         session: Active session
         process_id: Process ID
-        select_node_id: Context node
+        select_node_id: Context node. flowNode.js marks ``selectNodeId``
+            as required (``*选中节点ID``); omitting it makes the server
+            answer code 2000 "节点不存在".
 
     Returns:
         Sub-process list
@@ -638,7 +646,9 @@ def get_sub_process_list(
     data: dict[str, Any] = {"processId": process_id}
     if select_node_id:
         data["selectNodeId"] = select_node_id
-    return session.workflow_call("flowNode/getSubProcessList", data)
+    # Evidence: pd-openweb flowNode.js pins ``base.ajaxOptions.type = 'GET'``
+    # for this action; POSTing it returns 404 Not Found.
+    return session.workflow_call("flowNode/getSubProcessList", data, method="GET")
 
 
 # ── Code Templates ───────────────────────────────────────────────────────
@@ -672,7 +682,9 @@ def get_code_template_list(
         data["source"] = source
     if template_type:
         data["type"] = template_type
-    return session.workflow_call("flowNode/getCodeTemplateList", data)
+    # Evidence: pd-openweb flowNode.js pins ``base.ajaxOptions.type = 'GET'``
+    # for this action; POSTing it returns 404 Not Found.
+    return session.workflow_call("flowNode/getCodeTemplateList", data, method="GET")
 
 
 def create_code_template(
@@ -774,7 +786,9 @@ def get_flow_app_dtos(
         data["enumDefault"] = enum_default
     if field_type:
         data["type"] = field_type
-    return session.workflow_call("flowNode/getFlowAppDtos", data)
+    # Evidence: pd-openweb flowNode.js pins ``base.ajaxOptions.type = 'GET'``
+    # for this action; POSTing it returns 404 Not Found.
+    return session.workflow_call("flowNode/getFlowAppDtos", data, method="GET")
 
 
 def get_start_event_deploy(
@@ -809,7 +823,9 @@ def get_start_event_deploy(
         data["controlId"] = control_id
     if select_node_id:
         data["selectNodeId"] = select_node_id
-    return session.workflow_call("flowNode/getStartEventDeploy", data)
+    # Evidence: pd-openweb flowNode.js pins ``base.ajaxOptions.type = 'GET'``
+    # for this action; POSTing it returns 404 Not Found.
+    return session.workflow_call("flowNode/getStartEventDeploy", data, method="GET")
 
 
 # ── Data Processing Convenience Functions ────────────────────────────────

{hap_cli-0.8.2 → hap_cli-0.8.3}/hap_cli/core/record.py

@@ -56,13 +56,26 @@ def _legacy_cell_value(ctrl: dict[str, Any], value: Any) -> str:
     if t == 10:  # MULTI_SELECT
         return json.dumps(_resolve_option_keys(ctrl, value), ensure_ascii=False)
 
-    if t == 29:  # RELATE_SHEET -> [{"sid": rowId}, ...]
+    if t in (29, 35):  # RELATE_SHEET / CASCADING_SELECT -> [{"sid": rowId}, ...]
+        # Cascade (35) is a relation to a row in another worksheet, persisted
+        # the same way as a plain relate (29): an array of {"sid": rowId}. A
+        # bare rowId makes the server answer "服务异常" (bug #642cc8).
         if isinstance(value, (list, tuple)):
             ids = [str(v) for v in value]
         else:
             ids = [s for s in str(value).split(",") if s != ""]
         return json.dumps([{"sid": rid} for rid in ids], ensure_ascii=False)
 
+    if t == 48:  # ORG_ROLE -> [{"organizeId": id}, ...]
+        # Mirrors DEPARTMENT (27): the legacy AddWorksheetRow takes an array
+        # of {"organizeId": id} objects; organizeName is display-only and the
+        # server resolves it from the id. A bare organizeId is rejected with
+        # "服务异常" (bug #642cc8). See pd-openweb CellControls/OrgRole.jsx.
+        ids = value if isinstance(value, (list, tuple)) else \
+            [s for s in str(value).split(",") if s != ""]
+        return json.dumps([{"organizeId": str(i)} for i in ids],
+                          ensure_ascii=False)
+
     if t == 26:  # USER_PICKER
         ids = value if isinstance(value, (list, tuple)) else \
             [s for s in str(value).split(",") if s != ""]

{hap_cli-0.8.2 → hap_cli-0.8.3}/hap_cli/tests/test_core.py

@@ -486,6 +486,38 @@ class TestRecord:
         # endpoint is the legacy AddWorksheetRow
         assert mock_post.call_args[0][0].endswith("/Worksheet/AddWorksheetRow")
 
+    @patch("hap_cli.core.worksheet.get_worksheet_controls")
+    @patch("hap_cli.core.session.requests.post")
+    def test_legacy_batch_create_serializes_orgrole_and_cascade(
+        self, mock_post, mock_controls, mock_session
+    ):
+        # Org-role (48) and cascading-select (35) cells must be wrapped in
+        # the wire shapes the legacy AddWorksheetRow expects — a bare id
+        # makes the server answer "服务异常". OrgRole -> [{"organizeId": id}];
+        # Cascade is a relation-to-a-row -> [{"sid": rowId}] (like type 29).
+        mock_controls.return_value = [
+            {"controlId": "cOrg", "controlName": "组织角色", "type": 48,
+             "dot": 0},
+            {"controlId": "cCas", "controlName": "级联选择", "type": 35,
+             "dot": 0},
+        ]
+        mock_post.return_value = _mock_response({"rowid": "r_new"})
+
+        rec_mod.batch_create_by_name(
+            mock_session,
+            "ws1",
+            [{
+                "组织角色": "40d102b2-12bc-48d2-9364-f57070502609",
+                "级联选择": "97ebc5ba-4d57",
+            }],
+        )
+
+        rc = {c["controlId"]: c
+              for c in mock_post.call_args[1]["json"]["receiveControls"]}
+        assert json.loads(rc["cOrg"]["value"]) == [
+            {"organizeId": "40d102b2-12bc-48d2-9364-f57070502609"}]
+        assert json.loads(rc["cCas"]["value"]) == [{"sid": "97ebc5ba-4d57"}]
+
     @patch("hap_cli.core.worksheet.get_worksheet_controls")
     @patch("hap_cli.core.session.requests.post")
     def test_cli_batch_create_uses_main_api(
@@ -899,10 +931,18 @@ class TestFlowNode:
         assert not mock_post.called, "flowNode/get must not be POSTed"
         assert "startId" in result
 
+    @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
-    def test_get_node_detail(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response({"nodeId": "n1", "flowNodeType": 4})
+    def test_get_node_detail(self, mock_post, mock_get, mock_session):
+        """``flowNode/getNodeDetail`` is GET per ``flowNode.js`` (pins
+        ``base.ajaxOptions.type = 'GET'``). POSTing returns 404."""
+        mock_get.return_value = _mock_response({"nodeId": "n1", "flowNodeType": 4})
         result = node_mod.get_node_detail(mock_session, "wf1", "n1")
+        assert mock_get.called, "flowNode/getNodeDetail must be issued as GET"
+        assert not mock_post.called
+        params = mock_get.call_args[1]["params"]
+        assert params["processId"] == "wf1"
+        assert params["nodeId"] == "n1"
         assert result["flowNodeType"] == 4
 
     @patch("hap_cli.core.session.requests.post")
@@ -972,12 +1012,18 @@ class TestFlowNode:
         body = mock_post.call_args[1]["json"]
         assert body["json"] == '{"name": "test"}'
 
+    @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
-    def test_get_code_template_list(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response([{"id": "t1", "name": "Template1"}])
+    def test_get_code_template_list(self, mock_post, mock_get, mock_session):
+        """``flowNode/getCodeTemplateList`` is GET per ``flowNode.js``.
+        POSTing returns 404."""
+        mock_get.return_value = _mock_response([{"id": "t1", "name": "Template1"}])
         result = node_mod.get_code_template_list(mock_session, keyword="test")
-        body = mock_post.call_args[1]["json"]
-        assert body["keyword"] == "test"
+        assert mock_get.called, "flowNode/getCodeTemplateList must be issued as GET"
+        assert not mock_post.called
+        params = mock_get.call_args[1]["params"]
+        assert params["keyword"] == "test"
+        assert result[0]["id"] == "t1"
 
     @patch("hap_cli.core.session.requests.post")
     def test_create_code_template(self, mock_post, mock_session):
@@ -987,12 +1033,64 @@ class TestFlowNode:
         assert body["name"] == "My Tmpl"
         assert body["code"] == "console.log('hi')"
 
+    @patch("hap_cli.core.session.requests.get")
     @patch("hap_cli.core.session.requests.post")
-    def test_get_sub_process_list(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response([{"id": "sub1"}])
-        result = node_mod.get_sub_process_list(mock_session, "wf1")
-        body = mock_post.call_args[1]["json"]
-        assert body["processId"] == "wf1"
+    def test_get_sub_process_list(self, mock_post, mock_get, mock_session):
+        """``flowNode/getSubProcessList`` is GET per ``flowNode.js``.
+        POSTing returns 404."""
+        mock_get.return_value = _mock_response([{"id": "sub1"}])
+        result = node_mod.get_sub_process_list(mock_session, "wf1", select_node_id="n1")
+        assert mock_get.called, "flowNode/getSubProcessList must be issued as GET"
+        assert not mock_post.called
+        params = mock_get.call_args[1]["params"]
+        assert params["processId"] == "wf1"
+        # selectNodeId is required by the server (code 2000 without it)
+        assert params["selectNodeId"] == "n1"
+        assert result[0]["id"] == "sub1"
+
+    @patch("hap_cli.core.session.requests.get")
+    @patch("hap_cli.core.session.requests.post")
+    def test_get_node_form_property(self, mock_post, mock_get, mock_session):
+        """``flowNode/getNodeFormProperty`` is GET per ``flowNode.js``.
+        POSTing returns 404."""
+        mock_get.return_value = _mock_response({"controls": []})
+        result = node_mod.get_node_form_property(mock_session, "wf1", "n1")
+        assert mock_get.called, "flowNode/getNodeFormProperty must be issued as GET"
+        assert not mock_post.called
+        params = mock_get.call_args[1]["params"]
+        assert params["processId"] == "wf1"
+        assert params["nodeId"] == "n1"
+        assert "controls" in result
+
+    @patch("hap_cli.core.session.requests.get")
+    @patch("hap_cli.core.session.requests.post")
+    def test_get_webhook_data_uses_get(self, mock_post, mock_get, mock_session):
+        """``flowNode/getWebHookData`` is GET per ``flowNode.js``.
+        POSTing returns 404."""
+        mock_get.return_value = _mock_response({"data": "{}"})
+        node_mod.get_webhook_data(mock_session, "wf1", "n1")
+        assert mock_get.called, "flowNode/getWebHookData must be issued as GET"
+        assert not mock_post.called
+
+    @patch("hap_cli.core.session.requests.get")
+    @patch("hap_cli.core.session.requests.post")
+    def test_get_flow_app_dtos_uses_get(self, mock_post, mock_get, mock_session):
+        """``flowNode/getFlowAppDtos`` is GET per ``flowNode.js``.
+        POSTing returns 404."""
+        mock_get.return_value = _mock_response([{"id": "app1"}])
+        node_mod.get_flow_app_dtos(mock_session, "wf1", "n1")
+        assert mock_get.called, "flowNode/getFlowAppDtos must be issued as GET"
+        assert not mock_post.called
+
+    @patch("hap_cli.core.session.requests.get")
+    @patch("hap_cli.core.session.requests.post")
+    def test_get_start_event_deploy_uses_get(self, mock_post, mock_get, mock_session):
+        """``flowNode/getStartEventDeploy`` is GET per ``flowNode.js``.
+        POSTing returns 404."""
+        mock_get.return_value = _mock_response({"processId": "wf1"})
+        node_mod.get_start_event_deploy(mock_session, "wf1", "n1")
+        assert mock_get.called, "flowNode/getStartEventDeploy must be issued as GET"
+        assert not mock_post.called
 
     @patch("hap_cli.core.session.requests.post")
     def test_add_node_with_action_id(self, mock_post, mock_session):

{hap_cli-0.8.2 → hap_cli-0.8.3}/hap_cli.egg-info/PKG-INFO

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