hap-cli 0.7.2__tar.gz → 0.8.0__tar.gz

{hap_cli-0.7.2 → hap_cli-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.7.2
+Version: 0.8.0
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -63,10 +63,32 @@ command — it falls back to a paste prompt for the token shown on the success
 page.
 
 ```bash
-hap auth whoami        # current user + current organization
-hap auth logout        # clear the saved token
+hap auth whoami        # current user + current environment/account + org
+hap auth logout        # log out the current account
 ```
 
+#### Multiple environments / accounts
+
+You can stay logged in to several environments (MingDAO SaaS, Nocoly, self-hosted) and
+several accounts at once. Each is saved under a name and you switch between them:
+
+```bash
+hap auth login mingdao --profile work-prod        # log in and save under a name
+hap auth login https://hap.example.com --profile onprem
+# Omit --profile and the name is derived from the login address, so logging
+# into a new environment never overwrites one you already saved.
+
+hap auth accounts                  # list saved environments/accounts (current marked *)
+hap auth use work-prod             # switch the environment/account used next
+hap --profile onprem app list      # use one environment/account for a single command
+HAP_PROFILE=onprem hap app list    # default a whole shell session to one
+
+hap auth logout -p onprem          # log out a specific account
+hap auth logout --all              # log out every account
+```
+
+Profile resolution order: `--profile` > the `HAP_PROFILE` env var > the current profile.
+
 ### 2. Pick an organization and app
 
 ```bash
@@ -113,9 +135,11 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
-| `auth login [SERVER]` | Browser login (use `--token` for scripted login) |
-| `auth logout` | Clear the saved auth token |
-| `auth whoami` | Show current user and current organization |
+| `auth login [SERVER]` | Browser login (`--token` for scripted login; `--profile NAME` saves under a name, auto-named if omitted; `--force` repoints an existing name) |
+| `auth accounts` | List saved environments/accounts (current marked `*`) |
+| `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 |
 

{hap_cli-0.7.2/hap_cli → hap_cli-0.8.0}/README.md

@@ -34,10 +34,32 @@ command — it falls back to a paste prompt for the token shown on the success
 page.
 
 ```bash
-hap auth whoami        # current user + current organization
-hap auth logout        # clear the saved token
+hap auth whoami        # current user + current environment/account + org
+hap auth logout        # log out the current account
 ```
 
+#### Multiple environments / accounts
+
+You can stay logged in to several environments (MingDAO SaaS, Nocoly, self-hosted) and
+several accounts at once. Each is saved under a name and you switch between them:
+
+```bash
+hap auth login mingdao --profile work-prod        # log in and save under a name
+hap auth login https://hap.example.com --profile onprem
+# Omit --profile and the name is derived from the login address, so logging
+# into a new environment never overwrites one you already saved.
+
+hap auth accounts                  # list saved environments/accounts (current marked *)
+hap auth use work-prod             # switch the environment/account used next
+hap --profile onprem app list      # use one environment/account for a single command
+HAP_PROFILE=onprem hap app list    # default a whole shell session to one
+
+hap auth logout -p onprem          # log out a specific account
+hap auth logout --all              # log out every account
+```
+
+Profile resolution order: `--profile` > the `HAP_PROFILE` env var > the current profile.
+
 ### 2. Pick an organization and app
 
 ```bash
@@ -84,9 +106,11 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
-| `auth login [SERVER]` | Browser login (use `--token` for scripted login) |
-| `auth logout` | Clear the saved auth token |
-| `auth whoami` | Show current user and current organization |
+| `auth login [SERVER]` | Browser login (`--token` for scripted login; `--profile NAME` saves under a name, auto-named if omitted; `--force` repoints an existing name) |
+| `auth accounts` | List saved environments/accounts (current marked `*`) |
+| `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 |
 

{hap_cli-0.7.2 → hap_cli-0.8.0}/app_live_tests/smoke.py

@@ -415,6 +415,88 @@ def case_application(app_id: str, section_id: str) -> None:
     check("section gone after delete", renamed not in _sections(app_id))
 
 
+def case_app_usage(app_id: str, section_id: str) -> None:
+    """`hap app usage` — org overview + app-scoped + range variants.
+
+    Regression: --range used to be a raw day count passed straight through
+    as the dayRange enum (default 7 → out-of-range → 参数错误 / 服务异常).
+    """
+    print("scenario: app usage (org overview + app-scoped + ranges)")
+    _, org_id = state.ensure_app()
+
+    overview = hap(["app", "usage", "--org-id", org_id])
+    check("org-wide usage returns a dict", isinstance(overview, dict),
+          f"got {type(overview).__name__}: {overview!r}")
+    check("org-wide usage has 'app' bucket",
+          isinstance(overview, dict) and "app" in overview,
+          f"keys={list(overview) if isinstance(overview, dict) else overview!r}")
+
+    scoped = hap(["app", "usage", "--org-id", org_id, "--app-id", app_id])
+    check("app-scoped usage returns a dict", isinstance(scoped, dict),
+          f"got {type(scoped).__name__}: {scoped!r}")
+
+    # Every range label must be accepted by the server (no 参数错误).
+    for label in ("7d", "30d", "90d", "6m", "1y"):
+        res = hap(["app", "usage", "--org-id", org_id, "--range", label], check=False)
+        check(f"usage --range {label} accepted", isinstance(res, dict),
+              f"got {res!r}")
+
+
+def _exports(app_id: str) -> list[dict]:
+    data = hap(["app", "exports", app_id], check=False)
+    if isinstance(data, dict):
+        data = data.get("list", data.get("exports", []))
+    return data if isinstance(data, list) else []
+
+
+def case_app_export(app_id: str, section_id: str) -> None:
+    """`hap app export` — structure-only batch export.
+
+    Regression: the wrapper sent {appIds:[...]} but BatchExportApp wants
+    {projectId, appConfigs:[{appId, exampleType, sheetConfig}]} → 服务异常.
+    """
+    print("scenario: app export (structure only)")
+    _, org_id = state.ensure_app()
+
+    res = hap(["app", "export", app_id, "--org-id", org_id], check=False)
+    # The fix is proven by the call NOT raising 服务异常 and returning a
+    # truthy payload (the server accepts the export request).
+    check("export request accepted (no 服务异常)",
+          res not in (None, {}, False) or res is True,
+          f"got {res!r}")
+
+
+def case_app_logs(app_id: str, section_id: str) -> None:
+    """`hap app logs APP_ID` must filter to that app, not return the whole org.
+
+    Regression: the wrapper called the legacy GetLogs with a singular appId
+    that GetGlobalLogs ignores, so every call returned the org-wide logs.
+    """
+    print("scenario: app logs (app filter vs org-wide)")
+    _, org_id = state.ensure_app()
+
+    scoped = hap(["app", "logs", app_id, "--org-id", org_id, "-n", "10"])
+    org_wide = hap(["app", "logs", "--org-id", org_id, "-n", "10"])
+
+    check("logs envelope has list+allCount",
+          isinstance(scoped, dict) and "list" in scoped and "allCount" in scoped,
+          f"got {scoped!r}")
+    # The whole point: scoping to one app returns fewer rows than org-wide.
+    s_count = scoped.get("allCount", 0) if isinstance(scoped, dict) else 0
+    o_count = org_wide.get("allCount", 0) if isinstance(org_wide, dict) else 0
+    check("app filter narrows result (scoped < org-wide)", s_count < o_count,
+          f"scoped allCount={s_count} not < org-wide allCount={o_count}")
+    # No row may belong to a *different* app (some rows carry no app
+    # metadata at all — those are fine; foreign app ids are not).
+    rows = scoped.get("list", []) if isinstance(scoped, dict) else []
+    def _row_app(r):
+        a = r.get("application")
+        return a.get("id") if isinstance(a, dict) else a
+    foreign = {_row_app(r) for r in rows} - {app_id, None, ""}
+    check("no scoped row belongs to another app", not foreign,
+          f"foreign apps: {sorted(foreign)}")
+
+
 _CASES = {
     "worksheet": case_worksheet,
     "field": case_field,
@@ -427,6 +509,9 @@ _CASES = {
     "workflow": case_workflow,
     "node": case_node,
     "application": case_application,
+    "app-usage": case_app_usage,
+    "app-export": case_app_export,
+    "app-logs": case_app_logs,
 }
 
 

{hap_cli-0.7.2 → hap_cli-0.8.0/hap_cli}/README.md

@@ -34,10 +34,32 @@ command — it falls back to a paste prompt for the token shown on the success
 page.
 
 ```bash
-hap auth whoami        # current user + current organization
-hap auth logout        # clear the saved token
+hap auth whoami        # current user + current environment/account + org
+hap auth logout        # log out the current account
 ```
 
+#### Multiple environments / accounts
+
+You can stay logged in to several environments (MingDAO SaaS, Nocoly, self-hosted) and
+several accounts at once. Each is saved under a name and you switch between them:
+
+```bash
+hap auth login mingdao --profile work-prod        # log in and save under a name
+hap auth login https://hap.example.com --profile onprem
+# Omit --profile and the name is derived from the login address, so logging
+# into a new environment never overwrites one you already saved.
+
+hap auth accounts                  # list saved environments/accounts (current marked *)
+hap auth use work-prod             # switch the environment/account used next
+hap --profile onprem app list      # use one environment/account for a single command
+HAP_PROFILE=onprem hap app list    # default a whole shell session to one
+
+hap auth logout -p onprem          # log out a specific account
+hap auth logout --all              # log out every account
+```
+
+Profile resolution order: `--profile` > the `HAP_PROFILE` env var > the current profile.
+
 ### 2. Pick an organization and app
 
 ```bash
@@ -84,9 +106,11 @@ discover every subcommand.
 
 | Command | Description |
 |---|---|
-| `auth login [SERVER]` | Browser login (use `--token` for scripted login) |
-| `auth logout` | Clear the saved auth token |
-| `auth whoami` | Show current user and current organization |
+| `auth login [SERVER]` | Browser login (`--token` for scripted login; `--profile NAME` saves under a name, auto-named if omitted; `--force` repoints an existing name) |
+| `auth accounts` | List saved environments/accounts (current marked `*`) |
+| `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 |
 

{hap_cli-0.7.2 → hap_cli-0.8.0}/hap_cli/README_CN.md

@@ -30,10 +30,30 @@ hap auth login https://your-server.com --token YOUR_TOKEN
 浏览器流程会打开 HAP 登录页并捕获令牌。如果 CLI 收不到回调（无 GUI、网络受限），中断命令即可回退到粘贴登录页显示的令牌。
 
 ```bash
-hap auth whoami        # 当前用户与当前组织
-hap auth logout        # 清除已保存的令牌
+hap auth whoami        # 当前用户、当前环境/账号与当前组织
+hap auth logout        # 登出当前账号
 ```
 
+#### 多环境 / 多账号
+
+可同时授权多个环境（MingDAO SaaS、Nocoly、私有部署）与多个账号，各存成一个具名档案，长期共存、随时切换：
+
+```bash
+hap auth login mingdao --profile work-prod        # 登录并起名保存
+hap auth login https://hap.example.com --profile onprem
+# 省略 --profile 时按登录地址自动起名，登录新环境不会覆盖已保存的
+
+hap auth accounts                  # 列出所有环境/账号，当前的带 *
+hap auth use work-prod             # 切换当前使用的环境/账号
+hap --profile onprem app list      # 只让这一条命令临时用某个环境/账号
+HAP_PROFILE=onprem hap app list    # 整个终端会话默认用某个环境/账号
+
+hap auth logout -p onprem          # 登出指定账号
+hap auth logout --all              # 登出全部账号
+```
+
+档案选择优先级：`--profile` > 环境变量 `HAP_PROFILE` > 当前档案。
+
 ### 2. 选定组织和应用
 
 ```bash
@@ -77,9 +97,11 @@ hap --json worksheet record list WORKSHEET_ID
 
 | 命令 | 说明 |
 |---|---|
-| `auth login [SERVER]` | 浏览器登录（`--token` 走非交互） |
-| `auth logout` | 清除已保存的令牌 |
-| `auth whoami` | 当前用户与当前组织 |
+| `auth login [SERVER]` | 浏览器登录（`--token` 走非交互；`--profile NAME` 存成具名档案，省略则自动起名；`--force` 重指向已有名字） |
+| `auth accounts` | 列出所有环境/账号，当前的标 `*` |
+| `auth use NAME` | 切换当前使用的环境/账号 |
+| `auth logout` | 登出当前账号（`-p NAME` 指定，`-a/--all` 全部） |
+| `auth whoami` | 当前用户、当前环境/账号与当前组织 |
 | `auth list-my-orgs` | 当前账号所属组织（当前组织标 `*`） |
 | `auth set-current-org ORG_ID` | 切换默认组织 |
 

{hap_cli-0.7.2 → hap_cli-0.8.0}/hap_cli/__init__.py

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

{hap_cli-0.7.2 → hap_cli-0.8.0}/hap_cli/commands/app_cmd.py

@@ -404,12 +404,34 @@ def app_restore(ctx, app_id, org_id, backup_id, file_url, file_name, no_data, as
 
 @app.command("export")
 @click.argument("app_ids", nargs=-1, required=True)
+@org_id_option()
+@click.option(
+    "--include-data/--no-data",
+    default=False,
+    help="Include up to 10000 records per table (default: structure only).",
+)
+@click.option(
+    "--password",
+    default="",
+    help="Protect the exported package with an import password.",
+)
 @pass_context
-def app_export(ctx, app_ids):
-    """Export applications (batch)."""
+def app_export(ctx, app_ids, org_id, include_data, password):
+    """Export one or more applications.
+
+    Exports run against an organization — pass --org-id or rely on the
+    current one. By default only the app structure is exported; use
+    --include-data to bundle sample records.
+    """
     try:
         session = ctx.get_session()
-        data = app_mod.export_apps(session, list(app_ids))
+        data = app_mod.export_apps(
+            session,
+            require_api_project_id(session, org_id),
+            list(app_ids),
+            example_type=1 if include_data else 0,
+            password=password,
+        )
         ctx.output(data, lambda d: click.echo(f"Export started: {d}"))
     except Exception as e:
         ctx.handle_error(e)
@@ -447,16 +469,39 @@ def app_backup_logs(ctx, app_id, org_id, page_size, page):
 # ── Usage & Logs ─────────────────────────────────────────────────────────
 
 
+# CLI time-window labels → the server's dayRange enum (0=7d,1=month,
+# 2=quarter,3=half-year,4=year). Evidence: pd-openweb
+# src/pages/Admin/app/useAnalytics/util.js selectDateList.
+_USAGE_RANGE = {"7d": 0, "30d": 1, "90d": 2, "6m": 3, "1y": 4}
+
+
 @app.command("usage")
 @org_id_option()
-@click.option("--app-id", "-a", default="", help="Filter by app ID")
-@click.option("--days", "-d", default=7, type=int, help="Day range (default 7)")
+@click.option("--app-id", "-a", default="", help="Show stats for a single app (omit for the whole org)")
+@click.option(
+    "--range",
+    "time_range",
+    type=click.Choice(list(_USAGE_RANGE.keys())),
+    default="7d",
+    help="Time window: 7d / 30d / 90d / 6m / 1y (default 7d)",
+)
 @pass_context
-def app_usage(ctx, org_id, app_id, days):
-    """Get application usage statistics."""
+def app_usage(ctx, org_id, app_id, time_range):
+    """Get application usage statistics for an organization.
+
+    Without --app-id you get an organization-wide overview; pass --app-id
+    to focus on one application.
+    """
     try:
         session = ctx.get_session()
-        data = app_mod.get_usage_stats(session, require_api_project_id(session, org_id), app_id=app_id, day_range=days)
+        data = app_mod.get_usage_stats(
+            session,
+            require_api_project_id(session, org_id),
+            app_id=app_id,
+            day_range=_USAGE_RANGE[time_range],
+            # isApp mirrors the frontend: true only when scoped to one app.
+            is_app=bool(app_id),
+        )
         ctx.output(data, lambda d: output_json(d))
     except Exception as e:
         ctx.handle_error(e)
@@ -465,17 +510,25 @@ def app_usage(ctx, org_id, app_id, days):
 @app.command("logs")
 @click.argument("app_id", required=False, default="")
 @click.option("--org-id", default="", help="Organization ID (falls back to default)")
+@click.option("--start", default="", help="Window start 'YYYY-MM-DD HH:MM:SS' (default: last 30 days)")
+@click.option("--end", default="", help="Window end 'YYYY-MM-DD HH:MM:SS' (default: now)")
 @click.option("--page-size", "-n", default=50, help="Items per page")
 @click.option("--page", "-p", default=1, help="Page number")
 @pass_context
-def app_logs(ctx, app_id, org_id, page_size, page):
-    """Get application operation logs (org-wide; pass APP_ID to filter)."""
+def app_logs(ctx, app_id, org_id, start, end, page_size, page):
+    """Get operation logs for an organization.
+
+    Pass APP_ID to see only that app's logs; omit it for the whole
+    organization. Defaults to the last 30 days unless --start/--end given.
+    """
     try:
         session = ctx.get_session()
         data = app_mod.get_app_logs(
             session,
             project_id=require_api_project_id(session, org_id),
             app_id=app_id,
+            start=start,
+            end=end,
             page_index=page,
             page_size=page_size,
         )