hap-cli 0.8.4__tar.gz → 0.8.6__tar.gz

{hap_cli-0.8.4 → hap_cli-0.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.4
+Version: 0.8.6
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -285,8 +285,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
 
@@ -313,8 +313,31 @@ body, and a redacted `Authorization` header (first 16 chars). `password`
 and other sensitive keys are masked. `HAP_LOG_LEVEL=DEBUG` temporarily
 overrides the persisted level.
 
+### update — keep the CLI current
+
+| Command | Description |
+|---|---|
+| `update` | Check PyPI for a newer release and upgrade in place, using the same tool the CLI was installed with (pip / pipx / uv) |
+| `update --check` | Only report whether a newer version exists, without installing |
+
 ---
 
+## Organization CLI access control
+
+Organizations can control whether CLI tools are allowed to call their
+APIs. Before each command runs, `hap` checks this setting for the
+current organization:
+
+- **Enabled** — the command runs normally; the result is remembered for
+  5 minutes, so back-to-back commands stay fast.
+- **Disabled** — the command is blocked with a message asking you to
+  contact an organization administrator to enable CLI access.
+- **Setting not available** (older server versions) — the command runs
+  normally; the check is retried about once an hour.
+
+If an administrator enables access after a command was blocked, just
+re-run the command — the change takes effect immediately.
+
 ## Default app & organization
 
 Every command that needs an `--app-id` resolves it in this order:

{hap_cli-0.8.4/hap_cli → hap_cli-0.8.6}/README.md

@@ -256,8 +256,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
 
@@ -284,8 +284,31 @@ body, and a redacted `Authorization` header (first 16 chars). `password`
 and other sensitive keys are masked. `HAP_LOG_LEVEL=DEBUG` temporarily
 overrides the persisted level.
 
+### update — keep the CLI current
+
+| Command | Description |
+|---|---|
+| `update` | Check PyPI for a newer release and upgrade in place, using the same tool the CLI was installed with (pip / pipx / uv) |
+| `update --check` | Only report whether a newer version exists, without installing |
+
 ---
 
+## Organization CLI access control
+
+Organizations can control whether CLI tools are allowed to call their
+APIs. Before each command runs, `hap` checks this setting for the
+current organization:
+
+- **Enabled** — the command runs normally; the result is remembered for
+  5 minutes, so back-to-back commands stay fast.
+- **Disabled** — the command is blocked with a message asking you to
+  contact an organization administrator to enable CLI access.
+- **Setting not available** (older server versions) — the command runs
+  normally; the check is retried about once an hour.
+
+If an administrator enables access after a command was blocked, just
+re-run the command — the change takes effect immediately.
+
 ## Default app & organization
 
 Every command that needs an `--app-id` resolves it in this order:

{hap_cli-0.8.4 → hap_cli-0.8.6/hap_cli}/README.md

@@ -256,8 +256,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
 
@@ -284,8 +284,31 @@ body, and a redacted `Authorization` header (first 16 chars). `password`
 and other sensitive keys are masked. `HAP_LOG_LEVEL=DEBUG` temporarily
 overrides the persisted level.
 
+### update — keep the CLI current
+
+| Command | Description |
+|---|---|
+| `update` | Check PyPI for a newer release and upgrade in place, using the same tool the CLI was installed with (pip / pipx / uv) |
+| `update --check` | Only report whether a newer version exists, without installing |
+
 ---
 
+## Organization CLI access control
+
+Organizations can control whether CLI tools are allowed to call their
+APIs. Before each command runs, `hap` checks this setting for the
+current organization:
+
+- **Enabled** — the command runs normally; the result is remembered for
+  5 minutes, so back-to-back commands stay fast.
+- **Disabled** — the command is blocked with a message asking you to
+  contact an organization administrator to enable CLI access.
+- **Setting not available** (older server versions) — the command runs
+  normally; the check is retried about once an hour.
+
+If an administrator enables access after a command was blocked, just
+re-run the command — the change takes effect immediately.
+
 ## Default app & organization
 
 Every command that needs an `--app-id` resolves it in this order:

{hap_cli-0.8.4 → hap_cli-0.8.6}/hap_cli/README_CN.md

@@ -236,8 +236,8 @@ hap --json worksheet record list WORKSHEET_ID
 
 | 命令 | 说明 |
 |---|---|
-| `icon search` | 按中英文关键词搜索图标（多关键词取并集，命中越多排越前）；无关键词列出全部 |
-| `icon list` | 列出全部图标及其关键词 |
+| `icon search` | 按中英文关键词搜索图标（多关键词取并集，命中越多排越前）；命中不足 10 个时随机补足推荐；无关键词列出全部 |
+| `icon list [-n SIZE] [-p PAGE]` | 分页列出图标及其关键词（默认每页 50 个） |
 
 ### upload — 文件上传
 
@@ -260,8 +260,27 @@ hap --json worksheet record list WORKSHEET_ID
 
 日志默认写入 `~/.hap-cli/hap-cli.log`，10 MB × 3 滚动。开启后每次 API 调用以 `INFO` 级别记录 URL、请求体、响应体，以及脱敏后的 `Authorization` 头（仅前 16 字符）；`password` 等敏感字段会被自动打码。临时调试可设 `HAP_LOG_LEVEL=DEBUG`。
 
+### update — 升级 CLI
+
+| 命令 | 说明 |
+|---|---|
+| `update` | 检查 PyPI 上的最新版本，有新版则用安装时的工具（pip / pipx / uv）原地升级 |
+| `update --check` | 只检查是否有新版本，不安装 |
+
 ---
 
+## 组织 CLI 访问控制
+
+组织可以控制是否允许 CLI 工具调用其接口。每条命令运行前，`hap`
+会检查当前组织的这项设置：
+
+- **已开启** — 命令正常执行；结果保留 5 分钟，连续命令不会变慢。
+- **已关闭** — 命令被拦截，并提示联系组织管理员开启 CLI 访问权限。
+- **服务器暂不支持该设置**（旧版本环境）— 命令正常执行，约每小时
+  重试一次检查。
+
+如果命令被拦后管理员开启了权限，直接重跑命令即可，立即生效。
+
 ## 默认应用与组织
 
 任何需要 `--app-id` 的命令解析顺序：

{hap_cli-0.8.4 → hap_cli-0.8.6}/hap_cli/__init__.py

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

hap_cli-0.8.6/hap_cli/__main__.py

@@ -0,0 +1,11 @@
+"""Allow ``python -m hap_cli`` — used by the detached background
+update child (``hap update --background``), which is spawned with
+``sys.executable -m hap_cli`` so it always runs in the same
+environment as the parent process regardless of how the ``hap``
+console script was installed.
+"""
+
+from hap_cli.hap_cli import main
+
+if __name__ == "__main__":
+    main()

{hap_cli-0.8.4 → hap_cli-0.8.6}/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)
 
@@ -156,32 +156,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:
@@ -336,7 +310,11 @@ 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.
+    """
     try:
         session = ctx.get_session()
         org = auth_mod.switch_org(session, org_id)

{hap_cli-0.8.4 → hap_cli-0.8.6}/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.4 → hap_cli-0.8.6}/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.4 → hap_cli-0.8.6}/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.6/hap_cli/commands/update_cmd.py

@@ -0,0 +1,101 @@
+"""CLI command for self-updating hap-cli from PyPI.
+
+The hidden ``--background`` flag is the entry point for the detached
+child process spawned by the exit-time hook in ``hap_cli.py`` — it is
+internal plumbing and intentionally absent from ``--help`` and docs.
+"""
+
+import time
+
+import click
+
+from hap_cli.context import pass_context
+from hap_cli.core import update as upd
+
+
+@click.command("update")
+@click.option(
+    "--check",
+    "check_only",
+    is_flag=True,
+    help="Only check whether a newer version exists; do not install.",
+)
+@click.option("--background", is_flag=True, hidden=True)
+@pass_context
+def update(ctx, check_only, background):
+    """Upgrade hap-cli to the latest version from PyPI.
+
+    Checks for a newer release and installs it using the same tool the
+    CLI was installed with (pip, pipx, or uv). Installs that are not
+    managed from PyPI are left untouched.
+    """
+    if background:
+        # Detached child: silent check-and-upgrade; results go to the
+        # state file and are surfaced on the next foreground run.
+        upd.run_background_update()
+        return
+
+    from hap_cli import __version__
+
+    kind = upd.get_install_kind()
+    if kind in ("editable", "unknown"):
+        ctx.output(
+            {"current": __version__, "install": kind, "updated": False},
+            lambda d: click.echo(
+                "This copy of hap-cli is not managed from PyPI "
+                f"(current version {__version__}) — nothing to update."
+            ),
+        )
+        return
+
+    latest = upd.fetch_latest_version()
+    if latest is None:
+        ctx.handle_error(Exception("Could not reach PyPI to check for updates."))
+        return
+
+    if not upd.is_newer(latest, __version__):
+        upd.save_state(
+            {
+                "last_check_at": time.time(),
+                "latest_version": latest,
+                "last_result": "up_to_date",
+                "notified": True,
+            }
+        )
+        ctx.output(
+            {"current": __version__, "latest": latest, "updated": False},
+            lambda d: click.echo(
+                f"hap-cli {__version__} is already the latest version."
+            ),
+        )
+        return
+
+    if check_only:
+        ctx.output(
+            {"current": __version__, "latest": latest, "updated": False},
+            lambda d: click.echo(
+                f"A newer version is available: {latest} "
+                f"(current {__version__}). Run `hap update` to upgrade."
+            ),
+        )
+        return
+
+    click.echo(f"Upgrading hap-cli {__version__} -> {latest} ...")
+    ok, output = upd.perform_upgrade(kind)
+    upd.save_state(
+        {
+            "last_check_at": time.time(),
+            "latest_version": latest,
+            "last_result": "upgraded" if ok else "upgrade_failed",
+            "upgraded_to": latest if ok else None,
+            "notified": True,
+        }
+    )
+    if ok:
+        ctx.output(
+            {"current": __version__, "latest": latest, "updated": True},
+            lambda d: click.echo(f"Upgraded to hap-cli {latest}."),
+        )
+    else:
+        click.echo(output, err=True)
+        ctx.handle_error(Exception(f"Upgrade to {latest} failed."))

{hap_cli-0.8.4 → hap_cli-0.8.6}/hap_cli/commands/workflow_cmd.py

@@ -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)