dirigent-cli 0.12.0__tar.gz → 0.13.0__tar.gz

{dirigent_cli-0.12.0 → dirigent_cli-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirigent-cli
-Version: 0.12.0
+Version: 0.13.0
 Summary: The dirigent command line interface (dirigent / dg).
 License-Expression: LicenseRef-Proprietary
 License-File: LICENSE

{dirigent_cli-0.12.0 → dirigent_cli-0.13.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-cli"
-version = "0.12.0"
+version = "0.13.0"
 description = "The dirigent command line interface (dirigent / dg)."
 readme = "README.md"
 requires-python = ">=3.13"

{dirigent_cli-0.12.0 → dirigent_cli-0.13.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-cli"
-version = "0.12.0"
+version = "0.13.0"
 description = "The dirigent command line interface (dirigent / dg)."
 readme = "README.md"
 requires-python = ">=3.13"

{dirigent_cli-0.12.0 → dirigent_cli-0.13.0}/src/dirigent_cli/commands.py

@@ -1930,11 +1930,27 @@ def _relay_log(entry: LogEntryOut, state: CliState) -> None:
 def runs_report(
     ctx: typer.Context,
     run_id: Annotated[UUID, typer.Argument(help="The run to summarise.")],
+    markdown: Annotated[
+        bool, typer.Option("--markdown", help="Write the document the run rendered when it settled.")
+    ] = False,
 ) -> None:
-    """Summarise a run: what each step amounted to, and how long it took."""
-    with client_for(state_of(ctx)) as dg:
+    """Summarise a run: what each step amounted to, and how long it took.
+
+    `--markdown` answers with the run's own report document instead, which a run renders only
+    when its pipeline document declares a `report:` section.
+    """
+    state = state_of(ctx)
+    with client_for(state) as dg:
+        if markdown:
+            document = dg.call(dg.runs.report_document(run_id))
+            if document is None:
+                fail(f"run {run_id} has no report document; declare `report:` in the pipeline document")
+            if state.json_output:
+                return emit_fact("run.report_document", message="rendered", run_id=str(run_id), document=document)
+            console.print(document, end="", highlight=False, markup=False)
+            return
         report = dg.call(dg.runs.report(run_id))
-    if state_of(ctx).json_output:
+    if state.json_output:
         return emit_one("run.report", report)
     _print_report(report)
 

{dirigent_cli-0.12.0 → dirigent_cli-0.13.0}/src/dirigent_cli/project.py

@@ -209,9 +209,9 @@ SERVICE_EXAMPLES: Final = {
         """\
 # A greeting written to the stack's own bucket and read back, through the s3:// scheme.
 #
-# There is no S3 block: storage.copy moves bytes between schemes, and the stack's `migrate`
-# service bootstraps the `artifacts` connection that serves s3://. The bucket comes from the
-# URI, so this one is the stack's:
+# There is no S3 block: storage.write puts text in an object, storage.copy moves bytes between
+# schemes, and the stack's `migrate` service bootstraps the `artifacts` connection that serves
+# s3://. The bucket comes from the URI, so this one is the stack's:
 #
 #   dg run s3-hello --watch
 
@@ -223,7 +223,7 @@ description: Write a greeting to the bucket and copy it back, through s3://.
 
 requires:
   blocks:
-    - value.const
+    - storage.write
     - storage.copy
   connections:
     - artifacts
@@ -232,10 +232,10 @@ requires:
 
 steps:
   greet:
-    block: value.const
+    block: storage.write
     config:
-      value: "hello from object storage"
-      save_to: "${run.scratch}/hello.txt"
+      target: "${run.scratch}/hello.txt"
+      text: "hello from object storage"
 
   upload:
     block: storage.copy

{dirigent_cli-0.12.0 → dirigent_cli-0.13.0}/src/dirigent_cli/triggers.py

@@ -441,12 +441,22 @@ def alerts_rules_create(
     description: Annotated[str | None, typer.Option("--description", help="What this rule is for.")] = None,
     pipeline: Annotated[str | None, typer.Option("--pipeline", help="Watch one pipeline instead of all.")] = None,
     connection: Annotated[str | None, typer.Option("--connection", help="The credential the channel uses.")] = None,
-    template: Annotated[str | None, typer.Option("--template", help="Subject template, reading ${run.*}.")] = None,
+    template: Annotated[
+        str | None, typer.Option("--template", help="Subject, a Jinja template over the run's facts.")
+    ] = None,
+    body: Annotated[str | None, typer.Option("--body", help="Body, a Jinja template over the run's facts.")] = None,
+    body_file: Annotated[
+        Path | None, typer.Option("--body-file", help="Read the body template from a file instead.")
+    ] = None,
     throttle: Annotated[str, typer.Option("--throttle", help="At most one message per window, e.g. 15m.")] = "0s",
 ) -> None:
     """Declare an alert rule binding an event at a scope to a channel."""
     if event not in set(AlertEvent):
         _fail(f"{event!r} is not an alert event ({', '.join(sorted(AlertEvent))})")
+    if body is not None and body_file is not None:
+        _fail("a rule takes one body: --body or --body-file, not both")
+    if body_file is not None:
+        body = body_file.read_text()
     with client_for(state_of(ctx)) as dg:
         created = dg.call(
             dg.alerts.create_rule(
@@ -459,6 +469,7 @@ def alerts_rules_create(
                 pipeline=pipeline,
                 connection=connection,
                 template=template,
+                body=body,
                 throttle=throttle,
             )
         )
@@ -471,6 +482,8 @@ def alerts_rules_create(
         scope=created.pipeline or created.scope.value,
         notifier=created.notifier,
         connection=created.connection,
+        template=created.template is not None,
+        body=created.body is not None,
         throttle=created.throttle,
     )