hap-cli 0.8.15__tar.gz → 0.8.17__tar.gz

{hap_cli-0.8.15 → hap_cli-0.8.17}/PKG-INFO

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

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/__init__.py

@@ -1,3 +1,3 @@
 """CLI harness for Mingdao HAP (hap-cli)."""
 
-__version__ = "0.8.15"
+__version__ = "0.8.17"

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/commands/node_cmd.py

@@ -313,13 +313,21 @@ def node_test_code(ctx, process_id, node_id, code, input_json):
 @click.argument("process_id")
 @click.argument("node_id")
 @click.option("--url", "-u", required=True, help="Target URL")
-@click.option("--method", "-m", default="POST", help="HTTP method")
+@click.option("--method", "-m", default="POST",
+              help="HTTP method: GET, POST, PUT, DELETE, HEAD, or PATCH.")
 @click.option("--body", "-b", default="", help="Request body (JSON string)")
 @click.option("--headers", "-H", default="", help="Headers JSON: [{name,value}]")
-@click.option("--content-type", default="application/json", help="Content-Type")
+@click.option("--content-type", default="json",
+              help="Body format: json, text, form-data, "
+                   "x-www-form-urlencoded, or file.")
 @pass_context
 def node_test_webhook(ctx, process_id, node_id, url, method, body, headers, content_type):
-    """Test a WebHook node."""
+    """Run the "Test API" action of a Send Custom Request node.
+
+    Issues the request the node is configured to make and prints the
+    response. Works for any outbound API call the node performs, not just
+    webhook callbacks.
+    """
     try:
         session = ctx.get_session()
         headers_list = json.loads(headers) if headers else None

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/commands/worksheet_cmd.py

@@ -189,12 +189,23 @@ def worksheet_create(ctx, app_id, name, org_id, section_id, icon, icon_color,
 @click.option("--app-id", "-a", default="", help="Application ID")
 @org_id_option()
 @click.option("--copy-rows", is_flag=True, default=False, help="Copy rows as well")
+@click.option("--section-id", default="",
+              help="Sidebar group the copy lands in. Auto-resolved from the "
+                   "source worksheet's group when omitted (requires --app-id).")
 @pass_context
-def worksheet_copy(ctx, worksheet_id, name, app_id, org_id, copy_rows):
-    """Copy a worksheet."""
+def worksheet_copy(ctx, worksheet_id, name, app_id, org_id, copy_rows, section_id):
+    """Copy a worksheet into the same sidebar group as the original.
+
+    Pass --app-id so the target group can be resolved, or set --section-id
+    to place the copy in a specific group.
+    """
     try:
         session = ctx.get_session()
-        data = ws_mod.copy_worksheet(session, worksheet_id, name, app_id, require_api_project_id(session, org_id), copy_rows)
+        data = ws_mod.copy_worksheet(
+            session, worksheet_id, name, app_id,
+            require_api_project_id(session, org_id), copy_rows,
+            section_id=section_id,
+        )
         ctx.output(data, lambda d: output_json(d))
     except Exception as e:
         ctx.handle_error(e)

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/core/flow_node.py

@@ -455,6 +455,66 @@ def test_code(
     return session.workflow_call("flowNode/codeTest", data)
 
 
+# flowNode/webHookTestRequest wants integer enums, not strings. Source of
+# truth: pd-openweb src/pages/workflow/WorkflowSettings/enum.js (METHODS_TYPE)
+# and src/pages/workflow/WorkflowSettings/Detail/WebHook/index.jsx
+# (contentTypes + the raw JSON/Text sub-dropdown). Sending "POST" /
+# "application/json" verbatim makes the server answer 400.
+_WEBHOOK_METHODS = {
+    "GET": 1,
+    "POST": 2,
+    "PUT": 3,
+    "DELETE": 14,
+    "HEAD": 5,
+    "PATCH": 6,
+}
+
+_WEBHOOK_CONTENT_TYPES = {
+    "x-www-form-urlencoded": 1,
+    "urlencoded": 1,
+    "json": 2,
+    "application/json": 2,
+    "text": 3,
+    "form-data": 4,
+    "file": 5,
+}
+
+
+def _encode_webhook_method(method: Any) -> int:
+    """Map a friendly HTTP method name to its webHookTestRequest enum int.
+
+    Accepts an int (passed through) or a case-insensitive method name.
+    """
+    if isinstance(method, int):
+        return method
+    key = str(method).strip()
+    if key.isdigit():
+        return int(key)
+    code = _WEBHOOK_METHODS.get(key.upper())
+    if code is None:
+        raise ValueError(
+            f"Unknown HTTP method {method!r}; expected one of "
+            f"{', '.join(_WEBHOOK_METHODS)}."
+        )
+    return code
+
+
+def _encode_webhook_content_type(content_type: Any) -> int:
+    """Map a friendly body format name to its webHookTestRequest enum int."""
+    if isinstance(content_type, int):
+        return content_type
+    key = str(content_type).strip()
+    if key.isdigit():
+        return int(key)
+    code = _WEBHOOK_CONTENT_TYPES.get(key.lower())
+    if code is None:
+        raise ValueError(
+            f"Unknown content type {content_type!r}; expected one of "
+            "json, text, form-data, x-www-form-urlencoded, file."
+        )
+    return code
+
+
 def test_webhook(
     session: Session,
     process_id: str,
@@ -463,22 +523,28 @@ def test_webhook(
     method: str = "POST",
     headers: Optional[list] = None,
     body: str = "",
-    content_type: str = "application/json",
+    content_type: str = "json",
     params: Optional[list] = None,
     auth_id: str = "",
     settings: Optional[dict] = None,
 ) -> dict[str, Any]:
-    """Test a WebHook request.
+    """Send the HTTP request configured on a "Send Custom Request" node.
+
+    This drives the node's "Test API" action (flowNode/webHookTestRequest):
+    it issues the configured outbound request and returns the response —
+    it works for any API call the node makes, not just webhook callbacks.
 
     Args:
         session: Active session
         process_id: Process ID
-        node_id: WebHook node ID
+        node_id: Send-Custom-Request node ID
         url: Target URL
-        method: HTTP method
+        method: HTTP method name (GET/POST/PUT/DELETE/HEAD/PATCH) or its
+            enum int. Mapped to the integer the endpoint requires.
         headers: Request headers [{name, value}]
         body: Request body (JSON string)
-        content_type: Content-Type header
+        content_type: Body format — json, text, form-data,
+            x-www-form-urlencoded, or file — or its enum int.
         params: URL parameters [{name, value}]
         auth_id: Authentication config ID
         settings: Additional settings
@@ -490,8 +556,8 @@ def test_webhook(
         "processId": process_id,
         "nodeId": node_id,
         "url": url,
-        "method": method,
-        "contentType": content_type,
+        "method": _encode_webhook_method(method),
+        "contentType": _encode_webhook_content_type(content_type),
     }
     if headers:
         data["headers"] = headers

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/core/workflow_node_dsl.py

@@ -684,17 +684,24 @@ def get_trigger_ref(session, process_id: str) -> dict[str, str]:
 
 
 # Worksheet-event trigger event codes (triggerId on the flowNodeType-0
-# node). Evidence: workflow-nodes-all-types 新增记录触发 capture (triggerId
-# "1") + pd-openweb trigger config.
+# node). Authoritative values from pd-openweb TRIGGER_ID enum
+# (src/pages/workflow/WorkflowSettings/enum.js) and the trigger radio
+# options in Detail/Start/WorksheetContent.jsx:
+#   ADD='1' (仅新增记录), EDIT='2' (当新增或更新记录), DELETE='3' (删除记录),
+#   ONLY_EDIT='4' (仅更新记录).
+# Note the non-sequential mapping: create_or_update is '2' and delete is
+# '3' — do NOT "tidy" these into 1/2/3/4 order. (Earlier code had
+# create_or_update='3', which the backend interprets as 删除记录 — that was
+# the cause of bug: "创建或更新" workflows showing up as 记录删除时触发.)
 WORKSHEET_TRIGGER_EVENTS = {
-    "create": "1",          # 新增记录
-    "update": "2",          # 修改记录
-    "create_or_update": "3",  # 新增或修改
-    "delete": "4",          # 删除记录
+    "create": "1",            # 仅新增记录 (TRIGGER_ID.ADD)
+    "update": "4",            # 仅更新记录 (TRIGGER_ID.ONLY_EDIT)
+    "create_or_update": "2",  # 当新增或更新记录 (TRIGGER_ID.EDIT)
+    "delete": "3",            # 删除记录 (TRIGGER_ID.DELETE)
     # Design-vocabulary aliases (mcp_workflow_build_tool.json#create_process
     # trigger.config.event uses the backend database values).
     "add": "1",
-    "add_or_update": "3",
+    "add_or_update": "2",
 }
 
 

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/core/worksheet.py

@@ -351,13 +351,34 @@ def copy_worksheet(
     app_id: str = "",
     project_id: str = "",
     copy_rows: bool = False,
+    section_id: str = "",
 ) -> dict[str, Any]:
-    """Copy a worksheet."""
-    data: dict[str, Any] = {"worksheetId": worksheet_id, "name": name}
+    """Copy a worksheet.
+
+    CopyWorksheet needs ``appSectionId`` — the sidebar group the new
+    worksheet should land in. Without it the server answers "服务异常"
+    (evidence: pd-openweb src/pages/worksheet/redux/actions/sheetList.js
+    copySheet + WorkSheetLeft/MoreOperation.jsx, both of which always send
+    ``appSectionId``). When ``section_id`` is omitted but ``app_id`` is
+    given, resolve it from the source worksheet's own section so the copy
+    lands beside the original.
+    """
+    data: dict[str, Any] = {
+        "worksheetId": worksheet_id,
+        "name": name,
+        "relationControlIds": [],
+    }
     if app_id:
         data["appId"] = app_id
     if project_id:
         data["projectId"] = project_id
+    if not section_id and app_id:
+        from hap_cli.core import app as _app
+        section_id, _ = _app.find_worksheet_section(
+            session, app_id, worksheet_id,
+        )
+    if section_id:
+        data["appSectionId"] = section_id
     data["isCopyRows"] = copy_rows
     return session.api_call("Worksheet", "CopyWorksheet", data)
 

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/locale/messages.json

@@ -2599,19 +2599,19 @@
       "en": "Input data JSON: [{name,value,type}]"
     },
     "workflow node test-webhook": {
-      "en": "Test a WebHook node."
+      "en": "Run the \"Test API\" action of a Send Custom Request node."
     },
     "workflow node test-webhook --body": {
       "en": "Request body (JSON string)"
     },
     "workflow node test-webhook --content-type": {
-      "en": "Content-Type"
+      "en": "Body format: json, text, form-data, x-www-form-urlencoded, or file."
     },
     "workflow node test-webhook --headers": {
       "en": "Headers JSON: [{name,value}]"
     },
     "workflow node test-webhook --method": {
-      "en": "HTTP method"
+      "en": "HTTP method: GET, POST, PUT, DELETE, HEAD, or PATCH."
     },
     "workflow node test-webhook --url": {
       "en": "Target URL"
@@ -2713,7 +2713,7 @@
       "en": "Worksheet operations."
     },
     "worksheet copy": {
-      "en": "Copy a worksheet."
+      "en": "Copy a worksheet into the same sidebar group as the original."
     },
     "worksheet copy --app-id": {
       "en": "Application ID"
@@ -2724,6 +2724,9 @@
     "worksheet copy --org-id": {
       "en": "Organization ID"
     },
+    "worksheet copy --section-id": {
+      "en": "Sidebar group the copy lands in. Auto-resolved from the source worksheet's group when omitted (requires --app-id)."
+    },
     "worksheet create": {
       "en": "Create a worksheet with the full v3 field-type set including Attachment."
     },

hap_cli-0.8.17/hap_cli/tests/test_bug_036750.py

@@ -0,0 +1,130 @@
+"""Bugfix coverage for bug #036750.
+
+Two reproducible sub-issues are fixed here (traced from pd-openweb):
+
+1. ``workflow node test-webhook``: the underlying flowNode/webHookTestRequest
+   endpoint wants integer enums for ``method`` and ``contentType``
+   (METHODS_TYPE in src/pages/workflow/WorkflowSettings/enum.js;
+   contentTypes in .../Detail/WebHook/index.jsx). The old wrapper forwarded
+   the friendly strings "POST" / "application/json" verbatim, so the server
+   answered "400 Client Error". The command also described itself as a
+   webhook-only test; it actually drives the "Test API" action of a Send
+   Custom Request node and works for any outbound call.
+
+2. ``worksheet copy``: CopyWorksheet needs ``appSectionId`` (the sidebar
+   group). The old wrapper never sent it, so the server answered "服务异常".
+   It is now sent — auto-resolved from the source worksheet's own section
+   when ``--app-id`` is given, or supplied via ``--section-id``.
+"""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from hap_cli.core import flow_node as node_mod
+from hap_cli.core import worksheet as ws_mod
+from hap_cli.core.session import Session
+
+
+def _mock_response(data, state=1):
+    resp = MagicMock()
+    resp.status_code = 200
+    resp.json.return_value = {"data": data, "state": state}
+    resp.raise_for_status = MagicMock()
+    return resp
+
+
+@pytest.fixture
+def mock_session():
+    return Session(server_url="https://test.mingdao.com", auth_token="tok123")
+
+
+# ── Bug 1: test-webhook enum encoding ────────────────────────────────────
+
+class TestWebhookEnumEncoding:
+    @patch("hap_cli.core.session.requests.post")
+    def test_method_name_mapped_to_int(self, mock_post, mock_session):
+        mock_post.return_value = _mock_response({"status": 1})
+        node_mod.test_webhook(
+            mock_session, "p1", "n1", "https://api.example.com",
+            method="POST", content_type="json",
+            body='{"name":"x"}',
+        )
+        body = mock_post.call_args[1]["json"]
+        assert body["method"] == 2
+        assert body["contentType"] == 2
+        assert body["body"] == '{"name":"x"}'
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_all_method_names(self, mock_post, mock_session):
+        mock_post.return_value = _mock_response({"status": 1})
+        expected = {"GET": 1, "POST": 2, "PUT": 3, "DELETE": 14,
+                    "HEAD": 5, "PATCH": 6}
+        for name, code in expected.items():
+            node_mod.test_webhook(
+                mock_session, "p1", "n1", "https://api.example.com",
+                method=name,
+            )
+            assert mock_post.call_args[1]["json"]["method"] == code
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_content_type_names(self, mock_post, mock_session):
+        mock_post.return_value = _mock_response({"status": 1})
+        expected = {
+            "json": 2, "application/json": 2, "text": 3,
+            "form-data": 4, "x-www-form-urlencoded": 1, "file": 5,
+        }
+        for name, code in expected.items():
+            node_mod.test_webhook(
+                mock_session, "p1", "n1", "https://api.example.com",
+                content_type=name,
+            )
+            assert mock_post.call_args[1]["json"]["contentType"] == code
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_lowercase_and_int_passthrough(self, mock_post, mock_session):
+        mock_post.return_value = _mock_response({"status": 1})
+        node_mod.test_webhook(
+            mock_session, "p1", "n1", "https://api.example.com",
+            method="get", content_type=3,
+        )
+        body = mock_post.call_args[1]["json"]
+        assert body["method"] == 1
+        assert body["contentType"] == 3
+
+    def test_unknown_method_raises(self, mock_session):
+        with pytest.raises(ValueError):
+            node_mod.test_webhook(
+                mock_session, "p1", "n1", "https://api.example.com",
+                method="FETCH",
+            )
+
+
+# ── Bug 2: copy worksheet sends appSectionId ─────────────────────────────
+
+class TestCopyWorksheetSection:
+    @patch("hap_cli.core.session.requests.post")
+    def test_explicit_section_id_sent(self, mock_post, mock_session):
+        mock_post.return_value = _mock_response("new-ws-id")
+        ws_mod.copy_worksheet(
+            mock_session, "ws1", "Copy", app_id="app1",
+            section_id="sec-123",
+        )
+        body = mock_post.call_args[1]["json"]
+        assert body["appSectionId"] == "sec-123"
+        assert body["worksheetId"] == "ws1"
+        assert body["name"] == "Copy"
+
+    @patch("hap_cli.core.app.find_worksheet_section")
+    @patch("hap_cli.core.session.requests.post")
+    def test_section_auto_resolved_from_app(
+        self, mock_post, mock_find, mock_session,
+    ):
+        mock_find.return_value = ("resolved-sec", "原表")
+        mock_post.return_value = _mock_response("new-ws-id")
+        ws_mod.copy_worksheet(
+            mock_session, "ws1", "Copy", app_id="app1",
+        )
+        mock_find.assert_called_once_with(mock_session, "app1", "ws1")
+        body = mock_post.call_args[1]["json"]
+        assert body["appSectionId"] == "resolved-sec"

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/tests/test_core.py

@@ -1352,7 +1352,9 @@ class TestFlowNode:
         )
         body = mock_post.call_args[1]["json"]
         assert body["url"] == "https://example.com/api"
-        assert body["method"] == "GET"
+        # webHookTestRequest wants the integer enum, not the method name.
+        assert body["method"] == 1
+        assert body["contentType"] == 2
 
     @patch("hap_cli.core.session.requests.post")
     def test_test_aigc(self, mock_post, mock_session):
@@ -8818,10 +8820,13 @@ class TestLiveWireFixes:
 
     def test_worksheet_trigger_event_codes(self):
         from hap_cli.core import workflow_node_dsl as dsl
+        # Authoritative TRIGGER_ID enum: ADD=1, EDIT(create_or_update)=2,
+        # DELETE=3, ONLY_EDIT(update)=4. The mapping is intentionally
+        # non-sequential — see WORKSHEET_TRIGGER_EVENTS comment.
         assert dsl.WORKSHEET_TRIGGER_EVENTS["create"] == "1"
-        assert dsl.WORKSHEET_TRIGGER_EVENTS["update"] == "2"
-        assert dsl.WORKSHEET_TRIGGER_EVENTS["create_or_update"] == "3"
-        assert dsl.WORKSHEET_TRIGGER_EVENTS["delete"] == "4"
+        assert dsl.WORKSHEET_TRIGGER_EVENTS["update"] == "4"
+        assert dsl.WORKSHEET_TRIGGER_EVENTS["create_or_update"] == "2"
+        assert dsl.WORKSHEET_TRIGGER_EVENTS["delete"] == "3"
 
 
 class TestRolePermBuilder:

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli/tests/test_workflow_v3_semantic_cli.py

@@ -452,7 +452,7 @@ class TestTriggerSpecLowering:
         assert args["trigger_fields"] == ["f1"]
         assert args["trigger_filter"] == {"logic": "and", "items": []}
         assert dsl.WORKSHEET_TRIGGER_EVENTS["add"] == "1"
-        assert dsl.WORKSHEET_TRIGGER_EVENTS["add_or_update"] == "3"
+        assert dsl.WORKSHEET_TRIGGER_EVENTS["add_or_update"] == "2"
 
     def test_schedule(self):
         args = dsl.v3_trigger_to_batch_args({

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli.egg-info/PKG-INFO

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

{hap_cli-0.8.15 → hap_cli-0.8.17}/hap_cli.egg-info/SOURCES.txt

@@ -147,6 +147,7 @@ hap_cli/tests/test_app_editor.py
 hap_cli/tests/test_app_export_usage.py
 hap_cli/tests/test_auth_prerelease.py
 hap_cli/tests/test_bug_036430.py
+hap_cli/tests/test_bug_036750.py
 hap_cli/tests/test_chart.py
 hap_cli/tests/test_cli_access.py
 hap_cli/tests/test_config_cmd.py