zettcode-app 0.4.2__tar.gz → 0.4.4__tar.gz

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: zettcode-app
-Version: 0.4.2
+Version: 0.4.4
 Summary: The terminal application of ZettCode: the conversation model, the shell and its views
 Project-URL: Repository, https://github.com/Chang-LeHung/zettcode
 Author: Chang-LeHung

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/src/zettcode/app/agent/agent/commands.py

@@ -18,7 +18,6 @@ from zettcode.plugin_api.plugin import TuiPlugins
 from zettcode.plugin_api.presenters import Presenters
 from zettcode.plugin_api.state import TurnSegment, UiRow
 from zettcode.presenters.statusline import NAMES, unknown
-from zettcode.providers import BUILTIN_PROVIDERS, Provider, merge_providers
 from zettcode.tui import ThemeCatalog
 
 from .settings import AppearanceMixin
@@ -71,11 +70,6 @@ class CommandsMixin(AppearanceMixin, ExportsMixin):
         """Return the commands the program's own plugins registered: ``/resume``, ``/model``, ``/usage`` and the rest."""
         return self.terminal_plugins.builtin_commands
 
-    @property
-    def providers(self) -> tuple[Provider, ...]:
-        """Return the hosts ``/config`` can offer: the built-in ones, then the plugins' own."""
-        return merge_providers(BUILTIN_PROVIDERS, self.runtime.plugins.providers)
-
     @property
     def themes(self) -> ThemeCatalog:
         """Return every palette that can be asked for by name: the plugins', then the reader's own files.

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/src/zettcode/app/ui/app.py

@@ -99,6 +99,9 @@ from .shell import (
     EMPTY_REPLY,
     FLASH_SECONDS,
     NO_MODEL_ASKED,
+    NO_MODEL_CHOSEN_ASKED,
+    NO_MODEL_CHOSEN_QUESTION,
+    NO_MODEL_CHOSEN_START,
     NO_MODEL_QUESTION,
     NO_MODEL_START,
     PAGE_SCREEN,
@@ -210,7 +213,8 @@ class ZettCodeApp(
         if agent.runtime.active_model is None:
             # The first thing the conversation says on a machine that has never been set up, under the banner and
             # above anything the reader does next: the shell runs, and this is the one command it is waiting for.
-            self.transcript.notice(NO_MODEL_START)
+            chosen = NO_MODEL_CHOSEN_START if self.client.models else NO_MODEL_START
+            self.transcript.notice(chosen)
         for failure in agent.plugin_failures:
             self.transcript.error(f"plugin: {failure}")
         self.projector = TranscriptProjector(
@@ -750,7 +754,7 @@ class ZettCodeApp(
             # Nothing to ask, and no turn is opened for it: one sentence, where /compact gives it, instead of a turn
             # that the stream then fails and a "btw failed" line under it. Its own sentence, not the prompt's: a
             # command clears the composer before its handler runs, so "your words are still in the box" would lie.
-            self.transcript.error(NO_MODEL_QUESTION)
+            self.transcript.error(NO_MODEL_CHOSEN_QUESTION if self.client.models else NO_MODEL_QUESTION)
             self.app.invalidate()
             return
         self.projector.begin_turn(question, side=True)
@@ -1094,7 +1098,7 @@ class ZettCodeApp(
             # the draft away: the words stay in the box, so setting the model up is all that is left to do. This is
             # checked before the parts are taken, because nothing downstream of here has a model to ask about.
             if self.model is None:
-                self.transcript.error(NO_MODEL_ASKED)
+                self.transcript.error(NO_MODEL_CHOSEN_ASKED if self.client.models else NO_MODEL_ASKED)
                 self.app.invalidate()
                 return False
             # The parts are taken before the composer is cleared, and keep the

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/src/zettcode/app/ui/commands.py

@@ -44,10 +44,9 @@ THEME_NOTES = {
 
 #: What ``/config`` takes first, as its description lists them.
 CONFIG_WORDS = (
-    Subcommand("add", "add a model: a provider, then what it needs", needs_more=True),
+    Subcommand("add", "add a model: its protocol, then what it needs", needs_more=True),
     Subcommand("remove", "remove a model by number or name", needs_more=True),
     Subcommand("list", "show the models in the file"),
-    Subcommand("providers", "show the providers and where to get a key"),
 )
 
 
@@ -97,7 +96,7 @@ class ShellCommands(CommandProvider):
             # /resume, /fork, plus the agent's /new, /compact and /export.
             Command(
                 "/config",
-                "add, change or remove models: /config [add|remove|list|providers]",
+                "add, change or remove models: /config [add|remove|list]",
                 "app",
                 self.config,
                 subcommands=CONFIG_WORDS,
@@ -147,10 +146,9 @@ class ShellCommands(CommandProvider):
 
         With nothing after it the command opens the panel, which asks one question at a time and
         is the way to type a token without it being echoed. The words after it do the same job
-        on one line: ``add`` takes a provider and whatever of its settings the line gives, and
-        asks for the rest; ``remove`` takes a number or a name; ``list`` and ``providers`` only
-        show. A refusal \u2014 a bad address, a file that cannot be edited \u2014 is the command's error and
-        nothing is written.
+        on one line: ``add`` takes whatever of a model's settings the line gives, and asks for the
+        rest; ``remove`` takes a number or a name; ``list`` only shows. A refusal \u2014 a bad address, a
+        file that cannot be edited \u2014 is the command's error and nothing is written.
         """
         word, _, rest = context.argument.partition(" ")
         shell = self.shell
@@ -158,14 +156,12 @@ class ShellCommands(CommandProvider):
             return CommandResult(widget=shell.config_page())
         if word == "list":
             return CommandResult(message=shell.config_listing())
-        if word == "providers":
-            return CommandResult(message=shell.config_providers_listing())
         if word == "add":
             done = shell.config_add_from_line(rest)
             return CommandResult(notification=done, relayout=True) if done else CommandResult()
         if word == "remove":
             return CommandResult(notification=shell.config_remove_from_line(rest), relayout=True)
-        raise ValueError("Usage: /config [add <provider> ... | remove <number|name> | list | providers]")
+        raise ValueError("Usage: /config [add [--model ID] ... | remove <number|name> | list]")
 
     async def theme(self, context: CommandContext) -> CommandResult:
         """Switch straight to a named palette and remember it, or open the menu of them.

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/src/zettcode/app/ui/config_form.py

@@ -1,4 +1,4 @@
-"""What ``/config add`` means: turn a choice of provider and a few answers into one model entry.
+"""What ``/config add`` means: turn a few answers into one model entry.
 
 The panel asks one question at a time and ``/config add`` takes everything on one line; both end up
 here, so a model added either way is the same model. This module is plain data in and data out: it
@@ -13,7 +13,7 @@ from collections.abc import Callable, Mapping, Sequence
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, TypeVar
 
-from zettcode.providers import CUSTOM, Api, Provider, check_url, find_provider
+from zettcode.providers import Api, check_url
 
 if TYPE_CHECKING:  # pragma: no cover - annotations only
     from zettcode.sdk.types import ModelInfo
@@ -21,7 +21,7 @@ if TYPE_CHECKING:  # pragma: no cover - annotations only
 T = TypeVar("T")
 
 USAGE = (
-    "/config add <provider> [--model ID] [--token KEY] [--url URL] [--api chat|responses|anthropic] "
+    "/config add [--model ID] [--token KEY] [--url URL] [--api chat|responses|anthropic] "
     "[--name SHOWN] [--multimodal] [--context TOKENS] [--compact PERCENT] [--temperature T] "
     "[--web-search] [--search-tool TYPE]"
 )
@@ -51,8 +51,7 @@ class Draft:
     """What is known about a model that is being added, filled in as it is learned.
 
     Attributes:
-        provider: The described host the model is at, or ``None`` for a custom one.
-        api: Which protocol it speaks. Starts as the provider's, and a reader may change it.
+        api: Which protocol it speaks: chat completions unless the reader says otherwise.
         url: The address; ``None`` is the SDK's own default.
         model: The model id sent to the endpoint.
         token: The credential. May stay empty: a local server wants none, and the environment can supply one.
@@ -65,7 +64,6 @@ class Draft:
         search_tool: The tool type that search is sent as; empty takes the default for the API.
     """
 
-    provider: Provider | None = None
     api: Api = Api.CHAT
     url: str | None = None
     model: str = ""
@@ -85,8 +83,8 @@ class Draft:
     #: The questions answered in the panel, newest last, each with what was typed, so that
     #: Escape can take back the last one and show it again as it was answered.
     trail: list[tuple[str, str]] = field(default_factory=list)
-    #: Whether the flow was entered from the panel's provider list, which is where Escape from
-    #: the first question goes back to; from a typed line there is nothing behind it.
+    #: Whether the flow was entered from the model list, which is where Escape from the first question
+    #: goes back to; from a typed line there is nothing behind it.
     from_panel: bool = False
 
     def undo(self) -> str | None:
@@ -109,34 +107,16 @@ class Draft:
         self.given.discard(name)
         return previous
 
-    @classmethod
-    def for_provider(cls, provider: Provider | None) -> Draft:
-        """Start a draft with what the provider already says."""
-        if provider is None:
-            return cls()
-        return cls(
-            provider=provider,
-            api=provider.api,
-            url=provider.base_url,
-            multimodal=provider.multimodal,
-        )
-
-    @property
-    def custom(self) -> bool:
-        """Return whether the host is one nobody described, so its address has to be asked."""
-        return self.provider is None
-
     def missing(self) -> list[str]:
         """Return what still has to be asked, in the order to ask it.
 
-        The token is asked about, not required: a draft that was not told one (``--token``) is shown to the reader
-        with the line empty, and an empty line is a valid answer.
+        The protocol comes first, because it decides what the rest of the form offers. The token is asked about,
+        not required: a draft that was not told one (``--token``) is shown to the reader with the line empty, and
+        an empty line is a valid answer.
         """
         wanted: list[str] = []
-        if self.custom and "api" not in self.given:
+        if "api" not in self.given:
             wanted.append("api")
-        if (self.custom or self.url is None) and "url" not in self.given and self.api is not Api.ANTHROPIC:
-            wanted.append("url")
         if not self.model:
             wanted.append("model")
         if "token" not in self.given:
@@ -161,8 +141,6 @@ def entry_for(draft: Draft) -> dict[str, object]:
         entry["display_model"] = draft.name.strip()
     if draft.url:
         entry["base_url"] = check_url(draft.url)
-    elif draft.custom and draft.api is not Api.ANTHROPIC:
-        raise ValueError("A custom provider needs an address (--url)")
     entry.update(draft.api.keys)
     if draft.chat and draft.api is Api.CHAT:
         entry["chat"] = True
@@ -181,12 +159,11 @@ def entry_for(draft: Draft) -> dict[str, object]:
     return entry
 
 
-def parse_add(argument: str, providers: Sequence[Provider]) -> Draft:
+def parse_add(argument: str) -> Draft:
     """Read what follows ``/config add`` into a draft, which may still be missing answers.
 
     Args:
-        argument: The text after ``add``: a provider name (or ``custom``) and optional flags.
-        providers: The hosts that can be named.
+        argument: The text after ``add``, which is flags and their values.
 
     Raises:
         ValueError: With a sentence saying what is wrong and how to write it.
@@ -195,15 +172,17 @@ def parse_add(argument: str, providers: Sequence[Provider]) -> Draft:
         words = shlex.split(argument)
     except ValueError as error:
         raise ValueError(f"cannot read that: {error}") from error
-    if not words or words[0].startswith("--"):
-        names = ", ".join([*(provider.name for provider in providers), CUSTOM])
-        raise ValueError(f"Name the provider: one of {names}\nUsage: {USAGE}")
-    name, flags = words[0].lower(), _flags(words[1:])
-    provider = None if name == CUSTOM else find_provider(name, providers)
-    if provider is None and name != CUSTOM:
-        known = ", ".join([*(item.name for item in providers), CUSTOM])
-        raise ValueError(f"Unknown provider {words[0]!r}; use one of {known}")
-    draft = Draft.for_provider(provider)
+    if not words:
+        # `/config add` on its own opens the panel, which asks the protocol first.
+        return Draft()
+    if not words[0].startswith("--"):
+        raise ValueError(f"Put the model after --model, not on its own\nUsage: {USAGE}")
+    flags = _flags(words)
+    draft = Draft()
+    if "--api" not in flags:
+        # A line that names settings and no protocol means chat completions, the way an entry with no flag
+        # does: a reader typing everything on one line is not asked a question they did not raise.
+        draft.given.add("api")
     if "--api" in flags:
         try:
             draft.api = Api.parse(flags["--api"])

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/src/zettcode/app/ui/keys.py

@@ -14,7 +14,7 @@ from zettcode.tui import AnyEvent, Host
 from zettcode.tui.clipboard import copy_route
 
 from .clipboard import read_image
-from .shell import ASK_SCREEN, PAGE_SCREEN, ShellState
+from .shell import ASK_SCREEN, NO_MODEL_CHOSEN_IMAGE, NO_MODEL_IMAGE, PAGE_SCREEN, ShellState
 from .widgets.completer import COMMAND_PREFIX
 
 if TYPE_CHECKING:  # pragma: no cover - annotations only
@@ -297,8 +297,9 @@ class KeysMixin(ShellState):
         if image is None:
             self.transcript.notice("no image on the clipboard")
         elif self.model is None:
-            # Nothing would take the picture: say what to set up rather than reporting the model's limits.
-            self.transcript.error("no model is configured yet \u2014 /config adds one, then the image can go with it")
+            # Nothing would take the picture: say what to set up rather than reporting the model's limits. A
+            # machine whose plugin offers models has something to pick, so the picker is the instruction.
+            self.transcript.error(NO_MODEL_CHOSEN_IMAGE if self.client.models else NO_MODEL_IMAGE)
         elif not self.model.multimodal:
             self.transcript.error(f"{self.model.name} does not take images")
         else:

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/src/zettcode/app/ui/providers.py

@@ -11,8 +11,9 @@ from __future__ import annotations
 from collections.abc import Callable, Mapping
 from typing import TYPE_CHECKING, cast
 
+from zettcode.config import DEFAULT_COMPACT_PERCENT, DEFAULT_CONTEXT_WINDOW, model_from_entry
 from zettcode.presenters.text import compact_path
-from zettcode.providers import API_FLAG_KEYS, CUSTOM, Api, check_url
+from zettcode.providers import API_FLAG_KEYS, Api, check_url
 from zettcode.sdk.errors import ConfigurationError
 from zettcode.tui import SEPARATOR, ListItem, ListPage, Screen, Widget
 
@@ -32,7 +33,6 @@ from .widgets import Field, FormPage, ModelSettingsPage, bottom_panel, form_rows
 from .widgets.model_settings_page import Action, Answer, Setting
 
 if TYPE_CHECKING:  # pragma: no cover - annotations only
-    from zettcode.providers import Provider
     from zettcode.sdk.types import ModelInfo
 
 #: Rows the list pages take: the title, a blank, up to eight rows, the keys.
@@ -91,7 +91,7 @@ class ConfigMixin(ShellState):
             )
             for index, (model, _) in enumerate(entries)
         ]
-        rows.append(ListItem(None, "+ Add a model", "from a provider, or any endpoint"))
+        rows.append(ListItem(None, "+ Add a model", "choose the API, then the model"))
         page = ListPage(
             rows,
             title="Models",
@@ -104,26 +104,11 @@ class ConfigMixin(ShellState):
     def _config_chosen(self, item: ListItem) -> None:
         """A row of the model list: a model to change, or the row that adds one."""
         if item.value is None:
-            self._config_pick_provider(replace=True)
+            self._config_begin(replace=True)
         else:
             self._config_actions(int(item.value), replace=True)  # type: ignore[call-overload]
 
     # -- adding --------------------------------------------------------------------------
-    def _config_pick_provider(self, *, replace: bool) -> None:
-        """Ask which host the model is at."""
-        rows = [
-            ListItem(provider, provider.label, provider.note or provider.api.description)
-            for provider in self.agent.providers
-        ]
-        rows.append(ListItem(CUSTOM, "Custom", "any endpoint; you give the address and the protocol"))
-        page = ListPage(
-            rows,
-            title="Add a model \u2014 which provider?",
-            on_select=lambda item: self._config_begin(None if item.value == CUSTOM else cast("Provider", item.value)),
-            on_cancel=self._config_back,
-        )
-        self._config_show(page, rows=LIST_ROWS, replace=replace)
-
     def _config_back(self) -> None:
         """Go back to the model list."""
         try:
@@ -135,33 +120,33 @@ class ConfigMixin(ShellState):
         self.app.push_screen(Screen(page, name=PAGE_SCREEN, modal=True))
         self.app.request_layout()
 
-    def _config_begin(self, provider: Provider | None) -> None:
-        """Start asking what the provider does not already say."""
-        draft = Draft.for_provider(provider)
+    def _config_begin(self, *, replace: bool) -> None:
+        """Start a new model: the protocol is the first question, and the rest follows in one form."""
+        draft = Draft()
         draft.from_panel = True
-        self._config_ask(draft)
+        self._config_ask(draft, replace=replace)
 
     def _config_step_back(self, draft: Draft) -> None:
         """Escape in the form: take back the last choice made before it and ask it again.
 
-        That choice is the protocol of a custom endpoint, the one thing asked on a page of its own. With none behind
-        it, Escape goes to the provider list when the flow came from there, and closes when it was started from a
-        typed line, which has nothing behind it.
+        That choice is the protocol, the one thing asked on a page of its own. With none behind it, Escape goes back
+        to the model list when the flow came from there, and closes when it was started from a typed line, which has
+        nothing behind it.
         """
         previous = draft.undo()
         if previous is not None:
             self._config_ask(draft)
         elif draft.from_panel:
-            self._config_pick_provider(replace=True)
+            self._config_back()
         else:
             self._config_end()
 
     def _config_ask(self, draft: Draft, *, replace: bool = True) -> None:
         """Ask for what a draft is missing, or write it when nothing is.
 
-        A custom endpoint is asked which protocol it speaks, on a list of its own, because that is a choice among three
-        words and not text. Everything else is one form: the model id, the token, the address and a name, with the cursor
-        moving between them by Tab and Enter saving all of it.
+        The protocol is asked on a list of its own, because that is a choice among three words and not text.
+        Everything else is one form: the model id, the token, the address and a name, with the cursor moving
+        between them by Tab and Enter saving all of it.
 
         Args:
             draft: What is known so far.
@@ -178,21 +163,12 @@ class ConfigMixin(ShellState):
 
     def _config_add_form(self, draft: Draft, *, replace: bool) -> None:
         """Show the form that adds a model: only the model id has to be filled in."""
-        host = draft.provider.label if draft.provider is not None else "a custom endpoint"
-        suggestions = draft.provider.models if draft.provider is not None else ()
-        token_note = (
-            f"Your key; the vendor's own tools read it from ${draft.provider.token_env}. Leave it empty for a local server."
-            if draft.provider is not None and draft.provider.token_env
-            else "Your key for this endpoint. Leave it empty for a local server, or to use the environment's."
-        )
         fields = [
             Field(
                 "model",
                 "Model id",
                 initial=draft.model,
-                placeholder=suggestions[0] if suggestions else "",
-                hint="The id the provider calls the model, exactly as its documentation writes it."
-                + (f" For example: {', '.join(suggestions[:3])}" if suggestions else ""),
+                hint="The id the endpoint calls the model, exactly as its documentation writes it.",
                 required=True,
             ),
             Field(
@@ -200,21 +176,19 @@ class ConfigMixin(ShellState):
                 "Token",
                 initial=draft.token,
                 placeholder="optional",
-                hint=f"{token_note} It is written to {self.client.config_file}.",
+                hint=f"Your key for this endpoint. Leave it empty for a local server, or to use the environment's. "
+                f"It is written to {self.client.config_file}.",
                 secret=True,
             ),
+            Field(
+                "url",
+                "Address",
+                initial=draft.url or "",
+                placeholder="default address",
+                hint="The address the client appends its route to, such as https://api.example.com/v1. "
+                "Leave it empty for the API's own.",
+            ),
         ]
-        if draft.api is not Api.ANTHROPIC:
-            fields.append(
-                Field(
-                    "url",
-                    "Address",
-                    initial=draft.url or "",
-                    placeholder="default address" if not draft.custom else "https://api.example.com/v1",
-                    hint="The address the client appends its route to, such as https://api.example.com/v1.",
-                    required=draft.custom,
-                )
-            )
         fields.append(
             Field(
                 "name",
@@ -235,8 +209,44 @@ class ConfigMixin(ShellState):
                 + " Leave it empty to send none.",
             )
         )
+        fields.append(
+            Field(
+                "multimodal",
+                "Images",
+                switch=("text only", "accepted"),
+                value=1 if draft.multimodal else 0,
+                hint="Left and Right turn it over; text only is the default.",
+            )
+        )
+        fields.append(
+            Field(
+                "web_search",
+                "Web search",
+                switch=("off", "on"),
+                value=1 if draft.web_search else 0,
+                hint="Left and Right turn it over; off is the default.",
+            )
+        )
+        fields.append(
+            Field(
+                "context_window",
+                "Context window",
+                initial="" if draft.context_window is None else f"{draft.context_window:,}",
+                placeholder=f"{DEFAULT_CONTEXT_WINDOW:,} tokens",
+                hint="Tokens the model can carry: 128000, 128k or 1m. Leave it empty for 128,000.",
+            )
+        )
+        fields.append(
+            Field(
+                "compact_percent",
+                "Compress at",
+                initial="" if draft.compact_percent is None else f"{whole_if_whole(draft.compact_percent)}%",
+                placeholder=f"{whole_if_whole(DEFAULT_COMPACT_PERCENT)}%",
+                hint="Share of the window at which a conversation is summarized: 80 or 80%. Leave it empty for 80.",
+            )
+        )
         page = FormPage(
-            f"Add a model at {host}",
+            f"Add a model \u2014 {draft.api.label}",
             fields,
             on_submit=lambda values: self._config_added(draft, values),
             on_cancel=lambda: self._config_step_back(draft),
@@ -253,7 +263,7 @@ class ConfigMixin(ShellState):
             except ValueError as error:
                 return ("url", str(error))
             draft.url = checked
-        elif draft.api is not Api.ANTHROPIC:
+        else:
             draft.url = None
         draft.given.add("url")
         draft.model = values["model"]
@@ -266,13 +276,59 @@ class ConfigMixin(ShellState):
                 return ("temperature", str(error))
         else:
             draft.temperature = None
+        draft.multimodal = values["multimodal"] == "yes"
+        draft.web_search = values["web_search"] == "yes"
+        if values["context_window"].strip():
+            try:
+                draft.context_window = parse_tokens(values["context_window"])
+            except ValueError as error:
+                return ("context_window", str(error))
+        else:
+            draft.context_window = None
+        if values["compact_percent"].strip():
+            try:
+                draft.compact_percent = parse_percent(values["compact_percent"])
+            except ValueError as error:
+                return ("compact_percent", str(error))
+        else:
+            draft.compact_percent = None
+        shown = draft.name.strip() or draft.model.strip()
+        if shown and any(model.name == shown for model, _ in self.client.model_entries()):
+            return ("name", f"a model is already shown as {shown!r}; choose another shown name")
+        try:
+            entry = entry_for(draft)
+            model_from_entry(entry)
+        except ValueError as error:
+            # The rules the loader will read (a DeepSeek chat endpoint cannot search, say) are asked before
+            # anything is written, so the row that caused it keeps the form and everything typed into it.
+            return (self._refusal_key(draft, error), str(error))
         draft.given.add("token")
         self._config_write(draft)
         return None
 
+    @staticmethod
+    def _refusal_key(draft: Draft, error: ValueError) -> str:
+        """Return the form row a loader refusal belongs to, by the rule it names."""
+        if (
+            draft.web_search
+            and draft.api is not Api.ANTHROPIC
+            and ("deepseek" in draft.model.lower() or "deepseek" in (draft.url or "").lower())
+        ):
+            return "web_search"
+        # The three parsers above refuse these values before the loader sees them; these are a floor for a
+        # rule the form does not word yet.
+        message = str(error).lower()
+        if "context_window" in message or "context window" in message:
+            return "context_window"
+        if "compact_percent" in message or "compact percent" in message:
+            return "compact_percent"
+        if "temperature" in message:
+            return "temperature"
+        return ""
+
     def _config_ask_api(self, draft: Draft, *, replace: bool = True) -> None:
-        """Ask which protocol a custom endpoint speaks."""
-        rows = [ListItem(api, api.value, api.description) for api in Api]
+        """Ask which protocol the endpoint speaks."""
+        rows = [ListItem(api, api.label, api.description) for api in Api]
         page = ListPage(
             rows,
             title="Which API does the endpoint speak?",
@@ -564,7 +620,7 @@ class ConfigMixin(ShellState):
         Raises:
             ValueError: With the reason, when the line cannot be understood or the entry is refused.
         """
-        draft = parse_add(argument, self.agent.providers)
+        draft = parse_add(argument)
         if draft.missing():
             self._config_ask(draft, replace=False)  # nothing of the flow is on screen yet
             return None
@@ -615,12 +671,3 @@ class ConfigMixin(ShellState):
                 f"| {whole_if_whole(model.compact_percent)}% |"
             )
         return "\n".join(lines)
-
-    def config_providers_listing(self) -> str:
-        """Return the providers `/config add` accepts, as Markdown."""
-        lines = ["| name | api | address | note |", "| --- | --- | --- | --- |"]
-        for provider in self.agent.providers:
-            note = provider.note or provider.api.description
-            lines.append(f"| `{provider.name}` | {provider.api} | {provider.base_url or 'default'} | {note} |")
-        lines.append(f"| `{CUSTOM}` | you choose | you give it | any endpoint |")
-        return "\n".join(lines)

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/src/zettcode/app/ui/settings.py

@@ -44,6 +44,9 @@ class SettingsMixin(ShellState):
         selected = self.client.use_model(name)
         if previous is None or selected.name != previous.name or selected.model != previous.model:
             self.transcript.model_changed(previous.name if previous is not None else "", selected.name)
+        # A machine whose first model is one a plugin offered had nothing to warm at launch; the choice is the
+        # moment the runtime has something to build, exactly as the first `/config` entry is.
+        self._warm_runtime()
         self.app.request_layout()
         return selected
 

{zettcode_app-0.4.2 → zettcode_app-0.4.4}/src/zettcode/app/ui/shell.py

@@ -29,19 +29,32 @@ EMPTY_REPLY = "The model sent back an empty reply. Try again, or check the model
 #: What a machine with no ``[[models]]`` entry says for itself. The shell starts anyway — a reader can look through
 #: sessions, change the theme and set a model up — so the line that opens the conversation names the one command
 #: that turns it into a working agent, rather than a start that exits with a message about a file.
-NO_MODEL_START = (
-    "no model is configured yet \u2014 /config adds one (a provider, a model id, and a token); "
-    "nothing else here waits for it"
-)
+NO_MODEL_START = "no model is configured yet \u2014 /config adds one; nothing else here waits for it"
+
+#: What that machine says when a plugin offers models but none has been chosen: ``/config`` edits only the file, so
+#: the picker is the command that makes it work.
+NO_MODEL_CHOSEN_START = "no model is chosen yet \u2014 /model picks one; nothing else here waits for it"
 
 #: What a prompt typed on such a machine is answered with. It is not an error in the program but in the setup, so
 #: the sentence says how to finish the setup, and the draft is kept so nothing has to be typed again.
 NO_MODEL_ASKED = "no model is configured yet \u2014 /config adds one, then ask again; your words are still in the box"
 
+#: What a prompt is answered with when the models exist but none is chosen.
+NO_MODEL_CHOSEN_ASKED = (
+    "no model is chosen yet \u2014 /model picks one, then ask again; your words are still in the box"
+)
+
 #: What ``/btw`` says instead, and the difference is the box: a command is submitted and the composer cleared
 #: before its handler runs, so the prompt's "your words are still in the box" would be false there.
 NO_MODEL_QUESTION = "no model is configured yet \u2014 /config adds one; /btw asks it once there is one"
 
+#: What ``/btw`` says when the models exist but none is chosen.
+NO_MODEL_CHOSEN_QUESTION = "no model is chosen yet \u2014 /model picks one; /btw asks it once there is one"
+
+#: What a pasted image is told when nothing could take it, by the two states above.
+NO_MODEL_IMAGE = "no model is configured yet \u2014 /config adds one, then the image can go with it"
+NO_MODEL_CHOSEN_IMAGE = "no model is chosen yet \u2014 /model picks one, then the image can go with it"
+
 #: Screen name used for a page a command presented; the shell checks it to know
 #: that Ctrl-C and Ctrl-D belong to the page rather than the composer.
 PAGE_SCREEN = "page"