sovaria-cli 0.6.0__tar.gz → 0.7.0__tar.gz

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/PKG-INFO

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

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/apps/cli/src/__init__.py

@@ -1,3 +1,3 @@
 """Sovaria CLI — sov command."""
 
-__version__ = "0.6.0"
+__version__ = "0.7.0"

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/apps/cli/src/commands/db.py

@@ -972,6 +972,7 @@ def _dry_run_in_order(items: list[tuple[Path, dict]], scope: dict[str, str | Non
     print_success(f"All {len(items)} pending migration(s) apply cleanly in order. Nothing was changed.")
 
 
+@app.command("push", help="Apply pending migrations (same as `sov db migrations push`, like `supabase db push`).")
 @migrations_app.command("push")
 def migrations_push(
     directory: str | None = typer.Option(

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/apps/cli/src/commands/import_cmd.py

@@ -543,7 +543,7 @@ def import_firebase(
             if mapping and not dry_run:
                 Path(_UID_MAP).write_text(json.dumps(mapping, indent=2))
             print_success(f"Users: {len(users)} read" + (f"; uid map in {_UID_MAP}" if mapping else ""))
-        elif "auth" in parts and only:
+        elif "auth" in parts:
             print_warning("Auth skipped: pass --auth-export (firebase auth:export users.json --format=json)")
 
         if "firestore" in parts and sa:
@@ -562,8 +562,14 @@ def import_firebase(
             report["rules"] = suggestions
             Path("sovaria-rules-report.md").write_text(_rules_markdown(suggestions))
             print_success(f"Rules: {len(suggestions)} rule(s) mapped in sovaria-rules-report.md (review, then add in Policies)")
-        if ("firestore" in parts or "storage" in parts) and not sa and only:
+        if ("firestore" in parts or "storage" in parts) and not sa:
             print_warning("Firestore/Storage skipped: pass --service-account")
+        if "rules" in parts and not rules and only:
+            print_warning("Rules skipped: pass --rules firestore.rules")
+        if not ({"auth", "firestore", "storage", "rules"} & set(report)):
+            typer.echo("Nothing was imported: pass --auth-export, --service-account and/or --rules "
+                       "(see `sov import firebase --help`).", err=True)
+            raise typer.Exit(1)
     except CLIRequestError as exc:
         report["error"] = str(exc)
         _write_report(report)

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/apps/cli/src/commands/keys.py

@@ -6,7 +6,7 @@ from urllib.parse import quote
 
 import typer
 
-from apps.cli.src.utils.api_client import CLIRequestError, call_api, parse_json_arg
+from apps.cli.src.utils.api_client import CLIRequestError, call_api
 from apps.cli.src.utils.display import handle_cli_error, print_json, print_success, print_warning
 from apps.cli.src.utils.premium_display import run_with_spinner
 
@@ -49,7 +49,8 @@ def create_key(
     name: str = typer.Option(..., "--name", help="Human-readable key name"),
     role: str = typer.Option("viewer", "--role", help="admin, editor or viewer (read-only)"),
     expires: str = typer.Option("never", "--expires", help="never, 30d, 90d or 1y"),
-    metadata: str | None = typer.Option(None, "--metadata", help="JSON object"),
+    metadata: str | None = typer.Option(None, "--metadata", hidden=True,
+                                        help="Not stored by the server (kept so old scripts still run)"),
     profile: str | None = typer.Option(None, "--profile"),
     org_id: str | None = typer.Option(None, "--org"),
     project_id: str | None = typer.Option(None, "--project"),
@@ -72,9 +73,9 @@ def create_key(
     expires = expires.strip().lower()
     if expires not in _EXPIRIES:
         raise typer.BadParameter("choose never, 30d, 90d or 1y", param_hint="--expires")
-    parsed = parse_json_arg(metadata, label="--metadata") if metadata else {}
-    if parsed is not None and not isinstance(parsed, dict):
-        raise typer.BadParameter("--metadata must be a JSON object")
+    if metadata:
+        # API keys have no metadata field: the server dropped it silently (p32). Say so instead.
+        print_warning("--metadata is ignored: API keys don't store metadata (use --name to label the key)")
     try:
         result = run_with_spinner(
             f"Creating API key '{name}'…",
@@ -86,7 +87,7 @@ def create_key(
                 project_id=project_id,
                 env_id=env_id,
                 require_scope=True,
-                body={"name": name, "kind": "custom", "role": role, "expires_in": expires, "metadata": parsed or {}},
+                body={"name": name, "kind": "custom", "role": role, "expires_in": expires},
             ),
             success="API key created",
         )

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/apps/cli/src/commands/link_cmd.py

@@ -7,7 +7,8 @@ from pathlib import Path
 import typer
 
 from apps.cli.src.utils.api_client import CLIRequestError
-from apps.cli.src.utils.display import handle_cli_error, handle_command_error, print_success
+from apps.cli.src.utils.auth_store import load_tokens
+from apps.cli.src.utils.display import handle_cli_error, handle_command_error, print_success, print_warning
 from apps.cli.src.utils.premium_display import (
     print_brand_panel,
     print_next_steps,
@@ -15,7 +16,7 @@ from apps.cli.src.utils.premium_display import (
     run_with_spinner,
 )
 from apps.cli.src.utils.project_context import find_project_config, link_project_to_profile
-from apps.cli.src.utils.scope_picker import interactive_pick_scope
+from apps.cli.src.utils.scope_picker import fetch_projects, interactive_pick_scope
 
 app = typer.Typer(help="Link local project to Sovaria cloud", invoke_without_command=True)
 
@@ -28,6 +29,27 @@ _LINK_NEXT_STEPS = [
 ]
 
 
+def _verify_project(org_id: str, project_id: str, profile: str | None) -> None:
+    """Refuse to link a project the signed-in user can't reach (a typo used to be written as-is and every later
+    command failed). Logged out (CI with a key, offline), the IDs are linked unchecked, with a warning."""
+    if not load_tokens(profile=profile):
+        print_warning("Not logged in: the org/project IDs were not checked (run `sov login` to check them).")
+        return
+    try:
+        projects = fetch_projects(org_id, profile)
+    except CLIRequestError as exc:
+        if exc.status_code in (401, 403, 404, 422):
+            typer.echo(f"You can't access organisation {org_id} ({exc}). Check --org, or run `sov orgs`.", err=True)
+            raise typer.Exit(1) from None
+        print_warning(f"Couldn't check the project ({exc}); linking anyway.")
+        return
+    ids = {str(p.get("node_id") or p.get("id") or "").lower() for p in projects}
+    if project_id.strip().lower() not in ids:
+        typer.echo(f"Project {project_id} isn't in organisation {org_id}. Run `sov projects {org_id}` to list them.",
+                   err=True)
+        raise typer.Exit(1)
+
+
 @app.callback()
 def link_project(
     org_id: str | None = typer.Option(None, "--org", help="Organisation UUID"),
@@ -87,6 +109,8 @@ def link_project(
         typer.echo("No sovaria.config.json found. Run: sov init", err=True)
         raise typer.Exit(1)
 
+    _verify_project(resolved_org, resolved_project, profile)
+
     try:
         path = link_project_to_profile(
             org_id=resolved_org,

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/apps/cli/src/commands/oidc_providers.py

@@ -175,13 +175,13 @@ def login_url(
             "Building OIDC login URL…",
             lambda: call_api(
                 method="GET",
-                path=f"/api/v1/auth/oidc/{quote(provider_id, safe='')}/login",
+                path=f"/api/v1/auth/sso/{quote(provider_id, safe='')}/authorize",
                 profile=profile,
                 org_id=resolved_org,
                 project_id=resolved_project,
                 env_id=env_id,
                 require_scope=True,
-                params={"project_id": resolved_project},
+                params={"project_id": resolved_project, "mode": "json"},
             ),
             success="Login URL ready",
         )

sovaria_cli-0.7.0/apps/cli/src/commands/orgs_projects.py

@@ -0,0 +1,167 @@
+"""`sov orgs` and `sov projects`: list (the old forms keep working), `sov orgs get`, `sov projects create`.
+
+`sov projects create` does what the console's New project dialog does: the project node, its owner edge, the
+primary environment, and the database. It sends a region only when you pass `--region`; otherwise the server uses
+the organization's default region (Organization settings › General), and Sovaria's default when the org has none.
+"""
+
+from __future__ import annotations
+
+import sys
+from typing import Any
+from urllib.parse import quote
+
+import typer
+from typer.core import TyperGroup
+
+from apps.cli.src.commands import context as context_mod
+from apps.cli.src.utils.api_client import CLIRequestError, call_api
+from apps.cli.src.utils.api_helpers import require_login
+from apps.cli.src.utils.config import get_scope
+from apps.cli.src.utils.display import handle_cli_error, print_json, print_success, print_warning
+from apps.cli.src.utils.output_mode import wants_json
+
+
+class _ListByDefault(TyperGroup):
+    """`sov projects` / `sov projects <org_id>` run `list`; named subcommands run as usual."""
+
+    def resolve_command(self, ctx: Any, args: list[str]) -> Any:
+        if args and args[0] not in self.commands and not args[0].startswith("-"):
+            return "list", self.commands["list"], args
+        return super().resolve_command(ctx, args)
+
+
+orgs_app = typer.Typer(cls=_ListByDefault, invoke_without_command=True,
+                       help="Your organisations: list (default) and get (with the default region)")
+projects_app = typer.Typer(cls=_ListByDefault, invoke_without_command=True,
+                           help="Projects: list (default) and create (in the org's default region unless --region)")
+
+
+@orgs_app.callback()
+def _orgs_default(ctx: typer.Context, profile: str | None = typer.Option(None, "--profile")) -> None:
+    if ctx.invoked_subcommand is None:
+        context_mod.list_orgs(profile=profile)
+
+
+@projects_app.callback()
+def _projects_default(ctx: typer.Context, profile: str | None = typer.Option(None, "--profile")) -> None:
+    if ctx.invoked_subcommand is None:
+        context_mod.list_projects(org_id=None, profile=profile)
+
+
+orgs_app.command("list")(context_mod.list_orgs)
+projects_app.command("list")(context_mod.list_projects)
+
+
+def _settings(node: dict[str, Any]) -> dict[str, Any]:
+    for key in ("metadata_json", "metadata"):
+        meta = node.get(key)
+        if isinstance(meta, dict) and isinstance(meta.get("settings"), dict):
+            return meta["settings"]
+    return {}
+
+
+def org_default_region(org_id: str, profile: str | None) -> str | None:
+    """The organization's default region (Organization settings › General), or None when it has none."""
+    node = call_api(method="GET", path=f"/api/v1/org/{quote(org_id, safe='')}", profile=profile)
+    if not isinstance(node, dict):
+        return None
+    return str(_settings(node).get("default_region") or "").strip() or None
+
+
+@orgs_app.command("get")
+def get_org(
+    org_id: str = typer.Argument(..., help="Organisation ID"),
+    profile: str | None = typer.Option(None, "--profile"),
+) -> None:
+    """An organisation, with its default region (where new projects go unless you pick one)."""
+    require_login(profile)
+    try:
+        node = call_api(method="GET", path=f"/api/v1/org/{quote(org_id, safe='')}", profile=profile)
+    except CLIRequestError as exc:
+        handle_cli_error(exc)
+        return
+    region = str(_settings(node if isinstance(node, dict) else {}).get("default_region") or "").strip()
+    if wants_json():
+        print_json({**(node if isinstance(node, dict) else {}), "default_region": region or None})
+        return
+    print_json(node, title=f"Organisation {org_id[:8]}…")
+    typer.echo(f"Default region: {region or 'not set (new projects use Sovaria’s default region)'}")
+
+
+def _node_id(data: Any, step: str) -> str:
+    node_id = str((data or {}).get("node_id") or (data or {}).get("id") or "") if isinstance(data, dict) else ""
+    if not node_id:
+        raise CLIRequestError(f"{step}: the server returned no id")
+    return node_id
+
+
+@projects_app.command("create")
+def create_project(
+    name: str = typer.Argument(..., help="Project name"),
+    org_id: str | None = typer.Option(None, "--org", help="Organisation ID (default: your current scope)"),
+    region: str | None = typer.Option(
+        None, "--region", help="Region for the database; omit to use the organisation's default region"),
+    env_name: str = typer.Option("production", "--env-name", help="Name of the primary environment"),
+    db_password_stdin: bool = typer.Option(
+        False, "--db-password-stdin", help="Read the database password (12–72 characters) from stdin; random otherwise"),
+    profile: str | None = typer.Option(None, "--profile"),
+) -> None:
+    """Create a cloud project: the project, its primary environment and its database (like the console)."""
+    require_login(profile)
+    org = (org_id or get_scope(profile=profile).get("org_id") or "").strip()
+    if not org:
+        typer.echo("Pass --org, or pick a scope first (sov scope pick).", err=True)
+        raise typer.Exit(1)
+    password = sys.stdin.readline().rstrip("\n") if db_password_stdin else ""
+    if db_password_stdin and not 12 <= len(password) <= 72:
+        raise typer.BadParameter("the database password must be 12–72 characters", param_hint="--db-password-stdin")
+
+    try:
+        default_region = None if region else org_default_region(org, profile)
+    except CLIRequestError as exc:
+        handle_cli_error(exc)
+        return
+
+    created: dict[str, str] = {}
+    try:
+        project = call_api(method="POST", path="/api/v1/org", profile=profile, body={
+            "type": "PROJECT", "name": name.strip(), "metadata": {"org_id": org},
+            **({"database_password": password} if password else {}),
+        })
+        created["project_id"] = _node_id(project, "Creating the project")
+        call_api(method="POST", path="/api/v1/edge", profile=profile, body={
+            "source_id": org, "target_id": created["project_id"], "relation_type": "OWNS", "role": "OWNER"})
+        env = call_api(method="POST", path="/api/v1/org", profile=profile, body={
+            "type": "ENV", "name": env_name.strip() or "production", "metadata": {"db_type": "hybrid"}})
+        created["env_id"] = _node_id(env, "Creating the environment")
+        call_api(method="POST", path="/api/v1/edge", profile=profile, body={
+            "source_id": created["project_id"], "target_id": created["env_id"], "relation_type": "HAS_ENV",
+            "role": "PRIMARY"})
+        # No region unless asked: the server places the database in the org's default region.
+        database = call_api(
+            method="POST", path=f"/api/v1/governance/tenants/{quote(org, safe='')}/databases/provision",
+            profile=profile, timeout=120,
+            body={"project_id": created["project_id"], "tier": "dedicated", **({"region": region} if region else {})})
+    except CLIRequestError as exc:
+        if created.get("project_id"):
+            print_warning(f"Stopped part way: project {created['project_id']} exists"
+                          + (f" with environment {created['env_id']}" if created.get("env_id") else "")
+                          + ". Finish it in the console, or remove it: sov api call DELETE /api/v1/org/"
+                          + created["project_id"])
+        handle_cli_error(exc)
+        return
+
+    placed = (database or {}).get("region") if isinstance(database, dict) else None
+    where = region or placed or default_region
+    source = ("--region" if region else "the organisation's default region" if default_region
+              else "Sovaria's default region (the organisation has none set)")
+    out = {"org_id": org, **created, "name": name.strip(), "env_name": env_name, "region": where,
+           "region_source": source, "database": database}
+    if wants_json():
+        print_json(out)
+        return
+    print_success(f"Project created: {created['project_id']}")
+    typer.echo(f"Environment: {env_name} ({created['env_id']})")
+    typer.echo(f"Region: {where or 'chosen by the server'} — from {source}")
+    typer.echo(f"Next: sov link --org {org} --project {created['project_id']}")

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/apps/cli/src/commands/vector.py

@@ -121,7 +121,8 @@ def app_search(
 @app.command("reembed")
 def reembed(
     collection: str = typer.Argument(..., help="Collection name"),
-    force: bool = typer.Option(False, "--force", help="Also for collections above the automatic limit (uses quota)"),
+    force: bool = typer.Option(False, "--force", hidden=True,
+                               help="Not needed: an explicit re-embed always covers the whole collection (uses quota)"),
     org_id: str | None = typer.Option(None, "--org"),
     project_id: str | None = typer.Option(None, "--project"),
     env_id: str | None = typer.Option(None, "--env"),
@@ -131,7 +132,7 @@ def reembed(
     result = run_with_spinner(
         f"Re-embedding '{collection}'…",
         lambda: _call("POST", f"/api/v1/collections/{quote(collection, safe='')}/reembed", org_id=org_id,
-                      project_id=project_id, env_id=env_id, profile=profile, params={"force": "true"} if force else None),
+                      project_id=project_id, env_id=env_id, profile=profile),
         success="Re-embedded",
     )
     print_json(result)

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/apps/cli/src/main.py

@@ -221,8 +221,10 @@ app.add_typer(shell_mod.app, name="shell", help="Interactive Sovaria REPL")
 app.command("login")(login_mod.login)
 app.command("logout")(login_mod.logout)
 app.command("whoami")(context_mod.whoami)
-app.command("orgs")(context_mod.list_orgs)
-app.command("projects")(context_mod.list_projects)
+from apps.cli.src.commands import orgs_projects as orgs_projects_mod  # noqa: E402
+
+app.add_typer(orgs_projects_mod.orgs_app, name="orgs")
+app.add_typer(orgs_projects_mod.projects_app, name="projects")
 app.command("context")(context_mod.context)
 app.command("dashboard")(dashboard_mod.show_dashboard)
 app.command("connect")(connect_mod.show_connect)

{sovaria_cli-0.6.0 → sovaria_cli-0.7.0}/pyproject.toml

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