aioli-cli 0.1.40__tar.gz → 0.1.41__tar.gz

{aioli_cli-0.1.40 → aioli_cli-0.1.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: aioli-cli
-Version: 0.1.40
+Version: 0.1.41
 Summary: aioli — local-first AI media suite CLI (images, video, music, voice, podcast)
 Author: aioli contributors
 License: MIT

{aioli_cli-0.1.40 → aioli_cli-0.1.41}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioli-cli"
-version = "0.1.40"
+version = "0.1.41"
 description = "aioli — local-first AI media suite CLI (images, video, music, voice, podcast)"
 readme = "README.md"
 requires-python = ">=3.12"

{aioli_cli-0.1.40 → aioli_cli-0.1.41}/src/aioli_image/cli.py

@@ -159,6 +159,9 @@ def generate(
     stub_mode: bool = typer.Option(
         False, "--stub", help="Write a placeholder PNG (offline tests, no GPU)."
     ),
+    verbose: bool = typer.Option(
+        False, "--verbose", help="Muestra los logs de sd-cli en vivo (por defecto se capturan)."
+    ),
     models_dir: Path | None = typer.Option(None, "--models-dir"),
 ) -> None:
     """Generate an image (or video with --video-frames > 1)."""
@@ -229,6 +232,7 @@ def generate(
             gpu=gpu,
             dry_run=dry_run,
             picker=False,
+            verbose=verbose,
         )
     if vae_tile_size is not None and not vae_tiling:
         typer.echo("ERROR: --vae-tile-size requires --vae-tiling.", err=True)
@@ -283,6 +287,7 @@ def generate(
         gpu=gpu,
         dry_run=dry_run,
         picker=model is None,
+        verbose=verbose,
     )
 
 

{aioli_cli-0.1.40 → aioli_cli-0.1.41}/src/aioli_image/launcher.py

@@ -6,6 +6,7 @@ import os
 import shlex
 import subprocess
 import sys
+import time
 from dataclasses import replace
 from pathlib import Path
 
@@ -327,6 +328,62 @@ def _default_output_path(model: ModelInfo, video: bool = False) -> Path:
     return (out_dir / f"{stem}_{ts}{ext}").resolve()
 
 
+_KNOWN_OUTPUT_EXTS = (".png", ".jpg", ".jpeg", ".webp", ".webm", ".mp4")
+
+
+def _resolve_actual_output(requested: Path) -> Path | None:
+    """Resolve the real artefact sd-cli left on disk.
+
+    sd-cli appends an image extension when `-o` has no suffix
+    (`-o superheroe` -> `superheroe.png`), so the requested path alone
+    false-negatives. If `requested` exists and is non-empty it wins;
+    otherwise probe `<stem><known-ext>` in the destination dir and CWD.
+    Returns None when nothing valid is found.
+    """
+    try:
+        if requested.is_file() and requested.stat().st_size > 0:
+            return requested
+    except OSError:
+        pass
+    stem = requested.stem if requested.suffix else requested.name
+    if not stem:
+        return None
+    ordered_dirs: list[Path] = []
+    seen: set[Path] = set()
+    for d in (requested.parent, Path.cwd()):
+        try:
+            key = d.resolve()
+        except OSError:
+            key = d
+        if key not in seen:
+            seen.add(key)
+            ordered_dirs.append(d)
+    for d in ordered_dirs:
+        for ext in _KNOWN_OUTPUT_EXTS:
+            cand = d / f"{stem}{ext}"
+            try:
+                if cand.is_file() and cand.stat().st_size > 0:
+                    return cand
+            except OSError:
+                continue
+    return None
+
+
+def _log_tail_lines(exc: BaseException, limit: int = 5) -> list[str]:
+    """Last non-blank log lines from a failed capture (stdout + stderr)."""
+    lines: list[str] = []
+    for chunk in (getattr(exc, "stdout", None), getattr(exc, "stderr", None)):
+        if not chunk:
+            continue
+        if isinstance(chunk, bytes):
+            try:
+                chunk = chunk.decode(errors="replace")
+            except Exception:
+                chunk = str(chunk)
+        lines.extend(str(chunk).splitlines())
+    return [ln for ln in lines if ln.strip()][-limit:]
+
+
 def _image_dimensions(path: Path) -> tuple[int, int] | None:
     """Read the pixel size (width, height) of a PNG/JPEG/WebP without deps.
 
@@ -541,6 +598,7 @@ def launch_gen(
     gpu: str = "auto",
     dry_run: bool = False,
     picker: bool = True,
+    verbose: bool = False,
 ) -> None:
     """Generate an image (or video with `video_frames > 1`)."""
     sd_cli = require_sd_cli()
@@ -724,12 +782,33 @@ def launch_gen(
         f"{final_steps} steps {final_method} · GPU {gpu} → [bold]{final_out.name}[/]"
     )
     console.print("[dim]  cargando modelo (la primera vez tarda)…[/]\n")
+    start = time.monotonic()
     try:
-        subprocess.run(shlex.split(cmd), check=True, env=run_env)
+        if verbose:
+            subprocess.run(shlex.split(cmd), check=True, env=run_env)
+        else:
+            status_msg = (
+                f"🎨 generando… {final_width}×{final_height} · "
+                f"{final_steps} pasos — el detalle con --verbose"
+            )
+            with console.status(status_msg, spinner="dots"):
+                subprocess.run(
+                    shlex.split(cmd), check=True, env=run_env, capture_output=True, text=True
+                )
+        elapsed = time.monotonic() - start
         # D17: exit 0 no es éxito si no hay artefacto. Fichero ausente o
-        # vacío = error con código propio (3), nunca "✓ saved".
+        # vacío = error con código propio (3), nunca "✓ saved". sd-cli
+        # añade la extensión cuando `-o` va sin sufijo (`-o superheroe` ->
+        # `superheroe.png`): resolver la salida real antes de fallar.
+        real_out = _resolve_actual_output(final_out)
+        if real_out is None:
+            console.print(
+                f"[red]❌ sd-cli terminó pero no dejó imagen válida en {final_out}[/]\n"
+                "[dim]  (ausente o 0 bytes: disco lleno, OOM silenciado o bug del runtime)[/]"
+            )
+            sys.exit(3)
         try:
-            size = final_out.stat().st_size
+            size = real_out.stat().st_size
         except OSError:
             size = -1
         if size <= 0:
@@ -739,17 +818,25 @@ def launch_gen(
             )
             sys.exit(3)
         size_mb = size / 1024 / 1024
-        console.print(f"\n[green]✓ saved[/] [bold]{final_out}[/] ({size_mb:.1f} MB)")
+        console.print(f"\n[green]✓ saved[/] [bold]{real_out}[/] ({size_mb:.1f} MB, {elapsed:.1f}s)")
         # Show absolute path again so the user can find it from any CWD.
-        console.print(f"  [dim]→ {final_out.resolve()}[/]")
+        console.print(f"  [dim]→ {real_out.resolve()}[/]")
     except subprocess.CalledProcessError as e:
         console.print(f"[red]sd-cli exited with code {e.returncode}[/]")
+        for line in _log_tail_lines(e):
+            console.print(f"[dim]  │ {line.strip()}[/]")
         if e.returncode == -4:
             console.print(
                 "[dim]  código -4 = SIGILL: binario con instrucciones que tu CPU no tiene. "
                 "Actualiza el runtime: aioli models download image -b <motor> --force[/]"
             )
-        sys.exit(e.returncode)
+        console.print(
+            "[yellow]⚠ este modelo puede estar mal descargado o no soportado "
+            "por tu versión del motor; prueba otro modelo "
+            "(`aioli image generate` y elige otro) o reintenta con "
+            "--verbose para el detalle[/]"
+        )
+        sys.exit(1)
     except KeyboardInterrupt:
         console.print("\n[dim]  cancelled.[/]")
         sys.exit(130)

{aioli_cli-0.1.40 → aioli_cli-0.1.41}/src/aioli_image/ui.py

@@ -407,6 +407,13 @@ def run_generate_wizard(models: list[ModelInfo], config: dict) -> dict | None:
             console.print("[yellow]Sin prompt no hay imagen.[/]")
             return None
         prompt = prompt.strip()
+        if len(prompt) >= 2 and (
+            (prompt[0] == '"' and prompt[-1] == '"') or (prompt[0] == "'" and prompt[-1] == "'")
+        ):
+            prompt = prompt[1:-1].strip()
+            if not prompt:
+                console.print("[yellow]Sin prompt no hay imagen.[/]")
+                return None
 
         model = pick_model(models, config)
         if model is None: