zettcode-commands 0.4.3__tar.gz → 0.4.5__tar.gz

{zettcode_commands-0.4.3 → zettcode_commands-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: zettcode-commands
-Version: 0.4.3
+Version: 0.4.5
 Summary: The slash commands that act on ZettCode's terminal application, offered to it as a plugin
 Project-URL: Repository, https://github.com/Chang-LeHung/zettcode
 Author: Chang-LeHung

{zettcode_commands-0.4.3 → zettcode_commands-0.4.5}/src/zettcode/commands/context.py

@@ -31,10 +31,17 @@ class ContextPagePlugin(TuiPlugin):
             """Open the context page, or say why there is nothing to measure yet."""
             host = context.require_host()
             if host.client.active_model is None:
-                return CommandResult(
-                    message="No model is configured yet \u2014 `/config` adds one; `/context` has something to "
-                    "measure after the first request."
-                )
+                if host.client.models:
+                    message = (
+                        "No model is chosen yet \u2014 `/model` picks one; `/context` has something to "
+                        "measure after the first request."
+                    )
+                else:
+                    message = (
+                        "No model is configured yet \u2014 `/config` adds one; `/context` has something to "
+                        "measure after the first request."
+                    )
+                return CommandResult(message=message)
             service = ctx.agent.context_report_service()
             if service is None:
                 report = await host.client.session.context()

{zettcode_commands-0.4.3 → zettcode_commands-0.4.5}/src/zettcode/commands/handlers.py

@@ -183,14 +183,19 @@ def model_words(host: CommandHost | None) -> tuple[Subcommand, ...]:
     """Offer the configured models by the name ``/model`` accepts.
 
     A name two entries share is left out (``/model`` refuses it as ambiguous), and so is one with a space in it,
-    which would not stay one word. Before there is a shell there is nothing to offer.
+    which would not stay one word. The line beside it says where the model came from and which protocol it speaks,
+    because two entries can share a model id and the name alone tells neither. Before there is a shell there is
+    nothing to offer.
     """
     if host is None:
         return ()
     models = host.client.models
     shown = [model.display_model or model.model for model in models]
     return tuple(
-        Subcommand(name, model.model)
+        Subcommand(
+            name,
+            f"{'plugin ' + model.provider if model.provider is not None else 'file'} · {model.api} · {model.model}",
+        )
         for name, model in zip(shown, models, strict=True)
         if shown.count(name) == 1 and not any(character.isspace() for character in name)
     )
@@ -228,11 +233,11 @@ class ModelCommands(TuiPlugin):
         """Open the model picker, or switch directly to a named model.
 
         The picker is a widget, so the command needs the shell: the agent owns the models, the shell owns the
-        widget that chooses between them. A machine with no model has nothing to pick, so the command points at
-        the one that adds the first entry instead of opening an empty list.
+        widget that chooses between them. A machine with nothing to pick has no model at all, so the command points
+        at the one that adds the first entry instead of opening an empty list.
         """
         host = context.require_host()
-        if host.client.active_model is None:
+        if host.client.active_model is None and not host.client.models:
             return CommandResult(message="No model is configured yet \u2014 `/config` adds the first one.")
         if context.argument:
             host.change_model(context.argument)
@@ -253,9 +258,13 @@ class ModelCommands(TuiPlugin):
         """
         host = context.require_host()
         if host.client.active_model is None:
-            return CommandResult(
-                message="No model is configured yet \u2014 `/config` adds one; `/effort` sets the level it reasons at."
-            )
+            if host.client.models:
+                message = "No model is chosen yet \u2014 `/model` picks one; `/effort` sets the level it reasons at."
+            else:
+                message = (
+                    "No model is configured yet \u2014 `/config` adds one; `/effort` sets the level it reasons at."
+                )
+            return CommandResult(message=message)
         if context.argument:
             try:
                 host.change_effort(context.argument)