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

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

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

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

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

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

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

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

@@ -32,7 +32,6 @@ from dirigent_cli.local import (
 from dirigent_cli.output import (
     Detail,
     age,
-    configure,
     console,
     elapsed,
     emit_event,
@@ -510,10 +509,6 @@ def init_command(
 
     from dirigent_core.auth import MIN_PASSWORD_LENGTH, WeakPassword
 
-    state = state_of(ctx)
-    # Run once by a person at a terminal, so it renders unless records were asked for.
-    if not state.chosen:
-        configure(output="console")
     root = directory.resolve()
     version = cli_version()
     unasked = template is None and service is None and pack is None and not workflow
@@ -1523,7 +1518,7 @@ def log_events(entries: list[LogEntryOut], labels: dict[UUID, str] | None = None
 
 def print_events(events: list[WatchEvent], level: Detail = Detail.SUMMARY, *, out: Sink | None = None) -> None:
     """Write transitions and log lines in the order they happened."""
-    writer = out or Sink()
+    writer = out or Sink(output_mode())
     for when, _, subject, label in sorted(events, key=lambda event: (event[0], event[1])):
         if isinstance(subject, LogEntryOut):
             if subject.level is LogLevel.DEBUG and level is not Detail.FULL:
@@ -2365,7 +2360,7 @@ def workers_command(
 def system_info(
     ctx: typer.Context,
 ) -> None:
-    """Describe the instance, and check every connection it holds."""
+    """Describe the instance, and repeat what each connection said when it was last checked."""
     with client_for(state_of(ctx)) as dg:
         info = dg.call(dg.system.info())
     if state_of(ctx).json_output:
@@ -2388,9 +2383,16 @@ def system_info(
         console.print()
         table(
             "connections",
-            ["code", "name", "kind", "connected", "detail"],
+            ["code", "name", "kind", "last check", "healthy", "detail"],
             [
-                [row.code, row.name or "-", row.kind, render_bool(row.connected), row.detail or "-"]
+                [
+                    row.code,
+                    row.name or "-",
+                    row.kind,
+                    moment(row.last_check_at),
+                    render_bool(row.last_check_healthy),
+                    row.last_check_detail or "-",
+                ]
                 for row in info.connections
             ],
         )

{dirigent_cli-0.10.2 → dirigent_cli-0.12.0}/src/dirigent_cli/context.py

@@ -40,13 +40,6 @@ class CliState(BaseModel):
     debug_all: bool = False
     output: Format = "json"
 
-    chosen: bool = False
-    """Whether a flag or the environment named the output, rather than it being the default.
-
-    A command run once by a person -- ``dg init`` -- renders unless it was asked for records,
-    and it can only tell the difference if the default is distinguishable from a choice.
-    """
-
     @property
     def json_output(self) -> bool:
         """Report whether this invocation writes records rather than a rendering."""

{dirigent_cli-0.10.2 → dirigent_cli-0.12.0}/src/dirigent_cli/main.py

@@ -7,7 +7,7 @@ from collections.abc import Sequence
 from datetime import UTC, datetime, timedelta
 from importlib.metadata import PackageNotFoundError, version
 from pathlib import Path
-from typing import TYPE_CHECKING, Annotated, Any, cast
+from typing import TYPE_CHECKING, Annotated, Any, TextIO, cast
 
 import typer
 from pydantic import ValidationError
@@ -23,7 +23,7 @@ from dirigent_client.enums import UserRole
 from dirigent_core import migrations
 from dirigent_core.config import STATE_DIR, Settings, get_settings, redacted_url, reset_settings_cache
 from dirigent_core.logging import LOG_FORMAT_ENV, configure_logging, silence_stdout
-from dirigent_core.protocol import FORMATS, Format, Record, as_json, make
+from dirigent_core.protocol import FORMATS, Format, Record, make
 from dirigent_core.telemetry import configure_telemetry
 
 if TYPE_CHECKING:
@@ -158,22 +158,22 @@ def main_callback(
         verbose=verbose,
         debug=debug,
         debug_all=debug_all,
-        output=_output_format(output, json_output=json_output),
-        chosen=output is not None or json_output or LOG_FORMAT_ENV in os.environ,
+        output=resolve_output(output, json_output=json_output),
     )
     ctx.obj.configure_output()
 
 
-def _output_format(named: str | None, *, json_output: bool) -> Format:
-    """Resolve the output: the flag, then the environment, then NDJSON.
+def resolve_output(named: str | None, *, json_output: bool) -> Format:
+    """Resolve the output: the flag, then the environment, then the terminal.
 
     ``--json`` is the same request as ``--output json``, and the environment is where a
-    container says it once. NDJSON is what an unasked invocation writes, so what a command
-    emits does not depend on who happens to be reading it; ``-o console`` renders it.
+    container says it once. Unasked, a terminal gets the rendering and anything else gets
+    NDJSON: a pipe, a container's log, an agent's shell and CI are never terminals, so a
+    script reads records without asking, and a person reads lines without asking.
     """
     chosen = named or ("json" if json_output else None) or os.environ.get(LOG_FORMAT_ENV)
     if chosen is None:
-        return "json"
+        return "console" if sys.stdout.isatty() else "json"
     resolved = chosen.lower()
     if resolved not in FORMATS:
         # The output that was asked for is exactly what is missing, so the refusal is written
@@ -643,7 +643,7 @@ def server(
         os.environ[UI_ENV] = "true" if ui else "false"
         reset_settings_cache()
     settings = get_settings()
-    configure_logging(_level(ctx, settings), "json", cap_foreign=_cap_foreign(ctx), stream=sys.stdout)
+    _process_logging(_level(ctx, settings), cap_foreign=_cap_foreign(ctx))
     if settings.is_sqlite and settings.scheduler_enabled:
         refuse(
             "dg server embeds the scheduler, and leadership is a PostgreSQL advisory lock: on SQLite "
@@ -687,7 +687,7 @@ def docker_reap(
     from dirigent_cli.stream import Sink
 
     settings = get_settings()
-    configure_logging(_level(ctx, settings), "json", cap_foreign=_cap_foreign(ctx), stream=sys.stderr)
+    _process_logging(_level(ctx, settings), cap_foreign=_cap_foreign(ctx), stream=sys.stderr)
     if not reaper.reachable():
         refuse(
             "docker is not on this host's PATH, so there is no daemon to reap stacks from",
@@ -830,11 +830,9 @@ def dev(
     settings = get_settings()
     # A developer convenience starts its own logging at WARNING and -v is what asks for more,
     # while a named DIRIGENT_LOG_LEVEL still wins.
-    configure_logging(
+    _process_logging(
         state.level if state is not None else "WARNING",
-        "json",
         cap_foreign=state is None or not state.debug_all,
-        stream=sys.stdout,
     )
     if not settings.is_sqlite:
         refuse(
@@ -919,18 +917,39 @@ def dev_started(
 
 
 def emit(record: Record) -> None:
-    """Write one record to the stream and flush it: a reader is waiting on this line.
+    """Write one record to the stream in this invocation's output, and flush it.
 
     A reader that has gone ends the stream rather than the process: the pipe is closed and
     every later write goes to the void, while shutdown runs to completion.
     """
+    from dirigent_cli.output import output_mode
+    from dirigent_cli.stream import Sink
+
     try:
-        sys.stdout.write(f"{as_json(record)}\n")
-        sys.stdout.flush()
+        Sink(output_mode()).write(record)
     except BrokenPipeError:
         silence_stdout()
 
 
+def _process_logging(level: str, *, cap_foreign: bool, stream: TextIO | None = None) -> None:
+    """Point a process's logging at its stream, in this invocation's output.
+
+    The console grammar is the one records are rendered in, so a process read at a terminal
+    is one stream of lines, and a process read by a pipe is one stream of records.
+    """
+    from dirigent_cli.output import output_mode
+    from dirigent_cli.stream import ansi
+
+    mode = output_mode()
+    configure_logging(
+        level,
+        mode,
+        cap_foreign=cap_foreign,
+        stream=stream if stream is not None else sys.stdout,
+        paint=ansi if mode == "console" else None,
+    )
+
+
 async def dev_admin(settings: Settings) -> tuple[str | None, str | None]:
     """Name the admin to log in as, and mint it a token where one is owed.
 
@@ -1007,7 +1026,7 @@ def worker(
     import asyncio
 
     settings = get_settings()
-    configure_logging(_level(ctx, settings), "json", cap_foreign=_cap_foreign(ctx), stream=sys.stdout)
+    _process_logging(_level(ctx, settings), cap_foreign=_cap_foreign(ctx))
     configure_telemetry(settings)
     if settings.is_sqlite:
         refuse(
@@ -1042,7 +1061,7 @@ def scheduler_command(ctx: typer.Context) -> None:
     import asyncio
 
     settings = get_settings()
-    configure_logging(_level(ctx, settings), "json", cap_foreign=_cap_foreign(ctx), stream=sys.stdout)
+    _process_logging(_level(ctx, settings), cap_foreign=_cap_foreign(ctx))
     configure_telemetry(settings)
     if settings.is_sqlite:
         refuse(

{dirigent_cli-0.10.2 → dirigent_cli-0.12.0}/src/dirigent_cli/summaries.py

@@ -217,7 +217,11 @@ def _kept(record: Record) -> list[RenderableType]:
 
 
 def _issued(record: Record) -> RenderableType | None:
-    """Hand over a minted token: the form it is used in, and that it is shown once."""
+    """Hand over a minted token: the form it is used in, and that it is shown once.
+
+    A login's ``token.issued`` and ``dg dev``'s ``starting`` both carry one exactly once; a
+    process record without a token, ``ready`` or ``state cleared``, is its line alone.
+    """
     token = record.get("token")
     if not token:
         return None
@@ -404,6 +408,7 @@ RENDERERS: Final[Mapping[str, Callable[[Record], RenderableType | None]]] = {
     "validation": _validation,
     "error": _refusal,
     "token.issued": _issued,
+    "process": _issued,
     "project.scaffolded": _scaffolded,
     "instance.initialised": _initialised,
 }