sovaria-cli 0.2.4__tar.gz → 0.2.5__tar.gz

{sovaria_cli-0.2.4 → sovaria_cli-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sovaria-cli
-Version: 0.2.4
+Version: 0.2.5
 Summary: Sovaria BaaS command-line interface (sov)
 Project-URL: Homepage, https://sovaria.in
 Project-URL: Documentation, https://docs.sovaria.in/cli

{sovaria_cli-0.2.4 → sovaria_cli-0.2.5}/apps/cli/src/commands/db.py

@@ -28,23 +28,118 @@ _LIST_TABLES_SQL = (
 )
 
 
-def _fetch_live_tables(
+def _begin_tx(
     *,
     profile: str | None,
     org_id: str | None,
     project_id: str | None,
     env_id: str | None,
-) -> list[str]:
+) -> int:
     result = call_api(
         method="POST",
-        path="/api/v1/sql/query",
+        path="/api/v1/data/rel/transaction/begin",
+        profile=profile,
+        org_id=org_id,
+        project_id=project_id,
+        env_id=env_id,
+        require_scope=True,
+    )
+    txid = result.get("txid") if isinstance(result, dict) else None
+    if not isinstance(txid, int) or txid < 1:
+        raise CLIRequestError(f"Invalid txid from transaction begin: {result!r}")
+    return txid
+
+
+def _commit_tx(
+    txid: int,
+    *,
+    profile: str | None,
+    org_id: str | None,
+    project_id: str | None,
+    env_id: str | None,
+) -> None:
+    call_api(
+        method="POST",
+        path="/api/v1/data/rel/transaction/commit",
         profile=profile,
-        body={"sql": _LIST_TABLES_SQL, "txid": 0},
+        body={"txid": txid},
         org_id=org_id,
         project_id=project_id,
         env_id=env_id,
         require_scope=True,
     )
+
+
+def _rollback_tx(
+    txid: int,
+    *,
+    profile: str | None,
+    org_id: str | None,
+    project_id: str | None,
+    env_id: str | None,
+) -> None:
+    try:
+        call_api(
+            method="POST",
+            path="/api/v1/data/rel/transaction/rollback",
+            profile=profile,
+            body={"txid": txid},
+            org_id=org_id,
+            project_id=project_id,
+            env_id=env_id,
+            require_scope=True,
+        )
+    except CLIRequestError:
+        pass
+
+
+def _run_sql_query(
+    sql: str,
+    *,
+    profile: str | None,
+    org_id: str | None,
+    project_id: str | None,
+    env_id: str | None,
+) -> dict:
+    scope = {
+        "profile": profile,
+        "org_id": org_id,
+        "project_id": project_id,
+        "env_id": env_id,
+    }
+    txid = _begin_tx(**scope)
+    try:
+        result = call_api(
+            method="POST",
+            path="/api/v1/sql/query",
+            profile=profile,
+            body={"sql": sql, "txid": txid},
+            org_id=org_id,
+            project_id=project_id,
+            env_id=env_id,
+            require_scope=True,
+        )
+        _commit_tx(txid, **scope)
+        return result if isinstance(result, dict) else {"rows": result}
+    except Exception:
+        _rollback_tx(txid, **scope)
+        raise
+
+
+def _fetch_live_tables(
+    *,
+    profile: str | None,
+    org_id: str | None,
+    project_id: str | None,
+    env_id: str | None,
+) -> list[str]:
+    result = _run_sql_query(
+        _LIST_TABLES_SQL,
+        profile=profile,
+        org_id=org_id,
+        project_id=project_id,
+        env_id=env_id,
+    )
     rows = result.get("rows") if isinstance(result, dict) else None
     if not isinstance(rows, list):
         return []
@@ -154,15 +249,12 @@ def _execute_sql(
     env_id: str | None,
 ) -> None:
     try:
-        result = call_api(
-            method="POST",
-            path="/api/v1/sql/query",
+        result = _run_sql_query(
+            sql,
             profile=profile,
-            body={"sql": sql, "txid": 0},
             org_id=org_id,
             project_id=project_id,
             env_id=env_id,
-            require_scope=True,
         )
     except CLIRequestError as exc:
         typer.echo(str(exc), err=True)
@@ -530,11 +622,8 @@ def migrations_push(
             continue
         typer.echo(f"Applying {path.name} …")
         try:
-            call_api(
-                method="POST",
-                path="/api/v1/sql/query",
-                body={"sql": sql, "txid": 0},
-                require_scope=True,
+            _run_sql_query(
+                sql,
                 **_scope_opts(profile, org_id, project_id, env_id),
             )
         except CLIRequestError as exc:

{sovaria_cli-0.2.4 → sovaria_cli-0.2.5}/apps/cli/tests/test_project_and_commands.py

@@ -60,10 +60,20 @@ def test_db_tables_uses_information_schema(monkeypatch: pytest.MonkeyPatch) -> N
     from apps.cli.src.commands import db
 
     captured: dict[str, Any] = {}
+    calls: list[tuple[str, str]] = []
 
     def _fake_call_api(**kwargs: Any) -> dict[str, Any]:
-        captured.update(kwargs)
-        return {"rows": [["users"], ["orders"]]}
+        method = str(kwargs.get("method", ""))
+        path = str(kwargs.get("path", ""))
+        calls.append((method, path))
+        if path.endswith("/transaction/begin"):
+            return {"txid": 1, "snapshot_txid": 1}
+        if path.endswith("/sql/query"):
+            captured.update(kwargs)
+            return {"rows": [["users"], ["orders"]]}
+        if path.endswith("/transaction/commit"):
+            return {"ok": True}
+        return {}
 
     monkeypatch.setattr(db, "call_api", _fake_call_api)
     db.list_tables(profile=None, org_id=None, project_id=None, env_id=None, migrations=False)
@@ -71,6 +81,9 @@ def test_db_tables_uses_information_schema(monkeypatch: pytest.MonkeyPatch) -> N
     assert captured["method"] == "POST"
     assert captured["path"] == "/api/v1/sql/query"
     assert "information_schema.tables" in captured["body"]["sql"]
+    assert captured["body"]["txid"] == 1
+    assert ("POST", "/api/v1/data/rel/transaction/begin") in calls
+    assert ("POST", "/api/v1/data/rel/transaction/commit") in calls
 
 
 def test_sim_discover_path_smoke(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -211,3 +224,34 @@ def test_storage_buckets_uses_call_api(monkeypatch: pytest.MonkeyPatch) -> None:
     assert captured["path"] == "/api/v1/store/buckets"
     assert captured["require_scope"] is True
     assert any("bucket-a" in line for line in output)
+
+
+def test_fetch_live_tables_uses_transaction(monkeypatch: pytest.MonkeyPatch) -> None:
+    from apps.cli.src.commands import db
+
+    calls: list[tuple[str, str]] = []
+
+    def _fake_call_api(**kwargs: Any) -> dict[str, Any]:
+        method = str(kwargs.get("method", ""))
+        path = str(kwargs.get("path", ""))
+        calls.append((method, path))
+        if path.endswith("/transaction/begin"):
+            return {"txid": 7, "snapshot_txid": 7}
+        if path.endswith("/sql/query"):
+            return {"rows": [["users"], ["posts"]]}
+        if path.endswith("/transaction/commit"):
+            return {"ok": True}
+        return {}
+
+    monkeypatch.setattr(db, "call_api", _fake_call_api)
+    tables = db._fetch_live_tables(
+        profile=None,
+        org_id="org-1",
+        project_id="proj-1",
+        env_id=None,
+    )
+
+    assert tables == ["users", "posts"]
+    assert ("POST", "/api/v1/data/rel/transaction/begin") in calls
+    assert ("POST", "/api/v1/sql/query") in calls
+    assert ("POST", "/api/v1/data/rel/transaction/commit") in calls

{sovaria_cli-0.2.4 → sovaria_cli-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sovaria-cli"
-version = "0.2.4"
+version = "0.2.5"
 description = "Sovaria BaaS command-line interface (sov)"
 readme = "apps/cli/README.md"
 requires-python = ">=3.11"