ollamadiffuser 1.2.3__py3-none-any.whl → 2.0.0__py3-none-any.whl

ollamadiffuser/cli/config_commands.py

@@ -0,0 +1,119 @@
+"""Configuration management CLI commands"""
+
+import sys
+from pathlib import Path
+
+import click
+from rich.console import Console
+from rich.table import Table
+from rich import print as rprint
+
+from ..core.config.settings import settings
+
+console = Console()
+
+
+@click.group(invoke_without_command=True)
+@click.pass_context
+def config(ctx):
+    """Show or modify OllamaDiffuser configuration"""
+    if ctx.invoked_subcommand is None:
+        _show_config()
+
+
+def _show_config():
+    """Display all current configuration values."""
+    # Paths section
+    rprint("[bold cyan]Paths[/bold cyan]")
+    table = Table(show_header=True)
+    table.add_column("Key", style="yellow")
+    table.add_column("Value", style="white")
+
+    default_models_dir = settings.config_dir / "models"
+    default_cache_dir = settings.config_dir / "cache"
+
+    table.add_row("config_dir", str(settings.config_dir))
+    table.add_row("config_file", str(settings.config_file))
+
+    models_label = str(settings.models_dir)
+    if settings.models_dir != default_models_dir:
+        models_label += "  [dim](custom)[/dim]"
+    table.add_row("models_dir", models_label)
+
+    cache_label = str(settings.cache_dir)
+    if settings.cache_dir != default_cache_dir:
+        cache_label += "  [dim](custom)[/dim]"
+    table.add_row("cache_dir", cache_label)
+
+    console.print(table)
+
+    # Server section
+    rprint("\n[bold cyan]Server[/bold cyan]")
+    server_table = Table(show_header=True)
+    server_table.add_column("Key", style="yellow")
+    server_table.add_column("Value", style="white")
+    server_table.add_row("server.host", settings.server.host)
+    server_table.add_row("server.port", str(settings.server.port))
+    server_table.add_row("server.max_queue_size", str(settings.server.max_queue_size))
+    server_table.add_row("server.timeout", str(settings.server.timeout))
+    server_table.add_row("server.enable_cors", str(settings.server.enable_cors))
+    console.print(server_table)
+
+
+# Map of settable keys to (type_hint, setter_function)
+SETTABLE_KEYS = {
+    "models_dir": ("path", lambda v: _set_path("models_dir", v)),
+    "cache_dir": ("path", lambda v: _set_path("cache_dir", v)),
+    "server.host": ("str", lambda v: setattr(settings.server, "host", v)),
+    "server.port": ("int", lambda v: setattr(settings.server, "port", int(v))),
+    "server.max_queue_size": ("int", lambda v: setattr(settings.server, "max_queue_size", int(v))),
+    "server.timeout": ("int", lambda v: setattr(settings.server, "timeout", int(v))),
+    "server.enable_cors": ("bool", lambda v: setattr(settings.server, "enable_cors", v.lower() in ("true", "1", "yes"))),
+}
+
+
+def _set_path(attr: str, value: str):
+    """Set a path attribute on settings, creating the directory."""
+    p = Path(value).expanduser().resolve()
+    p.mkdir(parents=True, exist_ok=True)
+    setattr(settings, attr, p)
+
+
+@config.command("set")
+@click.argument("key")
+@click.argument("value")
+def set_value(key: str, value: str):
+    """Set a configuration value.
+
+    \b
+    Settable keys:
+      models_dir              Custom model storage directory
+      cache_dir               Custom cache directory
+      server.host             Server bind address
+      server.port             Server port number
+      server.max_queue_size   Maximum request queue size
+      server.timeout          Request timeout in seconds
+      server.enable_cors      Enable CORS (true/false)
+
+    \b
+    Examples:
+      ollamadiffuser config set models_dir /mnt/ssd/models
+      ollamadiffuser config set server.port 9000
+    """
+    if key not in SETTABLE_KEYS:
+        rprint(f"[red]Unknown key: {key}[/red]")
+        rprint(f"[dim]Settable keys: {', '.join(sorted(SETTABLE_KEYS))}[/dim]")
+        sys.exit(1)
+
+    type_hint, setter = SETTABLE_KEYS[key]
+
+    try:
+        if type_hint == "int":
+            int(value)  # pre-validate
+        setter(value)
+    except (ValueError, OSError) as e:
+        rprint(f"[red]Invalid value for {key}: {e}[/red]")
+        sys.exit(1)
+
+    settings.save_config()
+    rprint(f"[green]Set {key} = {value}[/green]")

ollamadiffuser/cli/lora_commands.py

@@ -0,0 +1,169 @@
+"""LoRA management CLI commands"""
+
+import sys
+from typing import Optional
+
+import click
+from rich.console import Console
+from rich.table import Table
+from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich import print as rprint
+
+from ..core.models.manager import model_manager
+from ..core.config.settings import settings
+
+console = Console()
+
+
+@click.group()
+def lora():
+    """LoRA (Low-Rank Adaptation) management commands"""
+    pass
+
+
+@lora.command()
+@click.argument("repo_id")
+@click.option("--weight-name", "-w", help="Specific weight file name")
+@click.option("--alias", "-a", help="Local alias name for the LoRA")
+def pull(repo_id: str, weight_name: Optional[str], alias: Optional[str]):
+    """Download LoRA weights from Hugging Face Hub"""
+    from ..core.utils.lora_manager import lora_manager
+
+    rprint(f"[blue]Downloading LoRA: {repo_id}[/blue]")
+    with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), console=console) as progress:
+        task = progress.add_task("Downloading LoRA...", total=None)
+
+        def cb(msg):
+            progress.update(task, description=msg)
+
+        if lora_manager.pull_lora(repo_id, weight_name=weight_name, alias=alias, progress_callback=cb):
+            rprint(f"[green]LoRA {repo_id} downloaded successfully![/green]")
+        else:
+            rprint(f"[red]LoRA {repo_id} download failed![/red]")
+            sys.exit(1)
+
+
+@lora.command()
+@click.argument("lora_name")
+@click.option("--scale", "-s", default=1.0, type=float, help="LoRA scale (default: 1.0)")
+def load(lora_name: str, scale: float):
+    """Load LoRA weights into the current model"""
+    from ..core.utils.lora_manager import lora_manager
+
+    rprint(f"[blue]Loading LoRA: {lora_name} (scale: {scale})[/blue]")
+    if lora_manager.load_lora(lora_name, scale=scale):
+        rprint(f"[green]LoRA {lora_name} loaded![/green]")
+    else:
+        rprint(f"[red]Failed to load LoRA {lora_name}![/red]")
+        sys.exit(1)
+
+
+@lora.command()
+def unload():
+    """Unload current LoRA weights"""
+    from ..core.utils.lora_manager import lora_manager
+
+    if lora_manager.unload_lora():
+        rprint("[green]LoRA unloaded![/green]")
+    else:
+        rprint("[red]Failed to unload LoRA![/red]")
+        sys.exit(1)
+
+
+@lora.command()
+@click.argument("lora_name")
+@click.confirmation_option(prompt="Are you sure you want to delete this LoRA?")
+def rm(lora_name: str):
+    """Remove LoRA weights"""
+    from ..core.utils.lora_manager import lora_manager
+
+    if lora_manager.remove_lora(lora_name):
+        rprint(f"[green]LoRA {lora_name} removed![/green]")
+    else:
+        rprint(f"[red]Failed to remove LoRA {lora_name}![/red]")
+        sys.exit(1)
+
+
+@lora.command()
+def ps():
+    """Show currently loaded LoRA status"""
+    from ..core.utils.lora_manager import lora_manager
+
+    server_running = lora_manager._is_server_running()
+    current_lora = lora_manager.get_current_lora()
+
+    if server_running:
+        rprint(f"[green]Server: Running on {settings.server.host}:{settings.server.port}[/green]")
+        try:
+            import requests
+            resp = requests.get(f"http://{settings.server.host}:{settings.server.port}/api/lora/status", timeout=2)
+            if resp.status_code == 200:
+                data = resp.json()
+                if data.get("loaded"):
+                    info = data.get("info", {})
+                    rprint(f"\n[bold green]LoRA: LOADED[/bold green]")
+                    rprint(f"  Repo: {info.get('repo_id', 'Unknown')}")
+                    rprint(f"  Scale: {info.get('scale', 'Unknown')}")
+                    return
+                else:
+                    rprint("[dim]No LoRA loaded on server[/dim]")
+                    return
+        except Exception:
+            pass
+    elif not model_manager.is_model_loaded():
+        rprint("[yellow]No model loaded[/yellow]")
+        return
+
+    if current_lora:
+        info = lora_manager.get_lora_info(current_lora)
+        if info:
+            rprint(f"\n[bold green]LoRA: {current_lora}[/bold green]")
+            rprint(f"  Repo: {info.get('repo_id', 'Unknown')}")
+            rprint(f"  Size: {info.get('size', 'Unknown')}")
+    else:
+        rprint("[dim]No LoRA loaded[/dim]")
+
+
+@lora.command()
+def list():
+    """List installed LoRA weights"""
+    from ..core.utils.lora_manager import lora_manager
+
+    installed = lora_manager.list_installed_loras()
+    current = lora_manager.get_current_lora()
+
+    if not installed:
+        rprint("[yellow]No LoRA weights installed.[/yellow]")
+        rprint("[dim]Use 'ollamadiffuser lora pull <repo_id>' to download[/dim]")
+        return
+
+    table = Table(title="Installed LoRA Weights")
+    table.add_column("Name", style="cyan")
+    table.add_column("Repository", style="blue")
+    table.add_column("Status", style="green")
+    table.add_column("Size", style="yellow")
+
+    for name, info in installed.items():
+        status = "Loaded" if name == current else "Available"
+        table.add_row(name, info.get("repo_id", "?"), status, info.get("size", "?"))
+
+    console.print(table)
+
+
+@lora.command()
+@click.argument("lora_name")
+def show(lora_name: str):
+    """Show detailed LoRA information"""
+    from ..core.utils.lora_manager import lora_manager
+
+    info = lora_manager.get_lora_info(lora_name)
+    if not info:
+        rprint(f"[red]LoRA {lora_name} not found.[/red]")
+        sys.exit(1)
+
+    rprint(f"[bold cyan]LoRA: {lora_name}[/bold cyan]")
+    rprint(f"Repository: {info.get('repo_id', 'Unknown')}")
+    rprint(f"Weight File: {info.get('weight_name', 'Unknown')}")
+    rprint(f"Path: {info.get('path', 'Unknown')}")
+    rprint(f"Size: {info.get('size', 'Unknown')}")
+    rprint(f"Downloaded: {info.get('downloaded_at', 'Unknown')}")