akashcli 4.3.1__tar.gz → 4.3.2__tar.gz

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

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

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

@@ -74,11 +74,14 @@ class _Spin:
         sys.stdout.flush()
 
 
-def _resolve_client(url_override: str = None):
+def _resolve_client(url_override: str = None, require_key: bool = False):
     """
-    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`.
+    Return (api_key_or_None, base_url).
+
+    require_key=True  — hard-fail with a clear message if no key found
+                        (used by serve/devices which cannot work without server auth).
+    require_key=False — return None for api_key if missing; caller shows warning
+                        and can offer a local/offline fallback.
     """
     import os as _os
     config = ConfigManager.load()
@@ -88,22 +91,23 @@ def _resolve_client(url_override: str = None):
         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:
+    api_key = _os.getenv("AKASH_API_KEY") or config.get("api_key") or None
+
+    if not api_key and require_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)
+        print(f"  {_DM}Run {_C}akash login{_RS}{_DM} to save your key, or set {_C}AKASH_API_KEY{_RS}{_DM}.{_RS}")
+        raise typer.Exit(1)
 
     return api_key, base
 
 
+_GUEST_WARNING = (
+    f"  {_Y}⚠{_RS}  {_Y}Running as guest{_RS} — not logged in.\n"
+    f"  {_DM}Features are limited and your data won't be saved to the cloud.\n"
+    f"  Run {_RS}{_C}akash login{_RS}{_DM} to unlock full access.{_RS}"
+)
+
+
 def _progress_bar(done: int, total: int, width: int = 28) -> str:
     """Return a plain ASCII progress bar string."""
     if not total:
@@ -936,6 +940,12 @@ def run(
     try:
         api_key, base = _resolve_client(url)
 
+        # ── No key + device flag → relay needs auth ───────────────────────
+        if device is not None and not api_key:
+            print(_GUEST_WARNING)
+            _err("relay requires an API key. Run `akash login` first.")
+            raise typer.Exit(1)
+
         # ── Device relay path ─────────────────────────────────────────────
         if device is not None:
             from .relay import connect_run
@@ -952,6 +962,22 @@ def run(
                 raise typer.Exit(exit_code)
             return
 
+        # ── No key → local execution fallback ────────────────────────────
+        if not api_key:
+            print(_GUEST_WARNING)
+            _p()
+            _info(f"running locally:  {command}")
+            _p()
+            import subprocess as _sp
+            result = _sp.run(command, shell=True)
+            _p()
+            if result.returncode == 0:
+                _info("exited 0")
+            else:
+                _warn(f"exited {result.returncode}")
+                raise typer.Exit(result.returncode)
+            return
+
         if reauth:
             _clear_cached_token()
             _info("cleared cached token — re-authenticating…")
@@ -1079,6 +1105,12 @@ def shell(
     try:
         api_key, base = _resolve_client(url)
 
+        # ── No key + device flag → relay needs auth ───────────────────────
+        if device is not None and not api_key:
+            print(_GUEST_WARNING)
+            _err("relay requires an API key. Run `akash login` first.")
+            raise typer.Exit(1)
+
         # ── Device relay path ─────────────────────────────────────────────
         if device is not None:
             from .relay import connect_shell
@@ -1095,6 +1127,20 @@ def shell(
                 raise typer.Exit(exit_code)
             return
 
+        # ── No key → local PTY shell fallback ────────────────────────────
+        if not api_key:
+            import shutil as _sh
+            print(_GUEST_WARNING)
+            _p()
+            shell_bin = os.environ.get("SHELL") or _sh.which("bash") or _sh.which("sh") or "/bin/sh"
+            _info(f"opening local shell  {_dim(shell_bin)}")
+            _p()
+            import subprocess as _sp
+            result = _sp.run([shell_bin])
+            _p()
+            _info("session closed")
+            raise typer.Exit(result.returncode)
+
         if reauth:
             _clear_cached_token()
             _info("cleared cached token — re-authenticating…")
@@ -1136,7 +1182,7 @@ def devices(
       akash devices --revoke laptop   remove a device
     """
     try:
-        api_key, base = _resolve_client()
+        api_key, base = _resolve_client(require_key=True)
     except typer.Exit:
         raise
     except Exception as e:
@@ -1242,7 +1288,7 @@ def serve(
         return
 
     try:
-        api_key, base = _resolve_client(url)
+        api_key, base = _resolve_client(url, require_key=True)
     except typer.Exit:
         raise
     except Exception as e:

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

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

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

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