dirigent-testing 0.26.1__tar.gz → 0.27.1__tar.gz

{dirigent_testing-0.26.1 → dirigent_testing-0.27.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: dirigent-testing
-Version: 0.26.1
+Version: 0.27.1
 Summary: Test doubles and pytest fixtures for writing and testing dirigent blocks.
 License-Expression: LicenseRef-Proprietary
 License-File: LICENSE
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: dirigent-common==0.26.1
-Requires-Dist: dirigent-plugin==0.26.1
+Requires-Dist: dirigent-common==0.27.1
+Requires-Dist: dirigent-plugin==0.27.1
 Requires-Dist: httpx2>=2.12.0
 Requires-Dist: pydantic>=2.13.5
 Requires-Dist: pytest>=9.1.1

{dirigent_testing-0.26.1 → dirigent_testing-0.27.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-testing"
-version = "0.26.1"
+version = "0.27.1"
 description = "Test doubles and pytest fixtures for writing and testing dirigent blocks."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -11,8 +11,8 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "dirigent-common==0.26.1",
-    "dirigent-plugin==0.26.1",
+    "dirigent-common==0.27.1",
+    "dirigent-plugin==0.27.1",
     "httpx2>=2.12.0",
     "pydantic>=2.13.5",
     "pytest>=9.1.1",

{dirigent_testing-0.26.1 → dirigent_testing-0.27.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "dirigent-testing"
-version = "0.26.1"
+version = "0.27.1"
 description = "Test doubles and pytest fixtures for writing and testing dirigent blocks."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -11,8 +11,8 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "dirigent-common==0.26.1",
-    "dirigent-plugin==0.26.1",
+    "dirigent-common==0.27.1",
+    "dirigent-plugin==0.27.1",
     "httpx2>=2.12.0",
     "pydantic>=2.13.5",
     "pytest>=9.1.1",

{dirigent_testing-0.26.1 → dirigent_testing-0.27.1}/src/dirigent_testing/__init__.py

@@ -4,7 +4,7 @@ from dirigent_testing.conformance import assert_contribution_conforms, check_pac
 from dirigent_testing.doubles import FakeCapture, FakeContext, FakeRuns, FakeSink, FakeStorage, RecordingLogger
 from dirigent_testing.environment import CONFIGURING_PREFIXES, TEST_WIDTH, pin_terminal, scrub_configuration
 from dirigent_testing.fixtures import no_connection_outlives_its_loop
-from dirigent_testing.running import call_block, carry_cursor
+from dirigent_testing.running import FakeReceiveContext, call_block, carry_cursor, receive_request
 from dirigent_testing.wording import check_pack_messages
 
 __all__ = [
@@ -12,6 +12,7 @@ __all__ = [
     "TEST_WIDTH",
     "FakeCapture",
     "FakeContext",
+    "FakeReceiveContext",
     "FakeRuns",
     "FakeSink",
     "FakeStorage",
@@ -23,5 +24,6 @@ __all__ = [
     "check_pack_messages",
     "no_connection_outlives_its_loop",
     "pin_terminal",
+    "receive_request",
     "scrub_configuration",
 ]

{dirigent_testing-0.26.1 → dirigent_testing-0.27.1}/src/dirigent_testing/conformance.py

@@ -19,7 +19,7 @@ import yaml
 from jsonschema import Draft202012Validator
 from jsonschema import ValidationError as SchemaValidationError
 from jsonschema.validators import extend as extend_validator  # pyright: ignore[reportUnknownVariableType]
-from pydantic import JsonValue
+from pydantic import BaseModel, JsonValue
 
 from dirigent_common import BlockModel, HumaneJsonSchema, JsonMap
 from dirigent_plugin import AnyOperator, AnySensor, Contribution, mark_refusal
@@ -191,10 +191,11 @@ def assert_contribution_conforms(contribution: Contribution) -> list[str]:
     A ``Contribution`` already rejects colliding ids when it is built, and a block id is a
     pattern that forbids an empty one, so a valid contribution passes those. This adds the
     check the contract cannot make on its own: that every operator's and sensor's
-    ``config_model`` and ``output_model`` is a :class:`BlockModel`. A connection kind's ``mark``
-    is checked through :func:`dirigent_plugin.mark_refusal`, which is what registration holds
-    it to, so a pack reads the same refusal here as it would at startup; a kind that declares
-    none passes. An empty list means the contribution conforms.
+    ``config_model`` and ``output_model`` is a :class:`BlockModel`, and every source kind's is a
+    pydantic model. A connection or source kind's ``mark`` is checked through
+    :func:`dirigent_plugin.mark_refusal`, which is what registration holds it to, so a pack
+    reads the same refusal here as it would at startup; a kind that declares none passes. An
+    empty list means the contribution conforms.
     """
     issues: list[str] = []
     seen: set[str] = set()
@@ -214,4 +215,13 @@ def assert_contribution_conforms(contribution: Contribution) -> list[str]:
         refusal = mark_refusal(connection.id, connection.mark)
         if refusal is not None:
             issues.append(refusal)
+    for source in contribution.sources:
+        kind = source.spec.kind
+        for role in ("config_model", "output_model"):
+            model = getattr(source, role, None)
+            if not (isinstance(model, type) and issubclass(model, BaseModel)):
+                issues.append(f"source kind {kind} {role} is not a pydantic model")
+        refusal = mark_refusal(kind, source.mark)
+        if refusal is not None:
+            issues.append(refusal)
     return issues

dirigent_testing-0.27.1/src/dirigent_testing/running.py

@@ -0,0 +1,81 @@
+"""Making one block call from a test, through the validation the engine puts in front of it."""
+
+from collections.abc import Mapping
+from typing import Any
+
+from jsonschema import FormatChecker
+from pydantic import BaseModel
+
+from dirigent_common.formats import base_format_checker
+from dirigent_plugin import AnyOperator, AnySensor, Logger, NotYet, Operator, StepContext
+from dirigent_plugin.sources import Ignore, InboundRequest, ReceivedSource, Refusal
+from dirigent_testing.doubles import FakeContext, RecordingLogger
+
+
+async def call_block(
+    block: AnyOperator | AnySensor,
+    config: Mapping[str, Any],
+    ctx: StepContext | FakeContext,
+) -> BaseModel:
+    """Validate the config the way the engine would, then make the block's first call.
+
+    An operator's execute or a sensor's poke, with the validated config -- so a test
+    exercises the same validation path a real run does, and a config the schema refuses
+    fails here rather than silently succeeding with defaults.
+    """
+    context = ctx.as_context() if isinstance(ctx, FakeContext) else ctx
+    validated = block.config_model.model_validate(config)
+    if isinstance(block, Operator):
+        return await block.execute(validated, context)
+    return await block.poke(validated, context)
+
+
+def carry_cursor(sensor: AnySensor, answer: BaseModel, ctx: FakeContext) -> None:
+    """Hand the next poke the cursor the engine would, after one poke answered this.
+
+    A park that returned a cursor replaces the one the context held, and one that returned
+    none leaves it. A success hands on what :meth:`Sensor.resume_cursor` says, as a
+    ``sensor`` source hands it to the poke that starts its next wait.
+    """
+    if isinstance(answer, NotYet):
+        if answer.cursor is not None:
+            ctx.cursor = dict(answer.cursor)
+        return
+    resumed = sensor.resume_cursor(answer)
+    ctx.cursor = dict(resumed) if resumed is not None else None
+
+
+class FakeReceiveContext:
+    """What a received kind may reach while it turns a request into an input, with its log kept."""
+
+    def __init__(self, format_checker: FormatChecker | None = None) -> None:
+        """Start with an empty log and the base format checker unless one is given."""
+        self.logger = RecordingLogger()
+        self._format_checker = format_checker or base_format_checker()
+
+    @property
+    def log(self) -> Logger:
+        """Where the kind says what it did with the request."""
+        return self.logger
+
+    @property
+    def format_checker(self) -> FormatChecker:
+        """The checker the kind's input is held to."""
+        return self._format_checker
+
+
+async def receive_request(
+    source: ReceivedSource[Any, Any],
+    config: Mapping[str, Any],
+    request: InboundRequest,
+    ctx: FakeReceiveContext | None = None,
+) -> BaseModel | Ignore | Refusal:
+    """Validate the config, then take a request the way the intake does: its head, then its body.
+
+    A refusal on the head alone is answered before the body is read, as the server answers it.
+    """
+    validated = source.config_model.model_validate(config)
+    refused = source.admit(validated, request)
+    if refused is not None:
+        return refused
+    return await source.receive(validated, request, ctx or FakeReceiveContext())

dirigent_testing-0.26.1/src/dirigent_testing/running.py

@@ -1,42 +0,0 @@
-"""Making one block call from a test, through the validation the engine puts in front of it."""
-
-from collections.abc import Mapping
-from typing import Any
-
-from pydantic import BaseModel
-
-from dirigent_plugin import AnyOperator, AnySensor, NotYet, Operator, StepContext
-from dirigent_testing.doubles import FakeContext
-
-
-async def call_block(
-    block: AnyOperator | AnySensor,
-    config: Mapping[str, Any],
-    ctx: StepContext | FakeContext,
-) -> BaseModel:
-    """Validate the config the way the engine would, then make the block's first call.
-
-    An operator's execute or a sensor's poke, with the validated config -- so a test
-    exercises the same validation path a real run does, and a config the schema refuses
-    fails here rather than silently succeeding with defaults.
-    """
-    context = ctx.as_context() if isinstance(ctx, FakeContext) else ctx
-    validated = block.config_model.model_validate(config)
-    if isinstance(block, Operator):
-        return await block.execute(validated, context)
-    return await block.poke(validated, context)
-
-
-def carry_cursor(sensor: AnySensor, answer: BaseModel, ctx: FakeContext) -> None:
-    """Hand the next poke the cursor the engine would, after one poke answered this.
-
-    A park that returned a cursor replaces the one the context held, and one that returned
-    none leaves it. A success hands on what :meth:`Sensor.resume_cursor` says, as a watch
-    hands it to the first poke of its next run.
-    """
-    if isinstance(answer, NotYet):
-        if answer.cursor is not None:
-            ctx.cursor = dict(answer.cursor)
-        return
-    resumed = sensor.resume_cursor(answer)
-    ctx.cursor = dict(resumed) if resumed is not None else None