dirigent-cli 0.22.0__tar.gz → 0.23.1__tar.gz

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/PKG-INFO

@@ -1,19 +1,19 @@
 Metadata-Version: 2.4
 Name: dirigent-cli
-Version: 0.22.0
+Version: 0.23.1
 Summary: The dirigent command line interface (dirigent / dg).
 License-Expression: LicenseRef-Proprietary
 License-File: LICENSE
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: dirigent-block-execute==0.22.0
-Requires-Dist: dirigent-blocks==0.22.0
-Requires-Dist: dirigent-client==0.22.0
-Requires-Dist: dirigent-common==0.22.0
-Requires-Dist: dirigent-core==0.22.0
-Requires-Dist: dirigent-examples==0.22.0
-Requires-Dist: dirigent-plugin==0.22.0
-Requires-Dist: dirigent-server==0.22.0
+Requires-Dist: dirigent-block-execute==0.23.1
+Requires-Dist: dirigent-blocks==0.23.1
+Requires-Dist: dirigent-client==0.23.1
+Requires-Dist: dirigent-common==0.23.1
+Requires-Dist: dirigent-core==0.23.1
+Requires-Dist: dirigent-examples==0.23.1
+Requires-Dist: dirigent-plugin==0.23.1
+Requires-Dist: dirigent-server==0.23.1
 Requires-Dist: httpx2>=2.12.0
 Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: pyyaml>=6.0.3

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-cli"
-version = "0.22.0"
+version = "0.23.1"
 description = "The dirigent command line interface (dirigent / dg)."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -11,14 +11,14 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "dirigent-block-execute==0.22.0",
-    "dirigent-blocks==0.22.0",
-    "dirigent-client==0.22.0",
-    "dirigent-common==0.22.0",
-    "dirigent-core==0.22.0",
-    "dirigent-examples==0.22.0",
-    "dirigent-plugin==0.22.0",
-    "dirigent-server==0.22.0",
+    "dirigent-block-execute==0.23.1",
+    "dirigent-blocks==0.23.1",
+    "dirigent-client==0.23.1",
+    "dirigent-common==0.23.1",
+    "dirigent-core==0.23.1",
+    "dirigent-examples==0.23.1",
+    "dirigent-plugin==0.23.1",
+    "dirigent-server==0.23.1",
     "httpx2>=2.12.0",
     "python-dotenv>=1.1.0",
     "pyyaml>=6.0.3",

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-cli"
-version = "0.22.0"
+version = "0.23.1"
 description = "The dirigent command line interface (dirigent / dg)."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -11,14 +11,14 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "dirigent-block-execute==0.22.0",
-    "dirigent-blocks==0.22.0",
-    "dirigent-client==0.22.0",
-    "dirigent-common==0.22.0",
-    "dirigent-core==0.22.0",
-    "dirigent-examples==0.22.0",
-    "dirigent-plugin==0.22.0",
-    "dirigent-server==0.22.0",
+    "dirigent-block-execute==0.23.1",
+    "dirigent-blocks==0.23.1",
+    "dirigent-client==0.23.1",
+    "dirigent-common==0.23.1",
+    "dirigent-core==0.23.1",
+    "dirigent-examples==0.23.1",
+    "dirigent-plugin==0.23.1",
+    "dirigent-server==0.23.1",
     "httpx2>=2.12.0",
     "python-dotenv>=1.1.0",
     "pyyaml>=6.0.3",

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/src/dirigent_cli/commands.py

@@ -74,6 +74,7 @@ from dirigent_cli.messages import (
     RUN_SKIPPED,
     SCAFFOLD_REFUSED,
     SCHEMA_NOT_AN_OBJECT,
+    SCHEMA_NOTHING_TO_CHANGE,
     SCHEMA_UNREADABLE,
     SET_DG_TOKEN,
     SOURCE_REFUSED,
@@ -87,6 +88,7 @@ from dirigent_cli.messages import (
 from dirigent_cli.messages import WINDOW_GRAMMAR as WINDOW_GRAMMAR_MESSAGE
 from dirigent_cli.output import (
     CONNECTION_HEALTH,
+    RUNS_IN_FLIGHT,
     Detail,
     age,
     connection_health,
@@ -135,6 +137,7 @@ from dirigent_cli.sources import (
 from dirigent_cli.stream import Sink, track_steps, use_scratch_prefix
 from dirigent_cli.timing import RunProfile, attempt_timing, by_step, profile, step_timing
 from dirigent_client import (
+    CLEAR,
     ApplyResult,
     AttemptEvent,
     AttemptOut,
@@ -142,6 +145,7 @@ from dirigent_client import (
     BackfillAccepted,
     BlockKind,
     Catalog,
+    Clear,
     DocumentKind,
     ExampleDetail,
     ExampleOut,
@@ -159,6 +163,7 @@ from dirigent_client import (
     RunReport,
     RunStatus,
     ValidationIssue,
+    declared_label,
 )
 from dirigent_common import Issue, JsonMap, Message
 from dirigent_core import migrations
@@ -823,7 +828,7 @@ def pipeline_list(
         return emit_records("pipeline", rows)
     table(
         "pipelines",
-        ["code", "name", "tags", "version", "active", "runs in flight", "updated"],
+        ["code", "name", "tags", "version", "active", RUNS_IN_FLIGHT, "updated"],
         [
             [
                 row.code,
@@ -859,7 +864,7 @@ def pipeline_show(
             "importance": row.importance.value,
             "active": "yes" if row.active else "no",
             "current version": row.current_version,
-            "runs in flight": row.active_runs,
+            RUNS_IN_FLIGHT: row.active_runs,
             "created": moment(row.created_at),
         },
     )
@@ -2465,8 +2470,11 @@ def schema_list(ctx: typer.Context) -> None:
         return emit_records("schema", rows)
     table(
         "schemas",
-        ["code", "name", "description"],
-        [[row.code, row.name or "-", row.description or "-"] for row in rows],
+        ["code", "name", "description", "used by"],
+        [
+            [row.code, row.name or "-", row.description or "-", str(len(row.used_by)) if row.used_by else "-"]
+            for row in rows
+        ],
     )
 
 
@@ -2483,6 +2491,19 @@ def schema_create(
     ] = None,
 ) -> None:
     """Store a locally authored JSON Schema, taking its identity from its own keywords."""
+    schema, document = _read_schema(reference)
+    resolved = code
+    if resolved is None and not (isinstance(schema.get("$id"), str) and code_from_id(cast("str", schema["$id"]))):
+        resolved = code_from_id(Path(document.ref).name) if document.ref != "(stdin)" else None
+    with client_for(state_of(ctx)) as dg:
+        created = dg.call(dg.schemas.create(schema, code=resolved, name=name, description=description))
+    if state_of(ctx).json_output:
+        return emit_fact("schema.created", message="created", code=created.code, name=created.name)
+    console.print(f"[green]stored[/] schema [bold]{created.code}[/]")
+
+
+def _read_schema(reference: str) -> tuple[JsonMap, Document]:
+    """Read a locally authored JSON Schema from a file, a URL, or standard input."""
     try:
         document = read_document(reference)
     except SourceError as error:
@@ -2493,15 +2514,69 @@ def schema_create(
         fail(SCHEMA_UNREADABLE, label=document.label, detail=str(error))
     if not isinstance(body, dict):
         fail(SCHEMA_NOT_AN_OBJECT, label=document.label, kind=type(body).__name__)
-    schema = cast("JsonMap", body)
-    resolved = code
-    if resolved is None and not (isinstance(schema.get("$id"), str) and code_from_id(cast("str", schema["$id"]))):
-        resolved = code_from_id(Path(document.ref).name) if document.ref != "(stdin)" else None
+    return cast("JsonMap", body), document
+
+
+def _label_given(text: str | None) -> str | Clear | None:
+    """Read a label option: not given leaves what is stored, and given empty clears it.
+
+    An empty title is the absence of one rather than a title, and no screen can draw it, so
+    the empty string is never what gets stored.
+    """
+    if text is None:
+        return None
+    return text.strip() or CLEAR
+
+
+@schema_app.command("update")
+def schema_update(
+    ctx: typer.Context,
+    code: Annotated[str, typer.Argument(help="The schema to change; a code is fixed once minted.")],
+    reference: Annotated[
+        str | None,
+        typer.Argument(help="A JSON Schema file, or - for standard input, to replace the stored body with."),
+    ] = None,
+    name: Annotated[
+        str | None,
+        typer.Option(help="A human title; taken from the replacing schema's title when omitted, cleared when empty."),
+    ] = None,
+    description: Annotated[
+        str | None,
+        typer.Option(help="What the schema is for; taken from the replacing schema's description, cleared when empty."),
+    ] = None,
+) -> None:
+    """Correct a stored schema: replace the shape, relabel it, or both.
+
+    What this was not given is left as it stands, and an option given empty clears what is
+    stored. Replacing the body takes the new schema's own ``title`` and ``description`` where
+    the options name neither, exactly as storing one does, so the labels belong to the shape
+    the instance now holds rather than to the one it no longer does.
+
+    An edit is never refused for being depended on: a code is fixed once minted, so refusing
+    it would freeze an in-use shape permanently. The answer names the pipelines that validate
+    against it, and the decision was made for them.
+    """
+    schema = _read_schema(reference)[0] if reference is not None else None
+    label = _label_given(name)
+    about = _label_given(description)
+    if schema is not None:
+        label = declared_label(schema, "title") if label is None else label
+        about = declared_label(schema, "description") if about is None else about
+    changed = [
+        field for field, given in (("name", label), ("description", about), ("body", schema)) if given is not None
+    ]
+    if not changed:
+        fail(SCHEMA_NOTHING_TO_CHANGE, code=code)
     with client_for(state_of(ctx)) as dg:
-        created = dg.call(dg.schemas.create(schema, code=resolved, name=name, description=description))
-    if state_of(ctx).json_output:
-        return emit_fact("schema.created", message="created", code=created.code, name=created.name)
-    console.print(f"[green]stored[/] schema [bold]{created.code}[/]")
+        edited = dg.call(dg.schemas.update(code, body=schema, name=label, description=about))
+    emit_fact(
+        "schema.updated",
+        message="updated",
+        code=edited.code,
+        name=edited.name,
+        changed=changed,
+        used_by=edited.used_by,
+    )
 
 
 @schema_app.command("show")
@@ -2511,13 +2586,20 @@ def schema_show(ctx: typer.Context, code: Annotated[str, typer.Argument()]) -> N
         row = dg.call(dg.schemas.get(code))
     if state_of(ctx).json_output:
         return emit_one("schema", row)
-    fields(f"schema {code}", {"name": row.name or "-", "description": row.description or "-"})
+    fields(
+        f"schema {code}",
+        {
+            "name": row.name or "-",
+            "description": row.description or "-",
+            "used by": ", ".join(row.used_by) or "-",
+        },
+    )
     console.print_json(data=row.body)
 
 
 @schema_app.command("delete")
 def schema_delete(ctx: typer.Context, code: Annotated[str, typer.Argument()]) -> None:
-    """Remove a schema."""
+    """Remove a schema, which the instance refuses while a stored pipeline names it."""
     with client_for(state_of(ctx)) as dg:
         dg.call(dg.schemas.delete(code))
     emit_fact("schema.deleted", message="deleted", code=code)

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/src/dirigent_cli/messages.py

@@ -189,6 +189,11 @@ SCHEMA_NOT_AN_OBJECT = CLI.define(
     "{label} is not a JSON Schema: a schema is an object, and this is {kind}",
 )
 
+SCHEMA_NOTHING_TO_CHANGE = CLI.define(
+    "schema_nothing_to_change",
+    "nothing was given to change about {code}; pass a schema file, --name or --description",
+)
+
 # What a profile refuses at validation. Pydantic owns the code a validator's refusal reaches
 # the wire under, so this is rendered into the ``ValueError`` it wraps.
 

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/src/dirigent_cli/output.py

@@ -478,6 +478,11 @@ def prioritised(priority: object) -> str:
 #: same words out of its own catalogue, and `tests/test_shared_words.py` holds the two together.
 IMPORTANCE_FLOOR = "{importance} and above"
 
+#: What a pipeline's unsettled runs are called, wherever a rendering names the count the server
+#: computes from `ACTIVE_RUN_STATUSES`. The web UI heads its own feed of them with the same noun
+#: out of its catalogue, and `tests/test_shared_words.py` fails when the two stop agreeing.
+RUNS_IN_FLIGHT = "runs in flight"
+
 
 def watching(scope: object, importance: object) -> str:
     """What an alert rule watches, in one cell: its scope, and the floor it fires at.

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/src/dirigent_cli/seeding.py

@@ -11,7 +11,7 @@ from pathlib import Path
 from typing import Any, cast
 
 from dirigent_cli.local import ConnectionSpec
-from dirigent_client import Dirigent, DirigentError, PlanAction, ProvenanceSource
+from dirigent_client import Dirigent, DirigentError, PlanAction, ProvenanceSource, declared_label
 from dirigent_common import JsonMap
 from dirigent_core.documents import CARRIED, SUFFIXES, is_document, readable, safe_load
 from dirigent_core.protocol import Record, make
@@ -99,11 +99,21 @@ def _schemas(raw: JsonMap) -> dict[str, JsonMap]:
 
 
 async def _schema(client: Dirigent, code: str, body: JsonMap) -> None:
-    """Store one named schema, replacing the body of one this instance already holds."""
+    """Store one named schema, replacing the shape and the labels of one already held.
+
+    Storing reads the schema's own ``title`` and ``description`` and editing reads neither, so
+    the replacement sends what the document's schema declares about itself; otherwise the same
+    corpus would label a schema one way on a fresh instance and another way on a seeded one.
+    """
     try:
         await client.schemas.create(body, code=code)
     except DirigentError:
-        await client.schemas.update(code, body=body)
+        await client.schemas.update(
+            code,
+            body=body,
+            name=declared_label(body, "title"),
+            description=declared_label(body, "description"),
+        )
 
 
 async def _connections(client: Dirigent, declared: Sequence[ConnectionSpec], origin: str) -> AsyncIterator[Record]:

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/src/dirigent_cli/summaries.py

@@ -52,6 +52,7 @@ BULKY: Final = frozenset(
         "token",
         "preflight",
         "requires",
+        "used_by",
     }
 )
 
@@ -342,6 +343,33 @@ def _created(record: Record) -> RenderableType | None:
     return Group(*parts)
 
 
+#: What a changed shape reaches. The web UI warns in these words before a save, out of its own
+#: catalogue, and `tests/test_shared_words.py` fails when the two stop agreeing. Written without
+#: terminal punctuation, because the rendering puts the pipelines after it.
+SCHEMA_REACHES = "Every pipeline naming this code checks against this shape from its next run"
+
+#: What it does not reach. Said after the pipelines rather than with them: the colon above governs
+#: that list, and a run in flight is not on it. Paired with the web UI's own words by the
+#: same test, and punctuated, because nothing follows it.
+IN_FLIGHT_KEEPS_ITS_SHAPE = "A run in flight keeps the shape it started with."
+
+
+def _schema_edited(record: Record) -> RenderableType | None:
+    """Render whose pipelines the shape that was just changed was changed for.
+
+    An edit is never refused for being depended on, so the pipelines checking against the
+    code are the ones the edit was a decision about, and they are named rather than counted.
+    Where no pipeline names the code, no run checks against it either, so neither line is drawn.
+    """
+    named = _texts(record, "used_by")
+    if not named:
+        return None
+    parts: list[RenderableType] = [f"\n{SCHEMA_REACHES}:"]
+    parts.extend(f"  [yellow]-[/] {escape(one)}" for one in named)
+    parts.append(f"\n{IN_FLIGHT_KEEPS_ITS_SHAPE}")
+    return Group(*parts)
+
+
 def _config(record: Record) -> RenderableType | None:
     """Render the effective configuration as a setting-per-row table."""
     settings = record.get("settings")
@@ -524,4 +552,5 @@ RENDERERS: Final[Mapping[str, Callable[[Record], RenderableType | None]]] = {
     "project.scaffolded": _scaffolded,
     "instance.initialised": _initialised,
     "pipeline.created": _created,
+    "schema.updated": _schema_edited,
 }

{dirigent_cli-0.22.0 → dirigent_cli-0.23.1}/src/dirigent_cli/triggers.py

@@ -28,7 +28,7 @@ from dirigent_cli.output import (
     throttle_note,
     watching,
 )
-from dirigent_client import LOG_NOTIFIER, AlertEvent, AlertScope, WebhookTokenOut
+from dirigent_client import LOG_NOTIFIER, TEST_SUBJECT, AlertEvent, AlertScope, WebhookTokenOut
 from dirigent_common import Message
 
 schedule_app = typer.Typer(
@@ -609,7 +609,7 @@ def alerts_test(
         str | None,
         typer.Option("--connection", help="The connection to deliver through; none delivers to the process log."),
     ] = None,
-    subject: Annotated[str, typer.Option("--subject", help="What the test message says.")] = "dirigent test alert",
+    subject: Annotated[str, typer.Option("--subject", help="What the test message says.")] = TEST_SUBJECT,
 ) -> None:
     """Send a test message to one target, on the same queue a real alert takes."""
     with client_for(state_of(ctx)) as dg: