sovaria-cli 0.2.8__tar.gz → 0.2.9__tar.gz

{sovaria_cli-0.2.8 → sovaria_cli-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sovaria-cli
-Version: 0.2.8
+Version: 0.2.9
 Summary: Sovaria BaaS command-line interface (sov)
 Project-URL: Homepage, https://sovaria.in
 Project-URL: Documentation, https://docs.sovaria.in/cli
@@ -12,7 +12,7 @@ Requires-Dist: httpx>=0.28.1
 Requires-Dist: keyring>=25.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.7.0
-Requires-Dist: sovaria-sdk==0.4.0
+Requires-Dist: sovaria-sdk==0.4.1
 Requires-Dist: tomli-w>=1.2.0
 Requires-Dist: typer>=0.17.4
 Provides-Extra: dev
@@ -22,7 +22,7 @@ Requires-Dist: pytest>=8.0; extra == 'dev'
 Requires-Dist: ruff>=0.9; extra == 'dev'
 Requires-Dist: twine>=6.0; extra == 'dev'
 Provides-Extra: mcp
-Requires-Dist: sovaria-sdk[mcp]==0.4.0; extra == 'mcp'
+Requires-Dist: sovaria-sdk[mcp]==0.4.1; extra == 'mcp'
 Description-Content-Type: text/markdown
 
 # Sovaria CLI

{sovaria_cli-0.2.8 → sovaria_cli-0.2.9}/apps/cli/src/__init__.py

@@ -1,3 +1,3 @@
 """Sovaria CLI — sov command."""
 
-__version__ = "0.2.8"
+__version__ = "0.2.9"

{sovaria_cli-0.2.8 → sovaria_cli-0.2.9}/apps/cli/src/commands/db.py

@@ -612,6 +612,34 @@ def migrations_list(
     print_json(result)
 
 
+def _split_migration(path: Path) -> tuple[str, str | None]:
+    """Up and optional down SQL: a ``-- migrate:down`` section in the file, or a sibling ``<name>.down.sql``."""
+    import re as _re
+
+    text = path.read_text(encoding="utf-8")
+    parts = _re.split(r"^\s*--\s*migrate:down\s*$", text, maxsplit=1, flags=_re.MULTILINE | _re.IGNORECASE)
+    up = _re.sub(r"^\s*--\s*migrate:up\s*$", "", parts[0], flags=_re.MULTILINE | _re.IGNORECASE).strip()
+    down = parts[1].strip() if len(parts) > 1 else None
+    sibling = path.with_name(f"{path.stem}.down.sql")
+    if not down and sibling.exists():
+        down = sibling.read_text(encoding="utf-8").strip() or None
+    return up, down
+
+
+def _remote_migration_names(scope: dict[str, str | None]) -> set[str]:
+    """Names of migrations currently applied on the server (pages through the whole history)."""
+    names: set[str] = set()
+    offset, page = 0, 500  # server maximum
+    while True:
+        result = call_api(method="GET", path="/api/v1/data/rel/migrations",
+                          params={"limit": str(page), "offset": str(offset)}, require_scope=True, **scope)
+        rows = result.get("migrations", []) if isinstance(result, dict) else []
+        names |= {str(r.get("name")) for r in rows if isinstance(r, dict) and r.get("status", "applied") == "applied"}
+        if len(rows) < page:
+            return names
+        offset += page
+
+
 @migrations_app.command("push")
 def migrations_push(
     directory: str | None = typer.Option(
@@ -619,60 +647,96 @@ def migrations_push(
         "--dir",
         help="Migration directory (default: sovaria/migrations under linked project)",
     ),
-    dry_run: bool = typer.Option(False, "--dry-run", help="Show pending files without executing"),
+    dry_run: bool = typer.Option(
+        False, "--dry-run", help="Run each pending migration in a transaction and roll it back (nothing is kept)"
+    ),
     profile: str | None = typer.Option(None, "--profile"),
     org_id: str | None = typer.Option(None, "--org"),
     project_id: str | None = typer.Option(None, "--project"),
     env_id: str | None = typer.Option(None, "--env"),
 ) -> None:
-    """Apply pending local .sql migration files in sorted order."""
+    """Apply pending .sql migrations through the project's migration history.
+
+    Each file is applied atomically and recorded on the server, so every teammate and CI run sees the
+    same history. Put rollback SQL under a ``-- migrate:down`` line (or in ``<name>.down.sql``) to make
+    a migration reversible with ``sov db migrations rollback``.
+    """
     from apps.cli.src.utils.migrations import (
         list_local_migrations,
         load_applied_state,
-        migration_name,
         migrations_dir,
         save_applied_state,
     )
     from apps.cli.src.utils.premium_display import _console
 
     folder = Path(directory) if directory else migrations_dir()
-    files = list_local_migrations(folder)
+    files = [p for p in list_local_migrations(folder) if not p.name.endswith(".down.sql")]
     if not files:
         print_warning(f"No .sql files in {folder}. Create migrations there first.")
         raise typer.Exit(0)
 
-    applied = load_applied_state()
-    pending = [path for path in files if migration_name(path) not in applied]
+    scope = _scope_opts(profile, org_id, project_id, env_id)
+    try:
+        remote = run_with_spinner("Reading migration history…", lambda: _remote_migration_names(scope))
+    except CLIRequestError as exc:
+        handle_cli_error(exc)
+    pending = [path for path in files if path.stem not in remote]
     if not pending:
-        print_success("All local migrations already applied.")
+        print_success("Database is up to date — every local migration is in the project history.")
         raise typer.Exit(0)
 
     _console.print(f"\n[bold]Pending migrations ({len(pending)}):[/bold]")
     for path in pending:
         _console.print(f"  • {path.name}")
 
-    if dry_run:
-        raise typer.Exit(0)
-
-    scope = _scope_opts(profile, org_id, project_id, env_id)
+    endpoint = "/api/v1/data/rel/migrations/dry-run" if dry_run else "/api/v1/data/rel/migrations/apply"
+    applied_local = load_applied_state()
     for path in pending:
-        sql = path.read_text(encoding="utf-8").strip()
-        if not sql:
+        up, down = _split_migration(path)
+        if not up:
             print_warning(f"Skipping empty file: {path.name}")
-            applied.add(migration_name(path))
             continue
+        body = {"name": path.stem[:120], "up_sql": up, **({"down_sql": down} if down else {})}
         try:
             run_with_spinner(
-                f"Applying {path.name}…",
-                lambda s=sql: _run_sql_query(s, **scope),
-                success=f"Applied {path.name}",
+                f"{'Checking' if dry_run else 'Applying'} {path.name}…",
+                lambda b=body: call_api(method="POST", path=endpoint, body=b, require_scope=True, **scope),
+                success=f"{'Would apply' if dry_run else 'Applied'} {path.name}",
             )
         except CLIRequestError as exc:
             handle_cli_error(exc)
-        applied.add(migration_name(path))
+        if not dry_run:
+            applied_local.add(path.name)
+
+    if dry_run:
+        print_success(f"All {len(pending)} pending migration(s) apply cleanly. Nothing was changed.")
+        return
+    save_applied_state(applied_local)
+    print_success(f"Applied {len(pending)} migration(s).")
 
-    state_file = save_applied_state(applied)
-    print_success(f"Applied {len(pending)} migration(s). State: {state_file}")
+
+@migrations_app.command("rollback")
+def migrations_rollback(
+    version: str | None = typer.Option(None, "--version", help="Roll back this version (needs --force if it isn't the latest)"),
+    force: bool = typer.Option(False, "--force", help="Allow rolling back a migration that isn't the most recent"),
+    profile: str | None = typer.Option(None, "--profile"),
+    org_id: str | None = typer.Option(None, "--org"),
+    project_id: str | None = typer.Option(None, "--project"),
+    env_id: str | None = typer.Option(None, "--env"),
+) -> None:
+    """Undo the most recent migration using its down SQL."""
+    scope = _scope_opts(profile, org_id, project_id, env_id)
+    params = {**({"version": version} if version else {}), **({"force": "true"} if force else {})}
+    try:
+        result = run_with_spinner(
+            "Rolling back…",
+            lambda: call_api(method="POST", path="/api/v1/data/rel/migrations/rollback", params=params,
+                             require_scope=True, **scope),
+            success="Rolled back",
+        )
+    except CLIRequestError as exc:
+        handle_cli_error(exc)
+    print_json(result)
 
 
 @migrations_app.command("pull")

{sovaria_cli-0.2.8 → sovaria_cli-0.2.9}/apps/cli/src/commands/login.py

@@ -228,6 +228,36 @@ def _generate_pkce_pair() -> tuple[str, str]:
 
 # ── Local callback server ─────────────────────────────────────────────────────
 
+_PAGE_COPY = {
+    "ok": ("Signed in to the Sovaria CLI", "You're all set. Return to your terminal — this tab can be closed.", "#15803d", "✓"),
+    "denied": ("Sign-in cancelled", "Nothing was authorized. Run <code>sov login</code> again if you change your mind.", "#6b625a", "&#8211;"),
+    "error": ("Sign-in couldn't be completed", "The response didn't match this login attempt, so it was ignored. Run <code>sov login</code> again.", "#b4231f", "!"),
+}
+
+
+def _callback_page(kind: str) -> bytes:
+    """Small self-contained page (no external assets) shown in the browser after authorization."""
+    title, body, color, glyph = _PAGE_COPY[kind]
+    return f"""<!doctype html><html lang="en"><head><meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1"><title>{title} · Sovaria</title>
+<style>
+:root{{--bg:#faf9f7;--card:#fff;--text:#1c1917;--muted:#6b625a;--border:#ece6e0;--accent:{color}}}
+@media (prefers-color-scheme:dark){{:root{{--bg:#141210;--card:#1c1a17;--text:#f5f2ee;--muted:#a39b92;--border:#2e2a26}}}}
+*{{box-sizing:border-box}}body{{margin:0;min-height:100vh;display:flex;flex-direction:column;background:var(--bg);color:var(--text);
+font:14px/1.55 -apple-system,BlinkMacSystemFont,"Segoe UI",Inter,Arial,sans-serif}}
+header{{padding:16px 24px;font-weight:700;font-size:15px;letter-spacing:-.01em}}
+header span{{display:inline-block;width:10px;height:10px;border-radius:3px;background:#c2610c;margin-right:8px}}
+main{{flex:1;display:flex;align-items:center;justify-content:center;padding:24px 16px 64px}}
+.card{{width:min(420px,100%);padding:28px;border:1px solid var(--border);border-radius:12px;background:var(--card)}}
+.glyph{{width:32px;height:32px;display:grid;place-items:center;margin-bottom:16px;border-radius:8px;font-weight:700;
+color:var(--accent);background:color-mix(in srgb,var(--accent) 14%,transparent)}}
+.kicker{{margin:0 0 6px;font-size:12px;color:var(--muted)}}h1{{margin:0;font-size:20px;line-height:1.3;font-weight:600}}
+p.body{{margin:8px 0 0;color:var(--muted)}}code{{font:12px ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--text)}}
+</style></head><body><header><span></span>Sovaria</header><main><section class="card">
+<div class="glyph" aria-hidden="true">{glyph}</div><p class="kicker">Sovaria CLI</p><h1>{title}</h1>
+<p class="body">{body}</p></section></main></body></html>""".encode()
+
+
 
 def _make_callback_handler(
     result_queue: queue.Queue[tuple[str, str | None]], expected_state: str
@@ -256,23 +286,25 @@ def _make_callback_handler(
             # CSRF / state check — reject responses whose state doesn't match
             # what we sent to the auth server (RFC 6749 §10.12).
             if state != expected_state:
-                self._respond(
-                    400,
-                    b"<html><body><h2>State mismatch - possible CSRF attack.</h2></body></html>",
-                )
+                self._respond(400, _callback_page("error"))
                 result_queue.put(("csrf", None))
                 return
 
-            html = (
-                b"<html><body><h2>Sovaria Login Successful</h2>"
-                b"<p>You can close this tab and return to the terminal.</p></body></html>"
-            )
-            self._respond(200, html)
+            if qs.get("error", [None])[0] == "access_denied":
+                self._respond(200, _callback_page("denied"))
+                result_queue.put(("denied", None))
+                return
+
+            self._respond(200 if code else 400, _callback_page("ok" if code else "error"))
             result_queue.put(("ok", code) if code else ("missing_code", None))
 
         def _respond(self, status: int, body: bytes) -> None:
             self.send_response(status)
-            self.send_header("Content-Type", "text/html")
+            self.send_header("Content-Type", "text/html; charset=utf-8")
+            self.send_header("Cache-Control", "no-store")
+            self.send_header("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'")
+            self.send_header("X-Frame-Options", "DENY")
+            self.send_header("Referrer-Policy", "no-referrer")
             self.end_headers()
             self.wfile.write(body)
 
@@ -303,8 +335,8 @@ def _serve_callback(expected_state: str) -> tuple[str | None, str | None]:
                 return code, None
             if status == "csrf":
                 return None, "csrf"
-            if status == "missing_code":
-                return None, "missing_code"
+            if status in ("missing_code", "denied"):
+                return None, status
         return None, "timeout"
     finally:
         server.server_close()
@@ -468,6 +500,10 @@ def _pkce_login(
     if not code:
         if callback_error == "csrf":
             print_error_panel("Login failed: callback state mismatch (possible CSRF).")
+        elif callback_error == "denied":
+            print_error_panel("Login cancelled in the browser. Nothing was authorized.")
+        elif callback_error == "missing_code":
+            print_error_panel("Login failed: the browser returned without an authorization code. Run: sov login")
         else:
             print_error_panel(
                 "No authorization code received — login timed out.\n"

{sovaria_cli-0.2.8 → sovaria_cli-0.2.9}/apps/cli/src/commands/org.py

@@ -93,6 +93,11 @@ def create_org(
         raise typer.Exit(1) from exc
 
     node_id = data.get("node_id")
+    from apps.cli.src.utils.output_mode import wants_json
+
+    if wants_json():
+        typer.echo(json.dumps(data, default=str))
+        return
     typer.echo(
         typer.style("✓ Created", fg=typer.colors.GREEN)
         + f" {node_type} '{name}'  node_id={node_id}"

sovaria_cli-0.2.9/apps/cli/tests/test_db_migrations.py

@@ -0,0 +1,62 @@
+"""`sov db migrations push/rollback` go through the server's migration history."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from typer.testing import CliRunner
+
+from apps.cli.src.commands import db
+
+runner = CliRunner()
+
+
+def _fake_api(calls: list, remote: list[str]):
+    def call_api(**kw):
+        calls.append(kw)
+        if kw["method"] == "GET":
+            return {"migrations": [{"name": n, "status": "applied"} for n in remote]}
+        return {"status": "applied"}
+    return call_api
+
+
+def test_split_migration_sections_and_sibling(tmp_path: Path):
+    f = tmp_path / "001_notes.sql"
+    f.write_text("-- migrate:up\ncreate table notes (id int);\n-- migrate:down\ndrop table notes;\n")
+    assert db._split_migration(f) == ("create table notes (id int);", "drop table notes;")
+    g = tmp_path / "002_idx.sql"
+    g.write_text("create index i on notes (id);")
+    (tmp_path / "002_idx.down.sql").write_text("drop index i;")
+    assert db._split_migration(g) == ("create index i on notes (id);", "drop index i;")
+
+
+def test_push_applies_only_files_missing_from_server_history(tmp_path: Path, monkeypatch):
+    (tmp_path / "001_a.sql").write_text("create table a (id int);")
+    (tmp_path / "002_b.sql").write_text("create table b (id int);\n-- migrate:down\ndrop table b;")
+    (tmp_path / "002_b.down.sql").write_text("ignored because the file has its own down section")
+    calls: list = []
+    monkeypatch.setattr(db, "call_api", _fake_api(calls, remote=["001_a"]))
+    monkeypatch.setattr("apps.cli.src.utils.migrations.save_applied_state", lambda s: tmp_path / "state.json")
+    monkeypatch.setattr("apps.cli.src.utils.migrations.load_applied_state", lambda: set())
+    result = runner.invoke(db.app, ["migrations", "push", "--dir", str(tmp_path)])
+    assert result.exit_code == 0, result.output
+    posts = [c for c in calls if c["method"] == "POST"]
+    assert [c["body"]["name"] for c in posts] == ["002_b"]
+    assert posts[0]["path"].endswith("/migrations/apply") and posts[0]["body"]["down_sql"] == "drop table b;"
+
+
+def test_dry_run_uses_server_dry_run(tmp_path: Path, monkeypatch):
+    (tmp_path / "001_a.sql").write_text("create table a (id int);")
+    calls: list = []
+    monkeypatch.setattr(db, "call_api", _fake_api(calls, remote=[]))
+    result = runner.invoke(db.app, ["migrations", "push", "--dir", str(tmp_path), "--dry-run"])
+    assert result.exit_code == 0, result.output
+    assert [c["path"] for c in calls if c["method"] == "POST"] == ["/api/v1/data/rel/migrations/dry-run"]
+
+
+def test_rollback_passes_version_and_force(monkeypatch):
+    calls: list = []
+    monkeypatch.setattr(db, "call_api", _fake_api(calls, remote=[]))
+    result = runner.invoke(db.app, ["migrations", "rollback", "--version", "20261013", "--force"])
+    assert result.exit_code == 0, result.output
+    assert calls[-1]["path"].endswith("/migrations/rollback") and calls[-1]["params"] == {"version": "20261013", "force": "true"}

{sovaria_cli-0.2.8 → sovaria_cli-0.2.9}/apps/cli/tests/test_main_startup.py

@@ -26,4 +26,4 @@ def test_sov_console_script_help() -> None:
     )
 
     assert result.returncode == 0
-    assert "sov version 0.2.8" in result.stdout
+    assert "sov version 0.2.9" in result.stdout

{sovaria_cli-0.2.8 → sovaria_cli-0.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sovaria-cli"
-version = "0.2.8"
+version = "0.2.9"
 description = "Sovaria BaaS command-line interface (sov)"
 readme = "apps/cli/README.md"
 requires-python = ">=3.11"
@@ -12,7 +12,7 @@ license = { text = "MIT" }
 authors = [{ name = "Sovaria Team" }]
 # Keep in sync with requirements.txt. Pin sovaria-sdk exactly and publish CLI+SDK together.
 dependencies = [
-    "sovaria-sdk==0.4.0",
+    "sovaria-sdk==0.4.1",
     "typer>=0.17.4",
     "httpx>=0.28.1",
     "keyring>=25.0",
@@ -31,7 +31,7 @@ sov = "apps.cli.src.main:cli_entry"
 
 [project.optional-dependencies]
 mcp = [
-    "sovaria-sdk[mcp]==0.4.0",
+    "sovaria-sdk[mcp]==0.4.1",
 ]
 dev = [
     "pytest>=8.0",

{sovaria_cli-0.2.8 → sovaria_cli-0.2.9}/requirements.txt

@@ -1,6 +1,6 @@
 # Runtime dependencies for sovaria-cli. Prefer: pip install sovaria-cli
 # Keep in sync with [project].dependencies in pyproject.toml.
-sovaria-sdk==0.4.0
+sovaria-sdk==0.4.1
 typer>=0.17.4
 httpx>=0.28.1
 keyring>=25.0