akashcli 4.3.0__tar.gz → 4.3.1__tar.gz

{akashcli-4.3.0 → akashcli-4.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.3.0
+Version: 4.3.1
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
 License: MIT
 Keywords: akash,cli,relay,remote-shell,vault

{akashcli-4.3.0 → akashcli-4.3.1}/akashcli/cli.py

@@ -74,6 +74,36 @@ class _Spin:
         sys.stdout.flush()
 
 
+def _resolve_client(url_override: str = None):
+    """
+    Return (api_key, base_url).
+    If no API key is configured, prompt the user interactively rather than
+    crashing — so commands work on a fresh machine without `akash login`.
+    """
+    import os as _os
+    config = ConfigManager.load()
+    base = (
+        url_override
+        or _os.getenv("AKASH_API_URL")
+        or config.get("api_url", "https://jstore.2bd.net")
+    ).rstrip("/")
+
+    api_key = _os.getenv("AKASH_API_KEY") or config.get("api_key")
+    if not api_key:
+        print(f"  {_Y}!{_RS}  No API key found.")
+        print(f"  {_DM}Set AKASH_API_KEY env var, or run {_C}akash login{_RS}{_DM} to save credentials.{_RS}")
+        try:
+            api_key = typer.prompt("  API key", hide_input=True).strip()
+        except (EOFError, KeyboardInterrupt):
+            print()
+            raise typer.Exit(1)
+        if not api_key:
+            _err("API key required.")
+            raise typer.Exit(1)
+
+    return api_key, base
+
+
 def _progress_bar(done: int, total: int, width: int = 28) -> str:
     """Return a plain ASCII progress bar string."""
     if not total:
@@ -904,8 +934,7 @@ def run(
     from .exec import acquire_exec_token, run_command, _clear_cached_token
 
     try:
-        client = AkashClient()
-        base = (url or client.base_url).rstrip("/")
+        api_key, base = _resolve_client(url)
 
         # ── Device relay path ─────────────────────────────────────────────
         if device is not None:
@@ -914,7 +943,7 @@ def run(
             _p()
             with _Spin("connecting to relay…"):
                 pass
-            exit_code = connect_run(client.api_key, base, command, target=device or None)
+            exit_code = connect_run(api_key, base, command, target=device or None)
             _p()
             if exit_code == 0:
                 _info("exited 0")
@@ -928,7 +957,7 @@ def run(
             _info("cleared cached token — re-authenticating…")
 
         with _Spin("authenticating…"):
-            token = acquire_exec_token(client.api_key, base)
+            token = acquire_exec_token(api_key, base)
 
         _info(f"running: {command}")
         _p()
@@ -1048,8 +1077,7 @@ def shell(
     from .exec import acquire_exec_token, run_shell, _clear_cached_token
 
     try:
-        client = AkashClient()
-        base = (url or client.base_url).rstrip("/")
+        api_key, base = _resolve_client(url)
 
         # ── Device relay path ─────────────────────────────────────────────
         if device is not None:
@@ -1057,7 +1085,7 @@ def shell(
             label = device.strip() if device.strip() else None
             _info(f"connecting to device  {_cy(label or 'auto')}…")
             try:
-                exit_code = connect_shell(client.api_key, base, target=label)
+                exit_code = connect_shell(api_key, base, target=label)
             except RuntimeError as e:
                 _err(str(e))
                 raise typer.Exit(1)
@@ -1072,7 +1100,7 @@ def shell(
             _info("cleared cached token — re-authenticating…")
 
         with _Spin("authenticating…"):
-            token = acquire_exec_token(client.api_key, base)
+            token = acquire_exec_token(api_key, base)
 
         exit_code = run_shell(token, base)
 
@@ -1108,17 +1136,21 @@ def devices(
       akash devices --revoke laptop   remove a device
     """
     try:
-        client = AkashClient()
+        api_key, base = _resolve_client()
+    except typer.Exit:
+        raise
     except Exception as e:
         _err(str(e))
         raise typer.Exit(1)
 
+    _hdrs = {"x-api-key": api_key, "Origin": "https://akash.cli"}
+
     if revoke:
         try:
             import httpx as _hx
             resp = _hx.delete(
-                f"{client.base_url}/api/exec/devices/{revoke}",
-                headers=client._get_headers(), timeout=10,
+                f"{base}/api/exec/devices/{revoke}",
+                headers=_hdrs, timeout=10,
             )
             resp.raise_for_status()
             _ok(f"revoked  {_ye(revoke)}")
@@ -1130,8 +1162,8 @@ def devices(
     try:
         import httpx as _hx
         resp = _hx.get(
-            f"{client.base_url}/api/exec/devices",
-            headers=client._get_headers(), timeout=10,
+            f"{base}/api/exec/devices",
+            headers=_hdrs, timeout=10,
         )
         resp.raise_for_status()
         data = resp.json()
@@ -1210,8 +1242,9 @@ def serve(
         return
 
     try:
-        client = AkashClient()
-        base = (url or client.base_url).rstrip("/")
+        api_key, base = _resolve_client(url)
+    except typer.Exit:
+        raise
     except Exception as e:
         _err(str(e))
         raise typer.Exit(1)
@@ -1221,7 +1254,7 @@ def serve(
     resolved_label = (label or _cfg_label() or "default").strip()
 
     try:
-        _serve(client.api_key, base, resolved_label, daemon=daemon)
+        _serve(api_key, base, resolved_label, daemon=daemon)
     except Exception as e:
         _err(f"serve failed: {e}")
         raise typer.Exit(1)

{akashcli-4.3.0 → akashcli-4.3.1}/akashcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.3.0
+Version: 4.3.1
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
 License: MIT
 Keywords: akash,cli,relay,remote-shell,vault

{akashcli-4.3.0 → akashcli-4.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "akashcli"
-version = "4.3.0"
+version = "4.3.1"
 description = "Akash CLI — secure remote shell relay, file vault, and device management"
 readme = "README.md"
 requires-python = ">=3.9"