dirigent-core 0.26.1__tar.gz → 0.27.0__tar.gz

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirigent-core
-Version: 0.26.1
+Version: 0.27.0
 Summary: Dirigent engine core: schema, configuration, and plugin host.
 License-Expression: LicenseRef-Proprietary
 License-File: LICENSE
@@ -12,9 +12,9 @@ Requires-Dist: argon2-cffi>=25.1.0
 Requires-Dist: asyncpg>=0.31.0
 Requires-Dist: cronsim>=2.7
 Requires-Dist: cryptography>=46.0.5
-Requires-Dist: dirigent-client==0.26.1
-Requires-Dist: dirigent-common==0.26.1
-Requires-Dist: dirigent-plugin==0.26.1
+Requires-Dist: dirigent-client==0.27.0
+Requires-Dist: dirigent-common==0.27.0
+Requires-Dist: dirigent-plugin==0.27.0
 Requires-Dist: jsonschema>=4.26.0
 Requires-Dist: opentelemetry-api>=1.44.0
 Requires-Dist: pydantic-settings>=2.15.0

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-core"
-version = "0.26.1"
+version = "0.27.0"
 description = "Dirigent engine core: schema, configuration, and plugin host."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -17,9 +17,9 @@ dependencies = [
     "asyncpg>=0.31.0",
     "cronsim>=2.7",
     "cryptography>=46.0.5",
-    "dirigent-client==0.26.1",
-    "dirigent-common==0.26.1",
-    "dirigent-plugin==0.26.1",
+    "dirigent-client==0.27.0",
+    "dirigent-common==0.27.0",
+    "dirigent-plugin==0.27.0",
     "jsonschema>=4.26.0",
     "opentelemetry-api>=1.44.0",
     "pydantic-settings>=2.15.0",

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-core"
-version = "0.26.1"
+version = "0.27.0"
 description = "Dirigent engine core: schema, configuration, and plugin host."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -17,9 +17,9 @@ dependencies = [
     "asyncpg>=0.31.0",
     "cronsim>=2.7",
     "cryptography>=46.0.5",
-    "dirigent-client==0.26.1",
-    "dirigent-common==0.26.1",
-    "dirigent-plugin==0.26.1",
+    "dirigent-client==0.27.0",
+    "dirigent-common==0.27.0",
+    "dirigent-plugin==0.27.0",
     "jsonschema>=4.26.0",
     "opentelemetry-api>=1.44.0",
     "pydantic-settings>=2.15.0",

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/src/dirigent_core/alembic/versions/0001_baseline_schema.py

@@ -438,113 +438,6 @@ def upgrade() -> None:
         batch_op.create_index(batch_op.f("ix_schedules_pipeline_id"), ["pipeline_id"], unique=False)
         batch_op.create_index(batch_op.f("ix_schedules_trigger_document_id"), ["trigger_document_id"], unique=False)
 
-    op.create_table(
-        "webhook_triggers",
-        sa.Column("id", sa.Uuid(), nullable=False),
-        sa.Column("pipeline_id", sa.Uuid(), nullable=False),
-        sa.Column("code", sa.String(length=200), nullable=False),
-        sa.Column("name", sa.String(length=200), nullable=True),
-        sa.Column("description", sa.Text(), nullable=True),
-        sa.Column("token_hash", sa.String(length=128), nullable=False),
-        sa.Column("token_prefix", sa.String(length=16), server_default="", nullable=False),
-        sa.Column("hmac_secret", sa.LargeBinary(), nullable=True),
-        sa.Column("hmac_secret_key_id", sa.String(length=100), nullable=True),
-        sa.Column(
-            "params_from_payload",
-            sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"),
-            nullable=False,
-        ),
-        sa.Column(
-            "priority",
-            sa.Enum("low", "normal", "high", name="run_priority", native_enum=False, length=32),
-            nullable=True,
-        ),
-        sa.Column("managed", sa.Boolean(), server_default=sa.false(), nullable=False),
-        sa.Column("trigger_document_id", sa.Uuid(), nullable=True),
-        sa.Column("active", sa.Boolean(), server_default=sa.true(), nullable=False),
-        sa.Column("rate_limit_per_minute", sa.Integer(), server_default=sa.text("60"), nullable=False),
-        sa.Column("last_delivery_at", dirigent_core.types.UtcDateTime(timezone=True), nullable=True),
-        sa.Column(
-            "created_at",
-            dirigent_core.types.UtcDateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.Column(
-            "updated_at",
-            dirigent_core.types.UtcDateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.ForeignKeyConstraint(
-            ["pipeline_id"],
-            ["pipelines.id"],
-            name=op.f("fk_webhook_triggers_pipeline_id_pipelines"),
-            ondelete="CASCADE",
-        ),
-        sa.ForeignKeyConstraint(
-            ["trigger_document_id"],
-            ["trigger_documents.id"],
-            name=op.f("fk_webhook_triggers_trigger_document_id_trigger_documents"),
-            ondelete="CASCADE",
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_webhook_triggers")),
-        sa.UniqueConstraint("pipeline_id", "code", name=op.f("uq_webhook_triggers_pipeline_id_code")),
-        sa.UniqueConstraint("token_hash", name=op.f("uq_webhook_triggers_token_hash")),
-    )
-    with op.batch_alter_table("webhook_triggers", schema=None) as batch_op:
-        batch_op.create_index(batch_op.f("ix_webhook_triggers_pipeline_id"), ["pipeline_id"], unique=False)
-        batch_op.create_index(
-            batch_op.f("ix_webhook_triggers_trigger_document_id"), ["trigger_document_id"], unique=False
-        )
-
-    op.create_table(
-        "watches",
-        sa.Column("id", sa.Uuid(), nullable=False),
-        sa.Column("pipeline_id", sa.Uuid(), nullable=False),
-        sa.Column("code", sa.String(length=200), nullable=False),
-        sa.Column("name", sa.String(length=200), nullable=True),
-        sa.Column("description", sa.Text(), nullable=True),
-        sa.Column("step", sa.String(length=200), nullable=False),
-        sa.Column("params", sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"), nullable=False),
-        sa.Column("managed", sa.Boolean(), server_default=sa.false(), nullable=False),
-        sa.Column("trigger_document_id", sa.Uuid(), nullable=True),
-        sa.Column("paused", sa.Boolean(), server_default=sa.false(), nullable=False),
-        sa.Column("cursor", sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"), nullable=True),
-        sa.Column("waiting_run_id", sa.Uuid(), nullable=True),
-        sa.Column("failures", sa.Integer(), server_default=sa.text("0"), nullable=False),
-        sa.Column("last_error", sa.Text(), nullable=True),
-        sa.Column("last_error_at", dirigent_core.types.UtcDateTime(timezone=True), nullable=True),
-        sa.Column("rearm_at", dirigent_core.types.UtcDateTime(timezone=True), nullable=True),
-        sa.Column("last_armed_at", dirigent_core.types.UtcDateTime(timezone=True), nullable=True),
-        sa.Column(
-            "created_at",
-            dirigent_core.types.UtcDateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.Column(
-            "updated_at",
-            dirigent_core.types.UtcDateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.ForeignKeyConstraint(
-            ["pipeline_id"], ["pipelines.id"], name=op.f("fk_watches_pipeline_id_pipelines"), ondelete="CASCADE"
-        ),
-        sa.ForeignKeyConstraint(
-            ["trigger_document_id"],
-            ["trigger_documents.id"],
-            name=op.f("fk_watches_trigger_document_id_trigger_documents"),
-            ondelete="CASCADE",
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_watches")),
-        sa.UniqueConstraint("pipeline_id", "code", name=op.f("uq_watches_pipeline_id_code")),
-    )
-    with op.batch_alter_table("watches", schema=None) as batch_op:
-        batch_op.create_index(batch_op.f("ix_watches_pipeline_id"), ["pipeline_id"], unique=False)
-        batch_op.create_index(batch_op.f("ix_watches_trigger_document_id"), ["trigger_document_id"], unique=False)
-
     op.create_table(
         "sources",
         sa.Column("id", sa.Uuid(), nullable=False),
@@ -556,10 +449,20 @@ def upgrade() -> None:
         sa.Column("config", sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"), nullable=False),
         sa.Column("token_hash", sa.String(length=128), nullable=True),
         sa.Column("token_prefix", sa.String(length=16), nullable=True),
+        sa.Column("signing_secret", sa.LargeBinary(), nullable=True),
+        sa.Column("signing_key_id", sa.String(length=64), nullable=True),
         sa.Column("paused", sa.Boolean(), server_default=sa.false(), nullable=False),
         sa.Column("accepted", sa.Integer(), server_default=sa.text("0"), nullable=False),
         sa.Column("refused", sa.Integer(), server_default=sa.text("0"), nullable=False),
         sa.Column("last_input_at", dirigent_core.types.UtcDateTime(timezone=True), nullable=True),
+        sa.Column("next_poll_at", dirigent_core.types.UtcDateTime(timezone=True), nullable=True),
+        sa.Column("polled_at", dirigent_core.types.UtcDateTime(timezone=True), nullable=True),
+        sa.Column("cursor", sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"), nullable=True),
+        sa.Column("cursor_for", sa.String(length=71), nullable=True),
+        sa.Column("lease_owner", sa.String(length=200), nullable=True),
+        sa.Column("lease_expires_at", dirigent_core.types.UtcDateTime(timezone=True), nullable=True),
+        sa.Column("failures", sa.Integer(), server_default=sa.text("0"), nullable=False),
+        sa.Column("last_error", sa.Text(), nullable=True),
         sa.Column(
             "created_at",
             dirigent_core.types.UtcDateTime(timezone=True),
@@ -580,6 +483,7 @@ def upgrade() -> None:
         sa.UniqueConstraint("token_hash", name=op.f("uq_sources_token_hash")),
     )
     with op.batch_alter_table("sources", schema=None) as batch_op:
+        batch_op.create_index(batch_op.f("ix_sources_next_poll_at"), ["next_poll_at"], unique=False)
         batch_op.create_index(batch_op.f("ix_sources_pipeline_id"), ["pipeline_id"], unique=False)
 
     op.create_table(
@@ -642,12 +546,10 @@ def upgrade() -> None:
             sa.Enum(
                 "adhoc",
                 "schedule",
-                "webhook",
                 "api_token",
                 "user",
                 "pipeline",
                 "backfill",
-                "watch",
                 name="trigger_kind",
                 native_enum=False,
                 length=32,
@@ -868,43 +770,6 @@ def upgrade() -> None:
         batch_op.create_index("ix_schedule_firings_created_at", ["created_at"], unique=False)
         batch_op.create_index("ix_schedule_firings_schedule_id_id", ["schedule_id", "id"], unique=False)
 
-    op.create_table(
-        "webhook_deliveries",
-        sa.Column("id", sa.BigInteger().with_variant(sa.Integer(), "sqlite"), autoincrement=True, nullable=False),
-        sa.Column("webhook_id", sa.Uuid(), nullable=False),
-        sa.Column("run_id", sa.Uuid(), nullable=True),
-        sa.Column(
-            "created_at",
-            dirigent_core.types.UtcDateTime(timezone=True),
-            server_default=sa.func.now(),
-            nullable=False,
-        ),
-        sa.Column(
-            "outcome",
-            sa.Enum("accepted", "skipped", "rejected", name="webhook_outcome", native_enum=False, length=32),
-            nullable=False,
-        ),
-        sa.Column("reason", sa.Text(), nullable=True),
-        sa.Column("payload", sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"), nullable=True),
-        sa.Column(
-            "mapped_params", sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"), nullable=True
-        ),
-        sa.Column("source", sa.String(length=64), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["run_id"], ["runs.id"], name=op.f("fk_webhook_deliveries_run_id_runs"), ondelete="SET NULL"
-        ),
-        sa.ForeignKeyConstraint(
-            ["webhook_id"],
-            ["webhook_triggers.id"],
-            name=op.f("fk_webhook_deliveries_webhook_id_webhook_triggers"),
-            ondelete="CASCADE",
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_webhook_deliveries")),
-    )
-    with op.batch_alter_table("webhook_deliveries", schema=None) as batch_op:
-        batch_op.create_index("ix_webhook_deliveries_created_at", ["created_at"], unique=False)
-        batch_op.create_index("ix_webhook_deliveries_webhook_id_id", ["webhook_id", "id"], unique=False)
-
     op.create_table(
         "source_inputs",
         sa.Column("id", sa.BigInteger().with_variant(sa.Integer(), "sqlite"), autoincrement=True, nullable=False),
@@ -912,15 +777,16 @@ def upgrade() -> None:
         sa.Column("run_id", sa.Uuid(), nullable=True),
         sa.Column(
             "outcome",
-            sa.Enum("accepted", "refused", name="input_outcome", native_enum=False, length=32),
+            sa.Enum("accepted", "replied", "refused", "timed_out", name="input_outcome", native_enum=False, length=32),
             nullable=False,
         ),
-        sa.Column("status", sa.Integer(), nullable=False),
+        sa.Column("status", sa.Integer(), nullable=True),
         sa.Column("code", sa.String(length=128), nullable=True),
         sa.Column("reason", sa.Text(), nullable=True),
         sa.Column("params", sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"), nullable=True),
-        sa.Column("method", sa.String(length=16), nullable=False),
-        sa.Column("path", sa.String(length=2000), nullable=False),
+        sa.Column("method", sa.String(length=16), nullable=True),
+        sa.Column("path", sa.String(length=2000), nullable=True),
+        sa.Column("label", sa.String(length=2000), nullable=True),
         sa.Column("body_bytes", sa.Integer(), server_default=sa.text("0"), nullable=False),
         sa.Column("duration_ms", sa.Integer(), server_default=sa.text("0"), nullable=False),
         sa.Column("caller", sa.String(length=64), nullable=True),
@@ -1133,11 +999,6 @@ def downgrade() -> None:
         batch_op.drop_index("ix_step_attempts_lease_expires_at")
 
     op.drop_table("step_attempts")
-    with op.batch_alter_table("webhook_deliveries", schema=None) as batch_op:
-        batch_op.drop_index("ix_webhook_deliveries_webhook_id_id")
-        batch_op.drop_index("ix_webhook_deliveries_created_at")
-
-    op.drop_table("webhook_deliveries")
     with op.batch_alter_table("source_inputs", schema=None) as batch_op:
         batch_op.drop_index("ix_source_inputs_source_id_id")
         batch_op.drop_index("ix_source_inputs_created_at")
@@ -1167,11 +1028,6 @@ def downgrade() -> None:
         batch_op.drop_index("ix_runs_finished_at")
 
     op.drop_table("runs")
-    with op.batch_alter_table("watches", schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f("ix_watches_trigger_document_id"))
-        batch_op.drop_index(batch_op.f("ix_watches_pipeline_id"))
-
-    op.drop_table("watches")
     with op.batch_alter_table("source_routes", schema=None) as batch_op:
         batch_op.drop_index(batch_op.f("ix_source_routes_source_id"))
 
@@ -1180,11 +1036,6 @@ def downgrade() -> None:
         batch_op.drop_index(batch_op.f("ix_sources_pipeline_id"))
 
     op.drop_table("sources")
-    with op.batch_alter_table("webhook_triggers", schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f("ix_webhook_triggers_trigger_document_id"))
-        batch_op.drop_index(batch_op.f("ix_webhook_triggers_pipeline_id"))
-
-    op.drop_table("webhook_triggers")
     with op.batch_alter_table("schedules", schema=None) as batch_op:
         batch_op.drop_index(batch_op.f("ix_schedules_trigger_document_id"))
         batch_op.drop_index(batch_op.f("ix_schedules_pipeline_id"))

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/src/dirigent_core/blockdocs.py

@@ -24,7 +24,7 @@ builds forms from -- so it cannot drift from the code: a field added to a block
 up here or fails the build.
 
 What a block is, and the contract behind these tables, is in
-[the design document](design.md#2-the-six-plugin-surfaces). The short version:
+[the design document](design.md#2-the-seven-plugin-surfaces). The short version:
 
 - An **operator** does work. It either finishes and returns its output, or hands back a
   handle for the engine to probe, which is how a step waits for an hour without holding a
@@ -50,11 +50,11 @@ Two properties are worth reading before a block is used:
 
 SURFACES_PREAMBLE: Final = """## Other surfaces
 
-Blocks are two of the six surfaces a plugin contributes to. Three of the other four -- storage
-backends, notifiers and connection kinds -- are listed here by id, since a document references
-them by code and never by id of any other kind. The sixth, a JSON Schema format checker, is in
-[JSON Schema](json-schema.md). Source kinds, which a source node names as ``source.kind``, are
-listed after them; see [Source and reply](concepts.md#source-and-reply).
+Blocks are two of the seven surfaces a plugin contributes to. Storage backends, notifiers and
+connection kinds are listed here by id, since a document references them by code and never by
+id of any other kind. Source kinds, which a source node names as ``source.kind``, are listed
+after them; see [Source and reply](concepts.md#source-and-reply). The seventh, a JSON Schema
+format checker, is in [JSON Schema](json-schema.md).
 """
 
 NO_DESCRIPTION: Final = "--"

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/src/dirigent_core/config.py

@@ -287,9 +287,6 @@ class Settings(BaseSettings):
     retention_logs: Duration | None = None
     """How long a log entry is kept, for runs too young to be pruned themselves."""
 
-    retention_deliveries: Duration | None = None
-    """How long a webhook delivery is kept."""
-
     retention_inputs: Duration | None = None
     """How long the record of an input that reached a source is kept."""
 
@@ -326,12 +323,6 @@ class Settings(BaseSettings):
     scheduler_lock_key: int = Field(default=0x64_69_72_67)
     """The advisory-lock key leadership is taken on; only PostgreSQL has one to take."""
 
-    watch_backoff: Duration = Field(default=timedelta(seconds=5), gt=timedelta(0))
-    """How long a watch waits before arming again after its sensor failed; later failures double it."""
-
-    watch_backoff_max: Duration = Field(default=timedelta(minutes=5), gt=timedelta(0))
-    """The longest a watch backs off, however many waits in a row have failed."""
-
     apply_dir: Path | None = None
     """A directory of pipeline documents the server applies at boot; unset applies nothing."""
 
@@ -350,14 +341,6 @@ class Settings(BaseSettings):
     notification_lease: Duration = Field(default=timedelta(seconds=60), ge=timedelta(seconds=5))
     """How long a claimed notification's lease is valid before another worker may take it."""
 
-    webhook_max_payload: Size = Field(default=1_048_576, ge=1)
-    """The largest body the webhook intake will read; reading stops one byte past it."""
-
-    webhook_intake_rate_per_minute: int = Field(default=120, ge=1)
-    """How fast one *offered* token may deliver, before anything is looked up.
-
-    A real webhook's own ``rate_limit_per_minute`` applies on top of this."""
-
     endpoint_prefix: str = "/endpoints"
     """Where endpoint sources are served, outside the versioned API.
 
@@ -380,8 +363,34 @@ class Settings(BaseSettings):
 
     A call past it is answered 503 before its run is created."""
 
+    source_max_waiting_per_source: int = Field(default=64, ge=1)
+    """How many of those callers one source may hold, so one slow pipeline cannot take every seat.
+
+    A call past it is answered 503 before its run is created."""
+
     source_reply_poll: Duration = Field(default=timedelta(milliseconds=50), gt=timedelta(0))
-    """How often one server process reads the replies its held callers wait for, in one query."""
+    """The least time between two reads of the replies one server process's held callers wait for."""
+
+    source_poll_tick: Duration = Field(default=timedelta(seconds=5), gt=timedelta(0))
+    """How often a worker looks for polled sources that are due."""
+
+    source_poll_lease: Duration = Field(default=timedelta(minutes=5), gt=timedelta(0))
+    """How long a worker holds a worker-hosted source without renewing; another may take it once this passes."""
+
+    source_poll_batch: int = Field(default=100, ge=1)
+    """The most inputs one poll may hand over, before the source's own ``max_in_flight``."""
+
+    source_held_max: int = Field(default=16, ge=1)
+    """How many held sources, such as queue consumers, one worker keeps open at once."""
+
+    source_hold_wait: Duration = Field(default=timedelta(seconds=1), gt=timedelta(0))
+    """How long a held source's consumer waits for a message before the worker checks on it."""
+
+    source_backoff: Duration = Field(default=timedelta(seconds=30), gt=timedelta(0))
+    """How long a polled source waits after a failed poll; later failures double it."""
+
+    source_backoff_max: Duration = Field(default=timedelta(minutes=30), gt=timedelta(0))
+    """The longest a polled source backs off, however many polls in a row have failed."""
 
     login_rate_per_minute: int = Field(default=10, ge=1)
     """How many login attempts one address, and one username, get a minute.

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/src/dirigent_core/directory.py

@@ -109,8 +109,8 @@ async def prune_absent(
     The narrowing is by the CURRENT version's provenance: what a directory applied last, a
     directory may take away. Deactivation pauses nothing retroactively beyond what
     deactivation always means, and history survives untouched. A triggers document has no
-    history worth keeping, so it is deleted instead, and the cascade takes the schedules and
-    webhooks it owned -- never the pipeline's own inline ones. A schema is never pruned.
+    history worth keeping, so it is deleted instead, and the cascade takes the schedules
+    it owned -- never the pipeline's own inline ones. A schema is never pruned.
     """
     rows = await session.execute(
         sa.select(Pipeline.code)
@@ -132,7 +132,7 @@ async def prune_absent(
     documents = await delete_absent_trigger_documents(session, services, keep, dry_run=dry_run)
     if not dry_run:
         for code in absent:
-            await set_active(session, services, code, active=False)
+            await set_active(session, code, active=False)
     return PruneResult(pruned=absent, trigger_documents_removed=documents, dry_run=dry_run)
 
 

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/src/dirigent_core/documents.py

@@ -13,14 +13,13 @@ from jsonschema.exceptions import SchemaError
 from jsonschema.validators import extend as extend_validator  # pyright: ignore[reportUnknownVariableType]
 from pydantic import BaseModel, ConfigDict, Field, JsonValue, ValidationError
 
-from dirigent_client.schemas import BlockKind, Catalog, ValidationIssue
+from dirigent_client.schemas import Catalog, ValidationIssue
 from dirigent_common import STORAGE_URI_FORMAT, Issue, JsonMap, Message, base_format_checker, validation_issue
 from dirigent_core.engine.definition import (
     FORMAT_V1,
     KIND_PIPELINE,
     KIND_TRIGGERS,
     Document,
-    ParameterError,
     PipelineDefinition,
     TriggerRule,
     TriggersDefinition,
@@ -75,8 +74,6 @@ from dirigent_core.messages import (
     TARGET_PIPELINE_INACTIVE,
     TARGET_PIPELINE_MISSING,
     UNKNOWN_DOCUMENT_KIND,
-    WATCH_PARAMS_REFUSED,
-    WEBHOOK_MAPPING_REFUSED,
     WORKER_TAGS_MISSING,
     WRONG_DOCUMENT_KIND,
     WRONG_FORMAT,
@@ -392,10 +389,9 @@ def validate_against_catalog(
 
     kinds = source_kinds if source_kinds is not None else built_in_kinds()
     checker = format_checker if format_checker is not None else base_format_checker()
-    sensors = _sensors(catalog) if check_blocks else None
     if isinstance(definition, TriggersDefinition):
         return _triggers_document_issues(
-            definition, checker, target, check_target=check_blocks and pipelines is not None, sensors=sensors
+            definition, checker, target, check_target=check_blocks and pipelines is not None
         )
     # A document that brings its own connections or schemas satisfies its own references to them.
     known = None if connections is None else {name for name in connections} | set(definition.connections)
@@ -417,7 +413,7 @@ def validate_against_catalog(
     issues.extend(malformed_params)
     issues.extend(_carried_schema_issues(definition))
     issues.extend(_reference_issues(definition))
-    issues.extend(_trigger_issues(definition, checker, check_params=not malformed_params, sensors=sensors))
+    issues.extend(_trigger_issues(definition, checker, check_params=not malformed_params))
     issues.extend(source_issues(definition, kinds))
     if check_blocks:
         issues.extend(
@@ -492,27 +488,19 @@ def _carried_schema_issues(definition: PipelineDefinition) -> list[ValidationIss
     return issues
 
 
-def _sensors(catalog: Catalog) -> frozenset[str]:
-    """Name the installed blocks that are sensors, which are the only ones a watch can wait on."""
-    return frozenset(entry.id for entry in catalog.blocks if entry.kind is BlockKind.SENSOR)
-
-
 def _trigger_issues(
     definition: Document,
     format_checker: FormatChecker,
     *,
     check_params: bool = True,
     against: PipelineDefinition | None = None,
-    sensors: frozenset[str] | None = None,
 ) -> list[ValidationIssue]:
     """Check the clocks a document declares, the parameters its triggers pin, and its mappings.
 
     ``check_params`` is off when the parameter schema is not itself a schema, which is already
     reported and would otherwise be reported again once per trigger. ``against`` is the
     definition whose parameter schema the pins and the mappings are checked against, which for
-    a triggers document is another document's current version, and whose steps a watch is
-    checked against. ``sensors`` names the installed sensors; unset, a watched step's block
-    is not checked.
+    a triggers document is another document's current version.
     """
     from dirigent_core.triggers.schedules import (
         ScheduleError,
@@ -520,7 +508,6 @@ def _trigger_issues(
         check_schedule,
         check_schedule_params,
     )
-    from dirigent_core.triggers.webhooks import WebhookError, check_webhook_mapping
 
     pins_against = against if against is not None else definition
     issues: list[ValidationIssue] = []
@@ -547,61 +534,6 @@ def _trigger_issues(
                     detail=str(error).strip(),
                 )
             )
-    if isinstance(pins_against, PipelineDefinition):
-        issues.extend(
-            _watch_issues(definition, pins_against, format_checker, check_params=check_params, sensors=sensors)
-        )
-    if not check_params or not isinstance(pins_against, PipelineDefinition):
-        return issues
-    for index, hook in enumerate(definition.triggers.webhooks):
-        try:
-            check_webhook_mapping(pins_against, hook.params_from_payload)
-        except WebhookError as error:
-            issues.append(
-                ValidationIssue.of(
-                    WEBHOOK_MAPPING_REFUSED,
-                    location=f"triggers.webhooks[{index}].params_from_payload",
-                    detail=str(error).strip(),
-                )
-            )
-    return issues
-
-
-def _watch_issues(
-    definition: Document,
-    against: PipelineDefinition,
-    format_checker: FormatChecker,
-    *,
-    check_params: bool,
-    sensors: frozenset[str] | None,
-) -> list[ValidationIssue]:
-    """Check that each watch waits on a root sensor step of the pipeline, with pins it accepts."""
-    from dirigent_core.triggers.watches import watch_issue
-
-    issues: list[ValidationIssue] = []
-    for index, watch in enumerate(definition.triggers.watches):
-        refusal = watch_issue(watch.code, watch.step, against, sensors)
-        if refusal is not None:
-            issues.append(
-                ValidationIssue(
-                    location=f"triggers.watches[{index}].step",
-                    message=refusal.message,
-                    code=refusal.code,
-                    params=refusal.params,
-                )
-            )
-        if not check_params:
-            continue
-        try:
-            against.validate_params(dict(watch.params), format_checker)
-        except ParameterError as error:
-            issues.append(
-                ValidationIssue.of(
-                    WATCH_PARAMS_REFUSED,
-                    location=f"triggers.watches[{index}].params",
-                    detail=str(error).strip(),
-                )
-            )
     return issues
 
 
@@ -611,7 +543,6 @@ def _triggers_document_issues(
     target: TriggerTarget | None,
     *,
     check_target: bool,
-    sensors: frozenset[str] | None = None,
 ) -> list[ValidationIssue]:
     """Check a triggers document: the pipeline it names, its clocks, and the pins they carry."""
     if not check_target:
@@ -624,7 +555,7 @@ def _triggers_document_issues(
         from dirigent_core.sources.rules import triggers_issues
 
         return triggers_issues(target.code, definition.triggers)
-    return _trigger_issues(definition, format_checker, against=target.definition, sensors=sensors)
+    return _trigger_issues(definition, format_checker, against=target.definition)
 
 
 def _requirement_issues(
@@ -1058,8 +989,6 @@ class DocumentSummary(BaseModel):
     steps: list[str] = Field(default_factory=list[str])
     blocks: list[str] = Field(default_factory=list[str])
     schedules: list[str] = Field(default_factory=list[str])
-    webhooks: list[str] = Field(default_factory=list[str])
-    watches: list[str] = Field(default_factory=list[str])
     digest: str
 
 
@@ -1081,7 +1010,5 @@ def summarize(definition: Document) -> DocumentSummary:
         steps=steps,
         blocks=blocks,
         schedules=[spec.code for spec in definition.triggers.schedules],
-        webhooks=[spec.code for spec in definition.triggers.webhooks],
-        watches=[spec.code for spec in definition.triggers.watches],
         digest=digest_of(definition),
     )

{dirigent_core-0.26.1 → dirigent_core-0.27.0}/src/dirigent_core/engine/__init__.py

@@ -24,7 +24,6 @@ from dirigent_core.engine.definition import (
     TriggerRule,
     TriggersDefinition,
     TriggerSpecs,
-    WebhookSpec,
     canonical_document,
     dump_definition,
     load_definition,
@@ -93,7 +92,6 @@ __all__ = [
     "TriggerSpecs",
     "TriggersDefinition",
     "UnknownReference",
-    "WebhookSpec",
     "advance",
     "aggregate_items",
     "backoff_delay",