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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: zettcode-server
-Version: 0.4.2
+Version: 0.4.4
 Summary: The HTTP face of ZettCode: a FastAPI server that drives the SDK
 Project-URL: Repository, https://github.com/Chang-LeHung/zettcode
 Author: Chang-LeHung

{zettcode_server-0.4.2 → zettcode_server-0.4.4}/src/zettcode/server/app.py

@@ -36,7 +36,7 @@ from zettcode.sdk.models import remove_model as remove_model_entry
 from zettcode.sdk.models import update_model as update_model_entry
 from zettcode.version import __version__
 
-from .runner import NoModelError, Runner, prepare, result_payload
+from .runner import NO_MODEL_MESSAGE, NoModelError, Runner, prepare, result_payload
 from .runner import Request as RunRequest
 from .schemas import (
     AnswerOut,
@@ -151,7 +151,7 @@ def stream_of(runner: Runner, request: RunRequest, *, resume: bool = False) -> S
     if runner.busy:
         raise SessionBusyError("A run is already in progress; wait for it or cancel it")
     if not runner.ready:
-        raise NoModelError("No model is configured; add one with POST /models")
+        raise NoModelError(NO_MODEL_MESSAGE)
     prepare(request)
 
     async def frames() -> AsyncIterator[bytes]:
@@ -176,7 +176,7 @@ def message_stream_of(runner: Runner, message_id: str) -> StreamingResponse:
     status line is still possible; what fails once the stream is open becomes an ``error`` frame.
     """
     if not runner.ready:
-        raise NoModelError("No model is configured; add one with POST /models")
+        raise NoModelError(NO_MODEL_MESSAGE)
     try:
         frames = runner.stream_message(message_id)
     except KeyError:
@@ -326,6 +326,8 @@ def create_app(settings: Settings, *, client_factory: ClientFactory | None = Non
     @protected.get("/settings", response_model=SettingsOut, tags=["models"])
     async def settings_out(runner: RunnerDep) -> SettingsOut:
         """Return the model, effort, permission and harness a run starts with."""
+        if not runner.ready:
+            raise NoModelError(NO_MODEL_MESSAGE)
         client = runner.client
         return SettingsOut(
             model=model_out(client.model),
@@ -572,7 +574,7 @@ def create_app(settings: Settings, *, client_factory: ClientFactory | None = Non
         if runner.busy:
             raise SessionBusyError("A run is already in progress; ask again when it ends")
         if not runner.ready:
-            raise NoModelError("No model is configured; add one with POST /models")
+            raise NoModelError(NO_MODEL_MESSAGE)
 
         async def frames() -> AsyncIterator[bytes]:
             try:

{zettcode_server-0.4.2 → zettcode_server-0.4.4}/src/zettcode/server/runner.py

@@ -186,11 +186,18 @@ class Pending:
         )
 
 
+#: What a request that needs an agent is refused with. The server opens its client from the configuration file, so
+#: the first entry is what makes it ready; models a plugin offers appear afterwards.
+NO_MODEL_MESSAGE = "No model is configured; add one with POST /models"
+
+
 class NoModelError(RuntimeError):
-    """No model is configured yet, so there is nothing to run a prompt with.
+    """No model is configured, so there is nothing to run a prompt with.
 
     A fresh machine has no ``[[models]]`` entry; the server still starts, lists and edits the configuration, and
-    answers this on what needs an agent. ``POST /models`` is what turns it into a working server.
+    answers this on what needs an agent. ``POST /models`` adds the file entry that makes the client, which is what
+    loads the plugins: the models they offer appear in ``GET /models`` after that and are chosen with
+    ``PATCH /settings``.
     """
 
 
@@ -262,7 +269,7 @@ class Runner:
             NoModelError: No model is configured yet, so there is no agent to drive.
         """
         if self._slot is None:
-            raise NoModelError("No model is configured; add one with POST /models")
+            raise NoModelError(NO_MODEL_MESSAGE)
         return self._slot
 
     @property
@@ -641,7 +648,7 @@ class Runner:
             model=like.model.name, effort=like.effort, permission=like.permission, harness=like.harness
         )
         if client is None:
-            raise NoModelError("No model is configured; add one with POST /models")
+            raise NoModelError(NO_MODEL_MESSAGE)
         slot = Slot(client)
         await self._join(slot)
         return slot

{zettcode_server-0.4.2 → zettcode_server-0.4.4}/src/zettcode/server/schemas.py

@@ -201,6 +201,8 @@ class ModelOut(BaseModel):
     temperature: float | None = None
     can_search: bool = True
     search_name: str = ""
+    provider: str | None = None
+    token_env: str | None = None
 
 
 class ModelsOut(BaseModel):

{zettcode_server-0.4.2 → zettcode_server-0.4.4}/src/zettcode/server/serialize.py

@@ -151,6 +151,8 @@ def model_out(model: ModelInfo) -> ModelOut:
         temperature=model.temperature,
         can_search=model.can_search,
         search_name=model.search_name,
+        provider=model.provider,
+        token_env=model.token_env,
     )