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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.5
+Version: 0.8.7
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -40,6 +40,15 @@ pip install hap-cli
 The package ships with the v3 tool schemas it needs, so no extra setup is
 required after `pip install`.
 
+## Prerequisite: enable CLI access for your organization
+
+**`hap` can only access an organization's data after the organization has
+enabled CLI access.** Ask an organization administrator to turn on the
+switch under Organization Admin → Security → Data & Access → CLI access
+policy. Commands are blocked until it is enabled; once an administrator
+turns it on, just re-run the command. Use `hap auth list-my-orgs` to see
+each organization's status (`CLI:on/off`).
+
 ## Quick start
 
 ### 1. Login
@@ -102,8 +111,9 @@ hap app select APP_ID
 hap app unselect                     # clear it
 ```
 
-`hap auth set-current-org` only changes the default organization. The default app
-is managed independently with `hap app select` / `hap app unselect`.
+`hap auth set-current-org` switches the default organization; moving to a
+different organization also clears the default app (apps belong to an
+organization). Pick a new one with `hap app select`.
 
 ### 3. Explore worksheets and records
 
@@ -140,8 +150,8 @@ discover every subcommand.
 | `auth use NAME` | Switch the environment/account used next |
 | `auth logout` | Log out the current account (`-p NAME` for a specific one, `-a/--all` for every one) |
 | `auth whoami` | Show current user, current environment/account, and current organization |
-| `auth list-my-orgs` | List every org for the current account (current marked `*`) |
-| `auth set-current-org ORG_ID` | Switch the saved current organization |
+| `auth list-my-orgs` | List every org for the current account (current marked `*`; each row shows whether the org allows CLI access, `CLI:on/off`, checked live; omitted where the environment has no such switch) |
+| `auth set-current-org ORG_ID` | Switch the saved current organization (clears the default app when the org changes) |
 
 ### app — application management
 
@@ -285,8 +295,8 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
-| `icon search` | Search icons by Chinese/English keyword (OR across terms, more matches rank higher); no keyword lists all |
-| `icon list` | List every icon with its keywords |
+| `icon search` | Search icons by Chinese/English keyword (OR across terms, more matches rank higher); fewer than 10 matches get random suggestions appended; no keyword lists all |
+| `icon list [-n SIZE] [-p PAGE]` | List icons page by page with keywords (50 per page by default) |
 
 ### upload — file upload
 
@@ -330,8 +340,8 @@ Every command that needs an `--app-id` resolves it in this order:
 2. The default app saved by `hap app select`;
 3. Otherwise the command exits with an error suggesting `hap app select APP_ID`.
 
-`hap auth set-current-org` changes the default *organization* only — it does not
-touch the default app.
+`hap auth set-current-org` switches the default *organization*; switching to a
+different organization also clears the default app.
 
 ## REPL mode
 

{hap_cli-0.8.5/hap_cli → hap_cli-0.8.7}/README.md

@@ -11,6 +11,15 @@ pip install hap-cli
 The package ships with the v3 tool schemas it needs, so no extra setup is
 required after `pip install`.
 
+## Prerequisite: enable CLI access for your organization
+
+**`hap` can only access an organization's data after the organization has
+enabled CLI access.** Ask an organization administrator to turn on the
+switch under Organization Admin → Security → Data & Access → CLI access
+policy. Commands are blocked until it is enabled; once an administrator
+turns it on, just re-run the command. Use `hap auth list-my-orgs` to see
+each organization's status (`CLI:on/off`).
+
 ## Quick start
 
 ### 1. Login
@@ -73,8 +82,9 @@ hap app select APP_ID
 hap app unselect                     # clear it
 ```
 
-`hap auth set-current-org` only changes the default organization. The default app
-is managed independently with `hap app select` / `hap app unselect`.
+`hap auth set-current-org` switches the default organization; moving to a
+different organization also clears the default app (apps belong to an
+organization). Pick a new one with `hap app select`.
 
 ### 3. Explore worksheets and records
 
@@ -111,8 +121,8 @@ discover every subcommand.
 | `auth use NAME` | Switch the environment/account used next |
 | `auth logout` | Log out the current account (`-p NAME` for a specific one, `-a/--all` for every one) |
 | `auth whoami` | Show current user, current environment/account, and current organization |
-| `auth list-my-orgs` | List every org for the current account (current marked `*`) |
-| `auth set-current-org ORG_ID` | Switch the saved current organization |
+| `auth list-my-orgs` | List every org for the current account (current marked `*`; each row shows whether the org allows CLI access, `CLI:on/off`, checked live; omitted where the environment has no such switch) |
+| `auth set-current-org ORG_ID` | Switch the saved current organization (clears the default app when the org changes) |
 
 ### app — application management
 
@@ -256,8 +266,8 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
-| `icon search` | Search icons by Chinese/English keyword (OR across terms, more matches rank higher); no keyword lists all |
-| `icon list` | List every icon with its keywords |
+| `icon search` | Search icons by Chinese/English keyword (OR across terms, more matches rank higher); fewer than 10 matches get random suggestions appended; no keyword lists all |
+| `icon list [-n SIZE] [-p PAGE]` | List icons page by page with keywords (50 per page by default) |
 
 ### upload — file upload
 
@@ -301,8 +311,8 @@ Every command that needs an `--app-id` resolves it in this order:
 2. The default app saved by `hap app select`;
 3. Otherwise the command exits with an error suggesting `hap app select APP_ID`.
 
-`hap auth set-current-org` changes the default *organization* only — it does not
-touch the default app.
+`hap auth set-current-org` switches the default *organization*; switching to a
+different organization also clears the default app.
 
 ## REPL mode
 

{hap_cli-0.8.5 → hap_cli-0.8.7/hap_cli}/README.md

@@ -11,6 +11,15 @@ pip install hap-cli
 The package ships with the v3 tool schemas it needs, so no extra setup is
 required after `pip install`.
 
+## Prerequisite: enable CLI access for your organization
+
+**`hap` can only access an organization's data after the organization has
+enabled CLI access.** Ask an organization administrator to turn on the
+switch under Organization Admin → Security → Data & Access → CLI access
+policy. Commands are blocked until it is enabled; once an administrator
+turns it on, just re-run the command. Use `hap auth list-my-orgs` to see
+each organization's status (`CLI:on/off`).
+
 ## Quick start
 
 ### 1. Login
@@ -73,8 +82,9 @@ hap app select APP_ID
 hap app unselect                     # clear it
 ```
 
-`hap auth set-current-org` only changes the default organization. The default app
-is managed independently with `hap app select` / `hap app unselect`.
+`hap auth set-current-org` switches the default organization; moving to a
+different organization also clears the default app (apps belong to an
+organization). Pick a new one with `hap app select`.
 
 ### 3. Explore worksheets and records
 
@@ -111,8 +121,8 @@ discover every subcommand.
 | `auth use NAME` | Switch the environment/account used next |
 | `auth logout` | Log out the current account (`-p NAME` for a specific one, `-a/--all` for every one) |
 | `auth whoami` | Show current user, current environment/account, and current organization |
-| `auth list-my-orgs` | List every org for the current account (current marked `*`) |
-| `auth set-current-org ORG_ID` | Switch the saved current organization |
+| `auth list-my-orgs` | List every org for the current account (current marked `*`; each row shows whether the org allows CLI access, `CLI:on/off`, checked live; omitted where the environment has no such switch) |
+| `auth set-current-org ORG_ID` | Switch the saved current organization (clears the default app when the org changes) |
 
 ### app — application management
 
@@ -256,8 +266,8 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
-| `icon search` | Search icons by Chinese/English keyword (OR across terms, more matches rank higher); no keyword lists all |
-| `icon list` | List every icon with its keywords |
+| `icon search` | Search icons by Chinese/English keyword (OR across terms, more matches rank higher); fewer than 10 matches get random suggestions appended; no keyword lists all |
+| `icon list [-n SIZE] [-p PAGE]` | List icons page by page with keywords (50 per page by default) |
 
 ### upload — file upload
 
@@ -301,8 +311,8 @@ Every command that needs an `--app-id` resolves it in this order:
 2. The default app saved by `hap app select`;
 3. Otherwise the command exits with an error suggesting `hap app select APP_ID`.
 
-`hap auth set-current-org` changes the default *organization* only — it does not
-touch the default app.
+`hap auth set-current-org` switches the default *organization*; switching to a
+different organization also clears the default app.
 
 ## REPL mode
 

{hap_cli-0.8.5 → hap_cli-0.8.7}/hap_cli/README_CN.md

@@ -10,6 +10,10 @@ pip install hap-cli
 
 安装包内已附带 CLI 启动需要的 v3 工具 schema，`pip install` 之后无需额外配置。
 
+## 使用前提：开启组织的 CLI 访问权限
+
+**只有组织开启了 CLI 访问权限，`hap` 才能访问该组织的数据。** 请组织管理员前往「组织管理后台 → 安全 → 数据与访问 → CLI 访问策略」开启允许访问开关。未开启时命令会被拦截；管理员开启后直接重跑命令即可。可用 `hap auth list-my-orgs` 查看各组织的开启状态（`CLI:on/off`）。
+
 ## 快速上手
 
 ### 1. 登录
@@ -67,7 +71,7 @@ hap app select APP_ID
 hap app unselect                     # 清除默认应用
 ```
 
-`hap auth set-current-org` 只切换默认组织，不会改写默认应用。默认应用通过 `hap app select` / `hap app unselect` 单独管理。
+`hap auth set-current-org` 切换默认组织；切换到不同组织时会同时清除默认应用（应用从属于组织）。之后用 `hap app select` 重新选择默认应用。
 
 ### 3. 浏览工作表与记录
 
@@ -102,8 +106,8 @@ hap --json worksheet record list WORKSHEET_ID
 | `auth use NAME` | 切换当前使用的环境/账号 |
 | `auth logout` | 登出当前账号（`-p NAME` 指定，`-a/--all` 全部） |
 | `auth whoami` | 当前用户、当前环境/账号与当前组织 |
-| `auth list-my-orgs` | 当前账号所属组织（当前组织标 `*`） |
-| `auth set-current-org ORG_ID` | 切换默认组织 |
+| `auth list-my-orgs` | 当前账号所属组织（当前组织标 `*`，并实时显示各组织是否开启 CLI 访问权限 `CLI:on/off`，环境不支持该开关时不显示） |
+| `auth set-current-org ORG_ID` | 切换默认组织（切到不同组织时会清除默认应用） |
 
 ### app — 应用管理
 
@@ -236,8 +240,8 @@ hap --json worksheet record list WORKSHEET_ID
 
 | 命令 | 说明 |
 |---|---|
-| `icon search` | 按中英文关键词搜索图标（多关键词取并集，命中越多排越前）；无关键词列出全部 |
-| `icon list` | 列出全部图标及其关键词 |
+| `icon search` | 按中英文关键词搜索图标（多关键词取并集，命中越多排越前）；命中不足 10 个时随机补足推荐；无关键词列出全部 |
+| `icon list [-n SIZE] [-p PAGE]` | 分页列出图标及其关键词（默认每页 50 个） |
 
 ### upload — 文件上传
 
@@ -277,7 +281,7 @@ hap --json worksheet record list WORKSHEET_ID
 2. 否则使用 `hap app select APP_ID` 保存的默认应用；
 3. 仍为空时报错并提示设置默认应用。
 
-`hap auth set-current-org` 切换的是默认**组织**，**不**会改默认应用。
+`hap auth set-current-org` 切换默认**组织**；切到不同组织时会同时清除默认应用。
 
 ## REPL 模式
 

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

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

{hap_cli-0.8.5 → hap_cli-0.8.7}/hap_cli/commands/auth_cmd.py

@@ -54,7 +54,7 @@ def _paste_flow(ctx, server):
     _api_host, webui = auth_mod.resolve_server(server)
     if not ctx.json_mode:
         click.echo(f"Log in at {webui} on a device with a browser,")
-        click.echo("then copy the md_pss_id token and paste it below.")
+        click.echo("then copy the token and paste it below.")
     token = click.prompt("Paste token").strip()
     return auth_mod.verify_token(server, token)
 
@@ -102,6 +102,21 @@ def _save_and_report(ctx, token, webui, user_info, meta, profile_name):
     session.save(profile=profile_name)
     set_active_profile(profile_name)
 
+    # Probe the org CLI-access switch for the org we just saved as
+    # current, so the user learns right away that commands will be
+    # blocked. Only an explicit "off" verdict prints the warning
+    # (404 / network trouble stays silent — same fail-open policy as
+    # the request gate). Covers all login paths (browser, paste,
+    # --token), unlike the browser success page.
+    from hap_cli.core import cli_access
+
+    access_denied = False
+    if cli_access.GATE_ENABLED and current_org.get("projectId"):
+        access_denied = (
+            cli_access.probe_cli_access(webui, token, current_org["projectId"])
+            is False
+        )
+
     data = {
         "status": "ok",
         "profile": profile_name,
@@ -109,17 +124,24 @@ def _save_and_report(ctx, token, webui, user_info, meta, profile_name):
         "user": user_info,
         "current_org": current_org,
     }
-    ctx.output(
-        data,
-        lambda d: click.echo(
+    if access_denied:
+        data["cli_access_denied"] = True
+
+    def _human(_d):
+        click.echo(
             f"Logged in as: {user_info.get('name', '')} "
             f"({user_info.get('email', '')})\n"
             f"Saved as: {profile_name}\n"
             f"Server: {webui}\n"
             f"Current org: {current_org.get('projectId', '')} "
             f"{current_org.get('companyName', '')}".rstrip()
-        ),
-    )
+        )
+        if access_denied:
+            # Deliberately NOT localized: the surrounding login summary
+            # is English-only, so this line stays English too.
+            click.echo(f"Error: {cli_access.DENIED_MESSAGE_EN}")
+
+    ctx.output(data, _human)
 
 
 @auth.command("login")
@@ -156,32 +178,6 @@ def auth_login(ctx, server, timeout, token_opt, profile_opt, force):
     Use --token to supply a token non-interactively for scripts.
     """
     try:
-        # Shared-credential warm switch: skip the browser when an
-        # existing session on a sibling host can be reused.
-        if not token_opt and auth_mod.can_warm_switch_to(server):
-            target_host = auth_mod._resolve_target_host(server)
-            if not ctx.json_mode:
-                click.echo(f"Switching to {target_host} using existing credentials...")
-            token, webui, user_info, meta, reused = (
-                auth_mod.shortcut_switch_shared_credential(server)
-            )
-            name = resolve_login_profile(profile_opt, webui, force)
-            _save_and_report(ctx, token, webui, user_info, meta, name)
-            if not ctx.json_mode and reused:
-                click.echo("(reused existing token — no browser opened)")
-            return
-
-        # Cold pre-release: no existing session, but target is meihua.
-        # The shortcut handles browser-to-prod-then-swap so users still
-        # land on meihua at the end.
-        if not token_opt and auth_mod.is_prerelease_login(server):
-            token, webui, user_info, meta, reused = (
-                auth_mod.shortcut_switch_shared_credential(server)
-            )
-            name = resolve_login_profile(profile_opt, webui, force)
-            _save_and_report(ctx, token, webui, user_info, meta, name)
-            return
-
         if token_opt:
             token, webui, user_info, meta = auth_mod.verify_token(server, token_opt)
         else:
@@ -316,17 +312,33 @@ def _print_orgs(session, data):
         pid = p.get("projectId", "")
         name = p.get("companyName", p.get("name", ""))
         role = p.get("roleName", "")
-        marker = "*" if pid and pid == current_org_id else " "
-        click.echo(f"{marker} {pid}  {name}  {role}".rstrip())
+        # Only render the CLI column when the server gave an explicit
+        # verdict; environments without the org switch show no column.
+        enabled = p.get("cliAccessEnabled")
+        cli_col = ""
+        if isinstance(enabled, bool):
+            cli_col = "CLI:on" if enabled else "CLI:off"
+        click.echo(
+            f"{'*' if pid and pid == current_org_id else ' '} "
+            f"{pid}  {name}  {role}  {cli_col}".rstrip()
+        )
 
 
 @auth.command("list-my-orgs")
 @pass_context
 def auth_list_my_orgs(ctx):
-    """List all organizations the current user belongs to."""
+    """List all organizations the current user belongs to.
+
+    Each row also shows whether the organization currently allows
+    CLI access (checked live against the server).
+    """
     try:
+        from hap_cli.core import cli_access
+
         session = ctx.get_session()
         data = auth_mod.list_my_orgs(session)
+        if cli_access.GATE_ENABLED:
+            cli_access.annotate_orgs_cli_access(session, data)
         ctx.output(data, lambda d: _print_orgs(session, d))
     except Exception as e:
         ctx.handle_error(e)
@@ -336,7 +348,14 @@ def auth_list_my_orgs(ctx):
 @click.argument("org_id")
 @pass_context
 def auth_set_current_org(ctx, org_id):
-    """Set the saved current organization."""
+    """Set the saved current organization.
+
+    Run 'hap auth list-my-orgs' first to see the organizations you
+    belong to and their IDs.
+
+    Switching to a different organization also clears the saved
+    default app — pick a new one with 'hap app select' afterwards.
+    """
     try:
         session = ctx.get_session()
         org = auth_mod.switch_org(session, org_id)

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

@@ -40,25 +40,70 @@ def icon_search(ctx, query, limit):
     """Search icons by keyword (Chinese or English).
 
     Pass one or more keywords; an icon must relate to every keyword to
-    match. With no keyword, lists the whole catalogue. Use the returned
-    icon name with the --icon option of app/worksheet creation.
+    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.
     """
     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:
+            rows = ic_mod.pad_with_random_icons(
+                rows, target=min(10, max(0, limit))
+            )
         ctx.output(rows, _icon_table)
     except Exception as e:
         ctx.handle_error(e)
 
 
 @icon.command("list")
+@click.option(
+    "--page-size",
+    "--size",
+    "-n",
+    "page_size",
+    type=int,
+    default=50,
+    show_default=True,
+    help="Icons per page.",
+)
+@click.option(
+    "--page",
+    "-p",
+    type=int,
+    default=1,
+    show_default=True,
+    help="Page number (1-based).",
+)
 @pass_context
-def icon_list(ctx):
-    """List every icon in the catalogue with its keywords."""
+def icon_list(ctx, page_size, page):
+    """List the icon catalogue page by page with keywords.
+
+    Shows 50 icons per page by default; use -p/--page to move through
+    the catalogue and -n/--page-size to change the page length.
+    """
     try:
         rows = ic_mod.list_icons()
-        ctx.output(rows, _icon_table)
+        total = len(rows)
+        page_size = max(1, page_size)
+        pages = max(1, (total + page_size - 1) // page_size)
+        page = min(max(1, page), pages)
+        start = (page - 1) * page_size
+        data = {
+            "total": total,
+            "page": page,
+            "pages": pages,
+            "page_size": page_size,
+            "icons": rows[start : start + page_size],
+        }
+
+        def show(d):
+            _icon_table(d["icons"])
+            click.echo(f"Page {d['page']}/{d['pages']} · {d['total']} icons total")
+
+        ctx.output(data, show)
     except Exception as e:
         ctx.handle_error(e)

{hap_cli-0.8.5 → hap_cli-0.8.7}/hap_cli/commands/instance_cmd.py

@@ -253,7 +253,9 @@ def instance_restart(ctx, instance_id, work_id):
 
 
 @instance.command("history")
-@click.option("--process-id", default="", help="Filter by process")
+# getHistoryList requires processId server-side (instance.js:60-77 marks
+# it *流程ID); omitting it returns HTTP 400 (bug #036490).
+@click.option("--process-id", required=True, help="Workflow process ID")
 @click.option("--status", "-s", default=0, type=int,
               help="Status: 1=running, 2=completed, 3=rejected, 4=failed")
 @click.option("--keyword", "-k", default="", help="Title search")

{hap_cli-0.8.5 → hap_cli-0.8.7}/hap_cli/commands/node_cmd.py

@@ -444,7 +444,7 @@ def node_create_code_template(ctx, name, code):
 @click.option("--fields", "-f", default="", help="Field mapping JSON: [{fieldId,type,fieldValue}]")
 @click.option("--name", "-n", default="", help="Node name")
 @click.option("--select-node-id", "-s", default="", help="Source data node ID")
-@click.option("--condition", default="", help="Filter conditions JSON")
+@click.option("--condition", default="", help="Filter conditions JSON: [{fieldId, conditionId, value:[...]}] — field type is looked up automatically; AND within a list, wrap lists for OR groups")
 @click.option("--sorts", default="", help="Sort rules JSON")
 @pass_context
 def node_save_action(ctx, process_id, node_id, action_id, app_id, fields,
@@ -465,12 +465,19 @@ def node_save_action(ctx, process_id, node_id, action_id, app_id, fields,
     try:
         session = ctx.get_session()
         fields_list = json.loads(fields) if fields else None
-        cond_list = json.loads(condition) if condition else None
+        filters_list = node_mod.condition_to_filters(
+            json.loads(condition) if condition else None)
+        if filters_list:
+            filters_list = node_mod.fill_condition_field_types(
+                session, process_id, node_id, filters_list,
+                app_id=app_id, select_node_id=select_node_id,
+                action_id=action_id,
+            )
         sorts_list = json.loads(sorts) if sorts else None
         data = node_mod.save_action_node(
             session, process_id, node_id, action_id, app_id,
             fields=fields_list, name=name, select_node_id=select_node_id,
-            operate_condition=cond_list, sorts=sorts_list,
+            filters=filters_list, sorts=sorts_list,
         )
         ctx.output(data, lambda d: click.echo("Action node saved."))
     except json.JSONDecodeError as e:
@@ -489,7 +496,7 @@ def node_save_action(ctx, process_id, node_id, action_id, app_id, fields,
 @click.option("--fields", "-f", default="", help="Return fields JSON")
 @click.option("--name", "-n", default="", help="Node name")
 @click.option("--select-node-id", "-s", default="", help="Source node ID (for 407)")
-@click.option("--condition", default="", help="Query conditions JSON")
+@click.option("--condition", default="", help="Filter conditions JSON: [{fieldId, conditionId, value:[...]}] — field type is looked up automatically; AND within a list, wrap lists for OR groups")
 @click.option("--sorts", default="", help="Sort rules JSON")
 @click.option("--random", is_flag=True, help="Pick random record")
 @click.option("--not-found", "execute_type", default=0, type=int,
@@ -515,12 +522,19 @@ def node_save_search(ctx, process_id, node_id, action_id, app_id, fields,
     try:
         session = ctx.get_session()
         fields_list = json.loads(fields) if fields else None
-        cond_list = json.loads(condition) if condition else None
+        filters_list = node_mod.condition_to_filters(
+            json.loads(condition) if condition else None)
+        if filters_list:
+            filters_list = node_mod.fill_condition_field_types(
+                session, process_id, node_id, filters_list,
+                app_id=app_id, select_node_id=select_node_id,
+                action_id=action_id,
+            )
         sorts_list = json.loads(sorts) if sorts else None
         data = node_mod.save_search_node(
             session, process_id, node_id, action_id,
             app_id=app_id, fields=fields_list, name=name,
-            select_node_id=select_node_id, operate_condition=cond_list,
+            select_node_id=select_node_id, filters=filters_list,
             sorts=sorts_list, random=random, execute_type=execute_type,
         )
         ctx.output(data, lambda d: click.echo("Search node saved."))
@@ -540,7 +554,7 @@ def node_save_search(ctx, process_id, node_id, action_id, app_id, fields,
 @click.option("--fields", "-f", default="", help="Field mapping JSON")
 @click.option("--name", "-n", default="", help="Node name")
 @click.option("--select-node-id", "-s", default="", help="Source node ID (for 401)")
-@click.option("--condition", default="", help="Filter conditions JSON")
+@click.option("--condition", default="", help="Filter conditions JSON: [{fieldId, conditionId, value:[...]}] — field type is looked up automatically; AND within a list, wrap lists for OR groups")
 @click.option("--sorts", default="", help="Sort rules JSON")
 @click.option("--limit", "limit_json", default="", help="Record limit JSON: {fieldValue, fieldNodeId}")
 @click.option("--random", is_flag=True, help="Pick random records")
@@ -565,13 +579,20 @@ def node_save_get_more(ctx, process_id, node_id, action_id, app_id, fields,
     try:
         session = ctx.get_session()
         fields_list = json.loads(fields) if fields else None
-        cond_list = json.loads(condition) if condition else None
+        filters_list = node_mod.condition_to_filters(
+            json.loads(condition) if condition else None)
+        if filters_list:
+            filters_list = node_mod.fill_condition_field_types(
+                session, process_id, node_id, filters_list,
+                app_id=app_id, select_node_id=select_node_id,
+                action_id=action_id,
+            )
         sorts_list = json.loads(sorts) if sorts else None
         limit_dict = json.loads(limit_json) if limit_json else None
         data = node_mod.save_get_more_record_node(
             session, process_id, node_id, action_id,
             app_id=app_id, fields=fields_list, name=name,
-            select_node_id=select_node_id, operate_condition=cond_list,
+            select_node_id=select_node_id, filters=filters_list,
             sorts=sorts_list, number_field_value=limit_dict, random=random,
         )
         ctx.output(data, lambda d: click.echo("GetMoreRecord node saved."))

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

@@ -155,6 +155,10 @@ 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.
     """
     if field and fields_json:
         raise click.UsageError("Pass exactly one of -f or --fields-json.")
@@ -164,7 +168,8 @@ def record_update(ctx, worksheet_id, row_id, field, fields_json, no_workflow):
             raw = _fields_json_to_raw(fields_json)
         else:
             raw = _parse_fields(field)
-        controls = rec_mod.encode_controls_by_id(session, worksheet_id, raw)
+        controls = rec_mod.encode_controls_by_id(
+            session, worksheet_id, raw, for_update=True)
         data = rec_mod.update_record(
             session, worksheet_id, row_id, controls,
             trigger_workflow=not no_workflow,

{hap_cli-0.8.5 → hap_cli-0.8.7}/hap_cli/commands/workflow_cmd.py

@@ -63,7 +63,7 @@ def workflow_list(ctx, app_id, keyword, enabled, page_size, page):
         if not aid:
             raise click.UsageError("App ID required.")
         result = wf_mod.get_process_list(
-            session, aid, keyword=keyword,
+            session, aid, keyword=keyword, enabled=enabled,
             page_index=page, page_size=page_size,
         )
         ctx.output(
@@ -311,15 +311,22 @@ def workflow_trigger(ctx, process_id, source_id):
 @click.option("--app-id", "-a", required=True, help="Application ID")
 @click.option("--trigger-id", default="", help="Trigger ID")
 @click.option("--title", default="", help="Instance title")
+@click.option("--controls", default="",
+              help='Input parameter values JSON: [{controlId, value}]')
 @pass_context
-def workflow_trigger_pbp(ctx, process_id, app_id, trigger_id, title):
+def workflow_trigger_pbp(ctx, process_id, app_id, trigger_id, title,
+                         controls):
     """Trigger a PBP (Packaged Business Process) workflow."""
     try:
         session = ctx.get_session()
+        controls_list = json.loads(controls) if controls else None
         data = wf_mod.start_process_by_pbp(
             session, process_id, app_id, trigger_id, title,
+            controls=controls_list,
         )
         ctx.output(data, lambda d: click.echo(f"PBP triggered: {d}"))
+    except json.JSONDecodeError as e:
+        ctx.handle_error(click.UsageError(f"Invalid JSON: {e}"))
     except Exception as e:
         ctx.handle_error(e)