dirigent-block-execute 0.17.3__tar.gz → 0.18.0__tar.gz

{dirigent_block_execute-0.17.3 → dirigent_block_execute-0.18.0}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: dirigent-block-execute
-Version: 0.17.3
+Version: 0.18.0
 Summary: The execute block family for dirigent: shell, docker, compose, buildx, and a checkout.
 License-Expression: LicenseRef-Proprietary
 License-File: LICENSE
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: dirigent-block-http==0.17.3
-Requires-Dist: dirigent-common==0.17.3
-Requires-Dist: dirigent-plugin==0.17.3
+Requires-Dist: dirigent-block-http==0.18.0
+Requires-Dist: dirigent-common==0.18.0
+Requires-Dist: dirigent-plugin==0.18.0
 Requires-Dist: httpx2>=2.12.0
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown

{dirigent_block_execute-0.17.3 → dirigent_block_execute-0.18.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-block-execute"
-version = "0.17.3"
+version = "0.18.0"
 description = "The execute block family for dirigent: shell, docker, compose, buildx, and a checkout."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -11,9 +11,9 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "dirigent-block-http==0.17.3",
-    "dirigent-common==0.17.3",
-    "dirigent-plugin==0.17.3",
+    "dirigent-block-http==0.18.0",
+    "dirigent-common==0.18.0",
+    "dirigent-plugin==0.18.0",
     "httpx2>=2.12.0",
 ]
 

{dirigent_block_execute-0.17.3 → dirigent_block_execute-0.18.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-block-execute"
-version = "0.17.3"
+version = "0.18.0"
 description = "The execute block family for dirigent: shell, docker, compose, buildx, and a checkout."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -11,9 +11,9 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "dirigent-block-http==0.17.3",
-    "dirigent-common==0.17.3",
-    "dirigent-plugin==0.17.3",
+    "dirigent-block-http==0.18.0",
+    "dirigent-common==0.18.0",
+    "dirigent-plugin==0.18.0",
     "httpx2>=2.12.0",
 ]
 

{dirigent_block_execute-0.17.3 → dirigent_block_execute-0.18.0}/src/dirigent_block_execute/compose.py

@@ -141,10 +141,9 @@ class DockerComposeUpConfig(BlockModel):
     pipeline document itself."""
 
     project_name: str | None = None
-    """The compose project (``-p``). Defaults to a deterministic name derived from the run id,
-
-    so this ``up``, the steps that drive it, and a later ``down`` all address the same project,
-    and two runs never collide."""
+    """The compose project (``-p``). Defaults to a deterministic name derived from the run id, so
+    this ``up``, the steps that drive it, and a later ``down`` all address the same project, and
+    two runs never collide."""
 
     profiles: list[str] = Field(default_factory=list[str])
     """Compose profiles to activate (``--profile``)."""
@@ -213,13 +212,11 @@ class DockerComposeDownConfig(BlockModel):
 
     project_name: str | None = None
     """The compose project (``-p``). Defaults to the same deterministic name ``up`` derives from
-
-    the run id, so a teardown step in the same run addresses the stack the ``up`` created with
-    no wiring from the author."""
+    the run id, so a teardown step in the same run addresses the stack the ``up`` created with no
+    wiring from the author."""
 
     file: str | None = None
     """A compose file, only if the CLI needs ``-f`` to resolve the project; a project tears down
-
     by its label alone otherwise. As a path inside the run's work directory."""
 
     content: str | None = None

{dirigent_block_execute-0.17.3 → dirigent_block_execute-0.18.0}/src/dirigent_block_execute/docker.py

@@ -109,8 +109,8 @@ NOT_FOUND = 404
 CONFLICT = 409
 
 
-#: The schemes a daemon URL may be written in, which are the ones the docker CLI accepts.
-DAEMON_SCHEMES = ("tcp://", "ssh://", "unix://")
+#: The schemes a daemon URL may be written in, which are the ones the worker speaks.
+DAEMON_SCHEMES = ("tcp://", "unix://")
 
 #: What a registry credential that names no registry authenticates to.
 DOCKER_HUB = "docker.io"
@@ -123,7 +123,7 @@ class DockerConnectionConfig(BlockModel):
     """A daemon to reach, a registry to authenticate to, or both."""
 
     host: str = ""
-    """The daemon, as ``tcp://host:2376``, ``ssh://user@host`` or ``unix:///var/run/docker.sock``.
+    """The daemon, as ``tcp://host:2376`` or ``unix:///var/run/docker.sock``.
 
     Left empty, a step using this connection reaches the daemon the worker's own environment
     names, which is what a step naming no connection does."""
@@ -157,7 +157,7 @@ class DockerConnectionConfig(BlockModel):
     def _check_shape(self) -> "DockerConnectionConfig":
         """Refuse a daemon URL of an unknown form, half a TLS triple, and half a credential."""
         if self.host and not self.host.startswith(DAEMON_SCHEMES):
-            raise ValueError(NOT_A_DAEMON_SCHEME.render(schemes=", ".join(DAEMON_SCHEMES), host=repr(self.host)))
+            raise ValueError(NOT_A_DAEMON_SCHEME.render(schemes=" or ".join(DAEMON_SCHEMES), host=repr(self.host)))
         pems = [self.tls_ca, self.tls_cert, self.tls_key]
         if any(pem is not None for pem in pems) and not all(pem is not None for pem in pems):
             raise ValueError(TLS_IS_ALL_THREE.render())
@@ -493,6 +493,7 @@ class DockerRunOutput(BlockModel):
     """What the container did, with its full streams and produced files addressable as artifacts."""
 
     exit_code: int
+    """The status the container exited with."""
 
     stdout: str
     """The head of what the container printed, cut at the instance's inline capture size.
@@ -521,7 +522,11 @@ class DockerRunOutput(BlockModel):
     """Whether ``stderr`` above is short of the stream, which is an independent question."""
 
     container_id: str
+    """The container that ran, by the id the daemon gave it."""
+
     image: str
+    """The image the container ran."""
+
     outputs: dict[str, str] = Field(default_factory=dict[str, str])
     """Where each declared output was written, by the name the config gave it: the storage URI,
     or the path relative to the run's work directory it landed at."""
@@ -1148,6 +1153,9 @@ def resolve_endpoint(explicit_socket: str | None, environ: Mapping[str, str] | N
     pipeline's containers off the host. ``DOCKER_TLS_VERIFY`` with ``DOCKER_CERT_PATH`` turns
     that into https with client certificates, the way the docker CLI reads the same variables.
 
+    A ``DOCKER_HOST`` in any other scheme is refused instead of resolving to the local socket:
+    the daemon is reached over HTTP here, and nothing tunnels an ``ssh://`` one.
+
     ``environ`` is what a step with a ``docker`` connection reads instead of the worker's own.
     """
     source = os.environ if environ is None else environ
@@ -1168,6 +1176,13 @@ def resolve_endpoint(explicit_socket: str | None, environ: Mapping[str, str] | N
     if host.startswith("unix://"):
         socket = host.removeprefix("unix://") or DEFAULT_SOCKET_PATH
         return DaemonEndpoint(DAEMON_BASE_URL, socket, True, None, socket)
+    if host:
+        raise BlockFailure(
+            NOT_A_DAEMON_SCHEME,
+            error_class=ErrorClass.REJECTED,
+            schemes=" or ".join(DAEMON_SCHEMES),
+            host=repr(host),
+        )
     return DaemonEndpoint(DAEMON_BASE_URL, DEFAULT_SOCKET_PATH, True, None, DEFAULT_SOCKET_PATH)
 
 

{dirigent_block_execute-0.17.3 → dirigent_block_execute-0.18.0}/src/dirigent_block_execute/messages.py

@@ -125,7 +125,7 @@ CWD_STAYS_INSIDE = EXECUTE.define(
 
 NOT_A_DAEMON_SCHEME = EXECUTE.define(
     "not_a_daemon_scheme",
-    "a docker host is one of {schemes}, and {host} is none of them",
+    "a docker host is {schemes}, and {host} is not one of them",
 )
 
 TLS_IS_ALL_THREE = EXECUTE.define(

{dirigent_block_execute-0.17.3 → dirigent_block_execute-0.18.0}/src/dirigent_block_execute/shell.py

@@ -77,6 +77,7 @@ class ShellRunOutput(BlockModel):
     """What the command did, with its full streams addressable as artifacts."""
 
     exit_code: int
+    """The status the command exited with."""
 
     stdout: str
     """The head of what the command printed, cut at the instance's inline capture size.