aioli-cli 0.1.30__tar.gz → 0.1.32__tar.gz

{aioli_cli-0.1.30 → aioli_cli-0.1.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: aioli-cli
-Version: 0.1.30
+Version: 0.1.32
 Summary: aioli — local-first AI media suite CLI (images, video, music, voice, podcast)
 Author: aioli contributors
 License: MIT
@@ -79,8 +79,8 @@ with these commands. No accounts, no subscription.
 ## Install
 
 ```bash
-curl -fsSL https://aioli.es/install.sh | sh   # hardware → advice → models, fully guided
-# …or by hand (needs `uv`, Python ≥3.12 and `ffmpeg`):
+curl -fsSL https://aioli.es/install.sh | sh   # installs uv+ffmpeg if missing → doctor → setup → status
+# …or truly by hand (needs `uv`, Python ≥3.12 and `ffmpeg`):
 uv tool install aioli-cli            # extras: aioli-cli[voice-piper,music-storage]
 aioli setup                            # tells you what fits your GPU, downloads weights
 aioli doctor                           # preflight: CUDA, ffmpeg, models, VRAM
@@ -91,7 +91,9 @@ huggingface.co and export `HF_TOKEN` (read-only token) before `setup`.
 
 > 🔒 Paranoid (good): the installer lives in the repo's `install.sh`.
 > It only uses the network for `astral.sh` (uv), GitHub and HuggingFace.
-> No `sudo`.
+> The only elevated step is installing `ffmpeg` if missing — it asks first
+> (or skips with `--no-ffmpeg`). Re-running is safe: it upgrades in place
+> and preserves your extras and `--with` engines.
 
 ## Requirements
 

{aioli_cli-0.1.30 → aioli_cli-0.1.32}/README.md

@@ -47,8 +47,8 @@ with these commands. No accounts, no subscription.
 ## Install
 
 ```bash
-curl -fsSL https://aioli.es/install.sh | sh   # hardware → advice → models, fully guided
-# …or by hand (needs `uv`, Python ≥3.12 and `ffmpeg`):
+curl -fsSL https://aioli.es/install.sh | sh   # installs uv+ffmpeg if missing → doctor → setup → status
+# …or truly by hand (needs `uv`, Python ≥3.12 and `ffmpeg`):
 uv tool install aioli-cli            # extras: aioli-cli[voice-piper,music-storage]
 aioli setup                            # tells you what fits your GPU, downloads weights
 aioli doctor                           # preflight: CUDA, ffmpeg, models, VRAM
@@ -59,7 +59,9 @@ huggingface.co and export `HF_TOKEN` (read-only token) before `setup`.
 
 > 🔒 Paranoid (good): the installer lives in the repo's `install.sh`.
 > It only uses the network for `astral.sh` (uv), GitHub and HuggingFace.
-> No `sudo`.
+> The only elevated step is installing `ffmpeg` if missing — it asks first
+> (or skips with `--no-ffmpeg`). Re-running is safe: it upgrades in place
+> and preserves your extras and `--with` engines.
 
 ## Requirements
 

{aioli_cli-0.1.30 → aioli_cli-0.1.32}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioli-cli"
-version = "0.1.30"
+version = "0.1.32"
 description = "aioli — local-first AI media suite CLI (images, video, music, voice, podcast)"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -144,6 +144,7 @@ module = [
     "voxcpm",
     "qwen_tts", "qwen_tts.*",
     "chatterbox", "chatterbox.*",
+    "perth",
     "moss_tts_nano",
     "transformers", "transformers.*",
     "kokoro_onnx", "kokoro_onnx.*",
@@ -155,6 +156,17 @@ ignore_missing_imports = true
 module = ["soundfile", "soundfile.*", "tqdm"]
 ignore_missing_imports = true
 
+# Out-of-venv checkers (session lens) run mypy WITHOUT the project venv:
+# pytest (dev dep) and aioli_contract (workspace pkg in libs/contract, editable
+# in .venv) don't resolve there and mypy reports import-not-found — false
+# positive. In the real env they resolve (`.venv/bin/python -c "import pytest,
+# aioli_contract"` OK; ruff + pytest --collect-only green on libs/contract/tests).
+# ignore_missing_imports only fires when resolution fails, so the repo's own
+# venv runs keep full checking.
+[[tool.mypy.overrides]]
+module = ["pytest", "pytest.*", "aioli_contract", "aioli_contract.*"]
+ignore_missing_imports = true
+
 # DEBT: aioli_music.core.jobs imports aioli_music.core.storage, which does not
 # exist (unimplemented object-storage feature); nothing imports jobs. Decide:
 # implement storage or delete the module. Until then its errors stay hidden

{aioli_cli-0.1.30 → aioli_cli-0.1.32}/src/aioli_cli/main.py

@@ -1,5 +1,8 @@
 """aioli CLI entry point."""
 
+from pathlib import Path
+from typing import Any
+
 import typer
 from rich.console import Console
 from rich.table import Table
@@ -92,11 +95,10 @@ def doctor() -> None:
                 entry = ModelFile(**raw)
                 if entry.optional:
                     continue
-                if entry.platform:
-                    import sys as _sys
+                from aioli_contract.fetch import current_platform, platform_matches
 
-                    if entry.platform != _sys.platform:
-                        continue
+                if not platform_matches(entry.platform, current_platform()):
+                    continue
                 if entry.kind == "runtime":
                     continue
                 grouped.setdefault(entry.backend or "-", []).append(entry)
@@ -105,11 +107,10 @@ def doctor() -> None:
                 entry = ModelFile(**raw)
                 if entry.kind != "runtime" or entry.optional:
                     continue
-                if entry.platform:
-                    import sys as _sys2
+                from aioli_contract.fetch import current_platform, platform_matches
 
-                    if entry.platform != _sys2.platform:
-                        continue
+                if not platform_matches(entry.platform, current_platform()):
+                    continue
                 runtimes.append(entry)
             for backend, entries in sorted(grouped.items()):
                 if backend == "-":
@@ -174,6 +175,28 @@ def version() -> None:
 models_app = typer.Typer(help="Download + verify weight files.")
 app.add_typer(models_app, name="models")
 
+backend_app = typer.Typer(help="Ver + cambiar el motor por defecto (music/voice).")
+app.add_typer(backend_app, name="backend")
+
+
+@backend_app.command("set")
+def backend_set(
+    plugin: str = typer.Argument(..., help="Plugin con default persistido: music | voice."),
+    backend: str = typer.Argument(..., help="Motor a usar por defecto en generate."),
+) -> None:
+    """Cambia el default persistido sin descargar (orden explicita, AC6).
+
+    `generate` usa este default salvo flag explicito (`--backend`/`--engine`,
+    que manda). Image/video son informativos y no tienen default persistido.
+    """
+    from aioli_cli.setup import set_backend  # noqa: PLC0415
+
+    set_backend(plugin, backend)
+    console.print(
+        f"✅ default de {plugin}: [bold]{backend}[/] "
+        "(el flag --backend/--engine sigue mandando en generate)"
+    )
+
 
 def _wanted(plugin: str | None, backend: str | None = None) -> list[tuple[str, dict]]:
     from aioli_cli import _plugins  # noqa: PLC0415 — ensure loaded
@@ -202,6 +225,15 @@ def _wanted(plugin: str | None, backend: str | None = None) -> list[tuple[str, d
     return out
 
 
+def _plugin_roots(
+    wanted: list[tuple[str, Any]], cfg: AioliConfig, cli_flag: str | None
+) -> dict[str, Path]:
+    roots: dict[str, Path] = {}
+    for pname, _ in wanted:
+        roots.setdefault(pname, cfg.resolve_models_root(pname, cli_flag=cli_flag))
+    return roots
+
+
 def _backends() -> dict[str, list[str]]:
     from aioli_cli import _plugins  # noqa: PLC0415 — ensure loaded
 
@@ -222,24 +254,33 @@ def models_list(
         None,
         "--backend",
         "-b",
-        help="Engine filter (default: plugin default; 'all' = every engine).",
+        help="Engine filter (default: plugin default; 'all' = every engine). "
+        "Disponible para tu equipo: ver `aioli status`.",
+    ),
+    models_root: str | None = typer.Option(
+        None,
+        "--models-root",
+        help="Raíz de modelos (máxima precedencia, todos los plugins).",
     ),
 ) -> None:
     """Show manifest entries + local status."""
-    from aioli_contract import ModelFile, default_bin_dir, default_models_dir, human_gb, verify
+    from aioli_contract import ModelFile, default_bin_dir, human_gb, verify
 
-    models_dir = default_models_dir()
+    cfg = AioliConfig.load()
     bin_dir = default_bin_dir()
-    table = Table(title=f"aioli models → {models_dir}")
+    wanted = _wanted(plugin, backend)
+    roots = _plugin_roots(wanted, cfg, models_root)
+    distinct = ", ".join(sorted({str(r) for r in roots.values()}))
+    table = Table(title=f"aioli models → {distinct}")
     table.add_column("plugin")
     table.add_column("engine")
     table.add_column("kind")
     table.add_column("file")
     table.add_column("size")
     table.add_column("status")
-    for pname, raw in _wanted(plugin, backend):
+    for pname, raw in wanted:
         entry = ModelFile(**raw)
-        status = verify(entry, models_dir, bin_dir, quick=True)
+        status = verify(entry, roots[pname], bin_dir, quick=True)
         icon = {"ok": "✅", "missing": "⬇️", "corrupt": "⚠️", "unverified": "❔"}[status]
         table.add_row(
             pname,
@@ -260,11 +301,20 @@ def models_download(
     plugin: str | None = typer.Argument(None),
     yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation."),
     backend: str | None = typer.Option(
-        None, "--backend", "-b", help="Engine only (default: plugin default; 'all' = every engine)."
+        None,
+        "--backend",
+        "-b",
+        help="Engine only (default: plugin default; 'all' = every engine). "
+        "Disponible para tu equipo: ver `aioli status`.",
     ),
     with_optional: bool = typer.Option(
         False, "--with-optional", help="Include optional files (ASR, alt quants)."
     ),
+    models_root: str | None = typer.Option(
+        None,
+        "--models-root",
+        help="Raíz de modelos (máxima precedencia, todos los plugins).",
+    ),
     force: bool = typer.Option(
         False, "--force", help="Re-download even if verified (repairs partial runtime bundles)."
     ),
@@ -276,14 +326,14 @@ def models_download(
         ModelFile,
         check_space,
         default_bin_dir,
-        default_models_dir,
         human_gb,
         verify,
     )
 
-    models_dir = default_models_dir()
+    cfg = AioliConfig.load()
     bin_dir = default_bin_dir()
     wanted = [(pn, ModelFile(**raw)) for pn, raw in _wanted(plugin, backend)]
+    roots = _plugin_roots(wanted, cfg, models_root)
     if not with_optional:
         skipped = [e.rel for _, e in wanted if e.optional]
         wanted = [(pn, e) for pn, e in wanted if not e.optional]
@@ -296,19 +346,29 @@ def models_download(
     if force:
         missing = wanted  # re-descargar todo lo seleccionado
     else:
-        missing = [(pn, e) for pn, e in wanted if verify(e, models_dir, bin_dir) != "ok"]
+        missing = [(pn, e) for pn, e in wanted if verify(e, roots[pn], bin_dir) != "ok"]
     if not missing:
         console.print("✅ all models present + verified")
         return
+    by_root: dict[Path, list] = {}
+    for pn, e in missing:
+        by_root.setdefault(roots[pn], []).append(e)
     total = sum(e.size for _, e in missing)
-    fits, _needed, free = check_space([e for _, e in missing], models_dir, bin_dir, force=force)
-    console.print(f"⬇️  {len(missing)} file(s), {human_gb(total)} → {models_dir}")
-    if free is None:
+    fits_all = True
+    free_min: int | None = None
+    for root, es in by_root.items():
+        fits, _needed, free = check_space(es, root, bin_dir, force=force)
+        fits_all = fits_all and fits
+        if free is not None:
+            free_min = free if free_min is None else min(free_min, free)
+    distinct = ", ".join(sorted(str(r) for r in by_root))
+    console.print(f"⬇️  {len(missing)} file(s), {human_gb(total)} → {distinct}")
+    if free_min is None:
         console.print("   [yellow]⚠️  disco no medible: no puedo confirmar que quepa.[/]")
-    elif free:
-        console.print(f"   disk free: {human_gb(free)}")
-    if not fits:
-        have = human_gb(free) if free is not None else "desconocido"
+    elif free_min:
+        console.print(f"   disk free: {human_gb(free_min)}")
+    if not fits_all:
+        have = human_gb(free_min) if free_min is not None else "desconocido"
         raise typer.Abort(f"❌ not enough disk space for {human_gb(total)} (free: {have})")
     notes = {registry._plugins[pn].gated_note for pn, _ in missing}
     for note in sorted(n for n in notes if n):
@@ -323,28 +383,39 @@ def models_download(
 
     from aioli_cli.fetch_ui import download_many, print_summary
 
-    failures = download_many([e for _, e in missing], models_dir, bin_dir, jobs=jobs, force=force)
+    failures: list[tuple[str, str]] = []
+    for root, es in sorted(by_root.items(), key=lambda kv: str(kv[0])):
+        failures.extend(download_many(es, root, bin_dir, jobs=jobs, force=force))
     ok_count = len(missing) - len(failures)
     if not print_summary(failures, ok_count):
         raise typer.Exit(code=1)
 
 
 @models_app.command("verify")
-def models_verify(plugin: str | None = typer.Argument(None)) -> None:
+def models_verify(
+    plugin: str | None = typer.Argument(None),
+    models_root: str | None = typer.Option(
+        None,
+        "--models-root",
+        help="Raíz de modelos (máxima precedencia, todos los plugins).",
+    ),
+) -> None:
     """Re-hash local files against the manifest.
 
     Exit 1 si algo falta, está corrupto o no es verificable (apto para
     CI); 'unverified' (sin recibo legacy o sin hash) NO es "ok":
     presencia no es integridad. Regenera con `models download --force`.
     """
-    from aioli_contract import ModelFile, default_bin_dir, default_models_dir, verify
+    from aioli_contract import ModelFile, default_bin_dir, verify
 
-    models_dir = default_models_dir()
+    cfg = AioliConfig.load()
     bin_dir = default_bin_dir()
+    wanted = _wanted(plugin)
+    roots = _plugin_roots(wanted, cfg, models_root)
     bad = 0
-    for pname, raw in _wanted(plugin):
+    for pname, raw in wanted:
         entry = ModelFile(**raw)
-        status = verify(entry, models_dir, bin_dir)
+        status = verify(entry, roots[pname], bin_dir)
         icon = {"ok": "✅", "missing": "⬇️", "corrupt": "⚠️", "unverified": "❔"}[status]
         console.print(f"{icon} [{pname}] {entry.rel}: {status}")
         if status in ("corrupt", "missing", "unverified"):
@@ -353,6 +424,37 @@ def models_verify(plugin: str | None = typer.Argument(None)) -> None:
         raise typer.Exit(code=1)
 
 
+@models_app.command("import")
+def models_import(
+    plugin: str = typer.Argument(..., help="Plugin requerido: image,video,music,voice."),
+    src_dir: Path = typer.Argument(..., help="Directorio origen existente, no se borra."),
+    recursive: bool = typer.Option(False, "--recursive", "-r", help="Escanea subdirectorios."),
+    models_root: str | None = typer.Option(None, "--models-root", help="Raiz de modelos."),
+) -> None:
+    from aioli_contract import default_bin_dir
+    from aioli_contract.fetch import ModelFile, import_models
+
+    if not src_dir.is_dir():
+        raise typer.BadParameter(f"dir origen inexistente: {src_dir}")
+    cfg = AioliConfig.load()
+    bin_dir = default_bin_dir()
+    root = cfg.resolve_models_root(plugin, cli_flag=models_root)
+    wanted = _wanted(plugin, backend="all")
+    entries = [ModelFile(**raw) for _, raw in wanted]
+    report = import_models(entries, src_dir, root, bin_dir, recursive=recursive)
+    console.print(f"adoptados: {len(report.adopted)}")
+    for rel in sorted(report.adopted):
+        console.print(f"  adoptados {rel}")
+    console.print(f"desconocidos: {len(report.unknown)}")
+    for name in sorted(report.unknown):
+        console.print(f"  desconocidos {name}")
+    console.print(f"discrepantes: {len(report.discrepant)}")
+    for name in sorted(report.discrepant):
+        console.print(f"  discrepantes {name}")
+    if report.discrepant:
+        raise typer.Exit(code=1)
+
+
 def main() -> None:
     from aioli_cli import _plugins