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

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

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

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

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

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

@@ -382,19 +382,27 @@ def app_backup(ctx, app_id, org_id, no_data):
 @app.command("restore")
 @click.argument("app_id")
 @org_id_option()
-@click.option("--backup-id", "-b", required=True, help="Backup ID")
-@click.option("--file-url", required=True, help="Backup file URL")
-@click.option("--file-name", required=True, help="Backup file name")
+@click.option("--backup-id", "-b", default="", help="Restore from an existing backup (its ID)")
+@click.option("--file-url", default="", help="Restore from an uploaded backup file (its URL)")
+@click.option("--file-name", default="", help="File name to show for an uploaded backup file")
 @click.option("--no-data", is_flag=True, help="Restore without data")
 @click.option("--as-new", is_flag=True, help="Restore as a new app")
 @pass_context
 def app_restore(ctx, app_id, org_id, backup_id, file_url, file_name, no_data, as_new):
-    """Restore an application from backup."""
+    """Restore an application, either from an existing backup or an uploaded file.
+
+    Provide exactly one source: --backup-id (an existing backup) or
+    --file-url (an uploaded backup file).
+    """
     try:
+        if bool(backup_id) == bool(file_url):
+            raise click.UsageError(
+                "Provide exactly one of --backup-id or --file-url."
+            )
         session = ctx.get_session()
         data = app_mod.restore_app(
-            session, app_id, require_api_project_id(session, org_id), backup_id,
-            file_url, file_name,
+            session, app_id, require_api_project_id(session, org_id),
+            backup_id=backup_id, file_url=file_url, file_name=file_name,
             contain_data=not no_data, is_restore_new=as_new,
         )
         ctx.output(data, lambda d: click.echo(f"Restore started: {d}"))

{hap_cli-0.8.0 → hap_cli-0.8.1}/hap_cli/commands/chart_cmd.py

@@ -27,8 +27,7 @@ def chart():
 _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. See pd-openweb Statistics docs "
-    "for the full set."
+    "8=dual-axis, 9=pivot, 10=heatmap."
 )
 
 

{hap_cli-0.8.0 → hap_cli-0.8.1}/hap_cli/commands/config_cmd.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import os
+import re
 import time
 from pathlib import Path
 
@@ -251,6 +252,22 @@ def config_language(ctx, lang):
         click.echo(f"Language set to: {label} [{lang}]")
 
 
+# Request log lines carry redacted `Authorization=<...>` and
+# `AccountId=<...>` tokens. They add no value when reading the log and
+# are stripped from the view output. The Authorization value keeps its
+# `md_pss_id ` scheme prefix (one internal space) ahead of the redacted
+# token, so that space must be consumed too; AccountId's redacted form
+# has no spaces.
+_HIDDEN_LOG_TOKENS_RE = re.compile(
+    r"\s+(?:Authorization=(?:md_pss_id )?\S*|AccountId=\S+)"
+)
+
+
+def _sanitize_log_line(line: str) -> str:
+    """Drop `Authorization=` / `AccountId=` tokens from a log line."""
+    return _HIDDEN_LOG_TOKENS_RE.sub("", line)
+
+
 @config_log.command("view")
 @click.option("--lines", "-n", type=int, default=50, show_default=True,
               help="Number of existing lines to print before following.")
@@ -277,7 +294,7 @@ def log_view(lines, no_follow):
         with open(path, "r", encoding="utf-8", errors="replace") as f:
             tail = f.readlines()[-max(0, lines):]
             for line in tail:
-                click.echo(line.rstrip("\n"))
+                click.echo(_sanitize_log_line(line.rstrip("\n")))
             if no_follow:
                 return
             f.seek(0, os.SEEK_END)
@@ -287,7 +304,7 @@ def log_view(lines, no_follow):
                 if not chunk:
                     time.sleep(0.3)
                     continue
-                click.echo(chunk.rstrip("\n"))
+                click.echo(_sanitize_log_line(chunk.rstrip("\n")))
     except KeyboardInterrupt:
         click.echo("", err=True)
         return

{hap_cli-0.8.0 → hap_cli-0.8.1}/hap_cli/commands/page_cmd.py

@@ -244,7 +244,7 @@ def page_save(ctx, app_id, version, components, adjust_screen, url_params, confi
 
 
 @page.command("update-config")
-@click.argument("app_id")
+@click.argument("page_id")
 @click.option("--desc", default="", help="New description")
 @click.option("--config", "config_json", default="", help="JSON object of page config")
 @click.option(
@@ -253,13 +253,16 @@ def page_save(ctx, app_id, version, components, adjust_screen, url_params, confi
 )
 @click.option("--url-params", default="", help="JSON array of URL parameter descriptors")
 @pass_context
-def page_update_config(ctx, app_id, desc, config_json, adjust_screen, url_params):
-    """Patch custom-page metadata (Custom.updatePage)."""
+def page_update_config(ctx, page_id, desc, config_json, adjust_screen, url_params):
+    """Update a custom page's settings.
+
+    PAGE_ID is the custom page's own id (not the application id).
+    """
     try:
         session = ctx.get_session()
         data = page_mod.update_page_config(
             session,
-            app_id=app_id,
+            page_id=page_id,
             desc=desc,
             config=_json.loads(config_json) if config_json else None,
             adjust_screen=adjust_screen,

{hap_cli-0.8.0 → hap_cli-0.8.1}/hap_cli/commands/record_cmd.py

@@ -83,7 +83,9 @@ def record_create(ctx, worksheet_id, field, no_workflow):
     """Create a new record. Use -f CONTROL_ID=VALUE for each field."""
     try:
         session = ctx.get_session()
-        controls = _parse_fields(field)
+        controls = rec_mod.encode_controls_by_id(
+            session, worksheet_id, _parse_fields(field),
+        )
         data = rec_mod.create_record(
             session, worksheet_id, controls,
             trigger_workflow=not no_workflow,
@@ -103,7 +105,9 @@ def record_update(ctx, worksheet_id, row_id, field, no_workflow):
     """Update a record. Use -f CONTROL_ID=VALUE for each field."""
     try:
         session = ctx.get_session()
-        controls = _parse_fields(field)
+        controls = rec_mod.encode_controls_by_id(
+            session, worksheet_id, _parse_fields(field),
+        )
         data = rec_mod.update_record(
             session, worksheet_id, row_id, controls,
             trigger_workflow=not no_workflow,
@@ -210,7 +214,7 @@ def record_discussions(ctx, worksheet_id, row_id, page_size, page):
     try:
         session = ctx.get_session()
         data = rec_mod.get_discussions(
-            session, row_id, source_type=7,
+            session, worksheet_id, row_id,
             page_index=page, page_size=page_size,
         )
         ctx.output(data, lambda d: output_json(d))
@@ -222,14 +226,17 @@ def record_discussions(ctx, worksheet_id, row_id, page_size, page):
 @click.argument("worksheet_id")
 @click.argument("row_id")
 @click.option("--message", "-m", required=True, help="Discussion message")
-@click.option("--app-id", default="", help="Application ID")
+@click.option("--app-id", default="", help="Application ID (auto-detected from the worksheet if omitted)")
+@click.option("--view-id", default="", help="View ID the discussion originates from")
+@click.option("--reply-id", default="", help="ID of the discussion being replied to")
 @pass_context
-def record_add_discussion(ctx, worksheet_id, row_id, message, app_id):
+def record_add_discussion(ctx, worksheet_id, row_id, message, app_id, view_id, reply_id):
     """Add a discussion/comment to a record."""
     try:
         session = ctx.get_session()
         data = rec_mod.add_discussion(
-            session, row_id, message, source_type=7, app_id=app_id,
+            session, worksheet_id, row_id, message,
+            app_id=app_id, view_id=view_id, reply_id=reply_id,
         )
         ctx.output(data, lambda d: click.echo(f"Discussion added."))
     except Exception as e:
@@ -246,7 +253,7 @@ def record_delete_discussion(ctx, discussion_id, yes):
         if not yes:
             click.confirm(f"Delete discussion {discussion_id}?", abort=True)
         session = ctx.get_session()
-        data = rec_mod.remove_discussion(session, discussion_id, source_type=7)
+        data = rec_mod.remove_discussion(session, discussion_id)
         ctx.output(data, lambda d: click.echo(f"Discussion deleted."))
     except Exception as e:
         ctx.handle_error(e)

{hap_cli-0.8.0 → hap_cli-0.8.1}/hap_cli/commands/worksheet_cmd.py

@@ -627,13 +627,19 @@ def worksheet_update_view(ctx, worksheet_id, view_id, name, view_json,
 @worksheet.command("copy-view")
 @click.argument("worksheet_id")
 @click.argument("view_id")
-@click.argument("name")
+@click.argument("name", required=False, default="")
+@click.option("--app-id", default="",
+              help="Application ID the worksheet belongs to "
+                   "(auto-detected from the worksheet if omitted).")
 @pass_context
-def worksheet_copy_view(ctx, worksheet_id, view_id, name):
-    """Copy a worksheet view."""
+def worksheet_copy_view(ctx, worksheet_id, view_id, name, app_id):
+    """Copy a worksheet view.
+
+    NAME is optional; when given, the copied view is renamed to it.
+    """
     try:
         session = ctx.get_session()
-        data = ws_mod.copy_view(session, worksheet_id, view_id, name)
+        data = ws_mod.copy_view(session, worksheet_id, view_id, name, app_id=app_id)
         ctx.output(data, lambda d: output_json(d))
     except Exception as e:
         ctx.handle_error(e)

{hap_cli-0.8.0 → hap_cli-0.8.1}/hap_cli/core/app.py

@@ -525,25 +525,49 @@ def restore_app(
     session: Session,
     app_id: str,
     project_id: str,
-    backup_id: str,
-    file_url: str,
-    file_name: str,
+    backup_id: str = "",
+    file_url: str = "",
+    file_name: str = "",
     contain_data: bool = True,
     is_restore_new: bool = False,
+    auto_end_maintain: bool = False,
+    backup_current_version: bool = False,
 ) -> dict[str, Any]:
-    """Restore an application from backup."""
-    return session.api_call(
-        "AppManagement", "Restore",
-        {
-            "appId": app_id,
-            "projectId": project_id,
-            "id": backup_id,
-            "fileUrl": file_url,
-            "fileName": file_name,
-            "containData": contain_data,
-            "isRestoreNew": is_restore_new,
-        },
-    )
+    """Restore an application from a backup log id or an uploaded file.
+
+    The HAP UI has two mutually exclusive restore modes; the API field
+    set differs between them, so we must send only one mode's fields:
+
+    - Backup-log restore (``src/pages/AppSettings/components/
+      appBackupRestore/components/BackupFiles.jsx``): sends ``id`` (the
+      backup-restore operation-log id) plus ``autoEndMaintain``,
+      ``backupCurrentVersion`` and ``isRestoreNew`` — no ``fileUrl``.
+    - Uploaded-file restore (``.../BackupFromFiles.jsx``): sends
+      ``fileUrl`` + ``fileName`` + ``containData`` plus the same three
+      flags — no ``id``.
+
+    Sending both at once (as an earlier wrapper did, with all three
+    forced ``required``) made the command impossible to invoke. Exactly
+    one of ``backup_id`` / ``file_url`` must be supplied.
+    """
+    if not backup_id and not file_url:
+        raise ValueError("restore requires either backup_id or file_url")
+
+    params: dict[str, Any] = {
+        "appId": app_id,
+        "projectId": project_id,
+        "autoEndMaintain": auto_end_maintain,
+        "backupCurrentVersion": backup_current_version,
+        "isRestoreNew": is_restore_new,
+    }
+    if backup_id:
+        # `id` is the backup-restore operation-log id (named `id` in the API).
+        params["id"] = backup_id
+    else:
+        params["fileUrl"] = file_url
+        params["fileName"] = file_name
+        params["containData"] = contain_data
+    return session.api_call("AppManagement", "Restore", params)
 
 
 def export_apps(