agent-cli 0.67.1__tar.gz → 0.68.0__tar.gz

{agent_cli-0.67.1 → agent_cli-0.68.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.67.1
+Version: 0.68.0
 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>
@@ -52,8 +52,8 @@ Requires-Dist: pyyaml>=6.0.0; extra == 'memory'
 Requires-Dist: transformers>=4.30.0; extra == 'memory'
 Requires-Dist: watchfiles>=0.21.0; extra == 'memory'
 Provides-Extra: mlx-whisper
-Requires-Dist: fastapi[standard]; extra == 'mlx-whisper'
-Requires-Dist: mlx-whisper>=0.4.0; extra == 'mlx-whisper'
+Requires-Dist: fastapi[standard]; (sys_platform == 'darwin' and platform_machine == 'arm64') and extra == 'mlx-whisper'
+Requires-Dist: mlx-whisper>=0.4.0; (sys_platform == 'darwin' and platform_machine == 'arm64') and extra == 'mlx-whisper'
 Provides-Extra: piper
 Requires-Dist: fastapi[standard]; extra == 'piper'
 Requires-Dist: piper-tts>=1.2.0; extra == 'piper'
@@ -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.1 → agent_cli-0.68.0}/README.md

@@ -377,7 +377,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.68.0/agent_cli/_requirements/mlx-whisper.txt

@@ -0,0 +1,215 @@
+# This file was autogenerated by uv via the following command:
+#    uv export --extra mlx-whisper --no-dev --no-emit-project --no-hashes
+annotated-doc==0.0.4 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi
+annotated-types==0.7.0
+    # via pydantic
+anyio==4.12.1
+    # via
+    #   httpx
+    #   starlette
+    #   watchfiles
+certifi==2026.1.4
+    # via
+    #   httpcore
+    #   httpx
+    #   requests
+    #   sentry-sdk
+charset-normalizer==3.4.4 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via requests
+click==8.3.1
+    # via
+    #   rich-toolkit
+    #   typer
+    #   uvicorn
+colorama==0.4.6 ; sys_platform == 'win32'
+    # via
+    #   click
+    #   tqdm
+    #   uvicorn
+dnspython==2.8.0
+    # via email-validator
+dotenv==0.9.9
+    # via agent-cli
+email-validator==2.3.0
+    # via
+    #   fastapi
+    #   pydantic
+fastapi==0.128.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via agent-cli
+fastapi-cli==0.0.20 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi
+fastapi-cloud-cli==0.10.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi-cli
+fastar==0.8.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi-cloud-cli
+filelock==3.20.3 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   huggingface-hub
+    #   torch
+fsspec==2026.1.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   huggingface-hub
+    #   torch
+h11==0.16.0
+    # via
+    #   httpcore
+    #   uvicorn
+hf-xet==1.2.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via huggingface-hub
+httpcore==1.0.9
+    # via httpx
+httptools==0.7.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via uvicorn
+httpx==0.28.1
+    # via
+    #   agent-cli
+    #   fastapi
+    #   fastapi-cloud-cli
+huggingface-hub==0.36.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via mlx-whisper
+idna==3.11
+    # via
+    #   anyio
+    #   email-validator
+    #   httpx
+    #   requests
+jinja2==3.1.6 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   fastapi
+    #   torch
+llvmlite==0.46.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via numba
+markdown-it-py==4.0.0
+    # via rich
+markupsafe==3.0.3 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via jinja2
+mdurl==0.1.2
+    # via markdown-it-py
+mlx==0.30.3 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via mlx-whisper
+mlx-metal==0.30.3 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via mlx
+mlx-whisper==0.4.3 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via agent-cli
+more-itertools==10.8.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via mlx-whisper
+mpmath==1.3.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via sympy
+networkx==3.6.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via torch
+numba==0.63.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via mlx-whisper
+numpy==2.3.5 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   mlx-whisper
+    #   numba
+    #   scipy
+packaging==25.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via huggingface-hub
+psutil==7.2.1 ; sys_platform == 'win32'
+    # via agent-cli
+pydantic==2.12.5
+    # via
+    #   agent-cli
+    #   fastapi
+    #   fastapi-cloud-cli
+    #   pydantic-extra-types
+    #   pydantic-settings
+pydantic-core==2.41.5
+    # via pydantic
+pydantic-extra-types==2.11.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi
+pydantic-settings==2.12.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi
+pygments==2.19.2
+    # via rich
+pyperclip==1.11.0
+    # via agent-cli
+python-dotenv==1.2.1
+    # via
+    #   dotenv
+    #   pydantic-settings
+    #   uvicorn
+python-multipart==0.0.21 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi
+pyyaml==6.0.3 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   huggingface-hub
+    #   uvicorn
+regex==2026.1.15 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via tiktoken
+requests==2.32.5 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   huggingface-hub
+    #   tiktoken
+rich==14.2.0
+    # via
+    #   agent-cli
+    #   rich-toolkit
+    #   typer
+rich-toolkit==0.17.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   fastapi-cli
+    #   fastapi-cloud-cli
+rignore==0.7.6 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi-cloud-cli
+scipy==1.17.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via mlx-whisper
+sentry-sdk==2.49.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi-cloud-cli
+setproctitle==1.3.7
+    # via agent-cli
+setuptools==80.9.0 ; python_full_version >= '3.12' and platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via torch
+shellingham==1.5.4
+    # via typer
+starlette==0.50.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via fastapi
+sympy==1.14.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via torch
+tiktoken==0.12.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via mlx-whisper
+torch==2.9.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via mlx-whisper
+tqdm==4.67.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   huggingface-hub
+    #   mlx-whisper
+typer==0.21.1
+    # via
+    #   agent-cli
+    #   fastapi-cli
+    #   fastapi-cloud-cli
+typing-extensions==4.15.0
+    # via
+    #   anyio
+    #   fastapi
+    #   huggingface-hub
+    #   pydantic
+    #   pydantic-core
+    #   pydantic-extra-types
+    #   rich-toolkit
+    #   starlette
+    #   torch
+    #   typer
+    #   typing-inspection
+typing-inspection==0.4.2
+    # via
+    #   pydantic
+    #   pydantic-settings
+urllib3==2.3.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   requests
+    #   sentry-sdk
+uvicorn==0.40.0 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via
+    #   fastapi
+    #   fastapi-cli
+    #   fastapi-cloud-cli
+uvloop==0.22.1 ; platform_machine == 'arm64' and platform_python_implementation != 'PyPy' and sys_platform == 'darwin'
+    # via uvicorn
+watchfiles==1.1.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via uvicorn
+websockets==15.0.1 ; platform_machine == 'arm64' and sys_platform == 'darwin'
+    # via uvicorn

agent_cli-0.68.0/agent_cli/core/deps.py

@@ -0,0 +1,191 @@
+"""Helpers for optional dependency checks."""
+
+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.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]]] = {
+    k: (v[0], v[1]) for k, v in json.loads(_EXTRAS_FILE.read_text()).items()
+}
+
+
+def _check_package_installed(pkg: str) -> bool:
+    """Check if a single package is installed."""
+    top_module = pkg.split(".")[0]
+    try:
+        return find_spec(top_module) is not None
+    except (ValueError, ModuleNotFoundError):
+        return False
+
+
+def check_extra_installed(extra: str) -> bool:
+    """Check if packages for an extra are installed using find_spec (no actual import).
+
+    Supports `|` syntax for alternatives: "piper|kokoro" means ANY of these extras.
+    For regular extras, ALL packages must be installed.
+    """
+    # Handle "extra1|extra2" syntax - any of these extras is sufficient
+    if "|" in extra:
+        return any(check_extra_installed(e) for e in extra.split("|"))
+
+    if extra not in EXTRAS:
+        return False  # Unknown extra, trigger install attempt to surface error
+    _, packages = EXTRAS[extra]
+
+    # All packages must be installed
+    return all(_check_package_installed(pkg) for pkg in packages)
+
+
+def _format_extra_item(extra: str) -> str:
+    """Format a single extra as a list item with description."""
+    desc, _ = EXTRAS.get(extra, ("", []))
+    if desc:
+        return f"  - '{extra}' ({desc})"
+    return f"  - '{extra}'"
+
+
+def _format_install_commands(extras: list[str]) -> list[str]:
+    """Format install commands for one or more extras."""
+    combined = ",".join(extras)
+    extras_args = " ".join(extras)
+    return [
+        "Install with:",
+        f'  [bold cyan]uv tool install -p 3.13 "agent-cli\\[{combined}]"[/bold cyan]',
+        "  # or",
+        f"  [bold cyan]agent-cli install-extras {extras_args}[/bold cyan]",
+    ]
+
+
+def get_install_hint(extra: str) -> str:
+    """Get install command hint for a single extra.
+
+    Supports `|` syntax for alternatives: "piper|kokoro" shows both options.
+    """
+    # Handle "extra1|extra2" syntax - show all options
+    if "|" in extra:
+        alternatives = extra.split("|")
+        lines = ["This command requires one of:"]
+        lines.extend(_format_extra_item(alt) for alt in alternatives)
+        lines.append("")
+        lines.append("Install one with:")
+        lines.extend(
+            f'  [bold cyan]uv tool install -p 3.13 "agent-cli\\[{alt}]"[/bold cyan]'
+            for alt in alternatives
+        )
+        lines.append("  # or")
+        lines.extend(
+            f"  [bold cyan]agent-cli install-extras {alt}[/bold cyan]" for alt in alternatives
+        )
+        return "\n".join(lines)
+
+    desc, _ = EXTRAS.get(extra, ("", []))
+    header = f"This command requires the '{extra}' extra"
+    if desc:
+        header += f" ({desc})"
+    header += "."
+
+    lines = [header, ""]
+    lines.extend(_format_install_commands([extra]))
+    return "\n".join(lines)
+
+
+def get_combined_install_hint(extras: list[str]) -> str:
+    """Get a combined install hint for multiple missing extras."""
+    if len(extras) == 1:
+        return get_install_hint(extras[0])
+
+    lines = ["This command requires the following extras:"]
+    lines.extend(_format_extra_item(extra) for extra in extras)
+    lines.append("")
+    lines.extend(_format_install_commands(extras))
+    return "\n".join(lines)
+
+
+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
+
+
+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:
+        func._required_extras = extras  # type: ignore[attr-defined]
+
+        @functools.wraps(func)
+        def wrapper(*args: object, **kwargs: object) -> object:
+            if _check_and_install_extras(extras):
+                raise typer.Exit(1)
+            return func(*args, **kwargs)
+
+        wrapper._required_extras = extras  # type: ignore[attr-defined]
+        return wrapper  # type: ignore[return-value]
+
+    return decorator

{agent_cli-0.67.1 → agent_cli-0.68.0}/agent_cli/core/utils.py

@@ -211,8 +211,8 @@ def print_output_panel(
 
 
 def print_error_message(message: str, suggestion: str | None = None) -> None:
-    """Prints an error message in a panel."""
-    error_text = Text(message)
+    """Prints an error message in a panel with rich markup support."""
+    error_text = Text.from_markup(message)
     if suggestion:
         error_text.append("\n\n")
         error_text.append(suggestion)

{agent_cli-0.67.1 → agent_cli-0.68.0}/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-0.67.1 → agent_cli-0.68.0}/pyproject.toml

@@ -65,8 +65,8 @@ faster-whisper = [
     "faster-whisper>=1.0.0",
 ]
 mlx-whisper = [
-    "fastapi[standard]",
-    "mlx-whisper>=0.4.0",
+    "fastapi[standard]; sys_platform == 'darwin' and platform_machine == 'arm64'",
+    "mlx-whisper>=0.4.0; sys_platform == 'darwin' and platform_machine == 'arm64'",
 ]
 piper = [
     "fastapi[standard]",