hap-cli 0.8.7__tar.gz → 0.8.9__tar.gz

{hap_cli-0.8.7 → hap_cli-0.8.9}/PKG-INFO

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

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/__init__.py

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

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/commands/chart_cmd.py

@@ -22,12 +22,14 @@ def chart():
 
 
 # Report-type enum values used by the MingDAO statistics module. The CLI
-# accepts the integer directly so users can pass uncommon types (sankey,
-# treemap, etc.) without us having to enumerate every one.
+# accepts the integer directly so users can pass uncommon types without us
+# having to enumerate every one. Note: there is NO type 4 — passing 4 is
+# coerced to 10 (number) by the server, so it is omitted here (bug #036584).
 _REPORT_TYPE_HINT = (
-    "Chart type (integer). Common values: "
-    "1=column, 2=line, 3=pie, 4=number, 5=bar, 6=radar, 7=funnel, "
-    "8=dual-axis, 9=pivot, 10=heatmap."
+    "Chart type (integer). Values: "
+    "1=column, 2=line, 3=pie, 5=radar, 6=funnel, 7=dual-axis, 8=pivot, "
+    "9=region-map, 10=number, 11=bidirectional-bar, 12=scatter, "
+    "13=word-cloud, 14=gauge, 15=progress, 16=ranking, 17=world-map."
 )
 
 

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/commands/chatbot_cmd.py

@@ -120,7 +120,8 @@ def chatbot_rename(ctx, app_id, chatbot_id, section_id, name, icon):
 @click.option("--app-id", "-a", required=True, help="Application ID")
 @org_id_option()
 @click.option("--section-id", default="",
-              help="Section/group the assistant lives under. Optional.")
+              help="Section/group the assistant lives under. Auto-detected "
+                   "when omitted.")
 @click.option("--permanent", is_flag=True, default=False,
               help="Delete permanently instead of moving to the recycle bin.")
 @click.option("--yes", "-y", is_flag=True, help="Skip confirmation")

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/commands/icon_cmd.py

@@ -31,9 +31,10 @@ def _icon_table(rows):
 @click.option(
     "--limit",
     type=int,
-    default=20,
-    show_default=True,
-    help="Maximum number of icons to return.",
+    default=None,
+    help="Maximum number of icons to return. Caps the result exactly — "
+    "--limit 5 returns at most 5. Defaults to 20 for a keyword search, "
+    "or the whole catalogue when browsing with no keyword.",
 )
 @pass_context
 def icon_search(ctx, query, limit):
@@ -41,19 +42,24 @@ def icon_search(ctx, query, limit):
 
     Pass one or more keywords; an icon must relate to every keyword to
     match. With no keyword, lists the whole catalogue. When fewer than
-    10 icons match, random suggestions top the list up to 10 so you
-    always have something to pick from. Use the returned icon name with
-    the --icon option of app/worksheet creation.
+    10 icons match, random suggestions top the list up to 10 (never more
+    than --limit) so you always have something to pick from. Use the
+    returned icon name with the --icon option of app/worksheet creation.
     """
     try:
-        # With no keyword the command acts as "browse all"; the limit
-        # only narrows an actual keyword search.
-        effective_limit = limit if query else None
-        rows = ic_mod.search_icons(list(query), limit=effective_limit)
         if query:
+            # Keyword search: default to 20 matches; an explicit --limit
+            # is the exact upper bound, and the random-suggestion floor
+            # never exceeds it either.
+            effective_limit = limit if limit is not None else 20
+            rows = ic_mod.search_icons(list(query), limit=effective_limit)
             rows = ic_mod.pad_with_random_icons(
-                rows, target=min(10, max(0, limit))
+                rows, target=min(10, max(0, effective_limit))
             )
+        else:
+            # Browse all by default; honor an explicit --limit if given.
+            # search_icons treats None as "no truncation".
+            rows = ic_mod.search_icons(list(query), limit=limit)
         ctx.output(rows, _icon_table)
     except Exception as e:
         ctx.handle_error(e)

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/commands/record_cmd.py

@@ -156,9 +156,12 @@ def record_update(ctx, worksheet_id, row_id, field, fields_json, no_workflow):
     Pass values either as repeated -f CONTROL_ID=VALUE pairs or as one
     --fields-json array.
 
-    A sub-table value is the full list of child rows (each a dict keyed
-    by child field name) and replaces the existing rows; an empty list
-    clears the sub-table.
+    A sub-table value is a list of child rows, each a dict keyed by child
+    field name. Updates are incremental: a child row with a "rowid" key
+    edits that existing row in place (its id is kept and only the listed
+    fields change), a child row without a "rowid" adds a new row, and a
+    child row with "_delete": true removes that row. Rows you don't list
+    are left untouched. An empty list (or null) clears the sub-table.
     """
     if field and fields_json:
         raise click.UsageError("Pass exactly one of -f or --fields-json.")

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/core/chart.py

@@ -17,7 +17,14 @@ Save body shape (verified against pd-openweb @param docs):
   - ``name``         — chart display name
   - ``appId``        — worksheet id the chart attaches to
   - ``appType``      — 1: worksheet, 2: aggregate table (default 1)
-  - ``reportType``   — 1:柱图 2:折线图 3:饼图 4:数值图 (plus many more in the wild)
+  - ``reportType``   — chart type. The statistics module's canonical
+    enum (``pd-openweb/src/pages/Statistics/Charts/common.js`` →
+    ``reportTypes``) is: 1:柱图 2:折线图 3:饼图 5:雷达图 6:漏斗图
+    7:双轴图 8:透视表 9:行政区划 10:数值图 11:双向条形图 12:散点图
+    13:词云 14:仪表图 15:进度图 16:数值排名 17:世界地图. There is
+    **no reportType 4** — an old API doc comment labels 4 as 数值图,
+    but the live backend coerces a sent ``4`` to ``10`` (the real
+    数值图). Pass 10 for a number chart, never 4 (bug #036584).
   - ``filter`` / ``filters`` / ``config`` / ``displaySetup`` / ``pivotTable``
     / ``summary`` / ``xaxes`` / ``yaxisList`` / ``sorts`` / ``formulas`` —
     optional nested config objects; CLI accepts a full ``--spec-json`` so the
@@ -200,6 +207,17 @@ def save_chart(
     charts) are needed for that path.
     """
     body: dict[str, Any] = dict(extra or {})
+    # The statistics backend reads the split (拆分维度/分组) control from
+    # the TOP-LEVEL `splitId` field, not from the nested `split.controlId`.
+    # A spec that only sets `split.controlId` (the natural shape, and what
+    # the UI's drag-into-split slot produces internally) gets its split
+    # silently cleared on save unless `splitId` mirrors it. Auto-populate
+    # `splitId` from `split.controlId` when the caller hasn't pinned one
+    # (bug #036584). An explicit splitId always wins.
+    if not body.get("splitId") and isinstance(body.get("split"), dict):
+        split_control_id = body["split"].get("controlId")
+        if split_control_id:
+            body["splitId"] = split_control_id
     # Resolve the chart's filter block before sending saveReportConfig.
     if isinstance(body.get("filter"), dict):
         body["filter"] = _ensure_filter_id(

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/core/chatbot.py

@@ -196,6 +196,37 @@ def update_chatbot_info(
     return session.api_call("AppManagement", "EditWorkSheetInfoForApp", data)
 
 
+def _resolve_chatbot_section(
+    session: Session, app_id: str, chatbot_id: str
+) -> str:
+    """Find the appSectionId of the section holding ``chatbot_id``.
+
+    Walks the app's sections (and nested childSections) for the item whose
+    ``workSheetId`` is the chatbot, returning its section id. Empty string
+    if not found (caller proceeds without it).
+    """
+    from hap_cli.core.app import get_app_detail
+
+    detail = get_app_detail(session, app_id)
+
+    def _walk(sections: list[dict[str, Any]]) -> str:
+        for sec in sections or []:
+            for item in sec.get("workSheetInfo", []) or []:
+                if item.get("workSheetId") == chatbot_id:
+                    return sec.get("appSectionId", "") or ""
+            found = _walk(sec.get("childSections") or [])
+            if found:
+                return found
+        return ""
+
+    try:
+        return _walk(detail.get("sections", []) or [])
+    except Exception as e:  # never block a delete on a lookup hiccup
+        logger.warning("could not resolve chatbot %s section: %s",
+                       chatbot_id, e)
+        return ""
+
+
 def delete_chatbot(
     session: Session,
     chatbot_id: str,
@@ -207,17 +238,23 @@ def delete_chatbot(
 ) -> dict[str, Any]:
     """Delete a chatbot (AI assistant).
 
-    Evidence: pd-openweb ``src/pages/chatBot/MoreMenu.jsx:48-58``. Even
-    though a chatbot is *created* as a ``type:3`` worksheet
-    (``AddWorkSheet``), it is *deleted* through the shared deleteSheet
-    flow with ``type: 1`` (``AppManagement/RemoveWorkSheetForApp``,
-    ``workSheetId`` = the chatbot id) — the same call shape as a custom
-    page (see ``core/page.delete_page``). ``isPermanentlyDelete=False``
-    sends it to the recycle bin.
+    Evidence: pd-openweb ``src/pages/Chatbot/MoreMenu.jsx`` ->
+    ``sheetList.deleteSheet`` -> ``RemoveWorkSheetForApp``. Even though a
+    chatbot is *created* as a ``type:3`` worksheet (``AddWorkSheet``), it
+    is *deleted* through the shared deleteSheet flow with ``type: 1``
+    (``AppManagement/RemoveWorkSheetForApp``, ``workSheetId`` = the chatbot
+    id) — the same call shape as a custom page (see
+    ``core/page.delete_page``). ``isPermanentlyDelete=False`` sends it to
+    the recycle bin.
 
-    ``appSectionId`` (the group the assistant lives under) is optional
-    per the swagger ``DeleteItemRequest`` and sent only when provided.
+    ``appSectionId`` is REQUIRED in practice: the UI always sends
+    ``parentGroupId || groupId`` and the server returns ``服务异常`` without
+    it. When the caller omits ``section_id`` we resolve the chatbot's
+    section from the app structure so a bare ``chatbot delete <id> -a
+    <app>`` just works.
     """
+    if not section_id:
+        section_id = _resolve_chatbot_section(session, app_id, chatbot_id)
     data: dict[str, Any] = {
         "appId": app_id,
         "projectId": project_id,

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/core/record.py

@@ -76,12 +76,54 @@ def _sublist_parse_rows(ctrl: dict[str, Any], value: Any) -> list:
     return list(value)
 
 
+# Reserved keys a child-row dict may carry that are NOT child fields.
+# ``rowid`` (or ``_rowid``) pins an existing child row so an update edits
+# it in place and preserves its id; ``_delete`` (or ``_deleted``) marks
+# that row for removal. They never map to a cell.
+_SUBLIST_ROWID_KEYS = ("rowid", "_rowid")
+_SUBLIST_DELETE_KEYS = ("_delete", "_deleted")
+_SUBLIST_RESERVED_KEYS = frozenset(_SUBLIST_ROWID_KEYS + _SUBLIST_DELETE_KEYS)
+
+
+def _sublist_child_rowid(row: dict[str, Any]) -> Optional[str]:
+    """Return the existing child-row id a row dict pins, or None.
+
+    A ``temp-``/``default-`` prefixed value names a row that does not yet
+    exist server-side, so it is treated as "no id" (a fresh add).
+    """
+    for k in _SUBLIST_ROWID_KEYS:
+        v = (row or {}).get(k)
+        if v not in (None, ""):
+            s = str(v)
+            if s.startswith("temp-") or s.startswith("default-"):
+                return None
+            return s
+    return None
+
+
+def _sublist_row_is_delete(row: dict[str, Any]) -> bool:
+    return any((row or {}).get(k) for k in _SUBLIST_DELETE_KEYS)
+
+
 def _sublist_row_cells(
     ctrl: dict[str, Any], row: dict[str, Any],
+    *, temp_row_id: Optional[str] = None,
 ) -> list[dict[str, Any]]:
     """Serialize one child-row dict (keyed by child field name/alias/id)
     into the ``[{controlId, value}, ...]`` cell list the server expects,
-    prefixed with a fresh ``tempRowId`` cell.
+    prefixed with a ``tempRowId`` cell.
+
+    For a brand-new row ``temp_row_id`` is left None and a fresh
+    ``temp-<uuid>`` id is minted. For an in-place update of an existing
+    row, pass that row's real id as ``temp_row_id`` — the UI sends the
+    existing rowid in the ``tempRowId`` cell on edit (evidence: a
+    captured UpdateWorksheetRow body where an in-place child edit carried
+    ``{"controlId":"tempRowId","value":"<existing rowid>"}``).
+
+    Reserved keys (``rowid`` / ``_delete`` …) are skipped — they steer
+    the op, they are not child-field cells. Only the keys the caller
+    supplies become cells, so an in-place update touches just the
+    changed fields.
     """
     child_by_name: dict[str, dict[str, Any]] = {}
     for cc in ctrl.get("relationControls") or []:
@@ -91,9 +133,11 @@ def _sublist_row_cells(
                 child_by_name[k] = cc
     cells = [{
         "controlId": "tempRowId",
-        "value": "temp-" + str(uuid.uuid4()),
+        "value": temp_row_id or ("temp-" + str(uuid.uuid4())),
     }]
     for cname, cval in (row or {}).items():
+        if cname in _SUBLIST_RESERVED_KEYS:
+            continue
         cc = child_by_name.get(cname)
         if cc is None or cc.get("type") in _LEGACY_SKIP_TYPES:
             continue
@@ -109,20 +153,51 @@ def _sublist_update_value(ctrl: dict[str, Any], value: Any) -> str:
 
     Updates must NOT reuse the AddWorksheetRow 2-D array — the server
     answers "服务异常". The UI sends ``editType: 9`` on the control and a
-    value of per-row operations: ``{"rowid": "all", "editType": 2}``
-    (delete every existing child row) followed by one
-    ``{"editType": 0, "newOldControl": [cells...]}`` entry per new row —
-    i.e. full replace. Evidence: pd-openweb
-    src/components/Form/core/utils.js, formatControlToServer case 34
-    (the non-isNewRecord branch builds exactly this list).
+    value of per-row operations. We apply **incremental / patch**
+    semantics, matching what the form actually sends (it only emits the
+    rows that changed and leaves the rest untouched):
+
+    - a child row carrying an existing ``rowid`` →
+      ``{"rowid": id, "editType": 0, "newOldControl": [changed cells…]}``
+      — edits that row in place, preserving its id; only the supplied
+      fields are sent.
+    - a child row with no ``rowid`` →
+      ``{"editType": 0, "newOldControl": [cells…]}`` — a fresh add.
+    - a child row flagged ``_delete`` → ``{"rowid": id, "editType": 2}``.
+    - rows not listed are left as-is (server keeps them).
+    - ``None`` / ``[]`` clears the whole sub-table:
+      ``[{"rowid": "all", "editType": 2}]``.
+
+    Evidence: pd-openweb src/components/Form/core/utils.js,
+    formatControlToServer case 34 (the changes.updated branch builds
+    ``{rowid, editType:0, newOldControl}`` for existing rows), plus a
+    captured UpdateWorksheetRow body editing one field of one child row
+    while leaving its sibling row untouched.
     """
     rows = _sublist_parse_rows(ctrl, value)
-    ops: list[dict[str, Any]] = [{"rowid": "all", "editType": 2}]
+    # None or an explicit empty list means "clear every child row".
+    if not rows:
+        return json.dumps([{"rowid": "all", "editType": 2}],
+                          ensure_ascii=False)
+    ops: list[dict[str, Any]] = []
     for r in rows:
-        ops.append({
-            "editType": 0,
-            "newOldControl": _sublist_row_cells(ctrl, r),
-        })
+        rowid = _sublist_child_rowid(r)
+        if _sublist_row_is_delete(r):
+            if rowid:
+                ops.append({"rowid": rowid, "editType": 2})
+            continue
+        if rowid:
+            ops.append({
+                "rowid": rowid,
+                "editType": 0,
+                "newOldControl": _sublist_row_cells(
+                    ctrl, r, temp_row_id=rowid),
+            })
+        else:
+            ops.append({
+                "editType": 0,
+                "newOldControl": _sublist_row_cells(ctrl, r),
+            })
     return json.dumps(ops, ensure_ascii=False)
 
 
@@ -232,7 +307,8 @@ def encode_controls_by_id(
 
     ``for_update`` selects the UpdateWorksheetRow wire shapes where they
     differ from AddWorksheetRow — today that is SUB_LIST (34), which on
-    update needs ``editType: 9`` plus a delete-all/add-rows op list (see
+    update needs ``editType: 9`` plus an incremental per-row op list
+    (in-place edits keyed by ``rowid``, fresh adds, and deletes — see
     :func:`_sublist_update_value`).
     """
     controls = ws_mod.get_worksheet_controls(session, worksheet_id)

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/core/worksheet_templates.py

@@ -407,8 +407,14 @@ def build_control(
                 spec = dict(spec)
                 child_type = spec.pop("type")
                 child_name = spec.pop("name")
+                # row/col default to the child's position in the list, but a
+                # child spec may pin its own grid coordinates (the skill emits
+                # row/size per child). Seed defaults then let the spec win, so
+                # an explicit `row`/`col` in spec does not collide with a
+                # positional kwarg ("multiple values for 'row'").
+                child_kwargs = {"row": i, "col": 0, **spec}
                 built.append(build_control(
-                    child_type, child_name, row=i, col=0, **spec,
+                    child_type, child_name, **child_kwargs,
                 ))
             relation_controls = built
 

{hap_cli-0.8.7 → hap_cli-0.8.9}/hap_cli/tests/test_chart.py

@@ -138,6 +138,67 @@ class TestSaveChart:
         assert body["appType"] == 2
         assert body["reportType"] == 2
 
+    @patch("hap_cli.core.session.requests.post")
+    def test_split_control_id_auto_populates_top_level_split_id(self, mock_post):
+        # bug #036584: the statistics backend reads the split (拆分维度)
+        # control from the TOP-LEVEL `splitId` field, not from the nested
+        # `split.controlId`. A spec that only sets `split.controlId` (the
+        # natural shape) gets its split silently cleared on save. The core
+        # must mirror the controlId up to `splitId` so the split persists.
+        sess = Session(server_url="https://t.com", auth_token="tok")
+        mock_post.return_value = _resp({"reportId": "r1"})
+
+        chart_mod.save_chart(
+            sess, app_id="ws1", name="Grouped", report_type=1,
+            extra={"split": {"controlId": "ctrlX", "controlType": 9}},
+        )
+
+        body = mock_post.call_args[1]["json"]
+        assert body["splitId"] == "ctrlX"
+        assert body["split"]["controlId"] == "ctrlX"
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_explicit_split_id_is_not_overwritten(self, mock_post):
+        # If the caller already pinned a top-level splitId, honor it.
+        sess = Session(server_url="https://t.com", auth_token="tok")
+        mock_post.return_value = _resp({"reportId": "r1"})
+
+        chart_mod.save_chart(
+            sess, app_id="ws1", name="Grouped", report_type=1,
+            extra={
+                "splitId": "pinned",
+                "split": {"controlId": "ctrlX", "controlType": 9},
+            },
+        )
+
+        assert mock_post.call_args[1]["json"]["splitId"] == "pinned"
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_no_split_means_no_split_id_injected(self, mock_post):
+        # A chart without a split block must not gain an empty splitId.
+        sess = Session(server_url="https://t.com", auth_token="tok")
+        mock_post.return_value = _resp({"reportId": "r1"})
+
+        chart_mod.save_chart(
+            sess, app_id="ws1", name="Plain", report_type=1,
+        )
+
+        assert "splitId" not in mock_post.call_args[1]["json"]
+
+    @patch("hap_cli.core.session.requests.post")
+    def test_empty_split_control_id_does_not_inject_split_id(self, mock_post):
+        # A split block with a blank controlId carries no dimension —
+        # don't fabricate a splitId from it.
+        sess = Session(server_url="https://t.com", auth_token="tok")
+        mock_post.return_value = _resp({"reportId": "r1"})
+
+        chart_mod.save_chart(
+            sess, app_id="ws1", name="Plain", report_type=1,
+            extra={"split": {"controlId": ""}},
+        )
+
+        assert "splitId" not in mock_post.call_args[1]["json"]
+
     @patch("hap_cli.core.session.requests.post")
     def test_extra_dict_is_merged_under_required_fields(self, mock_post):
         sess = Session(server_url="https://t.com", auth_token="tok")
@@ -248,6 +309,23 @@ class TestChartCLI:
         body = mock_post.call_args[1]["json"]
         assert body["id"] == "r1"
 
+    def test_report_type_help_maps_number_to_10_not_4(self, tmp_config):
+        # bug #036584: the old help text claimed "4=number" and shifted
+        # every type above it by one. The statistics module has no
+        # reportType 4 (the backend coerces a legacy 4 to 10), and the
+        # number chart (数值图) is 10. The help must not mislead users
+        # into passing 4.
+        result = CliRunner().invoke(cli, [
+            "worksheet", "chart", "create", "--help",
+        ])
+        assert result.exit_code == 0, result.output
+        help_text = result.output
+        assert "4=number" not in help_text
+        assert "10=number" in help_text
+        # The genuinely correct anchors for the shifted-by-one values.
+        assert "5=radar" in help_text
+        assert "8=pivot" in help_text
+
     @patch("hap_cli.core.session.requests.post")
     def test_chart_delete_cli(self, mock_post, tmp_config):
         Session(server_url="https://t.com", auth_token="tok").save()