pyvolt-cli 0.1.0__tar.gz → 0.3.0__tar.gz

{pyvolt_cli-0.1.0 → pyvolt_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvolt-cli
-Version: 0.1.0
+Version: 0.3.0
 Summary: The command-line companion to Pyvolt: managed Python deployments on infrastructure you actually own.
 Project-URL: Homepage, https://pyvolt.com
 Project-URL: Repository, https://github.com/pyvolt-hq/pyvolt-cli
@@ -50,6 +50,7 @@ pyvolt deploy myapp --follow
 | `pyvolt logs DOMAIN [-p NAME] [-n N]` | Tail the app's journal |
 | `pyvolt bans SERVER` | IPs banned by fail2ban, your own flagged |
 | `pyvolt unban SERVER [IP] [--me]` | Lift a ban — `--me` unbans your own IP, even while it's banned |
+| `pyvolt ssh SERVER [--app DOMAIN]` | Open a shell on the server (as the `pyvolt` user); `--app` cds into the app dir |
 | `pyvolt open DOMAIN` | Jump to the dashboard |
 
 `DOMAIN` is the app's domain, or any unambiguous fragment of it — domains

{pyvolt_cli-0.1.0 → pyvolt_cli-0.3.0}/README.md

@@ -20,6 +20,7 @@ pyvolt deploy myapp --follow
 | `pyvolt logs DOMAIN [-p NAME] [-n N]` | Tail the app's journal |
 | `pyvolt bans SERVER` | IPs banned by fail2ban, your own flagged |
 | `pyvolt unban SERVER [IP] [--me]` | Lift a ban — `--me` unbans your own IP, even while it's banned |
+| `pyvolt ssh SERVER [--app DOMAIN]` | Open a shell on the server (as the `pyvolt` user); `--app` cds into the app dir |
 | `pyvolt open DOMAIN` | Jump to the dashboard |
 
 `DOMAIN` is the app's domain, or any unambiguous fragment of it — domains

{pyvolt_cli-0.1.0 → pyvolt_cli-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyvolt-cli"
-version = "0.1.0"
+version = "0.3.0"
 description = "The command-line companion to Pyvolt: managed Python deployments on infrastructure you actually own."
 readme = "README.md"
 license = { text = "MIT" }

{pyvolt_cli-0.1.0 → pyvolt_cli-0.3.0}/pyvolt_cli/__init__.py

@@ -1,4 +1,4 @@
 """pyvolt-cli: the terminal companion to Pyvolt — managed Python deployments
 on infrastructure you actually own. Docs: https://pyvolt.com/docs/cli/"""
 
-__version__ = "0.1.0"
+__version__ = "0.3.0"

{pyvolt_cli-0.1.0 → pyvolt_cli-0.3.0}/pyvolt_cli/app.py

@@ -1,6 +1,7 @@
 """The Pyvolt CLI — deploy, logs, env and processes from your terminal."""
 from __future__ import annotations
 
+import json as _json
 import platform
 import time
 import webbrowser
@@ -20,6 +21,20 @@ app = typer.Typer(
 )
 console = Console()
 
+# Global --json flag (set in the callback). When on, commands emit raw JSON to
+# stdout instead of Rich tables, so scripts and AI coding tools get a stable,
+# parseable contract instead of scraping formatted output.
+_STATE = {"json": False}
+
+
+def _emit(data) -> bool:
+    """If --json is active, print `data` as JSON and return True (the caller
+    should then return early). Otherwise return False and let it render normally."""
+    if _STATE["json"]:
+        print(_json.dumps(data, indent=2, default=str))
+        return True
+    return False
+
 STATUS_STYLE = {
     "ready": "green", "live": "green", "succeeded": "green", "running": "cyan",
     "active": "green", "queued": "yellow", "deploying": "cyan",
@@ -42,7 +57,9 @@ def _table(*columns: str) -> Table:
 def _main(
     ctx: typer.Context,
     version: bool = typer.Option(False, "--version", "-V", help="Print version and exit."),
+    json_output: bool = typer.Option(False, "--json", help="Emit raw JSON instead of tables (for scripts and AI tools)."),
 ):
+    _STATE["json"] = json_output
     if version:
         console.print(f"pyvolt-cli {__version__}")
         raise typer.Exit()
@@ -103,6 +120,8 @@ def logout():
 def whoami():
     """Show the authenticated account."""
     me = Api().get("/v1/me")
+    if _emit(me):
+        return
     console.print(f"{me['username']} <{me['email']}> @ {config.api_url()}")
 
 
@@ -111,8 +130,11 @@ def whoami():
 @app.command()
 def servers():
     """List your servers."""
+    data = Api().get("/v1/servers")
+    if _emit(data):
+        return
     t = _table("NAME", "IP", "PROVIDER", "STATUS", "CONNECTED")
-    for s in Api().get("/v1/servers"):
+    for s in data:
         t.add_row(
             s["name"], s["ip_address"], s["provider"], _status(s["status"]),
             "[green]yes[/]" if s["connected"] else "[red]no[/]",
@@ -120,15 +142,64 @@ def servers():
     console.print(t)
 
 
+@app.command()
+def ssh(
+    server: str = typer.Argument(..., metavar="SERVER"),
+    app_name: str = typer.Option("", "--app", "-a", help="cd into this app's directory on connect."),
+):
+    """Open an SSH shell on a server (as the pyvolt app-user).
+
+    A thin convenience wrapper: it resolves the host/port from the API and
+    execs your local `ssh`, so your own key must be on the box — add it under
+    Account → SSH Keys (or `pyvolt` on the web dashboard)."""
+    import os
+    import shutil
+
+    if not shutil.which("ssh"):
+        raise fail("No `ssh` client found on PATH.")
+    api = Api()
+    srv = api.resolve_server(server)
+    if srv["status"] != "ready":
+        raise fail(f"{srv['name']} is {srv['status']}, not ready.")
+    target = f"{srv.get('ssh_user', 'pyvolt')}@{srv['ip_address']}"
+    args = ["ssh", "-p", str(srv.get("ssh_port", 22)), target]
+    if app_name:
+        site = api.resolve_app(app_name)
+        # Drop into the app's checkout, then hand over an interactive shell.
+        args += ["-t", f"cd sites/{site['domain']}/repo 2>/dev/null; exec \"$SHELL\" -l"]
+    console.print(f"[dim]Connecting to {target}…[/dim]")
+    os.execvp("ssh", args)
+
+
 @app.command()
 def apps(server: str = typer.Option("", "--server", help="Filter by server name.")):
     """List your apps."""
+    data = Api().get("/v1/apps", params={"server": server} if server else None)
+    if _emit(data):
+        return
     t = _table("DOMAIN", "SERVER", "STATUS", "REPO", "BRANCH")
-    for a in Api().get("/v1/apps", params={"server": server} if server else None):
+    for a in data:
         t.add_row(a["domain"], a["server"], _status(a["status"]), a["repo"], a["branch"])
     console.print(t)
 
 
+@app.command()
+def status(app_name: str = typer.Argument(..., metavar="DOMAIN")):
+    """Show one app's details: status, URLs, repo and branch."""
+    site = Api().resolve_app(app_name)
+    if _emit(site):
+        return
+    t = _table("FIELD", "VALUE")
+    t.add_row("domain", site["domain"])
+    t.add_row("status", _status(site["status"]))
+    t.add_row("server", site.get("server", ""))
+    t.add_row("repo", f"{site.get('repo', '')} @ {site.get('branch', '')}")
+    if site.get("site_url"):
+        t.add_row("url", site["site_url"])
+    t.add_row("dashboard", site.get("dashboard_url", ""))
+    console.print(t)
+
+
 # ---- deployments --------------------------------------------------------------
 
 TERMINAL = ("succeeded", "failed")
@@ -172,8 +243,11 @@ def deployments(app_name: str = typer.Argument(..., metavar="DOMAIN")):
     """Recent deployments for an app."""
     api = Api()
     site = api.resolve_app(app_name)
+    data = api.get(f"/v1/apps/{site['id']}/deployments")
+    if _emit(data):
+        return
     t = _table("WHEN", "STATUS", "COMMIT", "MESSAGE", "BY", "TOOK")
-    for d in api.get(f"/v1/apps/{site['id']}/deployments"):
+    for d in data:
         took = f"{d['duration_seconds']}s" if d["duration_seconds"] is not None else ""
         t.add_row(
             d["created_at"][:16].replace("T", " "), _status(d["status"]),
@@ -199,8 +273,11 @@ def env_list(ctx: typer.Context):
     """Show the app's variables (secret values masked)."""
     api = Api()
     site = api.resolve_app(ctx.obj)
+    data = api.get(f"/v1/apps/{site['id']}/env")
+    if _emit(data):
+        return
     t = _table("KEY", "VALUE")
-    for row in api.get(f"/v1/apps/{site['id']}/env"):
+    for row in data:
         t.add_row(row["key"], "••••••••" if row["is_secret"] else row["value"])
     console.print(t)
 
@@ -251,6 +328,8 @@ def ps(
         api.post(f"/v1/apps/{site['id']}/processes/{match[0]['id']}/restart")
         console.print(f"[green]✓[/green] Restarted {process}")
         return
+    if _emit(procs):
+        return
     t = _table("NAME", "KIND", "STATE", "COMMAND")
     for p in procs:
         state = _status(p["state"]) + (f" ({p['exit']})" if p["exit"] else "")
@@ -273,6 +352,8 @@ def logs(
     r = api.get(f"/v1/apps/{site['id']}/logs", params=params)
     if r.get("error"):
         raise fail(f"journalctl failed on the server: {r['error']}")
+    if _emit(r):
+        return
     for line in r["lines"]:
         console.out(line, highlight=False)
 
@@ -285,6 +366,8 @@ def bans(server: str = typer.Argument(..., metavar="SERVER")):
     api = Api()
     srv = api.resolve_server(server)
     r = api.get(f"/v1/servers/{srv['id']}/bans")
+    if _emit(r):
+        return
     if not r["running"]:
         raise fail("fail2ban is not active on this server.")
     if not r["banned"]:
@@ -319,8 +402,18 @@ def unban(
 
 
 @app.command("open")
-def open_(app_name: str = typer.Argument(..., metavar="DOMAIN")):
-    """Open the app's dashboard page in your browser."""
+def open_(
+    app_name: str = typer.Argument(..., metavar="DOMAIN"),
+    print_url: bool = typer.Option(False, "--print", "-p", help="Print the URLs instead of opening a browser."),
+):
+    """Open the app's dashboard in your browser (or --print the URLs)."""
     site = Api().resolve_app(app_name)
+    if _emit({"site_url": site.get("site_url"), "dashboard_url": site.get("dashboard_url")}):
+        return
+    if print_url:
+        if site.get("site_url"):
+            console.print(site["site_url"])
+        console.print(site["dashboard_url"])
+        return
     console.print(f"Opening {site['dashboard_url']}")
     webbrowser.open(site["dashboard_url"])