dirigent-cli 0.18.2__tar.gz → 0.18.4__tar.gz

{dirigent_cli-0.18.2 → dirigent_cli-0.18.4}/PKG-INFO

@@ -1,19 +1,19 @@
 Metadata-Version: 2.4
 Name: dirigent-cli
-Version: 0.18.2
+Version: 0.18.4
 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.18.2
-Requires-Dist: dirigent-blocks==0.18.2
-Requires-Dist: dirigent-client==0.18.2
-Requires-Dist: dirigent-common==0.18.2
-Requires-Dist: dirigent-core==0.18.2
-Requires-Dist: dirigent-examples==0.18.2
-Requires-Dist: dirigent-plugin==0.18.2
-Requires-Dist: dirigent-server==0.18.2
+Requires-Dist: dirigent-block-execute==0.18.4
+Requires-Dist: dirigent-blocks==0.18.4
+Requires-Dist: dirigent-client==0.18.4
+Requires-Dist: dirigent-common==0.18.4
+Requires-Dist: dirigent-core==0.18.4
+Requires-Dist: dirigent-examples==0.18.4
+Requires-Dist: dirigent-plugin==0.18.4
+Requires-Dist: dirigent-server==0.18.4
 Requires-Dist: httpx2>=2.12.0
 Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: pyyaml>=6.0.3

{dirigent_cli-0.18.2 → dirigent_cli-0.18.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-cli"
-version = "0.18.2"
+version = "0.18.4"
 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.18.2",
-    "dirigent-blocks==0.18.2",
-    "dirigent-client==0.18.2",
-    "dirigent-common==0.18.2",
-    "dirigent-core==0.18.2",
-    "dirigent-examples==0.18.2",
-    "dirigent-plugin==0.18.2",
-    "dirigent-server==0.18.2",
+    "dirigent-block-execute==0.18.4",
+    "dirigent-blocks==0.18.4",
+    "dirigent-client==0.18.4",
+    "dirigent-common==0.18.4",
+    "dirigent-core==0.18.4",
+    "dirigent-examples==0.18.4",
+    "dirigent-plugin==0.18.4",
+    "dirigent-server==0.18.4",
     "httpx2>=2.12.0",
     "python-dotenv>=1.1.0",
     "pyyaml>=6.0.3",

{dirigent_cli-0.18.2 → dirigent_cli-0.18.4}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-cli"
-version = "0.18.2"
+version = "0.18.4"
 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.18.2",
-    "dirigent-blocks==0.18.2",
-    "dirigent-client==0.18.2",
-    "dirigent-common==0.18.2",
-    "dirigent-core==0.18.2",
-    "dirigent-examples==0.18.2",
-    "dirigent-plugin==0.18.2",
-    "dirigent-server==0.18.2",
+    "dirigent-block-execute==0.18.4",
+    "dirigent-blocks==0.18.4",
+    "dirigent-client==0.18.4",
+    "dirigent-common==0.18.4",
+    "dirigent-core==0.18.4",
+    "dirigent-examples==0.18.4",
+    "dirigent-plugin==0.18.4",
+    "dirigent-server==0.18.4",
     "httpx2>=2.12.0",
     "python-dotenv>=1.1.0",
     "pyyaml>=6.0.3",

{dirigent_cli-0.18.2 → dirigent_cli-0.18.4}/src/dirigent_cli/main.py

@@ -39,6 +39,8 @@ from dirigent_cli.messages import (
     RUN_DB_UPGRADE,
     SCHEDULER_NEEDS_POSTGRES,
     SERVER_NEEDS_A_LEADER,
+    STORE_UNCONFIGURED,
+    STORE_UNREACHABLE,
     UNKNOWN_CONNECTION_KIND,
     USE_DG_DEV,
     USE_DG_DEV_STANDALONE,
@@ -67,6 +69,7 @@ if TYPE_CHECKING:
     from dirigent_core import retention
     from dirigent_core.migrations import SchemaDifference
     from dirigent_core.worker import Worker
+    from dirigent_plugin import ContainerResult
 
 #: Help is capped rather than stretched: a panel the width of a wide terminal is unreadable.
 rich_utils.MAX_WIDTH = 100
@@ -112,6 +115,7 @@ app = typer.Typer(
 
 db_app = typer.Typer(name="db", help="Database schema management.", no_args_is_help=True)
 config_app = typer.Typer(name="config", help="Inspect the effective configuration.", no_args_is_help=True)
+storage_app = typer.Typer(name="storage", help="The store this instance keeps artifacts in.", no_args_is_help=True)
 health_app = typer.Typer(name="health", help="Process-side checks: everything this host runs, or one part.")
 docker_app = typer.Typer(name="docker", help="The docker daemon this host's worker uses.", no_args_is_help=True)
 
@@ -127,6 +131,7 @@ app.add_typer(triggers.trigger_document_app, rich_help_panel=TRIGGER_PANEL)
 app.add_typer(triggers.alerts_app, rich_help_panel=TRIGGER_PANEL)
 app.add_typer(docker_app, rich_help_panel=PROCESS_PANEL)
 app.add_typer(db_app, rich_help_panel=ADMIN_PANEL)
+app.add_typer(storage_app, rich_help_panel=ADMIN_PANEL)
 app.add_typer(config_app, rich_help_panel=ADMIN_PANEL)
 app.add_typer(commands.auth_app, rich_help_panel=ADMIN_PANEL)
 commands.system_app.add_typer(health_app)
@@ -357,6 +362,50 @@ def db_history() -> None:
     emit_fact("db.history", message="migration history", history=migrations.history(get_settings()).rstrip())
 
 
+@storage_app.command("ensure")
+def storage_ensure() -> None:
+    """Create the container the artifact root addresses, unless it is already there.
+
+    Process-side the way ``dg db upgrade`` is: it reads the artifact root and the connection
+    this instance configures that scheme from rather than a token, so a one-shot container
+    makes the bucket before anything writes to it. A root on a filesystem has no container to
+    make, and says so.
+    """
+    import asyncio
+
+    settings = get_settings()
+    made = asyncio.run(_ensure_container(settings))
+    emit_fact(
+        "storage.ensured",
+        message="created" if made.created else "already there" if made.container else "nothing to do",
+        root=settings.artifact_root,
+        bucket=made.container,
+        created=made.created,
+        endpoint=made.endpoint,
+    )
+
+
+async def _ensure_container(settings: Settings) -> "ContainerResult":
+    """Ask the backend the artifact root belongs to for its container, on this instance's connection."""
+    from dirigent_core.database import create_engine, create_session_factory, session_scope
+    from dirigent_core.engine.services import EngineServices
+    from dirigent_core.errors import DomainError
+    from dirigent_core.plugins import load_plugin_host
+
+    services = EngineServices.build(settings, load_plugin_host())
+    engine = create_engine(settings)
+    try:
+        async with session_scope(create_session_factory(engine)) as session:
+            storage = await services.bound_storage(session)
+            return await storage.ensure_container(settings.artifact_root)
+    except DomainError as error:
+        commands.fail(STORE_UNCONFIGURED, root=settings.artifact_root, detail=str(error))
+    except Exception as error:
+        commands.fail(STORE_UNREACHABLE, root=settings.artifact_root, detail=f"{type(error).__name__}: {error}")
+    finally:
+        await engine.dispose()
+
+
 @commands.connection_app.command("ensure")
 def connection_ensure(
     kind_id: Annotated[str, typer.Argument(metavar="KIND", help="The connection kind, such as s3.")],

{dirigent_cli-0.18.2 → dirigent_cli-0.18.4}/src/dirigent_cli/messages.py

@@ -55,6 +55,10 @@ NO_DOCKER_DAEMON = CLI.define(
 
 AUTH_REFUSED = CLI.define("auth_refused", "{detail}")
 
+STORE_UNREACHABLE = CLI.define("store_unreachable", "the store behind {root} did not answer: {detail}")
+
+STORE_UNCONFIGURED = CLI.define("store_unconfigured", "{root} cannot be reached from this instance: {detail}")
+
 DEV_IS_SQLITE_ONLY = CLI.define("dev_is_sqlite_only", "dg dev is the SQLite standalone mode")
 
 USE_DG_SERVER = CLI.define("use_dg_server", "use dg server on PostgreSQL")

{dirigent_cli-0.18.2 → dirigent_cli-0.18.4}/src/dirigent_cli/project.py

@@ -355,8 +355,8 @@ COMPOSE_ARTIFACTS_VOLUME = """\
 """
 
 COMPOSE_DEPENDS_S3 = """\
-    s3-bucket:
-      condition: service_completed_successfully
+    s3:
+      condition: service_healthy
 """
 
 COMPOSE_MIGRATE = """\
@@ -373,13 +373,14 @@ __MIGRATE_S3____MIGRATE_BROKERS__    environment:
 __MIGRATE_ENV__    depends_on:
       postgres:
         condition: service_healthy
-
+__MIGRATE_DEPENDS__
 """
 
 COMPOSE_MIGRATE_S3_WHAT = """, and ensures the connection the artifact root resolves
-  # through. That is a row, and a container has no API token, so `dg connection ensure`
-  # writes it process-side and seals its secret half with the instance key, exactly as the
-  # API would. Re-running the stack brings the row to whatever the environment now says."""
+  # through, and then the bucket that root addresses. That connection is a row, and a
+  # container has no API token, so `dg connection ensure` writes it process-side and seals
+  # its secret half with the instance key, exactly as the API would. Re-running the stack
+  # brings the row to whatever the environment now says."""
 
 COMPOSE_MIGRATE_KAFKA = """\
         dg connection ensure kafka kafka \\
@@ -410,6 +411,12 @@ COMPOSE_MIGRATE_S3 = """\
           --set access_key_id="$$S3_ACCESS_KEY" \\
           --set secret_access_key="$$S3_SECRET_KEY" \\
           --set path_style=true
+        dg storage ensure
+"""
+
+COMPOSE_MIGRATE_DEPENDS_S3 = """\
+      s3:
+        condition: service_healthy
 """
 
 COMPOSE_MIGRATE_ENV_S3 = """\
@@ -442,22 +449,6 @@ COMPOSE_S3 = """\
       retries: 30
       start_period: 5s
 
-  # The bucket has to exist before a run writes to it, and nothing else creates it.
-  s3-bucket:
-    image: quay.io/minio/mc:RELEASE.2025-04-16T18-13-26Z
-    depends_on:
-      s3:
-        condition: service_healthy
-    entrypoint: ["/bin/sh", "-ec"]
-    command:
-      - |
-        mc alias set fs http://s3:9000 "$$S3_ACCESS_KEY" "$$S3_SECRET_KEY"
-        mc mb --ignore-existing "fs/$$S3_BUCKET"
-    environment:
-      S3_ACCESS_KEY: ${S3_ACCESS_KEY:-dirigent}
-      S3_SECRET_KEY: ${S3_SECRET_KEY:-dirigent}
-      S3_BUCKET: ${S3_BUCKET:-dirigent}
-
 """
 
 COMPOSE_SERVER = """\
@@ -637,7 +628,7 @@ COMPOSE_WORKER_DOCKER_VOLUMES = """\
 """
 
 COMPOSE_DEPENDS = {
-    "s3": "      s3-bucket:\n        condition: service_completed_successfully\n",
+    "s3": "      s3:\n        condition: service_healthy\n",
     "docker": "      docker:\n        condition: service_healthy\n",
     "kafka": "      kafka-topic:\n        condition: service_completed_successfully\n",
     "rabbitmq": "      rabbitmq-queue:\n        condition: service_completed_successfully\n",
@@ -671,7 +662,8 @@ def compose_document(choices: InitChoices, version: str) -> str:
         .replace(
             "__MIGRATE_ENV__",
             (COMPOSE_MIGRATE_ENV_S3 if s3 else "") + (COMPOSE_MIGRATE_ENV_RABBITMQ if choices.has("rabbitmq") else ""),
-        ),
+        )
+        .replace("__MIGRATE_DEPENDS__", COMPOSE_MIGRATE_DEPENDS_S3 if s3 else ""),
         COMPOSE_S3 if s3 else "",
         COMPOSE_SERVER.replace("__ARTIFACTS_MOUNT__", artifacts_mount),
         COMPOSE_DOCKER if docker else "",