muapi-cli 0.2.6__tar.gz → 0.2.7__tar.gz

{muapi_cli-0.2.6 → muapi_cli-0.2.7}/.github/workflows/release.yml

@@ -153,6 +153,8 @@ jobs:
     name: Publish to PyPI
     needs: build
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
       - uses: actions/checkout@v4
 

{muapi_cli-0.2.6 → muapi_cli-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: muapi-cli
-Version: 0.2.6
+Version: 0.2.7
 Summary: Official CLI for muapi.ai — generative media at your fingertips
 License: MIT
 Requires-Python: >=3.9

muapi_cli-0.2.7/muapi/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.7"

{muapi_cli-0.2.6 → muapi_cli-0.2.7}/muapi/commands/auth.py

@@ -1,16 +1,121 @@
 """muapi auth — configure API key and inspect identity."""
-import typer
+import os
+import re
+import subprocess
+import sys
+import webbrowser
+
 import httpx
-from rich.prompt import Prompt
+import typer
+from rich.prompt import Confirm, Prompt
 
-from ..config import delete_api_key, get_api_key, save_api_key, BASE_URL
+from ..config import BASE_URL, _CONFIG_FILE, delete_api_key, get_api_key, get_key_info, save_api_key
 from .. import exitcodes
 from ..utils import console, error_exit, out
 
 app = typer.Typer(help="Manage authentication and API key.")
 
-# Auth endpoints live at the root host, not under /api/v1
 _AUTH_BASE = BASE_URL.replace("/api/v1", "")
+_ACCESS_KEYS_URL = "https://muapi.ai/access-keys"
+
+LINKS = {
+    "dashboard":   "https://muapi.ai/dashboard",
+    "access-keys": _ACCESS_KEYS_URL,
+    "models":      "https://muapi.ai/models",
+    "docs":        "https://muapi.ai/docs",
+    "pricing":     "https://muapi.ai/pricing",
+}
+
+
+def _mask(key: str) -> str:
+    if len(key) < 12:
+        return "••••"
+    return key[:8] + "…" + key[-4:]
+
+
+def _looks_like_key(s: str) -> bool:
+    s = s.strip()
+    return bool(re.match(r'^[A-Za-z0-9_\-]{20,}$', s) and '\n' not in s)
+
+
+def _read_clipboard() -> str | None:
+    try:
+        if sys.platform == "darwin":
+            r = subprocess.run(["pbpaste"], capture_output=True, text=True, timeout=2)
+            return r.stdout.strip() or None
+        if sys.platform.startswith("linux"):
+            for cmd in (["xclip", "-o"], ["xsel", "--clipboard", "--output"]):
+                try:
+                    r = subprocess.run(cmd, capture_output=True, text=True, timeout=2)
+                    if r.returncode == 0:
+                        return r.stdout.strip() or None
+                except FileNotFoundError:
+                    continue
+        if sys.platform == "win32":
+            r = subprocess.run(
+                ["powershell", "-command", "Get-Clipboard"],
+                capture_output=True, text=True, timeout=2,
+            )
+            return r.stdout.strip() or None
+    except Exception:
+        pass
+    return None
+
+
+def _validate_key(api_key: str) -> tuple[bool, str]:
+    """Validate key against the live API. Returns (ok, error_msg)."""
+    try:
+        resp = httpx.get(
+            f"{BASE_URL}/account/balance",
+            headers={"x-api-key": api_key},
+            timeout=15.0,
+        )
+        if resp.status_code in (401, 403):
+            return False, "API rejected the key (401/403)."
+        if resp.status_code >= 400:
+            return False, f"API returned {resp.status_code}."
+        return True, ""
+    except httpx.RequestError as e:
+        return False, f"Could not reach {BASE_URL}: {e}"
+
+
+def _find_project_config() -> str | None:
+    """Walk up from CWD looking for muapi.json."""
+    from pathlib import Path
+    d = Path.cwd()
+    while True:
+        candidate = d / "muapi.json"
+        if candidate.exists():
+            return str(candidate)
+        parent = d.parent
+        if parent == d:
+            return None
+        d = parent
+
+
+def _do_save(api_key: str) -> None:
+    with console.status("[dim]Validating with api.muapi.ai…[/dim]"):
+        ok, reason = _validate_key(api_key)
+
+    if not ok:
+        console.print(f"[bold red]✖[/bold red] {reason}")
+        console.print()
+        console.print(f"[dim]  Double-check at [/dim][cyan]{_ACCESS_KEYS_URL}[/cyan]")
+        console.print("[dim]  Or set [/dim][cyan]MUAPI_API_KEY[/cyan][dim] in your shell and skip this step.[/dim]\n")
+        raise typer.Exit(exitcodes.AUTH_ERROR)
+
+    location = save_api_key(api_key)
+    location_display = "OS keychain" if location == "keychain" else str(_CONFIG_FILE)
+    console.print("[bold green]✔[/bold green] Signed in.")
+    console.print()
+    console.print(f"  [dim]Key:    [/dim][green]{_mask(api_key)}[/green]")
+    console.print(f"  [dim]Stored: [/dim][cyan]{location_display}[/cyan]")
+    console.print()
+    console.print("[bold]Try it:[/bold]")
+    console.print("  [cyan]muapi account balance[/cyan]")
+    console.print("  [cyan]muapi image generate -p \"a cyberpunk skyline at golden hour\"[/cyan]")
+    console.print("  [cyan]muapi video generate -p \"drone shot over snowy peaks\" --model kling-master[/cyan]")
+    console.print()
 
 
 @app.command("login")
@@ -165,25 +270,85 @@ def reset_password(
 
 @app.command("configure")
 def configure(
-    api_key: str = typer.Option(None, "--api-key", "-k", help="API key (will prompt if omitted)"),
+    api_key: str = typer.Option(None, "--api-key", "-k", help="API key (skips all prompts)"),
+    no_browser: bool = typer.Option(False, "--no-browser", help="Skip opening the access-keys page"),
 ):
-    """Save your muapi API key to the OS keychain (or config file)."""
+    """Save your muapi API key — opens browser, detects clipboard, validates before saving."""
+    if api_key:
+        _do_save(api_key.strip())
+        return
+
+    console.print()
+    console.print("[bold magenta]  Welcome to muapi.[/bold magenta]")
+    console.print("[dim]  Sign in once and you're set on this machine.[/dim]\n")
+
+    if not no_browser:
+        console.print(f"[bold]  1.[/bold] Opening [cyan]{_ACCESS_KEYS_URL}[/cyan]")
+        try:
+            webbrowser.open(_ACCESS_KEYS_URL)
+        except Exception:
+            console.print("[dim]     (browser launch failed — open the link manually)[/dim]")
+        console.print("[bold]  2.[/bold] Copy your API key")
+        console.print("[bold]  3.[/bold] Paste below — we'll validate it automatically\n")
+
+    # Clipboard detection
+    detected: str | None = None
+    clip = _read_clipboard()
+    if clip and _looks_like_key(clip):
+        detected = clip
+
+    if detected:
+        use_it = Confirm.ask(
+            f"  Detected a key on your clipboard ({_mask(detected)}). Use it?",
+            default=True,
+            console=console,
+        )
+        if use_it:
+            api_key = detected
+
     if not api_key:
-        api_key = Prompt.ask("[bold]Enter your muapi API key[/bold]", password=True, console=console)
+        api_key = Prompt.ask("[bold]  Paste your API key[/bold]", password=True, console=console)
+        api_key = api_key.strip()
+
     if not api_key:
-        error_exit("No API key provided.")
-    location = save_api_key(api_key.strip())
-    console.print(f"[green]API key saved to {location}.[/green]")
+        error_exit("No API key provided.", exitcodes.AUTH_ERROR)
+
+    _do_save(api_key)
+
+
+@app.command("status")
+def status():
+    """Show the active API key, config location, base URL, and quick links."""
+    key, source = get_key_info()
+
+    console.print()
+    console.print("[bold]muapi CLI status[/bold]")
+    if key:
+        console.print(f"  [dim]API key:  [/dim][green]{_mask(key)}[/green]")
+    else:
+        console.print(f"  [dim]API key:  [/dim][red]not set — run [bold]muapi auth configure[/bold][/red]")
+    console.print(f"  [dim]Source:   [/dim][cyan]{source}[/cyan]")
+    console.print(f"  [dim]Base URL: [/dim][cyan]{BASE_URL}[/cyan]")
+    console.print(f"  [dim]Config:   [/dim][cyan]{_CONFIG_FILE}[/cyan]")
+
+    project_file = _find_project_config()
+    if project_file:
+        console.print(f"  [dim]Project:  [/dim][cyan]{project_file}[/cyan] [dim](muapi.json detected)[/dim]")
+
+    console.print()
+    console.print("[bold]Useful links[/bold]")
+    width = max(len(k) for k in LINKS)
+    for name, url in LINKS.items():
+        console.print(f"  [dim]{name.ljust(width)}[/dim]  [cyan]{url}[/cyan]")
+    console.print()
+    console.print("[dim]Jump in your browser: [/dim][cyan]muapi open <target>[/cyan]")
+    console.print()
 
 
 @app.command("whoami")
 def whoami():
-    """Show the currently configured API key (masked)."""
-    key = get_api_key()
-    if not key:
-        error_exit("No API key configured. Run: muapi auth configure", exitcodes.AUTH_ERROR)
-    masked = key[:8] + "..." + key[-4:]
-    out.print(f"API key: [bold]{masked}[/bold]")
+    """Alias for [bold]muapi auth status[/bold]."""
+    status()
 
 
 @app.command("logout")

muapi_cli-0.2.7/muapi/commands/init_cmd.py

@@ -0,0 +1,62 @@
+"""muapi init — create a muapi.json project config in the current directory."""
+import json
+from pathlib import Path
+
+import typer
+
+from ..utils import console, error_exit
+
+_PROJECT_FILE = "muapi.json"
+_SCHEMA_URL = "https://muapi.ai/schema/cli.json"
+
+_DEFAULT_CONFIG = {
+    "$schema": _SCHEMA_URL,
+    "defaultModel": "flux-dev-image",
+    "outputDir": "muapi-output",
+    "aliases": {},
+}
+
+
+def init(
+    yes: bool = typer.Option(False, "-y", "--yes", help="Skip prompts and write defaults"),
+    force: bool = typer.Option(False, "-f", "--force", help="Overwrite an existing muapi.json"),
+):
+    """Create a muapi.json project config with a defaultModel and alias stubs.
+
+    \b
+    Examples:
+      muapi init            # interactive
+      muapi init -y         # write defaults silently
+      muapi init -y -f      # overwrite existing
+    """
+    target = Path.cwd() / _PROJECT_FILE
+
+    if target.exists() and not force:
+        error_exit(
+            f"{_PROJECT_FILE} already exists. Use --force to overwrite.",
+        )
+
+    config = dict(_DEFAULT_CONFIG)
+
+    if not yes:
+        from rich.prompt import Prompt
+        default_model = Prompt.ask(
+            "Default model",
+            default=config["defaultModel"],
+            console=console,
+        )
+        output_dir = Prompt.ask(
+            "Output directory",
+            default=config["outputDir"],
+            console=console,
+        )
+        config["defaultModel"] = default_model
+        config["outputDir"] = output_dir
+
+    target.write_text(json.dumps(config, indent=2) + "\n")
+    console.print(f"[green]Wrote {_PROJECT_FILE}[/green]")
+    console.print()
+    console.print("Now try:")
+    console.print(f"  [cyan]muapi run -p \"a serene mountain lake at sunrise\"[/cyan]")
+    console.print(f"  Add aliases by editing [bold]{_PROJECT_FILE}[/bold]")
+    console.print()

muapi_cli-0.2.7/muapi/commands/open_cmd.py

@@ -0,0 +1,47 @@
+"""muapi open — open muapi.ai pages in your browser."""
+import webbrowser
+from typing import Optional
+
+import typer
+
+from ..utils import console, error_exit
+
+_TARGETS: dict[str, str] = {
+    "dashboard":   "https://muapi.ai/dashboard",
+    "access-keys": "https://muapi.ai/access-keys",
+    "models":      "https://muapi.ai/models",
+    "docs":        "https://muapi.ai/docs",
+    "pricing":     "https://muapi.ai/pricing",
+    "api":         "https://api.muapi.ai/docs",
+    "discord":     "https://discord.gg/muapi",
+}
+
+
+def open_page(
+    target: Optional[str] = typer.Argument(
+        None,
+        help="Page to open: " + ", ".join(_TARGETS.keys()),
+    ),
+):
+    """Open a muapi.ai page in your browser.
+
+    \b
+    Examples:
+      muapi open               # opens dashboard
+      muapi open access-keys   # key management
+      muapi open models        # model catalog
+      muapi open docs          # API docs
+    """
+    if not target:
+        target = "dashboard"
+
+    url = _TARGETS.get(target.lower())
+    if not url:
+        valid = ", ".join(_TARGETS.keys())
+        error_exit(f"Unknown target '{target}'. Valid: {valid}")
+
+    console.print(f"Opening [cyan]{url}[/cyan]")
+    try:
+        webbrowser.open(url)
+    except Exception as e:
+        error_exit(f"Could not open browser: {e}")

{muapi_cli-0.2.6 → muapi_cli-0.2.7}/muapi/config.py

@@ -96,6 +96,23 @@ def get_all_settings() -> dict:
     return {}
 
 
+def get_key_info() -> tuple[Optional[str], str]:
+    """Return (api_key, source_description) for display in status/whoami."""
+    if key := os.environ.get("MUAPI_API_KEY"):
+        return key, "env:MUAPI_API_KEY"
+    ok, val = _try_keyring()
+    if ok and val:
+        return val, "keychain"
+    if _CONFIG_FILE.exists():
+        try:
+            data = json.loads(_CONFIG_FILE.read_text())
+            if key := data.get("api_key"):
+                return key, f"file:{_CONFIG_FILE}"
+        except Exception:
+            pass
+    return None, "not set"
+
+
 def delete_api_key() -> None:
     ok, _ = _try_keyring()
     if ok:

{muapi_cli-0.2.6 → muapi_cli-0.2.7}/muapi/main.py

@@ -5,7 +5,7 @@ import typer
 from rich import print as rprint
 
 from . import __version__
-from .commands import auth, account, audio, config_cmd, docs, edit, enhance, image, keys, models, predict, run, upload, video, workflow
+from .commands import auth, account, audio, config_cmd, docs, edit, enhance, image, init_cmd, keys, models, open_cmd, predict, run, upload, video, workflow
 from .commands import mcp_server
 from .dynamic_help import maybe_handle_run_help
 
@@ -44,6 +44,18 @@ app.add_typer(config_cmd.app,  name="config",  help="Get and set persistent CLI
 app.add_typer(docs.app,        name="docs",    help="Access the muapi.ai API documentation.")
 app.add_typer(mcp_server.app,  name="mcp",     help="Run as an MCP server for AI agent integration.")
 
+app.command(
+    "init",
+    help="Create a muapi.json project config with defaultModel and alias stubs.",
+    context_settings={"help_option_names": ["-h", "--help"]},
+)(init_cmd.init)
+
+app.command(
+    "open",
+    help="Open a muapi.ai page in your browser (dashboard, models, docs, access-keys…).",
+    context_settings={"help_option_names": ["-h", "--help"]},
+)(open_cmd.open_page)
+
 
 @app.command("version")
 def version(

{muapi_cli-0.2.6 → muapi_cli-0.2.7}/npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muapi-cli",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Official CLI for muapi.ai \u2014 generate images, videos, and audio from your terminal",
   "keywords": [
     "muapi",

{muapi_cli-0.2.6 → muapi_cli-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "muapi-cli"
-version = "0.2.6"
+version = "0.2.7"
 description = "Official CLI for muapi.ai — generative media at your fingertips"
 readme = "README.md"
 requires-python = ">=3.9"

muapi_cli-0.2.6/muapi/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.6"