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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.3
+Version: 0.8.4
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -155,7 +155,7 @@ discover every subcommand.
 | `app create-section / edit-section / delete-section` | Section management |
 | `app sort-sections / sort-worksheets` | Reorder sections / a section's worksheets |
 | `app create-item` | Batch-create empty worksheets / custom pages |
-| `app backup / restore / export / exports / backup-logs` | Backup & export |
+| `app backup / export / exports / backup-logs` | Backup & export |
 | `app usage / logs` | Statistics and operation logs |
 | `app role …` | Role CRUD, permissions, members, leave-all, applications |
 | `app optionset …` | Option set CRUD and cross-app moves |

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

@@ -126,7 +126,7 @@ discover every subcommand.
 | `app create-section / edit-section / delete-section` | Section management |
 | `app sort-sections / sort-worksheets` | Reorder sections / a section's worksheets |
 | `app create-item` | Batch-create empty worksheets / custom pages |
-| `app backup / restore / export / exports / backup-logs` | Backup & export |
+| `app backup / export / exports / backup-logs` | Backup & export |
 | `app usage / logs` | Statistics and operation logs |
 | `app role …` | Role CRUD, permissions, members, leave-all, applications |
 | `app optionset …` | Option set CRUD and cross-app moves |

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

@@ -126,7 +126,7 @@ discover every subcommand.
 | `app create-section / edit-section / delete-section` | Section management |
 | `app sort-sections / sort-worksheets` | Reorder sections / a section's worksheets |
 | `app create-item` | Batch-create empty worksheets / custom pages |
-| `app backup / restore / export / exports / backup-logs` | Backup & export |
+| `app backup / export / exports / backup-logs` | Backup & export |
 | `app usage / logs` | Statistics and operation logs |
 | `app role …` | Role CRUD, permissions, members, leave-all, applications |
 | `app optionset …` | Option set CRUD and cross-app moves |

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

@@ -117,7 +117,7 @@ hap --json worksheet record list WORKSHEET_ID
 | `app create-section / edit-section / delete-section` | 分组管理 |
 | `app sort-sections / sort-worksheets` | 重排分组 / 分组内工作表顺序 |
 | `app create-item` | 批量创建空白工作表/自定义页面 |
-| `app backup / restore / export / exports / backup-logs` | 备份与导出 |
+| `app backup / export / exports / backup-logs` | 备份与导出 |
 | `app usage / logs` | 使用统计与操作日志 |
 | `app role …` | 角色 CRUD、权限、成员、leave-all、申请 |
 | `app optionset …` | 选项集 CRUD 与跨应用迁移 |

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

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

{hap_cli-0.8.3 → hap_cli-0.8.4}/hap_cli/commands/app_cmd.py

@@ -410,37 +410,6 @@ def app_backup(ctx, app_id, org_id, no_data):
         ctx.handle_error(e)
 
 
-@app.command("restore")
-@click.argument("app_id")
-@org_id_option()
-@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, 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=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}"))
-    except Exception as e:
-        ctx.handle_error(e)
-
-
 @app.command("export")
 @click.argument("app_ids", nargs=-1, required=True)
 @org_id_option()

{hap_cli-0.8.3 → hap_cli-0.8.4}/hap_cli/core/app.py

@@ -620,55 +620,6 @@ def backup_app(
     )
 
 
-def restore_app(
-    session: Session,
-    app_id: str,
-    project_id: 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 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(
     session: Session,
     project_id: str,

{hap_cli-0.8.3 → hap_cli-0.8.4}/hap_cli/locale/messages.json

@@ -900,27 +900,6 @@
     "app optionset update --options-json": {
       "en": "Option list.  [JSON value]  [required]"
     },
-    "app restore": {
-      "en": "Restore an application from backup."
-    },
-    "app restore --as-new": {
-      "en": "Restore as a new app"
-    },
-    "app restore --backup-id": {
-      "en": "Backup ID"
-    },
-    "app restore --file-name": {
-      "en": "Backup file name"
-    },
-    "app restore --file-url": {
-      "en": "Backup file URL"
-    },
-    "app restore --no-data": {
-      "en": "Restore without data"
-    },
-    "app restore --org-id": {
-      "en": "Organization ID"
-    },
     "app role": {
       "en": "Role management."
     },

{hap_cli-0.8.3 → hap_cli-0.8.4}/hap_cli/tests/test_core.py

@@ -6388,7 +6388,7 @@ class TestShellCompletion:
         comp = BashComplete(cli, {}, "hap", "_HAP_COMPLETE")
         items = comp.get_completions(["app"], "r")
         values = {item.value for item in items}
-        # app has a `role` subcommand; `restore` is fine too if it exists
+        # app has a `role` subcommand that completes from the "r" prefix
         assert "role" in values
 
     def test_completion_engine_completes_option_names(self):

{hap_cli-0.8.3 → hap_cli-0.8.4}/hap_cli/tests/test_org_id_cli.py

@@ -15,7 +15,6 @@ ORG_ID_HELP_CASES = [
     # as a body parameter (schema property ``org_id``).
     ["app", "create"],
     ["app", "backup"],
-    ["app", "restore"],
     ["app", "backup-logs"],
     ["app", "usage"],
     ["contact", "search"],

{hap_cli-0.8.3 → hap_cli-0.8.4}/hap_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.3
+Version: 0.8.4
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -155,7 +155,7 @@ discover every subcommand.
 | `app create-section / edit-section / delete-section` | Section management |
 | `app sort-sections / sort-worksheets` | Reorder sections / a section's worksheets |
 | `app create-item` | Batch-create empty worksheets / custom pages |
-| `app backup / restore / export / exports / backup-logs` | Backup & export |
+| `app backup / export / exports / backup-logs` | Backup & export |
 | `app usage / logs` | Statistics and operation logs |
 | `app role …` | Role CRUD, permissions, members, leave-all, applications |
 | `app optionset …` | Option set CRUD and cross-app moves |

{hap_cli-0.8.3 → hap_cli-0.8.4}/hap_cli.egg-info/SOURCES.txt

@@ -103,7 +103,6 @@ hap_cli/tests/__init__.py
 hap_cli/tests/conftest.py
 hap_cli/tests/test_app_editor.py
 hap_cli/tests/test_app_export_usage.py
-hap_cli/tests/test_app_restore.py
 hap_cli/tests/test_auth_prerelease.py
 hap_cli/tests/test_bug_036430.py
 hap_cli/tests/test_chart.py

hap_cli-0.8.3/hap_cli/tests/test_app_restore.py

@@ -1,123 +0,0 @@
-"""Bugfix coverage for `hap app restore` (bug #036418).
-
-The wrapper forced ``--backup-id``, ``--file-url`` and ``--file-name`` to
-all be ``required`` at once, but the HAP UI actually has two mutually
-exclusive restore modes (traced from pd-openweb):
-
-- Restore from an existing backup log
-  (``src/pages/AppSettings/components/appBackupRestore/components/BackupFiles.jsx``):
-  sends ``{appId, projectId, id, autoEndMaintain, backupCurrentVersion,
-  isRestoreNew}`` — NO fileUrl/fileName.
-- Restore from an uploaded file
-  (``.../BackupFromFiles.jsx``): sends ``{appId, projectId, fileUrl,
-  fileName, autoEndMaintain, backupCurrentVersion, isRestoreNew,
-  containData}`` — NO id.
-
-So the user only ever has one of (backup-id) or (file-url) on hand;
-requiring both made the command impossible to run.
-"""
-
-from unittest.mock import MagicMock, patch
-
-import pytest
-from click.testing import CliRunner
-
-from hap_cli.core import app as app_mod
-from hap_cli.core.session import Session
-from hap_cli.hap_cli import cli
-
-
-def _mock_response(data, state=1):
-    resp = MagicMock()
-    resp.status_code = 200
-    resp.json.return_value = {"data": data, "state": state}
-    resp.raise_for_status = MagicMock()
-    return resp
-
-
-@pytest.fixture
-def mock_session():
-    return Session(server_url="https://test.mingdao.com", auth_token="tok123")
-
-
-@pytest.fixture
-def logged_in(monkeypatch):
-    sess = Session(server_url="https://test.mingdao.com", auth_token="tok123")
-    sess.default_project_id = "org-default"
-    monkeypatch.setattr("hap_cli.context.Session.load", lambda *a, **k: sess)
-    return sess
-
-
-def _posted_body(mock_post):
-    return mock_post.call_args[1]["json"]
-
-
-class TestRestoreCore:
-    @patch("hap_cli.core.session.requests.post")
-    def test_backup_mode_sends_id_not_file(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response(True)
-        app_mod.restore_app(
-            mock_session, "app1", "org1", backup_id="bk1", is_restore_new=True
-        )
-        body = _posted_body(mock_post)
-        assert body["id"] == "bk1"
-        assert "fileUrl" not in body
-        assert "fileName" not in body
-        assert body["appId"] == "app1"
-        assert body["projectId"] == "org1"
-        assert body["isRestoreNew"] is True
-        assert body["autoEndMaintain"] is False
-        assert body["backupCurrentVersion"] is False
-
-    @patch("hap_cli.core.session.requests.post")
-    def test_file_mode_sends_file_not_id(self, mock_post, mock_session):
-        mock_post.return_value = _mock_response(True)
-        app_mod.restore_app(
-            mock_session,
-            "app1",
-            "org1",
-            file_url="https://x/y.mdy",
-            file_name="y.mdy",
-            contain_data=True,
-        )
-        body = _posted_body(mock_post)
-        assert body["fileUrl"] == "https://x/y.mdy"
-        assert body["fileName"] == "y.mdy"
-        assert body["containData"] is True
-        assert "id" not in body
-        assert body["autoEndMaintain"] is False
-        assert body["backupCurrentVersion"] is False
-
-    def test_requires_one_mode(self, mock_session):
-        with pytest.raises(ValueError):
-            app_mod.restore_app(mock_session, "app1", "org1")
-
-
-class TestRestoreCli:
-    def test_backup_id_only_is_accepted(self, logged_in):
-        with patch("hap_cli.core.session.requests.post") as mock_post:
-            mock_post.return_value = _mock_response(True)
-            res = CliRunner().invoke(
-                cli, ["app", "restore", "app1", "--backup-id", "bk1"]
-            )
-        assert res.exit_code == 0, res.output
-        assert _posted_body(mock_post)["id"] == "bk1"
-
-    def test_file_url_only_is_accepted(self, logged_in):
-        with patch("hap_cli.core.session.requests.post") as mock_post:
-            mock_post.return_value = _mock_response(True)
-            res = CliRunner().invoke(
-                cli,
-                [
-                    "app", "restore", "app1",
-                    "--file-url", "https://x/y.mdy",
-                    "--file-name", "y.mdy",
-                ],
-            )
-        assert res.exit_code == 0, res.output
-        assert _posted_body(mock_post)["fileUrl"] == "https://x/y.mdy"
-
-    def test_neither_mode_errors(self, logged_in):
-        res = CliRunner().invoke(cli, ["app", "restore", "app1"])
-        assert res.exit_code != 0
-        assert "backup-id" in res.output or "file-url" in res.output