lcode-cli 0.39.0__py3-none-any.whl → 0.41.0__py3-none-any.whl

lcode/__init__.py

@@ -3,7 +3,7 @@
 From a program: `from lcode import Session` (see lcode.api).
 """
 
-__version__ = "0.39.0"
+__version__ = "0.41.0"
 
 API = ("Session", "Result", "Options", "SetupError")
 

lcode/agent.py

@@ -306,6 +306,9 @@ class Settings:
     context: int
     mode: str = "code"  # what lcode makes: code, image or video (lcode.modes)
     comfyui_url: str = "http://127.0.0.1:8188"
+    comfyui_path: str | None = None  # a ComfyUI install lcode doesn't find by itself (lcode.comfy)
+    media_dir: str = ".lcode/media"  # where image and video mode save their files (lcode.media)
+    image_model: str = "flux2-klein-4b"  # the media catalog's model image mode uses (lcode.media_catalog)
     num_batch: int | None = None
     keep_alive: str = "30m"
     think: bool = True
@@ -370,6 +373,8 @@ class Agent:
         self.session_name = ""
         self.session_title = ""
         self.interactive = True  # False for `lcode -p`: no end-of-session questions
+        self.comfy_process = None  # the ComfyUI lcode started for image and video mode, stopped when it exits
+        self.no_coding_model = ""  # why there's no coding model, when lcode started in image or video mode without
         self.reflected = 0  # messages before this index were already checked for notes to remember
         self._memory: memory_notes.Memory | None = None
         self._agent_types: tuple[Path, dict[str, subagents.AgentType], list[str]] | None = None
@@ -683,6 +688,7 @@ class Agent:
             "cwd": str(self.workspace),  # where `lcode -c` there finds it, wherever the shell moved
             "model": self.settings.model,
             "mode": self.settings.mode,
+            "image_model": self.settings.image_model,
             "name": self.session_name,
             "title": self.session_title,
             "messages": self.messages,
@@ -731,6 +737,8 @@ class Agent:
         self.session_name = data.get("name", "")
         if data.get("mode") in ("code", "image", "video"):
             self.settings.mode = data["mode"]  # a session belongs to the mode it was made in
+        if isinstance(data.get("image_model"), str):
+            self.settings.image_model = data["image_model"]
         self.session_title = data.get("title") or sessions.title_from(self.messages)
         self.tools.read_mtimes.clear()  # files may have changed since; the model must read them again
         self.tools.todos = list(data.get("todos") or [])

lcode/api.py

@@ -15,6 +15,7 @@ A session is one conversation: each `run` continues it. `stream` yields the same
 
 from __future__ import annotations
 
+import contextlib
 import io
 import queue
 import threading
@@ -130,6 +131,24 @@ def switch(wanted: bool | None, configured: str, default_on: str) -> str:
     return configured if configured != "off" else default_on
 
 
+def coding_model(ollama, options: Options, cfg: dict, requested: int | None, hw: Hardware, console: Console):
+    """The coding model to use, its catalog entry and the context window; SetupError when there's none."""
+    from lcode import cli
+
+    check_server(ollama, hw)
+    try:
+        model, spec = cli.resolve_model(ollama, options.model or cfg["model"])
+    except cli.NotInstalled as e:
+        first_run = not options.model and cfg["model"] == config.DEFAULT_MODEL and not config.CONFIG_PATH.exists()
+        if first_run and not backends.is_openai(ollama):
+            raise SetupError("lcode isn't set up yet. Run:  lcode setup") from e
+        raise SetupError(str(e)) from e
+    context, note = cli.choose_context(ollama, model, spec, requested, hw)
+    if note:
+        console.print(f"[yellow]Context {config.format_tokens(context)}: {note}[/]")
+    return model, spec, context
+
+
 def open_agent(cwd: Path, options: Options, console: Console, hw: Hardware | None = None) -> Agent:
     """An agent set up the way `lcode` sets up a session: model, context, hooks, language servers, MCP."""
     from lcode import catalog, cli, extensions, hooks
@@ -153,17 +172,14 @@ def open_agent(cwd: Path, options: Options, console: Console, hw: Hardware | Non
     except OllamaError as e:
         raise SetupError(str(e)) from e
     hw = hw or detect()
-    check_server(ollama, hw)
+    no_coding_model = ""  # why, when image or video mode starts without one
     try:
-        model, spec = cli.resolve_model(ollama, options.model or cfg["model"])
-    except cli.NotInstalled as e:
-        first_run = not options.model and cfg["model"] == config.DEFAULT_MODEL and not config.CONFIG_PATH.exists()
-        if first_run and not backends.is_openai(ollama):
-            raise SetupError("lcode isn't set up yet. Run:  lcode setup") from e
-        raise SetupError(str(e)) from e
-    context, note = cli.choose_context(ollama, model, spec, requested, hw)
-    if note:
-        console.print(f"[yellow]Context {config.format_tokens(context)}: {note}[/]")
+        model, spec, context = coding_model(ollama, options, cfg, requested, hw, console)
+    except SetupError as e:
+        if (options.mode or cfg["mode"]) == "code":
+            raise
+        # Image and video mode don't need the coding model: start without it, and say so on /mode code.
+        model, spec, context, no_coding_model = options.model or cfg["model"], None, requested or 32768, str(e)
     num_batch = cfg["num_batch"]
     if num_batch is None and spec and spec.num_batch:
         if model == spec.local_name:
@@ -182,6 +198,9 @@ def open_agent(cwd: Path, options: Options, console: Console, hw: Hardware | Non
         permission_mode=options.permission_mode or cfg["permission_mode"],
         mode=options.mode or cfg["mode"],
         comfyui_url=cfg["comfyui_url"],
+        comfyui_path=cfg["comfyui_path"],
+        media_dir=cfg["media_dir"],
+        image_model=cfg["image_model"],
         web=switch(options.web, cfg["web"], "on"),
         search_backend=cfg["search_backend"],
         searxng_url=cfg["searxng_url"],
@@ -211,6 +230,7 @@ def open_agent(cwd: Path, options: Options, console: Console, hw: Hardware | Non
     )
     agent = Agent(ollama, settings, cwd, console=console)
     agent.hardware = hw
+    agent.no_coding_model = no_coding_model
     agent.autosave = True
     agent.interactive = options.interactive
     if options.max_steps:
@@ -250,15 +270,25 @@ def open_agent(cwd: Path, options: Options, console: Console, hw: Hardware | Non
 
 
 def close_agent(agent: Agent) -> None:
+    """Stop what lcode started (background jobs, servers, the sandbox, ComfyUI), then say so: the terminal may be
+    gone already (closed), and saying it then fails."""
+    from lcode import media
+
+    said = []
     stopped = agent.jobs.stop_all()
     if stopped:
-        agent.console.print(f"[dim]Stopped {stopped} background job(s).[/]")
+        said.append(f"Stopped {stopped} background job(s).")
+    if media.stop_engine(agent):
+        said.append("Stopped ComfyUI.")
     if agent.lsp is not None:
         agent.lsp.close()
     if agent.mcp:
         agent.mcp.close()
     if agent.sandbox:
         agent.sandbox.stop()
+    for line in said:
+        with contextlib.suppress(OSError):
+            agent.console.print(f"[dim]{line}[/]")
 
 
 # ----------------------------------------------------------------------------- running

lcode/cli.py

@@ -3,9 +3,11 @@
 from __future__ import annotations
 
 import argparse
+import contextlib
 import platform
 import re
 import shutil
+import signal
 import sys
 import tempfile
 import time
@@ -466,6 +468,7 @@ def cmd_doctor(args) -> None:
     except ValueError as e:
         line("MCP", str(e), False)
         ok = False
+    line("ComfyUI", *comfyui_status(cfg))
     if cfg["sandbox"] == "off":
         line("Sandbox", "off (lcode config set sandbox docker)", True)
     else:
@@ -733,17 +736,10 @@ def cmd_chat(args) -> None:
             print(json.dumps({"type": "result", "status": "error", "error": str(e)}), flush=True)
             sys.exit(1)
         fail(str(e))
+    exit_on_hangup()
     exit_code = 0
     if args.prompt and agent.settings.mode != "code":
-        from lcode import modes
-
-        message = modes.COMING[agent.settings.mode]
-        if quiet:
-            print(json.dumps({"type": "result", "status": "error", "error": message}), flush=True)
-        else:
-            out.print(f"[yellow]{escape(message)}[/]")
-        api.close_agent(agent)
-        sys.exit(2)
+        media_request(agent, args.prompt, out, quiet)  # makes the image or video, then exits
     if args.escalate and args.prompt:
         agent.escalate_approved = True  # the flag is the user's OK for this run
     try:
@@ -765,6 +761,83 @@ def cmd_chat(args) -> None:
         sys.exit(exit_code)
 
 
+def exit_on_hangup() -> None:
+    """A closed terminal (SIGHUP) or a plain kill (SIGTERM) ends lcode the usual way: it saves the session and stops
+    what it started (ComfyUI, MCP servers, background jobs) instead of leaving them running."""
+
+    def leave(signum, frame):
+        raise SystemExit(128 + signum)
+
+    for name in ("SIGHUP", "SIGTERM"):
+        sig = getattr(signal, name, None)
+        if sig is not None:
+            with contextlib.suppress(ValueError, OSError):  # only the main thread can
+                signal.signal(sig, leave)
+
+
+def comfyui_status(cfg: dict) -> tuple[str, bool | None]:
+    """lcode doctor's ComfyUI line: running or found, and whether the image model is there."""
+    from lcode import comfy
+    from lcode import media_catalog as catalog
+
+    model = catalog.load().find(cfg.get("image_model") or "") or catalog.load().models[catalog.DEFAULT_IMAGE]
+    server = comfy.Server(cfg["comfyui_url"])
+    stats = server.stats()
+    install = None if stats else comfy.find_install(cfg["comfyui_path"])
+    if not stats and install is None:
+        return "not found: image mode offers to install it (or lcode config set comfyui_path <folder>)", None
+    if stats:
+        where = f"{(stats.get('system') or {}).get('comfyui_version', '?')} running at {server.url}"
+    else:
+        where = f"{install.path} (lcode starts it in image mode)"
+    _, missing = catalog.chosen_files(model, catalog.lister(server if stats else None, install))
+    if missing:
+        size = sum(f.gb for f in missing)
+        return f"{where} · {model.name} not installed: lcode media install {model.key} ({size:.1f} GB)", None
+    return f"{where} · image model: {model.name}", True
+
+
+def media_request(agent, prompt: str, out: Console, quiet: bool) -> None:
+    """`lcode --mode image -p "…"`: make the image, say where it went (or, with --output json, a result object)."""
+    import json
+
+    from lcode import api, media, modes
+
+    if agent.settings.mode == "video":
+        message = modes.COMING["video"]
+        if quiet:
+            print(json.dumps({"type": "result", "status": "error", "error": message}), flush=True)
+        else:
+            out.print(f"[yellow]{escape(message)}[/]")
+        api.close_agent(agent)
+        sys.exit(2)
+    try:
+        made = media.generate_image(agent, prompt)
+    except (media.MediaError, KeyboardInterrupt) as e:
+        message = str(e) or "Cancelled."
+        if quiet:
+            print(json.dumps({"type": "result", "status": "error", "error": message}), flush=True)
+        else:
+            out.print(f"[red]{escape(message)}[/]")
+        api.close_agent(agent)
+        sys.exit(1)
+    if quiet:
+        result = {
+            "type": "result",
+            "status": "success",
+            "mode": "image",
+            "files": [str(path) for path in made.files],
+            "model": made.model,
+            "seed": made.seed,
+            "width": made.width,
+            "height": made.height,
+            "seconds": round(made.seconds, 1),
+        }
+        print(json.dumps(result, ensure_ascii=False), flush=True)
+    api.close_agent(agent)
+    sys.exit(0)
+
+
 def compact_tokens(value: str) -> int:
     """`--compact-at`: a token count such as 64k, or 0."""
     try:
@@ -836,6 +909,13 @@ def build_subparsers() -> dict[str, argparse.ArgumentParser]:
     subs["setup"] = p
     subs["models"] = argparse.ArgumentParser(prog="lcode models", description="List models and how they fit here.")
     subs["doctor"] = argparse.ArgumentParser(prog="lcode doctor", description="Check the installation.")
+    p = argparse.ArgumentParser(
+        prog="lcode media", description="Image and video models: list them, with how they fit here, or install one."
+    )
+    p.add_argument("action", nargs="?", choices=["list", "install"], default="list")
+    p.add_argument("model", nargs="?", help="with install: a model key from the list, e.g. z-image-turbo")
+    p.add_argument("-y", "--yes", action="store_true", help="don't ask before downloading")
+    subs["media"] = p
     p = argparse.ArgumentParser(prog="lcode config", description="Show or change settings.")
     p.add_argument("action", nargs="?", choices=["show", "set", "unset", "path"], default="show")
     p.add_argument("key", nargs="?", choices=list(config.SETTINGS))
@@ -992,6 +1072,55 @@ def cmd_index(args) -> None:
     )
 
 
+def cmd_media(args) -> None:
+    """lcode media [list] | install <model>: the media catalog, what's installed in ComfyUI, downloads."""
+    from rich.prompt import Confirm
+
+    from lcode import comfy, media
+    from lcode import media_catalog as catalog
+
+    try:
+        cfg = config.load()
+    except ConfigError as e:
+        fail(str(e))
+    cat, hw = catalog.load(), detect()
+    server = comfy.Server(cfg["comfyui_url"])
+    install = comfy.find_install(cfg["comfyui_path"])
+    running = server.stats() is not None
+    installed = catalog.lister(server if running else None, install) if running or install else None
+    if args.action == "install":
+        model = cat.find(args.model or "")
+        if model is None:
+            fail(f"no media model {args.model!r}: lcode media lists them")
+        if not running and install is None:
+            fail(f"lcode needs ComfyUI to install models into. {comfy.install_hint()}")
+        ask = None if args.yes else (lambda q: Confirm.ask(q, default=True, console=console))
+        try:
+            saved = catalog.install(model, server if running else None, install, console, ask)
+        except catalog.CatalogError as e:
+            fail(str(e))
+        how = f" ({len(saved)} file(s) downloaded)." if saved else "."
+        console.print(f"[green]{model.name} is installed[/]{how}")
+        return
+    where = (
+        f"ComfyUI at {server.url}" if running else (f"{install.path} (not running)" if install else "no ComfyUI found")
+    )
+    console.print(f"[dim]{hw.describe()} · {where} · image model: {cfg['image_model']}[/]\n")
+    for mode in ("image", "video"):
+        models = cat.for_mode(mode)
+        console.print(f"[bold]{mode.capitalize()} models[/]")
+        if not models:
+            console.print(f"  [dim]{media.SOON[mode]}[/]\n")
+            continue
+        for m in models:
+            line = escape(catalog.describe(m, hw, installed))
+            console.print(f"  [bold]{m.key:<16}[/] {escape(m.name)} [dim]· {line}[/]")
+            if m.measured:
+                console.print(f"  {'':<16} [dim]{escape(m.measured)}[/]")
+        console.print()
+    console.print("[dim]Install one: lcode media install <model> · choose in image mode: /model <model>[/]")
+
+
 def cmd_mcp(args) -> None:
     from lcode.mcp.commands import run
 
@@ -1002,6 +1131,7 @@ COMMANDS = {
     "setup": cmd_setup,
     "models": cmd_models,
     "doctor": cmd_doctor,
+    "media": cmd_media,
     "config": cmd_config,
     "bench": cmd_bench,
     "mcp": cmd_mcp,