loom-kernel 6.0.1__tar.gz → 6.0.2__tar.gz

{loom_kernel-6.0.1 → loom_kernel-6.0.2}/CHANGELOG.md

@@ -928,6 +928,14 @@
   `Explode` inside a Router branch fail compilation with
   `ROUTER_BRANCH_UNSAFE_NODE`. Such flows compiled and raised `TypeError` when
   the branch ran.
+- **streaming:** a `Router` requires a record stream. A batch reaching a
+  `Router`, such as after a `CollectBatch`, fails compilation with
+  `SHAPE_MISMATCH` before `Router`. Such flows compiled and raised
+  `TypeError` at the Router when a batch arrived.
+- **streaming:** `ROUTER_BRANCH_SHAPE_DIVERGENCE` reads "messages continuing
+  after the router have different shapes: ...", since the unmatched input of
+  a `Router` without a default takes part in the check. It read "router
+  branches produce different shapes: ...".
 - **streaming:** `SinkPartition.write_batch` and `close` return an `int`: how
   many of the oldest events not yet reported durable they made durable, `0`
   when they only buffered. A custom `IntoSink` partition must report it: a
@@ -1351,6 +1359,14 @@
   consumed again from the recovery snapshot or, without one, from the last
   committed offset; inside `With` or `WithAsync` the message becomes an error
   envelope.
+- **streaming:** a `Router` branch that ends its path in `IntoTopic`,
+  `IntoSink` or `Drain` no longer takes part in the branch shape check, and a
+  `Router` reports the shape of the messages that continue after it: the
+  output of the branches that do not end their path and, without a default
+  branch, the unmatched input. A `Router` with an `IntoTopic` branch and a
+  `Drain` default failed with `ROUTER_BRANCH_SHAPE_DIVERGENCE`, and a step
+  after a `Router` without a default whose branches all end their path failed
+  with `SHAPE_MISMATCH`; both compile now.
 
 ### prefect
 

{loom_kernel-6.0.1 → loom_kernel-6.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: loom-kernel
-Version: 6.0.1
+Version: 6.0.2
 Summary: Loom Python project
 License-File: LICENSE
 Classifier: Programming Language :: Python :: 3

{loom_kernel-6.0.1 → loom_kernel-6.0.2}/src/loom/streaming/compiler/_errors.py

@@ -116,7 +116,10 @@ class StreamingErrorCode(IssueCode):
     )
     ROUTER_BRANCH_SHAPE_DIVERGENCE = (
         "ROUTER_BRANCH_SHAPE_DIVERGENCE",
-        Template("router branches produce different shapes: {shapes}", component="router"),
+        Template(
+            "messages continuing after the router have different shapes: {shapes}",
+            component="router",
+        ),
     )
     OUTPUT_WITH_FORK = (
         "OUTPUT_WITH_FORK",

{loom_kernel-6.0.1 → loom_kernel-6.0.2}/src/loom/streaming/compiler/phases/validate.py

@@ -22,6 +22,7 @@ from loom.streaming.mongo import MongoConfig
 from loom.streaming.nodes._boundary import FromMultiTypeTopic, FromTopic, IntoTopic
 from loom.streaming.nodes._branches import (
     PATH_END_NODE_TYPES,
+    branch_ends_path,
     is_branching_node,
     iter_branches,
     router_ends_every_path,
@@ -350,7 +351,7 @@ def _validate_shape_node(
     if isinstance(node, ExpandRoutes):
         return _validate_expand_routes_node(node, idx, node_list)
     if isinstance(node, Router):
-        router_errors, next_shape = _validate_router_shapes(node, current_shape)
+        router_errors, next_shape = _validate_router_shapes(node, StreamShape.RECORD)
         if router_ends_every_path(node):
             not_last = StreamingErrorCode.TERMINAL_NOT_LAST.issue(component=type(node).__name__)
             router_errors.extend(_must_be_last_errors(idx, node_list, not_last))
@@ -519,10 +520,16 @@ def _validate_router_shapes(
     router: Router[StreamPayload, StreamPayload],
     initial_shape: StreamShape,
 ) -> tuple[list[CompilationIssue], StreamShape]:
+    """Validate *router*'s branches and return the shape of the messages that continue.
+
+    Those are the outputs of the branches that do not end their path and, without
+    a default branch, the unmatched input; only they must agree on one shape.
+    """
     errors: list[CompilationIssue] = []
-    outputs: list[StreamShape] = []
+    outputs: dict[StreamShape, None] = {} if router.default is not None else {initial_shape: None}
 
-    for label, nodes in _labelled_branch_nodes(router):
+    for branch in iter_branches(router):
+        label, nodes = branch.label, branch.nodes
         branch_errors, branch_output = _validate_router_branch_shape_sequence(nodes, initial_shape)
         errors.extend(_prefixed(issue, f"router branch {label}") for issue in branch_errors)
         for node in nodes:
@@ -538,14 +545,14 @@ def _validate_router_shapes(
                         label=label, node=type(node).__name__
                     )
                 )
-        outputs.append(branch_output)
+        if not branch_ends_path(branch):
+            outputs[branch_output] = None
 
-    unique_outputs = set(outputs)
-    if len(unique_outputs) > 1:
-        shapes = {shape.value for shape in unique_outputs}
+    if len(outputs) > 1:
+        shapes = {shape.value for shape in outputs}
         errors.append(StreamingErrorCode.ROUTER_BRANCH_SHAPE_DIVERGENCE.issue(shapes=shapes))
 
-    return errors, outputs[0] if outputs else initial_shape
+    return errors, next(iter(outputs), StreamShape.NONE)
 
 
 def _labelled_branch_nodes(node: object) -> Iterable[tuple[str, tuple[object, ...]]]:
@@ -656,6 +663,8 @@ def _node_input_shape(node: object) -> StreamShape | None:
         return None
     if isinstance(node, Fork):
         return None
+    if isinstance(node, Router):
+        return StreamShape.RECORD
     return None