akashcli 3.0.0__tar.gz → 3.2.0__tar.gz

{akashcli-3.0.0 → akashcli-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 3.0.0
+Version: 3.2.0
 Summary: Enterprise Developer SDK and CLI for Akash Vault
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -8,6 +8,7 @@ Requires-Dist: httpx
 Requires-Dist: typer[all]
 Requires-Dist: rich
 Requires-Dist: cryptography
+Requires-Dist: questionary
 
 To get started with **AkashCLI**, your users should follow these steps. You can provide this guide as a `README.md` or a "Getting Started" message in your bot.
 

akashcli-3.2.0/akashcli/cli.py

@@ -0,0 +1,377 @@
+import typer
+import time
+import json
+import os
+import subprocess
+import webbrowser
+import httpx
+import questionary
+from typing import Optional
+from pathlib import Path
+from rich.console import Console
+from rich.table import Table
+from rich.progress import Progress, SpinnerColumn, BarColumn, TextColumn, DownloadColumn, TransferSpeedColumn, FileSizeColumn, TimeRemainingColumn
+from rich.panel import Panel
+from .utils import get_file_emoji
+# Internal Imports
+from .client import AkashClient
+from .auth import AuthManager
+from .config import ConfigManager
+from .exceptions import AkashError
+from .uploader import VaultUploader
+
+# 🌟 Removed the 'gh' overrides and panels
+app = typer.Typer(help="🛡️ Akash Vault Enterprise CLI", add_completion=True)
+console = Console()
+
+@app.command()
+def login(
+    url: str = typer.Option("https://jstore.2bd.net", "--url", help="Custom Vault URL"),
+    key: str = typer.Option(..., prompt="🔑 Enter API Key", hide_input=True)
+):
+    """🔑 Link your device to the vault."""
+    try:
+        with console.status("[bold blue]Verifying identity..."):
+            user = AuthManager.perform_login(key, url)
+        
+        console.print(f"[green]✓ Login Successful![/green] Owner: {user.owner}")
+    except Exception as e:
+        console.print(f"[bold red]✗ Authentication Failed:[/bold red] {e}")
+
+@app.command()
+def whoami():
+    """👤 Check current login and quota status."""
+    try:
+        client = AkashClient()
+        user = client.whoami()
+        console.print(f"Logged in as: [bold cyan]{user.owner}[/bold cyan]")
+        console.print(f"Storage Quota: [bold yellow]{user.quota_used}/{user.quota_limit}[/bold yellow]")
+    except Exception as e:
+        console.print(f"[red]Error:[/red] {e}")
+
+@app.command()
+def upload(
+    path: Optional[Path] = typer.Argument(None, help="Path to file"),
+    text: Optional[str] = typer.Option(None, "--text", "-t", help="Upload raw text content"),
+    name: Optional[str] = typer.Option(None, "--name", "-n", help="Custom filename"),
+    burn: bool = typer.Option(False, "--burn", help="Self-destruct after one view"),
+    expiry: int = typer.Option(0, "--expiry", "-e", help="Expiry in days (0 for forever)"),
+    password: Optional[str] = typer.Option(None, "--pass", "-p", help="Password protect file")
+):
+    """📤 Vault content and display full file details."""
+    try:
+        client = AkashClient()
+        
+        # 1. Prepare Metadata
+        file_size = os.path.getsize(path) if path else len(text.encode())
+        display_name = name or (path.name if path else f"snippet_{int(time.time())}.txt")
+        icon = get_file_emoji(display_name)
+
+        # 2. PHASE 1: Client -> Server (Live Progress)
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[bold cyan]{task.description}"),
+            BarColumn(bar_width=None, pulse_style="blue"),
+            "[progress.percentage]{task.percentage:>3.1f}%",
+            DownloadColumn(), # 🌟 THE FIX: Use this instead of FileSize/TotalSize
+            TransferSpeedColumn(),
+            TimeRemainingColumn(),
+            console=console,
+            transient=True
+        ) as progress:
+            
+            task = progress.add_task(description=f"Sending {display_name}", total=file_size)
+
+            def update_bar(current, total):
+                progress.update(task, completed=current)
+
+            if text:
+                res = client.upload_text(text, filename=name, burn=burn, expiry=expiry, password=password)
+            else:
+                if not path:
+                    console.print("[red]Error:[/red] Provide a file path or use --text"); return
+                res = client.upload_file(str(path), burn=burn, expiry=expiry, password=password, progress_callback=update_bar)
+
+        # 3. PHASE 2: Server -> Telegram (Sync Monitoring)
+        file_code = res.file_code
+        with console.status(f"[bold yellow]🧬 Syncing to Cloud Vault (Code: {file_code})...") as status:
+            while True:
+                sync_status = client.get_upload_status(file_code)
+                if sync_status['status'] == "done":
+                    break
+                elif sync_status['status'] == "error":
+                    console.print(f"[bold red]❌ Cloud Sync Failed:[/bold red] {sync_status.get('detail')}")
+                    return
+                status.update(f"[bold yellow]🧬 Cloud Syncing: [white]{sync_status.get('status', 'processing')}[/white]...[/bold yellow]")
+                time.sleep(2)
+
+        # 4. PHASE 3: THE SUCCESS DASHBOARD
+        size_mb = f"{file_size / (1024*1024):.2f} MB"
+        
+        # Create a grid for aligned metadata
+        summary = Table.grid(padding=(0, 2))
+        summary.add_row("[bold cyan]NAME[/bold cyan]", f"{icon} {display_name}")
+        summary.add_row("[bold cyan]CODE[/bold cyan]", f"[bold yellow]{file_code}[/bold yellow]")
+        summary.add_row("[bold cyan]SIZE[/bold cyan]", size_mb)
+        summary.add_row("[bold cyan]DNA[/bold cyan]", f"[dim]{res.dna.get('sha256', 'N/A')[:32]}...[/dim]")
+        
+        # Security details
+        sec_info = f"🔥 Burn: {'ON' if burn else 'OFF'} | ⏳ Expire: {expiry if expiry > 0 else '∞'}d"
+        summary.add_row("[bold cyan]SECURITY[/bold cyan]", sec_info)
+
+        # Print the main panel
+        console.print("\n")
+        console.print(Panel(
+            summary, 
+            title="[bold green]✓ Vault Sync Successful[/bold green]", 
+            border_style="green", 
+            expand=False,
+            padding=(1, 3)
+        ))
+
+        # Show actionable links
+        console.print(f"🖼️  [bold]Web Player:[/bold] [blue underline]{res.embed_url}[/blue underline]")
+        console.print(f"🎬 [bold]Stream Link:[/bold] [blue underline]{res.direct_url}[/blue underline]")
+        console.print("\n[dim]💡 Tip: Use 'akash share' to generate a 6-digit access code for this file.[/dim]")
+        
+    except Exception as e:
+        console.print(f"[bold red]✗ Failed:[/bold red] {e}")
+
+@app.command()
+def stream(code: str, vlc: bool = typer.Option(False, "--vlc", help="Open directly in VLC")):
+    """🎬 Get a secure link or play in VLC (Handles processing state)."""
+    client = AkashClient()
+    try:
+        # We use a status spinner if the file is still processing on the server
+        with console.status("[bold cyan]Requesting secure stream...") as status:
+            while True:
+                try:
+                    resp = client.generate_secure_link(code)
+                    if resp.get('status') == 'success':
+                        url = resp['stream_url']
+                        break
+                except Exception as e:
+                    # If server returns 202 (Accepted/Processing)
+                    if "202" in str(e):
+                        status.update("[bold yellow]⏳ File is still vaulting to cloud. Waiting...")
+                        time.sleep(3)
+                        continue
+                    raise e
+            
+        if vlc:
+            console.print(f"🎬 [bold blue]Launching VLC...[/bold blue]")
+            subprocess.Popen(['vlc', url], stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
+        else:
+            console.print(Panel(f"[bold cyan]Secure Stream URL (30s):[/bold cyan]\n{url}", border_style="blue", title="Media Pipe"))
+    except Exception as e:
+        console.print(f"[red]Error:[/red] {e}")
+
+@app.command()
+def files(json_output: bool = typer.Option(False, "--json", help="Output in raw JSON")):
+    """📦 List and search files in your vault."""
+    try:
+        client = AkashClient()
+        file_list = client.list_files()
+        
+        if json_output:
+            console.print_json(data=[f.__dict__ for f in file_list])
+            return
+
+        table = Table(title="📦 Encrypted Vault")
+        table.add_column("Filename", style="cyan")
+        table.add_column("Code", style="yellow")
+        table.add_column("Size", justify="right")
+
+        for f in file_list:
+            size_mb = f"{f.size / (1024*1024):.2f} MB"
+            table.add_row(f.name, f.code, size_mb)
+
+        console.print(table)
+    except Exception as e:
+        console.print(f"[red]Error:[/red] {e}")
+
+@app.command()
+def download(
+    code: str, 
+    output: Optional[Path] = typer.Option(None, "--output", "-o", help="Custom save path")
+):
+    """📥 Download a file from the vault to your local machine."""
+    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)
+        
+        console.print(f"[bold green]✓ Download Complete![/bold green]")
+        console.print(f"📍 Saved to: [cyan]{path}[/cyan]")
+    except Exception as e:
+        console.print(f"[bold red]✗ Download Failed:[/bold red] {e}")
+
+@app.command()
+def delete(code: str):
+    """🗑️ Permanently remove a file."""
+    if typer.confirm(f"Are you sure you want to delete {code}?"):
+        try:
+            client = AkashClient()
+            client.delete_file(code)
+            console.print(f"[green]✓ Deleted {code}[/green]")
+        except Exception as e:
+            console.print(f"[red]Error:[/red] {e}")
+
+@app.command()
+def manage(
+    code: str, 
+    name: Optional[str] = typer.Option(None, "--name"),
+    burn: Optional[bool] = typer.Option(None, "--burn/--no-burn"),
+    expiry: Optional[int] = typer.Option(None, "--expiry")
+):
+    """⚙️ Modify settings for an existing file."""
+    try:
+        client = AkashClient()
+        updates = {}
+        if name: updates['filename'] = name
+        if burn is not None: updates['burn_on_read'] = 1 if burn else 0
+        if expiry is not None: updates['expiry_days'] = expiry
+        client.update_file(code, **updates)
+        console.print(f"[green]✓ Updated {code}[/green]")
+    except Exception as e:
+        console.print(f"[red]Error:[/red] {e}")
+
+@app.command()
+def share(code: Optional[str] = typer.Argument(None)):
+    """🔗 Share a file via 6-digit OTP (Sleek Interactive UI)."""
+    client = AkashClient()
+    
+    try:
+        if not code:
+            with console.status("[bold blue]Fetching your vault..."):
+                file_list = client.list_files()
+            
+            if not file_list:
+                console.print("[yellow]Your vault is empty.[/yellow]")
+                return
+
+            choices = []
+            for f in file_list:
+                clean_name = f.name.replace("_", " ")
+                display_name = (clean_name[:35] + '..') if len(clean_name) > 37 else clean_name
+                size_mb = f"{f.size / (1024*1024):.1f}MB"
+                
+                choices.append(questionary.Choice(
+                    title=[
+                        ("class:emoji", f"{get_file_emoji(f.name)} "),
+                        ("class:text",  f"{display_name:<38} "),
+                        ("class:meta",  f"{size_mb:>7} "),
+                        ("class:code",  f"({f.code})")
+                    ],
+                    value=f.code
+                ))
+            
+            choices.append(questionary.Separator())
+            choices.append(questionary.Choice("❌ Cancel", value="action_cancel"))
+
+            custom_style = questionary.Style([
+                ('qmark', 'fg:#00d2ff bold'),
+                ('question', 'bold'),
+                ('pointer', 'fg:#00d2ff bold'),
+                ('highlighted', 'fg:#000000 bg:#00d2ff bold'),
+                ('emoji', 'fg:#ffffff'),
+                ('text', 'fg:#eeeeee'),
+                ('meta', 'fg:#888888 italic'),
+                ('code', 'fg:#555555'),
+                ('selected', 'fg:#00d2ff bold'),
+            ])
+
+            code = questionary.select(
+                "Select a file to share:",
+                choices=choices,
+                style=custom_style,
+                pointer=" ➜"
+            ).ask()
+
+            if not code or code == "action_cancel":
+                return
+
+        # 2. OTP Generation
+        # Standardize HTTP client usage
+        headers = client._get_headers()
+        with httpx.Client(base_url=client.base_url) as c:
+            resp = c.post(f"/api/otp/generate/{code}", headers=headers)
+            resp.raise_for_status()
+            otp = resp.json()['otp']
+            
+        # 🌟 THE FIX: Used valid Rich markup tags 🌟
+        # We use [reverse] to make the code stand out instead of 'size'
+        otp_display = f"[bold yellow]      {otp}      [/bold yellow]"
+        
+        console.print("\n")
+        console.print(Panel(
+            f"Temporary vault code generated:\n\n"
+            f"{otp_display}\n\n"
+            f"Valid for 60 seconds. Use [bold cyan]akash get {otp}[/bold cyan] on the target device.",
+            title="✨ Quick Share", 
+            border_style="yellow", 
+            expand=False,
+            padding=(1, 5)
+        ))
+
+    except Exception as e:
+        # Prevent another MarkupError if the error message itself contains brackets
+        console.print(f"[bold red]✗ Error:[/bold red] {str(e)}")
+
+@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("/")
+    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)
+        
+        console.print(f"[bold green]✓ Successfully retrieved: {filename}[/bold green]")
+    except Exception as e:
+        console.print(f"[red]Error:[/red] {e}")
+
+@app.command()
+def bulk(path: Path):
+    """🚀 Recursive folder vaulting."""
+    try:
+        client = AkashClient()
+        uploader = VaultUploader(client)
+        files = [p for p in path.glob("**/*") if p.is_file() and not p.name.startswith('.')]
+        for file in files:
+            console.print(f"Vaulting: {file.name}")
+            uploader.upload(file_path=str(file))
+        console.print("[green]✓ Batch complete.[/green]")
+    except Exception as e:
+        console.print(f"[red]Error:[/red] {e}")
+
+@app.command()
+def docs():
+    """📖 View the integration guide."""
+    webbrowser.open("https://github.com/juniorsir/akashcli")
+
+@app.command()
+def logout():
+    """🚪 Clear local credentials."""
+    ConfigManager.save(b"") 
+    console.print("[yellow]Logged out.[/yellow]")
+
+if __name__ == "__main__":
+    app()

akashcli-3.2.0/akashcli/client.py

@@ -0,0 +1,164 @@
+import httpx
+import time
+import os
+from typing import Optional, List, Callable
+from datetime import datetime
+import jwt
+
+# Internal Imports
+from .models import UploadResult, FileInfo, UserInfo
+from .exceptions import *
+from .config import ConfigManager
+
+class AkashClient:
+    def __init__(self, api_key: Optional[str] = None, api_url: Optional[str] = None):
+        config = ConfigManager.load()
+        # API Key can come from: 1. Argument, 2. Env Var, 3. Config File
+        self.api_key = api_key or os.getenv("AKASH_API_KEY") or config.get("api_key")
+        self.base_url = (api_url or os.getenv("AKASH_API_URL") or config.get("api_url", "https://jstore.2bd.net")).rstrip("/")
+
+        if not self.api_key:
+            raise AuthenticationError("No API Key found. Run 'akash login' or set AKASH_API_KEY env var.")
+
+    def _get_headers(self, custom: dict = None):
+        """Standard headers for all Akash API requests."""
+        h = {
+            "x-api-key": self.api_key, 
+            "Origin": "https://akash.cli",
+            "User-Agent": "AkashCLI/3.0.0"
+        }
+        if custom: h.update(custom)
+        return h
+
+    def whoami(self) -> UserInfo:
+        """Fetches account identity and quota info."""
+        try:
+            with httpx.Client(base_url=self.base_url) as client:
+                resp = client.get("/api/me", headers=self._get_headers())
+                if resp.status_code != 200: 
+                    raise AuthenticationError(f"Invalid API Key or server rejected request ({resp.status_code})")
+                
+                d = resp.json()
+                return UserInfo(
+                    owner=d['owner'], 
+                    quota_used=d['quota']['used'], 
+                    quota_limit=d['quota']['limit'], 
+                    allowed_domains=d['allowed_domains']
+                )
+        except httpx.RequestError as e:
+            raise NetworkError(f"Vault server unreachable: {e}")
+
+    def upload_file(
+        self, 
+        path: str, 
+        burn: bool = False, 
+        expiry: int = 0, 
+        password: Optional[str] = None,
+        progress_callback: Optional[Callable[[int, int], None]] = None
+    ) -> UploadResult:
+        """
+        Uploads a physical file with optional progress tracking.
+        🌟 REFACTORED: Now correctly delegates to VaultUploader.
+        """
+        from .uploader import VaultUploader
+        uploader = VaultUploader(self)
+        return uploader.upload(
+            file_path=path, 
+            burn=burn, 
+            expiry=expiry, 
+            password=password, 
+            progress_callback=progress_callback
+        )
+
+    def upload_text(
+        self, 
+        content: str, 
+        filename: str = None, 
+        burn: bool = False, 
+        expiry: int = 0, 
+        password: Optional[str] = None
+    ) -> UploadResult:
+        """Vaults raw text as a snippet."""
+        from .uploader import VaultUploader
+        uploader = VaultUploader(self)
+        return uploader.upload(
+            content=content, 
+            filename=filename, 
+            burn=burn, 
+            expiry=expiry, 
+            password=password
+        )
+
+    def list_files(self) -> List[FileInfo]:
+        """Returns a list of FileInfo objects from the vault."""
+        try:
+            with httpx.Client(base_url=self.base_url) as client:
+                resp = client.get("/api/files", headers=self._get_headers())
+                resp.raise_for_status()
+                return [
+                    FileInfo(f['name'], f['code'], f['size'], f['uploaded_at']) 
+                    for f in resp.json()
+                ]
+        except Exception as e:
+            raise AkashError(f"Failed to list files: {e}")
+
+    def delete_file(self, code: str) -> bool:
+        """Permanently deletes a file by its vault code."""
+        try:
+            with httpx.Client(base_url=self.base_url) as client:
+                resp = client.delete(f"/api/files/{code}", headers=self._get_headers())
+                if resp.status_code == 404:
+                    raise VaultFileNotFound(f"File {code} not found.")
+                resp.raise_for_status()
+                return True
+        except httpx.HTTPStatusError as e:
+            raise AkashError(f"Delete failed: {e.response.text}")
+
+    def update_file(self, code: str, **kwargs) -> dict:
+        """
+        Modify existing file security (filename, burn_on_read, expiry_days).
+        """
+        try:
+            with httpx.Client(base_url=self.base_url, timeout=10.0) as client:
+                resp = client.patch(
+                    f"/api/files/{code}",
+                    headers=self._get_headers(),
+                    json=kwargs
+                )
+
+                if resp.status_code == 404:
+                    raise VaultFileNotFound(f"File code '{code}' does not exist.")
+                if resp.status_code in [401, 403]:
+                    raise AuthenticationError("Insufficient permissions to modify this content.")
+
+                resp.raise_for_status()
+                return resp.json()
+
+        except httpx.RequestError as e:
+            raise NetworkError(f"Network error: {e}")
+
+    def get_stats(self) -> dict:
+        """Admin Only: Fetch global vault diagnostics."""
+        # Note: Reuses whoami logic as per current API structure
+        return self.whoami().__dict__
+
+    # Inside AkashClient class in client.py
+
+    def get_upload_status(self, code: str) -> dict:
+        """Polls the server to check if background vaulting is finished."""
+        try:
+            with httpx.Client(base_url=self.base_url) as client:
+                resp = client.get(f"/api/status/{code}", headers=self._get_headers())
+                resp.raise_for_status()
+                return resp.json()
+        except Exception as e:
+            return {"status": "request_error", "detail": str(e)}
+
+    def generate_secure_link(self, code: str) -> dict:
+        """Fetches the short-lived IP-bound token."""
+        with httpx.Client(base_url=self.base_url) as client:
+            resp = client.get(f"/api/stream/generate/{code}", headers=self._get_headers())
+            # If server returns 202, this will raise an error containing '202'
+            # which our CLI 'stream' command catches to show the 'Waiting' status.
+            resp.raise_for_status()
+            return resp.json()

akashcli-3.2.0/akashcli/downloader.py

@@ -0,0 +1,28 @@
+# 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

akashcli-3.2.0/akashcli/uploader.py

@@ -0,0 +1,113 @@
+import os
+import httpx
+from pathlib import Path
+from typing import Optional, Callable, List
+from .models import UploadResult
+from .exceptions import UploadFailed, QuotaExceeded
+
+class ProgressStream:
+    """
+    A file-wrapper that updates a progress bar while the 
+    network library reads data from it.
+    """
+    def __init__(self, file_path: str, callback: Optional[Callable]):
+        self.file = open(file_path, "rb")
+        self.total_size = os.path.getsize(file_path)
+        self.callback = callback
+        self.bytes_read = 0
+
+    def __len__(self):
+        return self.total_size
+
+    def read(self, size=-1):
+        chunk = self.file.read(size)
+        if chunk:
+            self.bytes_read += len(chunk)
+            if self.callback:
+                self.callback(self.bytes_read, self.total_size)
+        return chunk
+
+    def close(self):
+        self.file.close()
+
+class VaultUploader:
+    def __init__(self, client):
+        self.client = client
+
+    def upload(
+        self, 
+        file_path: Optional[str] = None, 
+        content: Optional[str] = None,
+        filename: Optional[str] = None,
+        burn: bool = False,
+        expiry: int = 0,
+        password: Optional[str] = None,
+        progress_callback: Optional[Callable[[int, int], None]] = None
+    ) -> UploadResult:
+        
+        # 1. Prepare Headers (V3 Spec)
+        headers = {
+            "x-vault-burn": "1" if burn else "0",
+            "x-vault-expiry": str(expiry),
+        }
+        if password:
+            headers["x-vault-password"] = password
+
+        url = f"{self.client.base_url}/api/upload"
+        
+        try:
+            # --- CASE A: TEXT SNIPPET (JSON) ---
+            if content is not None:
+                payload = {
+                    "content": content,
+                    "filename": filename or "snippet.txt"
+                }
+                resp = httpx.post(
+                    url, 
+                    json=payload, 
+                    headers=self.client._get_headers(headers),
+                    timeout=None
+                )
+            
+            # --- CASE B: FILE UPLOAD (Multipart) ---
+            else:
+                if not file_path or not os.path.exists(file_path):
+                    raise UploadFailed(f"File not found: {file_path}")
+                
+                # 🌟 THE FIX: Use the ProgressStream wrapper instead of a generator
+                stream = ProgressStream(file_path, progress_callback)
+                
+                try:
+                    files = {
+                        "file": (os.path.basename(file_path), stream, "application/octet-stream")
+                    }
+                    
+                    resp = httpx.post(
+                        url, 
+                        files=files, 
+                        headers=self.client._get_headers(headers),
+                        timeout=None
+                    )
+                finally:
+                    stream.close()
+
+            # 2. Handle Response
+            if resp.status_code == 429:
+                raise QuotaExceeded("Upload quota reached.")
+            
+            resp.raise_for_status()
+            d = resp.json()
+            
+            return UploadResult(
+                status=d['status'],
+                file_code=d['file_code'],
+                embed_url=d['links']['embed'],
+                direct_url=d['links']['direct'],
+                input_type=d.get('input_type', 'file'),
+                dna=d.get('dna', {})
+            )
+
+        except httpx.HTTPStatusError as e:
+            raise UploadFailed(f"Server Error ({e.response.status_code}): {e.response.text}")
+        except Exception as e:
+            raise UploadFailed(f"Connection Error: {e}")

akashcli-3.2.0/akashcli/utils.py

@@ -0,0 +1,38 @@
+import uuid
+import hashlib
+import platform
+
+def get_device_id() -> str:
+    """Generates a unique hardware fingerprint for encrypted config binding."""
+    # Combine node (MAC address) and system info for a stable ID
+    raw_id = f"{uuid.getnode()}-{platform.node()}-{platform.processor()}"
+    return hashlib.sha256(raw_id.encode()).hexdigest()
+
+def get_file_emoji(filename: str) -> str:
+    """Returns a specific emoji based on the file extension for the CLI UI."""
+    if not filename: 
+        return "📄"
+    
+    fn = filename.lower()
+    
+    # Videos
+    if fn.endswith(('.mp4', '.mkv', '.mov', '.webm', '.avi', '.m4v')):
+        return "🎬"
+    # Images
+    if fn.endswith(('.jpg', '.jpeg', '.png', '.webp', '.gif', '.bmp', '.svg', '.ico')):
+        return "🖼️"
+    # Audio
+    if fn.endswith(('.mp3', '.ogg', '.wav', '.flac', '.m4a', '.opus', '.aac')):
+        return "🎵"
+    # Code / Developer Files
+    if fn.endswith(('.py', '.js', '.ts', '.sh', '.bash', '.html', '.css', '.json', '.yaml', '.yml', '.c', '.cpp', '.rs', '.go', '.php', '.sql')):
+        return "💻"
+    # Documents
+    if fn.endswith(('.pdf', '.docx', '.doc', '.xlsx', '.pptx', '.txt', '.rtf')):
+        return "📑"
+    # Compressed Archives
+    if fn.endswith(('.zip', '.rar', '.7z', '.tar', '.gz')):
+        return "📦"
+    
+    # Default
+    return "📄"

{akashcli-3.0.0 → akashcli-3.2.0}/akashcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 3.0.0
+Version: 3.2.0
 Summary: Enterprise Developer SDK and CLI for Akash Vault
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -8,6 +8,7 @@ Requires-Dist: httpx
 Requires-Dist: typer[all]
 Requires-Dist: rich
 Requires-Dist: cryptography
+Requires-Dist: questionary
 
 To get started with **AkashCLI**, your users should follow these steps. You can provide this guide as a `README.md` or a "Getting Started" message in your bot.
 

{akashcli-3.0.0 → akashcli-3.2.0}/akashcli.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ akashcli/cli.py
 akashcli/client.py
 akashcli/config.py
 akashcli/crypto.py
+akashcli/downloader.py
 akashcli/exceptions.py
 akashcli/models.py
 akashcli/uploader.py

{akashcli-3.0.0 → akashcli-3.2.0}/akashcli.egg-info/requires.txt

@@ -2,3 +2,4 @@ httpx
 typer[all]
 rich
 cryptography
+questionary

{akashcli-3.0.0 → akashcli-3.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "akashcli"
-version = "3.0.0"
+version = "3.2.0"
 description = "Enterprise Developer SDK and CLI for Akash Vault"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -9,6 +9,7 @@ dependencies = [
     "typer[all]",
     "rich",
     "cryptography",
+    "questionary",
 ]
 
 [project.scripts]

akashcli-3.0.0/akashcli/cli.py

@@ -1,184 +0,0 @@
-import typer
-import json
-import os
-import subprocess
-import webbrowser
-import httpx
-from typing import Optional
-from pathlib import Path
-from rich.console import Console
-from rich.table import Table
-from rich.progress import Progress, SpinnerColumn, BarColumn, TextColumn, DownloadColumn, TransferSpeedColumn
-from rich.panel import Panel
-
-# Internal Imports
-from .client import AkashClient
-from .auth import AuthManager
-from .config import ConfigManager
-from .exceptions import AkashError
-from .uploader import VaultUploader
-
-# 🌟 Removed the 'gh' overrides and panels
-app = typer.Typer(help="🛡️ Akash Vault Enterprise CLI", add_completion=True)
-console = Console()
-
-@app.command()
-def login(
-    url: str = typer.Option("https://jstore.2bd.net", "--url", help="Custom Vault URL"),
-    key: str = typer.Option(..., prompt="🔑 Enter API Key", hide_input=True)
-):
-    """🔑 Link your device to the vault."""
-    try:
-        with console.status("[bold blue]Verifying identity..."):
-            user = AuthManager.perform_login(key, url)
-        
-        console.print(f"[green]✓ Login Successful![/green] Owner: {user.owner}")
-    except Exception as e:
-        console.print(f"[bold red]✗ Authentication Failed:[/bold red] {e}")
-
-@app.command()
-def whoami():
-    """👤 Check current login and quota status."""
-    try:
-        client = AkashClient()
-        user = client.whoami()
-        console.print(f"Logged in as: [bold cyan]{user.owner}[/bold cyan]")
-        console.print(f"Storage Quota: [bold yellow]{user.quota_used}/{user.quota_limit}[/bold yellow]")
-    except Exception as e:
-        console.print(f"[red]Error:[/red] {e}")
-
-@app.command()
-def upload(
-    path: Optional[Path] = typer.Argument(None, help="Path to file"),
-    text: Optional[str] = typer.Option(None, "--text", "-t", help="Upload raw text content"),
-    name: Optional[str] = typer.Option(None, "--name", "-n", help="Custom filename"),
-    burn: bool = typer.Option(False, "--burn", help="Self-destruct after one view"),
-    expiry: int = typer.Option(0, "--expiry", "-e", help="Expiry in days (0 for forever)"),
-    password: Optional[str] = typer.Option(None, "--pass", "-p", help="Password protect file")
-):
-    """📤 Vault a single file or text snippet."""
-    try:
-        client = AkashClient()
-        
-        with Progress(
-            SpinnerColumn(),
-            TextColumn("[progress.description]{task.description}"),
-            BarColumn(),
-            console=console,
-            transient=True
-        ) as progress:
-            task = progress.add_task(description="[cyan]Processing...", total=100)
-            def update_bar(current, total):
-                progress.update(task, completed=(current/total)*100)
-
-            if text:
-                res = client.upload_text(text, filename=name, burn=burn, expiry=expiry, password=password)
-            else:
-                if not path:
-                    console.print("[red]Error:[/red] Provide a file path or use --text")
-                    return
-                res = client.upload_file(str(path), burn=burn, expiry=expiry, password=password, progress_callback=update_bar)
-
-        console.print(f"[bold green]✓ Vaulted![/bold green] Code: [yellow]{res.file_code}[/yellow]")
-    except Exception as e:
-        console.print(f"[bold red]✗ Upload Failed:[/bold red] {e}")
-
-@app.command()
-def files(json_output: bool = typer.Option(False, "--json", help="Output in raw JSON")):
-    """📦 List and search files in your vault."""
-    try:
-        client = AkashClient()
-        file_list = client.list_files()
-        
-        if json_output:
-            console.print_json(data=[f.__dict__ for f in file_list])
-            return
-
-        table = Table(title="📦 Encrypted Vault")
-        table.add_column("Filename", style="cyan")
-        table.add_column("Code", style="yellow")
-        table.add_column("Size", justify="right")
-
-        for f in file_list:
-            size_mb = f"{f.size / (1024*1024):.2f} MB"
-            table.add_row(f.name, f.code, size_mb)
-
-        console.print(table)
-    except Exception as e:
-        console.print(f"[red]Error:[/red] {e}")
-
-@app.command()
-def stream(code: str, vlc: bool = typer.Option(False, "--vlc", help="Open directly in VLC")):
-    """🎬 Get a secure streaming link."""
-    client = AkashClient()
-    try:
-        with httpx.Client(base_url=client.base_url) as c:
-            resp = c.get(f"/api/stream/generate/{code}", headers=client._get_headers())
-            resp.raise_for_status()
-            url = resp.json()['stream_url']
-            
-        if vlc:
-            console.print(f"🎬 Launching VLC for: {code}")
-            subprocess.Popen(['vlc', url], stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
-        else:
-            console.print(f"🎬 Secure URL: {url}")
-    except Exception as e:
-        console.print(f"[red]Error:[/red] {e}")
-
-@app.command()
-def delete(code: str):
-    """🗑️ Permanently remove a file."""
-    if typer.confirm(f"Are you sure you want to delete {code}?"):
-        try:
-            client = AkashClient()
-            client.delete_file(code)
-            console.print(f"[green]✓ Deleted {code}[/green]")
-        except Exception as e:
-            console.print(f"[red]Error:[/red] {e}")
-
-@app.command()
-def manage(
-    code: str, 
-    name: Optional[str] = typer.Option(None, "--name"),
-    burn: Optional[bool] = typer.Option(None, "--burn/--no-burn"),
-    expiry: Optional[int] = typer.Option(None, "--expiry")
-):
-    """⚙️ Modify settings for an existing file."""
-    try:
-        client = AkashClient()
-        updates = {}
-        if name: updates['filename'] = name
-        if burn is not None: updates['burn_on_read'] = 1 if burn else 0
-        if expiry is not None: updates['expiry_days'] = expiry
-        client.update_file(code, **updates)
-        console.print(f"[green]✓ Updated {code}[/green]")
-    except Exception as e:
-        console.print(f"[red]Error:[/red] {e}")
-
-@app.command()
-def bulk(path: Path):
-    """🚀 Recursive folder vaulting."""
-    try:
-        client = AkashClient()
-        uploader = VaultUploader(client)
-        files = [p for p in path.glob("**/*") if p.is_file() and not p.name.startswith('.')]
-        for file in files:
-            console.print(f"Vaulting: {file.name}")
-            uploader.upload(file_path=str(file))
-        console.print("[green]✓ Batch complete.[/green]")
-    except Exception as e:
-        console.print(f"[red]Error:[/red] {e}")
-
-@app.command()
-def docs():
-    """📖 View the integration guide."""
-    webbrowser.open("https://github.com/juniorsir/akashcli")
-
-@app.command()
-def logout():
-    """🚪 Clear local credentials."""
-    ConfigManager.save(b"") 
-    console.print("[yellow]Logged out.[/yellow]")
-
-if __name__ == "__main__":
-    app()

akashcli-3.0.0/akashcli/client.py

@@ -1,74 +0,0 @@
-import httpx
-import time
-from typing import List, Optional
-from .models import UploadResult, FileInfo, UserInfo
-from .exceptions import *
-from .config import ConfigManager
-
-class AkashClient:
-    def __init__(self, api_key: Optional[str] = None, api_url: Optional[str] = None):
-        config = ConfigManager.load()
-        self.api_key = api_key or config.get("api_key")
-        self.base_url = (api_url or config.get("api_url", "https://jstore.2bd.net")).rstrip("/")
-        
-        if not self.api_key:
-            raise AuthenticationError("No API Key found. Run 'akash login'")
-
-    def _get_headers(self, custom: dict = None):
-        h = {"x-api-key": self.api_key, "Origin": "https://akash.cli"}
-        if custom: h.update(custom)
-        return h
-
-    def whoami(self) -> UserInfo:
-        with httpx.Client(base_url=self.base_url) as client:
-            resp = client.get("/api/me", headers=self._get_headers())
-            if resp.status_code != 200: raise AuthenticationError("Invalid Key")
-            d = resp.json()
-            return UserInfo(d['owner'], d['quota']['used'], d['quota']['limit'], d['allowed_domains'])
-
-    def upload_file(self, path: str, burn: bool = False, expiry: int = 0) -> UploadResult:
-        files = {"file": open(path, "rb")}
-        headers = {
-            "x-vault-burn": "1" if burn else "0",
-            "x-vault-expiry": str(expiry)
-        }
-        with httpx.Client(base_url=self.base_url, timeout=None) as client:
-            resp = client.post("/api/upload", headers=self._get_headers(headers), files=files)
-            resp.raise_for_status()
-            d = resp.json()
-            return UploadResult(
-                d['status'], d['file_code'], d['links']['embed'], 
-                d['links']['direct'], d['input_type'], d.get('dna', {})
-            )
-
-    def list_files(self) -> List[FileInfo]:
-        with httpx.Client(base_url=self.base_url) as client:
-            resp = client.get("/api/files", headers=self._get_headers())
-            return [FileInfo(f['name'], f['code'], f['size'], f['uploaded_at']) for f in resp.json()]
-
-    def delete_file(self, code: str):
-        with httpx.Client(base_url=self.base_url) as client:
-            client.delete(f"/api/files/{code}", headers=self._get_headers())
-
-    def upload_text(self, content: str, filename: str = None, burn: bool = False, expiry: int = 0, password: str = None):
-        from .uploader import VaultUploader
-        uploader = VaultUploader(self)
-        return uploader.upload(content=content, filename=filename, burn=burn, expiry=expiry, password=password)
-
-    def update_file(self, code: str, **kwargs) -> dict:
-        """Update file settings (filename, burn_on_read, expiry_days)."""
-        with httpx.Client(base_url=self.base_url) as client:
-            resp = client.patch(
-                f"/api/files/{code}", 
-                headers=self._get_headers(), 
-                json=kwargs
-            )
-            resp.raise_for_status()
-            return resp.json()
-
-    def get_stats(self) -> dict:
-        """Admin Only: Fetch global vault statistics."""
-        with httpx.Client(base_url=self.base_url) as client:
-            # Reuses the logic from your bot's show_stats
-            resp = client.get("/api/me", headers=self._get_headers())
-            return resp.json()

akashcli-3.0.0/akashcli/uploader.py

@@ -1,123 +0,0 @@
-import os
-import httpx, asyncio
-from pathlib import Path
-from typing import Optional, Callable, Dict, Any, List
-from concurrent.futures import ThreadPoolExecutor
-from .models import UploadResult
-from .exceptions import UploadFailed, QuotaExceeded
-
-class VaultUploader:
-    def __init__(self, client):
-        self.client = client # Reference to AkashClient for headers/url
-
-    def upload(
-        self, 
-        file_path: Optional[str] = None, 
-        content: Optional[str] = None,
-        filename: Optional[str] = None,
-        burn: bool = False,
-        expiry: int = 0,
-        password: Optional[str] = None,
-        progress_callback: Optional[Callable[[int, int], None]] = None
-    ) -> UploadResult:
-        """
-        Standardizes both File and Text uploads into a single stream.
-        progress_callback signature: (bytes_read, total_bytes)
-        """
-        
-        # 1. Prepare Headers based on V3 Power-Control Specs
-        headers = {
-            "x-vault-burn": "1" if burn else "0",
-            "x-vault-expiry": str(expiry),
-        }
-        if password:
-            headers["x-vault-password"] = password
-
-        url = f"{self.client.base_url}/api/upload"
-        
-        try:
-            if content is not None:
-                # --- TEXT SNIPPET MODE (JSON) ---
-                payload = {
-                    "content": content,
-                    "filename": filename or "snippet.txt"
-                }
-                resp = httpx.post(
-                    url, 
-                    json=payload, 
-                    headers=self.client._get_headers(headers),
-                    timeout=None
-                )
-            else:
-                # --- FILE MODE (Multipart) ---
-                if not file_path or not os.path.exists(file_path):
-                    raise UploadFailed(f"File not found: {file_path}")
-                
-                file_size = os.path.getsize(file_path)
-                
-                # Setup custom stream to track progress
-                def file_generator():
-                    with open(file_path, "rb") as f:
-                        chunk_size = 1024 * 1024 # 1MB chunks
-                        bytes_read = 0
-                        while chunk := f.read(chunk_size):
-                            bytes_read += len(chunk)
-                            if progress_callback:
-                                progress_callback(bytes_read, file_size)
-                            yield chunk
-
-                files = {"file": (os.path.basename(file_path), file_generator())}
-                
-                resp = httpx.post(
-                    url, 
-                    files=files, 
-                    headers=self.client._get_headers(headers),
-                    timeout=None
-                )
-
-            if resp.status_code == 429:
-                raise QuotaExceeded("Monthly upload quota reached.")
-            
-            resp.raise_for_status()
-            d = resp.json()
-            
-            return UploadResult(
-                status=d['status'],
-                file_code=d['file_code'],
-                embed_url=d['links']['embed'],
-                direct_url=d['links']['direct'],
-                input_type=d['input_type'],
-                dna=d.get('dna', {})
-            )
-
-        except httpx.HTTPStatusError as e:
-            raise UploadFailed(f"Server rejected upload ({e.response.status_code}): {e.response.text}")
-        except Exception as e:
-            raise UploadFailed(f"Unexpected error during upload: {e}")
-
-    def upload_directory(self, folder_path: str, max_workers: int = 3) -> List[UploadResult]:
-        """Recursively uploads all files in a folder using a thread pool."""
-        # Convert string path to Path object
-        root = Path(folder_path)
-        if not root.is_dir():
-            raise UploadFailed(f"Source is not a directory: {folder_path}")
-
-        # Find all files recursively (excluding hidden files/folders)
-        paths = [p for p in root.glob("**/*") if p.is_file() and not p.name.startswith('.')]
-        results = []
-        
-        # Using ThreadPoolExecutor for parallel I/O bound tasks
-        with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            # We wrap the self.upload calls into the executor
-            # Note: We don't pass a progress_callback here to avoid UI overlap 
-            # (The CLI 'bulk' command will handle the UI instead)
-            futures = [executor.submit(self.upload, file_path=str(p)) for p in paths]
-            
-            for f in futures:
-                try:
-                    results.append(f.result())
-                except Exception as e:
-                    # Log error but continue with other files
-                    print(f"Error uploading a file in batch: {e}")
-        
-        return results  

akashcli-3.0.0/akashcli/utils.py

@@ -1,9 +0,0 @@
-import uuid
-import hashlib
-import platform
-
-def get_device_id() -> str:
-    """Generates a unique hardware fingerprint."""
-    # Combine node (MAC address) and system info for a stable ID
-    raw_id = f"{uuid.getnode()}-{platform.node()}-{platform.processor()}"
-    return hashlib.sha256(raw_id.encode()).hexdigest()