akashcli 3.4.0__tar.gz → 4.2.0__tar.gz

{akashcli-3.4.0 → akashcli-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 3.4.0
+Version: 4.2.0
 Summary: Enterprise Developer SDK and CLI for Akash Vault
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{akashcli-3.4.0 → akashcli-4.2.0}/akashcli/cli.py

@@ -5,8 +5,9 @@ import os
 import subprocess
 import webbrowser
 import httpx
+import urllib.parse
 import questionary
-from typing import Optional
+from typing import Optional, List
 from pathlib import Path
 from rich.console import Console
 from rich.table import Table
@@ -193,21 +194,32 @@ def files(json_output: bool = typer.Option(False, "--json", help="Output in raw
 @app.command()
 def download(
     code: str, 
-    output: Optional[Path] = typer.Option(None, "--output", "-o", help="Custom save path")
+    output: Optional[Path] = typer.Option(None, "--output", "-o")
 ):
-    """📥 Download a file from the vault to your local machine."""
+    """📥 Download a file from the vault to your current folder."""
     try:
         client = AkashClient()
-        # Attach the console to the client for the progress bar
-        client.console = console 
         
-        from .downloader import download_file
-        path = download_file(client, code, output)
+        # 1. Get the secure link
+        with console.status("[bold cyan]Requesting link..."):
+            resp = client.generate_secure_link(code)
+            if not resp or 'stream_url' not in resp:
+                raise Exception("Failed to generate download link.")
+
+        # 2. Start the download
+        from .downloader import smart_download
+        # Convert Path to string for the downloader
+        out_str = str(output) if output else None
+        saved_path = smart_download(resp['stream_url'], out_str)
         
-        console.print(f"[bold green]✓ Download Complete![/bold green]")
-        console.print(f"📍 Saved to: [cyan]{path}[/cyan]")
+        if saved_path:
+            console.print(f"[bold green]✓ Download Complete![/bold green]")
+            console.print(f"📍 Saved as: [bold cyan]{saved_path}[/bold cyan]")
+        else:
+            console.print("[red]❌ Download failed (Empty stream).[/red]")
+
     except Exception as e:
-        console.print(f"[bold red]✗ Download Failed:[/bold red] {e}")
+        console.print(f"[bold red]✗ Error:[/bold red] {e}")
 
 @app.command()
 def delete(code: str):
@@ -323,30 +335,22 @@ def share(code: Optional[str] = typer.Argument(None)):
 
 @app.command()
 def get(otp: str):
-    """✨ Download a file using a 6-digit temporary code."""
-    url = os.getenv("AKASH_API_URL", "https://jstore.2bd.net").rstrip("/")
+    """✨ Download a file using a 6-digit OTP code."""
+    config = ConfigManager.load()
+    base_url = os.getenv("AKASH_API_URL") or config.get("api_url", "https://jstore.2bd.net")
     try:
         with console.status("[bold cyan]Redeeming code..."):
-            resp = httpx.get(f"{url}/api/otp/redeem/{otp}")
-            if resp.status_code != 200:
-                console.print("[red]❌ Invalid or expired code.[/red]")
-                return
-            
-            data = resp.json()
-            stream_url = data['stream_url']
-            # We don't have the original filename easily, so we probe the headers
-            head = httpx.head(stream_url)
-            cd = head.headers.get("Content-Disposition", "")
-            filename = cd.split("filename*=UTF-8''")[-1] if "''" in cd else f"shared_{otp}.bin"
-            filename = urllib.parse.unquote(filename)
-
-        # Re-use your high-performance downloader logic
-        from .downloader import download_from_url
-        download_from_url(stream_url, filename)
+            resp = httpx.get(f"{base_url}/api/otp/redeem/{otp}")
+            resp.raise_for_status()
+            stream_url = resp.json()['stream_url']
+
+        from .downloader import smart_download
+        saved_path = smart_download(stream_url)
         
-        console.print(f"[bold green]✓ Successfully retrieved: {filename}[/bold green]")
+        if saved_path:
+            console.print(f"[bold green]✓ Successfully retrieved:[/bold green] [cyan]{saved_path}[/cyan]")
     except Exception as e:
-        console.print(f"[red]Error:[/red] {e}")
+        console.print(f"[bold red]✗ Failed:[/bold red] {e}")
 
 @app.command()
 def bulk(path: Path):

akashcli-4.2.0/akashcli/downloader.py

@@ -0,0 +1,47 @@
+import httpx
+import os
+import re
+import urllib.parse
+from pathlib import Path
+from typing import Optional
+from rich.console import Console
+from rich.progress import Progress, TextColumn, BarColumn, DownloadColumn, TransferSpeedColumn
+
+def smart_download(url: str, custom_filename: Optional[str] = None):
+    """Unified downloader that detects server errors properly."""
+    # We use a standard get first to check the response
+    with httpx.stream("GET", url, follow_redirects=True, timeout=None) as response:
+        # 🌟 THE FIX: If not 200/206, read the error message 🌟
+        if response.status_code not in [200, 206]:
+            # Load the first few bytes to see the error
+            error_text = response.read().decode('utf-8', errors='ignore')
+            print(f"\n[red]❌ Server Error ({response.status_code}):[/red] {error_text[:200]}")
+            return None
+
+        # Robust Filename Extraction
+        raw_name = response.headers.get("x-vault-filename")
+        if raw_name:
+            filename = urllib.parse.unquote(raw_name)
+        else:
+            cd = response.headers.get("Content-Disposition", "")
+            match = re.search(r"filename\*=UTF-8''([^;]+)", cd, re.IGNORECASE)
+            filename = urllib.parse.unquote(match.group(1)) if match else f"file_{os.urandom(2).hex()}.bin"
+
+        final_name = custom_filename or filename
+        total_size = int(response.headers.get("x-vault-size") or response.headers.get("Content-Length", 0))
+
+        # Stream the actual data
+        with Progress(
+            TextColumn("[bold blue]{task.fields[filename]}", justify="right"),
+            BarColumn(bar_width=None),
+            "[progress.percentage]{task.percentage:>3.1f}%",
+            DownloadColumn(),
+            console=Console()
+        ) as progress:
+            task = progress.add_task("download", total=total_size, filename=final_name)
+            with open(final_name, "wb") as f:
+                for chunk in response.iter_bytes():
+                    f.write(chunk)
+                    progress.update(task, advance=len(chunk))
+    
+    return final_name

{akashcli-3.4.0 → akashcli-4.2.0}/akashcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 3.4.0
+Version: 4.2.0
 Summary: Enterprise Developer SDK and CLI for Akash Vault
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{akashcli-3.4.0 → akashcli-4.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "akashcli"
-version = "3.4.0"
+version = "4.2.0"
 description = "Enterprise Developer SDK and CLI for Akash Vault"
 readme = "README.md"
 requires-python = ">=3.12"

akashcli-3.4.0/akashcli/downloader.py

@@ -1,28 +0,0 @@
-# akashcli/downloader.py
-import httpx
-import os
-from pathlib import Path
-from rich.console import Console # 🌟 ADD THIS
-from rich.progress import Progress, SpinnerColumn, BarColumn, TextColumn, DownloadColumn
-
-def download_from_url(url: str, filename: str):
-    """Standalone downloader for OTP/Guest links."""
-    # 🌟 FIX: Define the path
-    final_path = Path(os.getcwd()) / filename
-    
-    with httpx.stream("GET", url, follow_redirects=True) as response:
-        total = int(response.headers.get("Content-Length", 0))
-        
-        with Progress(
-            TextColumn("[bold blue]{task.fields[filename]}", justify="right"),
-            BarColumn(bar_width=None),
-            "[progress.percentage]{task.percentage:>3.1f}%",
-            DownloadColumn(),
-            console=Console() 
-        ) as progress:
-            task = progress.add_task("download", total=total, filename=filename)
-            with open(final_path, "wb") as f:
-                for chunk in response.iter_bytes():
-                    f.write(chunk)
-                    progress.update(task, advance=len(chunk))
-    return final_path # 🌟 Now defined