agent-cli 0.67.2__py3-none-any.whl → 0.68.1__py3-none-any.whl

agent_cli/core/deps.py

@@ -4,19 +4,29 @@ from __future__ import annotations
 
 import functools
 import json
+import os
 from importlib.util import find_spec
 from pathlib import Path
 from typing import TYPE_CHECKING, TypeVar
 
 import typer
 
-from agent_cli.core.utils import print_error_message
+from agent_cli.config import load_config
+from agent_cli.core.utils import console, print_error_message
 
 if TYPE_CHECKING:
     from collections.abc import Callable
 
 F = TypeVar("F", bound="Callable[..., object]")
 
+
+def _get_auto_install_setting() -> bool:
+    """Check if auto-install is enabled (default: True)."""
+    if os.environ.get("AGENT_CLI_NO_AUTO_INSTALL", "").lower() in ("1", "true", "yes"):
+        return False
+    return load_config().get("settings", {}).get("auto_install_extras", True)
+
+
 # Load extras from JSON file
 _EXTRAS_FILE = Path(__file__).parent.parent / "_extras.json"
 EXTRAS: dict[str, tuple[str, list[str]]] = {
@@ -44,7 +54,7 @@ def check_extra_installed(extra: str) -> bool:
         return any(check_extra_installed(e) for e in extra.split("|"))
 
     if extra not in EXTRAS:
-        return True  # Unknown extra, assume OK
+        return False  # Unknown extra, trigger install attempt to surface error
     _, packages = EXTRAS[extra]
 
     # All packages must be installed
@@ -116,44 +126,65 @@ def get_combined_install_hint(extras: list[str]) -> str:
     return "\n".join(lines)
 
 
-def requires_extras(*extras: str) -> Callable[[F], F]:
-    """Decorator to declare required extras for a command.
-
-    When a required extra is missing, the decorator prints a helpful error
-    message and exits with code 1.
-
-    The decorator stores the required extras on the function for test validation.
+def _try_auto_install(missing: list[str]) -> bool:
+    """Attempt to auto-install missing extras. Returns True if successful."""
+    from agent_cli.install.extras import install_extras_programmatic  # noqa: PLC0415
+
+    # Flatten alternatives (e.g., "piper|kokoro" -> just pick the first one)
+    extras_to_install = []
+    for extra in missing:
+        if "|" in extra:
+            # For alternatives, install the first option
+            extras_to_install.append(extra.split("|")[0])
+        else:
+            extras_to_install.append(extra)
+
+    console.print(
+        f"[yellow]Auto-installing missing extras: {', '.join(extras_to_install)}[/]",
+    )
+    return install_extras_programmatic(extras_to_install)
+
+
+def _check_and_install_extras(extras: tuple[str, ...]) -> list[str]:
+    """Check for missing extras and attempt auto-install. Returns list of still-missing."""
+    missing = [e for e in extras if not check_extra_installed(e)]
+    if not missing:
+        return []
+
+    if not _get_auto_install_setting():
+        print_error_message(get_combined_install_hint(missing))
+        return missing
+
+    if not _try_auto_install(missing):
+        print_error_message("Auto-install failed.\n" + get_combined_install_hint(missing))
+        return missing
+
+    console.print("[green]Installation complete![/]")
+    still_missing = [e for e in extras if not check_extra_installed(e)]
+    if still_missing:
+        print_error_message(
+            "Auto-install completed but some dependencies are still missing.\n"
+            + get_combined_install_hint(still_missing),
+        )
+    return still_missing
 
-    Process management flags (--stop, --status, --toggle) skip the dependency
-    check since they just manage running processes without using the actual
-    dependencies.
 
-    Example:
-        @app.command("rag-proxy")
-        @requires_extras("rag")
-        def rag_proxy(...):
-            ...
+def requires_extras(*extras: str) -> Callable[[F], F]:
+    """Decorator to declare required extras for a command.
 
+    Auto-installs missing extras by default. Disable via AGENT_CLI_NO_AUTO_INSTALL=1
+    or config [settings] auto_install_extras = false.
     """
 
     def decorator(func: F) -> F:
-        # Store extras on function for test introspection
         func._required_extras = extras  # type: ignore[attr-defined]
 
         @functools.wraps(func)
         def wrapper(*args: object, **kwargs: object) -> object:
-            # Skip dependency check for process management and info operations
-            # These don't need the actual dependencies, just manage processes or list info
-            if any(kwargs.get(flag) for flag in ("stop", "status", "toggle", "list_devices")):
-                return func(*args, **kwargs)
-
-            missing = [e for e in extras if not check_extra_installed(e)]
-            if missing:
-                print_error_message(get_combined_install_hint(missing))
+            if _check_and_install_extras(extras):
                 raise typer.Exit(1)
             return func(*args, **kwargs)
 
-        # Preserve the extras on wrapper too
         wrapper._required_extras = extras  # type: ignore[attr-defined]
         return wrapper  # type: ignore[return-value]
 

agent_cli/install/extras.py

@@ -86,6 +86,38 @@ def _install_cmd() -> list[str]:
     return cmd
 
 
+def _install_extras_impl(extras: list[str], *, quiet: bool = False) -> bool:
+    """Install extras. Returns True on success, False on failure."""
+    if _is_uv_tool_install():
+        current_extras = _get_current_uv_tool_extras()
+        new_extras = sorted(set(current_extras) | set(extras))
+        return _install_via_uv_tool(new_extras)
+
+    cmd = _install_cmd()
+    for extra in extras:
+        req_file = _requirements_path(extra)
+        if not quiet:
+            console.print(f"Installing [cyan]{extra}[/]...")
+        result = subprocess.run(
+            [*cmd, "-r", str(req_file)],
+            check=False,
+            capture_output=quiet,
+        )
+        if result.returncode != 0:
+            return False
+    return True
+
+
+def install_extras_programmatic(extras: list[str], *, quiet: bool = False) -> bool:
+    """Install extras programmatically (for auto-install feature)."""
+    available = _available_extras()
+    valid = [e for e in extras if e in available]
+    invalid = [e for e in extras if e not in available]
+    if invalid:
+        console.print(f"[yellow]Unknown extras (skipped): {', '.join(invalid)}[/]")
+    return bool(valid) and _install_extras_impl(valid, quiet=quiet)
+
+
 @app.command("install-extras", rich_help_panel="Installation")
 def install_extras(
     extras: Annotated[list[str] | None, typer.Argument(help="Extras to install")] = None,
@@ -128,25 +160,11 @@ def install_extras(
         print_error_message(f"Unknown extras: {invalid}. Use --list to see available.")
         raise typer.Exit(1)
 
-    # If running from uv tool install, reinstall with extras to persist them
+    if not _install_extras_impl(extras):
+        print_error_message("Failed to install extras")
+        raise typer.Exit(1)
+
     if _is_uv_tool_install():
-        current_extras = _get_current_uv_tool_extras()
-        new_extras = sorted(set(current_extras) | set(extras))
-        if not _install_via_uv_tool(new_extras):
-            print_error_message("Failed to reinstall via uv tool")
-            raise typer.Exit(1)
         console.print("[green]Done! Extras will persist across uv tool upgrade.[/]")
-        return
-
-    # Standard pip/uv pip install for non-tool environments
-    cmd = _install_cmd()
-
-    for extra in extras:
-        req_file = _requirements_path(extra)
-        console.print(f"Installing [cyan]{extra}[/]...")
-        result = subprocess.run([*cmd, "-r", str(req_file)], check=False)
-        if result.returncode != 0:
-            print_error_message(f"Failed to install '{extra}'")
-            raise typer.Exit(1)
-
-    console.print("[green]Done![/]")
+    else:
+        console.print("[green]Done![/]")

agent_cli/server/cli.py

@@ -20,13 +20,13 @@ console = Console()
 err_console = Console(stderr=True)
 logger = logging.getLogger(__name__)
 
-# Check for optional dependencies
-HAS_UVICORN = find_spec("uvicorn") is not None
-HAS_FASTAPI = find_spec("fastapi") is not None
-HAS_FASTER_WHISPER = find_spec("faster_whisper") is not None
-HAS_MLX_WHISPER = find_spec("mlx_whisper") is not None
-HAS_PIPER = find_spec("piper") is not None
-HAS_KOKORO = find_spec("kokoro") is not None
+# Check for optional dependencies at call time (not module load time)
+# This is important because auto-install may install packages after the module is loaded
+
+
+def _has(package: str) -> bool:
+    return find_spec(package) is not None
+
 
 app = typer.Typer(
     name="server",
@@ -48,7 +48,7 @@ def server_callback(ctx: typer.Context) -> None:
 
 def _check_server_deps() -> None:
     """Check that server dependencies are available."""
-    if not HAS_UVICORN or not HAS_FASTAPI:
+    if not _has("uvicorn") or not _has("fastapi"):
         err_console.print(
             "[bold red]Error:[/bold red] Server dependencies not installed. "
             "Run: [cyan]pip install agent-cli\\[server][/cyan] "
@@ -62,7 +62,7 @@ def _check_tts_deps(backend: str = "auto") -> None:
     _check_server_deps()
 
     if backend == "kokoro":
-        if not HAS_KOKORO:
+        if not _has("kokoro"):
             err_console.print(
                 "[bold red]Error:[/bold red] Kokoro backend requires kokoro. "
                 "Run: [cyan]pip install agent-cli\\[tts-kokoro][/cyan] "
@@ -72,7 +72,7 @@ def _check_tts_deps(backend: str = "auto") -> None:
         return
 
     if backend == "piper":
-        if not HAS_PIPER:
+        if not _has("piper"):
             err_console.print(
                 "[bold red]Error:[/bold red] Piper backend requires piper-tts. "
                 "Run: [cyan]pip install agent-cli\\[tts][/cyan] "
@@ -82,7 +82,7 @@ def _check_tts_deps(backend: str = "auto") -> None:
         return
 
     # For auto, check if either is available
-    if not HAS_PIPER and not HAS_KOKORO:
+    if not _has("piper") and not _has("kokoro"):
         err_console.print(
             "[bold red]Error:[/bold red] No TTS backend available. "
             "Run: [cyan]pip install agent-cli\\[tts][/cyan] for Piper "
@@ -136,7 +136,7 @@ def _check_whisper_deps(backend: str, *, download_only: bool = False) -> None:
     """Check that Whisper dependencies are available."""
     _check_server_deps()
     if download_only:
-        if not HAS_FASTER_WHISPER:
+        if not _has("faster_whisper"):
             err_console.print(
                 "[bold red]Error:[/bold red] faster-whisper is required for --download-only. "
                 "Run: [cyan]pip install agent-cli\\[whisper][/cyan] "
@@ -146,7 +146,7 @@ def _check_whisper_deps(backend: str, *, download_only: bool = False) -> None:
         return
 
     if backend == "mlx":
-        if not HAS_MLX_WHISPER:
+        if not _has("mlx_whisper"):
             err_console.print(
                 "[bold red]Error:[/bold red] MLX Whisper backend requires mlx-whisper. "
                 "Run: [cyan]pip install mlx-whisper[/cyan]",
@@ -154,7 +154,7 @@ def _check_whisper_deps(backend: str, *, download_only: bool = False) -> None:
             raise typer.Exit(1)
         return
 
-    if not HAS_FASTER_WHISPER:
+    if not _has("faster_whisper"):
         err_console.print(
             "[bold red]Error:[/bold red] Whisper dependencies not installed. "
             "Run: [cyan]pip install agent-cli\\[whisper][/cyan] "

{agent_cli-0.67.2.dist-info → agent_cli-0.68.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.67.2
+Version: 0.68.1
 Summary: A suite of AI-powered command-line tools for text correction, audio transcription, and voice assistance.
 Project-URL: Homepage, https://github.com/basnijholt/agent-cli
 Author-email: Bas Nijholt <bas@nijho.lt>
@@ -459,7 +459,14 @@ All necessary scripts are bundled with the package, so you can run these command
 
 #### Installing Optional Extras
 
-Some features require additional Python dependencies. Use `install-extras` to install them with pinned versions:
+Some features require additional Python dependencies. By default, **agent-cli will auto-install missing extras** when you run a command that needs them. To disable this, set `AGENT_CLI_NO_AUTO_INSTALL=1` or add to your config file:
+
+```toml
+[settings]
+auto_install_extras = false
+```
+
+You can also manually install extras with `install-extras`:
 
 ```bash
 # List available extras

{agent_cli-0.67.2.dist-info → agent_cli-0.68.1.dist-info}/RECORD

@@ -40,7 +40,7 @@ agent_cli/core/__init__.py,sha256=c_knH7u9QgjsfMIil9NP4bVizHawLUMYoQWU4H9vMlQ,46
 agent_cli/core/audio.py,sha256=43FpYe2Wu_BYK9xJ_55V4xHjHJeFwQ5aM-CQzlTryt8,15168
 agent_cli/core/audio_format.py,sha256=zk3qlYMAlKYPz1enrjihQQspl_C218v1Rbcm7Uktlew,8773
 agent_cli/core/chroma.py,sha256=Vb_ny7SzAIL9SCEGlYgYOqsdG9BgusFGMj0RUzb6W90,2728
-agent_cli/core/deps.py,sha256=roYg8KHqFAxuyRqVauKssr6gHNqSZ2_kJYD50O95bnM,5318
+agent_cli/core/deps.py,sha256=58zyHSJdzIAkJ0gZ7-snrASy8Ro9NePZmElch13r-SQ,6429
 agent_cli/core/openai_proxy.py,sha256=f2kqxk6bAOeN7gOzU0JnyS-RYtXUcK5Gbsa_pBmlCv0,4470
 agent_cli/core/process.py,sha256=Zay6beX4JUbkBHr6xbJxwVBjVFDABmRHQCXVPQH93r8,5916
 agent_cli/core/reranker.py,sha256=Qv5ASGUdseLzI6eQRfNeQY-Lvv4SOgLOu56CpwmszDM,3779
@@ -91,7 +91,7 @@ agent_cli/dev/terminals/warp.py,sha256=j-Jvz_BbWYC3QfLrvl4CbDh03c9OGRFmuCzjyB2ud
 agent_cli/dev/terminals/zellij.py,sha256=GnQnopimb9XH67CZGHjnbVWpVSWhaLCATGJizCT5TkY,2321
 agent_cli/install/__init__.py,sha256=JQPrOrtdNd1Y1NmQDkb3Nmm1qdyn3kPjhQwy9D8ryjI,124
 agent_cli/install/common.py,sha256=WvnmcjnFTW0d1HZrKVGzj5Tg3q8Txk_ZOdc4a1MBFWI,3121
-agent_cli/install/extras.py,sha256=ZknvNHXQDlg4K9Wn1Bs7tYQxx5T5wyQKi_Kea-aB1gU,5161
+agent_cli/install/extras.py,sha256=BPIlMdDeUo-tsKb_9Ttx3799YsIV_yup79ESFNpoJ1o,5731
 agent_cli/install/hotkeys.py,sha256=bwGoPeEKK6VI-IrKU8Q0RLMW9smkDNU7CdqD3Nbsd-w,1626
 agent_cli/install/services.py,sha256=2s_7ThxaElKCuomBYTn4Z36TF_o_arNeyJ4f8Wh4jEI,2912
 agent_cli/memory/__init__.py,sha256=8XNpVzP-qjF8o49A_eXsH_Rbp_FmxTIcknnvxq7vHms,162
@@ -156,7 +156,7 @@ agent_cli/scripts/nvidia-asr-server/server.py,sha256=kPNQIVF3exblvqMtIVk38Y6sZy2
 agent_cli/scripts/nvidia-asr-server/shell.nix,sha256=IT20j5YNj_wc7MdXi7ndogGodDNSGwyq8G0bNoZEpmg,1003
 agent_cli/scripts/nvidia-asr-server/uv.lock,sha256=5WWaqWOuV_moMPC-LIZK-A-Y5oaHr1tUn_vbR-IupzY,728608
 agent_cli/server/__init__.py,sha256=NZuJHlLHck9KWrepNZHrJONptYCQI9P-uTqknSFI5Ds,71
-agent_cli/server/cli.py,sha256=ZpsDmf9Z18jk2N1bdJILN2urPXb8iLYzrlHF9sCxmuY,23021
+agent_cli/server/cli.py,sha256=QA7MmASRN9Z5lDIQ25IBmxnFMsmW9AzmFsVqnUuafU0,22961
 agent_cli/server/common.py,sha256=fD2AZdM716TXcz1T4ZDPpPaKynVOEjbVC1LDDloDmDo,6463
 agent_cli/server/model_manager.py,sha256=93l_eeZeqnPALyDIK24or61tvded9TbM8tnde0okVjY,9225
 agent_cli/server/model_registry.py,sha256=KrRV1XxbFYuXu5rJlHFh6PTl_2BKiWnWsaNrf-0c6wQ,6988
@@ -188,8 +188,8 @@ agent_cli/services/asr.py,sha256=aRaCLVCygsJ15qyQEPECOZsdSrnlLPbyY4RwAqY0qIw,172
 agent_cli/services/llm.py,sha256=Kwdo6pbMYI9oykF-RBe1iaL3KsYrNWTLdRSioewmsGQ,7199
 agent_cli/services/tts.py,sha256=NX5Qnq7ddLI3mwm3nzhbR3zB1Os4Ip4sSVSjDZDTBcI,14855
 agent_cli/services/wake_word.py,sha256=JFJ1SA22H4yko9DXiQ1t7fcoxeALLAe3iBrLs0z8rX4,4664
-agent_cli-0.67.2.dist-info/METADATA,sha256=z4zcDhqiGt7d92suAsXn_-vLpzmYJEInek6WC5t0ar4,155800
-agent_cli-0.67.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-agent_cli-0.67.2.dist-info/entry_points.txt,sha256=FUv-fB2atLsPUk_RT4zqnZl1coz4_XHFwRALOKOF38s,97
-agent_cli-0.67.2.dist-info/licenses/LICENSE,sha256=majJU6S9kC8R8bW39NVBHyv32Dq50FL6TDxECG2WVts,1068
-agent_cli-0.67.2.dist-info/RECORD,,
+agent_cli-0.68.1.dist-info/METADATA,sha256=jkg7fVafbi-nnKMpUvs7Zink8exu_LWucHpM46YtNqA,156032
+agent_cli-0.68.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+agent_cli-0.68.1.dist-info/entry_points.txt,sha256=FUv-fB2atLsPUk_RT4zqnZl1coz4_XHFwRALOKOF38s,97
+agent_cli-0.68.1.dist-info/licenses/LICENSE,sha256=majJU6S9kC8R8bW39NVBHyv32Dq50FL6TDxECG2WVts,1068
+agent_cli-0.68.1.dist-info/RECORD,,