lsst-pipe-base 29.2025.3400__py3-none-any.whl → 29.2025.3500__py3-none-any.whl

lsst/pipe/base/dot_tools.py

@@ -38,17 +38,12 @@ __all__ = ["graph2dot", "pipeline2dot"]
 # -------------------------------
 import html
 import io
-import re
 from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any
 
 # -----------------------------
 #  Imports for other modules --
 # -----------------------------
-from lsst.daf.butler import DatasetType, DimensionUniverse
-
-from . import connectionTypes
-from .connections import iterConnections
 from .pipeline import Pipeline
 
 if TYPE_CHECKING:
@@ -234,7 +229,7 @@ def pipeline2dot(pipeline: Pipeline | Iterable[TaskDef], file: Any) -> None:
 
     Parameters
     ----------
-    pipeline : `lsst.pipe.base.Pipeline`
+    pipeline : `.Pipeline` or `~collections.abc.Iterable` [ `.TaskDef` ]
         Pipeline description.
     file : `str` or file object
         File where GraphViz graph (DOT language) is written, can be a file name
@@ -247,30 +242,7 @@ def pipeline2dot(pipeline: Pipeline | Iterable[TaskDef], file: Any) -> None:
     ImportError
         Raised if the task class cannot be imported.
     """
-    universe = DimensionUniverse()
-
-    def expand_dimensions(connection: connectionTypes.BaseConnection) -> list[str]:
-        """Return expanded list of dimensions, with special skypix treatment.
-
-        Parameters
-        ----------
-        connection : `list` [`str`]
-            Connection to examine.
-
-        Returns
-        -------
-        dimensions : `list` [`str`]
-            Expanded list of dimensions.
-        """
-        dimension_set = set()
-        if isinstance(connection, connectionTypes.DimensionedConnection):
-            dimension_set = set(connection.dimensions)
-        skypix_dim = []
-        if "skypix" in dimension_set:
-            dimension_set.remove("skypix")
-            skypix_dim = ["skypix"]
-        dimensions = universe.conform(dimension_set)
-        return list(dimensions.names) + skypix_dim
+    from .pipeline_graph import PipelineGraph, visualization
 
     # open a file if needed
     close = False
@@ -278,76 +250,19 @@ def pipeline2dot(pipeline: Pipeline | Iterable[TaskDef], file: Any) -> None:
         file = open(file, "w")
         close = True
 
-    print("digraph Pipeline {", file=file)
-    _renderDefault("graph", _ATTRIBS["defaultGraph"], file)
-    _renderDefault("node", _ATTRIBS["defaultNode"], file)
-    _renderDefault("edge", _ATTRIBS["defaultEdge"], file)
-
-    allDatasets: set[str | tuple[str, str]] = set()
     if isinstance(pipeline, Pipeline):
-        # TODO: DM-40639 will rewrite this code and finish off the deprecation
-        # of toExpandedPipeline but for now use the compatibility API.
-        pipeline = pipeline.to_graph()._iter_task_defs()
-
-    # The next two lines are a workaround until DM-29658 at which time metadata
-    # connections should start working with the above code
-    labelToTaskName = {}
-    metadataNodesToLink = set()
-
-    for idx, taskDef in enumerate(sorted(pipeline, key=lambda x: x.label)):
-        # node for a task
-        taskNodeName = f"task{idx}"
-
-        # next line is workaround until DM-29658
-        labelToTaskName[taskDef.label] = taskNodeName
-
-        _renderTaskNode(taskNodeName, taskDef, file, None)
-
-        metadataRePattern = re.compile("^(.*)_metadata$")
-        for attr in sorted(iterConnections(taskDef.connections, "inputs"), key=lambda x: x.name):
-            if attr.name not in allDatasets:
-                dimensions = expand_dimensions(attr)
-                _renderDSTypeNode(attr.name, dimensions, file)
-                allDatasets.add(attr.name)
-            nodeName, component = DatasetType.splitDatasetTypeName(attr.name)
-            _renderEdge(attr.name, taskNodeName, file)
-            # connect component dataset types to the composite type that
-            # produced it
-            if component is not None and (nodeName, attr.name) not in allDatasets:
-                _renderEdge(nodeName, attr.name, file)
-                allDatasets.add((nodeName, attr.name))
-                if nodeName not in allDatasets:
-                    dimensions = expand_dimensions(attr)
-                    _renderDSTypeNode(nodeName, dimensions, file)
-            # The next if block is a workaround until DM-29658 at which time
-            # metadata connections should start working with the above code
-            if (match := metadataRePattern.match(attr.name)) is not None:
-                matchTaskLabel = match.group(1)
-                metadataNodesToLink.add((matchTaskLabel, attr.name))
-
-        for attr in sorted(iterConnections(taskDef.connections, "prerequisiteInputs"), key=lambda x: x.name):
-            if attr.name not in allDatasets:
-                dimensions = expand_dimensions(attr)
-                _renderDSTypeNode(attr.name, dimensions, file)
-                allDatasets.add(attr.name)
-            # use dashed line for prerequisite edges to distinguish them
-            _renderEdge(attr.name, taskNodeName, file, style="dashed")
-
-        for attr in sorted(iterConnections(taskDef.connections, "outputs"), key=lambda x: x.name):
-            if attr.name not in allDatasets:
-                dimensions = expand_dimensions(attr)
-                _renderDSTypeNode(attr.name, dimensions, file)
-                allDatasets.add(attr.name)
-            _renderEdge(taskNodeName, attr.name, file)
-
-    # This for loop is a workaround until DM-29658 at which time metadata
-    # connections should start working with the above code
-    for matchLabel, dsTypeName in metadataNodesToLink:
-        # only render an edge to metadata if the label is part of the current
-        # graph
-        if (result := labelToTaskName.get(matchLabel)) is not None:
-            _renderEdge(result, dsTypeName, file)
+        pg = pipeline.to_graph(visualization_only=True)
+    else:
+        pg = PipelineGraph()
+        for task_def in pipeline:
+            pg.add_task(
+                task_def.label,
+                task_class=task_def.taskClass,
+                config=task_def.config,
+                connections=task_def.connections,
+            )
+        pg.resolve(visualization_only=True)
+    visualization.show_dot(pg, stream=file, dataset_types=True)
 
-    print("}", file=file)
     if close:
         file.close()

lsst/pipe/base/graph/graph.py

@@ -191,10 +191,10 @@ class QuantumGraph:
         """
         # Save packages to metadata
         self._metadata = dict(metadata) if metadata is not None else {}
-        self._metadata["packages"] = Packages.fromSystem()
-        self._metadata["user"] = getpass.getuser()
-        self._metadata["time"] = f"{datetime.datetime.now()}"
-        self._metadata["full_command"] = " ".join(sys.argv)
+        self._metadata.setdefault("packages", Packages.fromSystem())
+        self._metadata.setdefault("user", getpass.getuser())
+        self._metadata.setdefault("time", f"{datetime.datetime.now()}")
+        self._metadata.setdefault("full_command", " ".join(sys.argv))
 
         self._buildId = _buildId if _buildId is not None else BuildId(f"{time.time()}-{os.getpid()}")
         # Data structure used to identify relations between

lsst/pipe/base/mermaid_tools.py

@@ -33,15 +33,9 @@ from __future__ import annotations
 
 __all__ = ["graph2mermaid", "pipeline2mermaid"]
 
-import html
-import re
 from collections.abc import Iterable
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
-from lsst.daf.butler import DatasetType, DimensionUniverse
-
-from . import connectionTypes
-from .connections import iterConnections
 from .pipeline import Pipeline
 
 if TYPE_CHECKING:
@@ -141,156 +135,6 @@ def graph2mermaid(qgraph: QuantumGraph, file: Any) -> None:
         file.close()
 
 
-def _expand_dimensions(dimension_list: set[str] | Iterable[str], universe: DimensionUniverse) -> list[str]:
-    """Return expanded list of dimensions, with special skypix treatment.
-
-    Parameters
-    ----------
-    dimension_set : `set` [`str`] or iterable of `str`
-        The original set of dimension names.
-    universe : DimensionUniverse
-        Used to conform the dimension set according to a known schema.
-
-    Returns
-    -------
-    dimensions : `list` [`str`]
-        Expanded list of dimensions.
-    """
-    dimension_set = set(dimension_list)
-    skypix_dim = []
-    if "skypix" in dimension_set:
-        dimension_set.remove("skypix")
-        skypix_dim = ["skypix"]
-    dimensions = universe.conform(dimension_set)
-    return list(dimensions.names) + skypix_dim
-
-
-def _format_dimensions(dims: list[str]) -> str:
-    """Format and sort dimension names as a comma-separated list inside curly
-    braces.
-
-    For example, if dims=["detector", "visit"], returns "{detector, visit}".
-
-    Parameters
-    ----------
-    dims : list of str
-        The dimension names to format and sort.
-
-    Returns
-    -------
-    str
-        The formatted dimension string, or an empty string if no dimensions.
-    """
-    if not dims:
-        return ""
-    sorted_dims = sorted(dims)
-    return "{" + ", ".join(sorted_dims) + "}"
-
-
-def _render_task_node(
-    task_id: str,
-    taskDef: TaskDef,
-    universe: DimensionUniverse,
-    file: Any,
-    show_dimensions: bool,
-    expand_dimensions: bool,
-) -> None:
-    """Render a single task node in the Mermaid diagram.
-
-    Parameters
-    ----------
-    task_id : str
-        Unique Mermaid node identifier for this task.
-    taskDef : TaskDef
-        The pipeline task definition, which includes the task label, task name,
-        and connections.
-    universe : DimensionUniverse
-        Used to conform and sort the task's dimensions.
-    file : file-like
-        The output file-like object to write the Mermaid node definition.
-    show_dimensions : bool
-        If True, display the task's dimensions after conforming them.
-    expand_dimensions : bool
-        If True, expand dimension names to include all components.
-    """
-    # Basic info: bold label, then task name.
-    lines = [
-        f"<b>{html.escape(taskDef.label)}</b>",
-        html.escape(taskDef.taskName),
-    ]
-
-    # If requested, display the task's conformed dimensions.
-    if show_dimensions and taskDef.connections and taskDef.connections.dimensions:
-        if expand_dimensions:
-            task_dims = _expand_dimensions(taskDef.connections.dimensions, universe)
-        else:
-            task_dims = list(taskDef.connections.dimensions)
-        if task_dims:
-            dim_str = _format_dimensions(task_dims)
-            lines.append(f"<i>dimensions:</i>&nbsp;{dim_str}")
-
-    # Join with <br> for line breaks and define the node with the label.
-    label = "<br>".join(lines)
-    print(f'{task_id}["{label}"]', file=file)
-    print(f"class {task_id} task;", file=file)
-
-
-def _render_dataset_node(
-    ds_id: str,
-    ds_name: str,
-    connection: connectionTypes.BaseConnection,
-    universe: DimensionUniverse,
-    file: Any,
-    show_dimensions: bool,
-    expand_dimensions: bool,
-    show_storage: bool,
-) -> None:
-    """Render a dataset-type node in the Mermaid diagram.
-
-    Parameters
-    ----------
-    ds_id : str
-        Unique Mermaid node identifier for this dataset.
-    ds_name : str
-        The dataset type name.
-    connection : BaseConnection
-        The dataset connection object, potentially dimensioned and having a
-        storage class.
-    universe : DimensionUniverse
-        Used to conform and sort the dataset's dimensions if it is dimensioned.
-    file : file-like
-        The output file-like object to write the Mermaid node definition.
-    show_dimensions : bool
-        If True, display the dataset's conformed dimensions.
-    expand_dimensions : bool
-        If True, expand dimension names to include all components.
-    show_storage : bool
-        If True, display the dataset's storage class if available.
-    """
-    # Start with the dataset name in bold.
-    lines = [f"<b>{html.escape(ds_name)}</b>"]
-
-    # If dimensioned and requested, show conformed dimensions.
-    ds_dims = []
-    if show_dimensions and isinstance(connection, connectionTypes.DimensionedConnection):
-        if expand_dimensions:
-            ds_dims = _expand_dimensions(connection.dimensions, universe)
-        else:
-            ds_dims = list(connection.dimensions)
-
-    if ds_dims:
-        dim_str = _format_dimensions(ds_dims)
-        lines.append(f"<i>dimensions:</i>&nbsp;{dim_str}")
-
-    # If storage class is available and requested, display it.
-    if show_storage and getattr(connection, "storageClass", None) is not None:
-        lines.append(f"<i>storage&nbsp;class:</i>&nbsp;{html.escape(str(connection.storageClass))}")
-
-    label = "<br>".join(lines)
-    print(f'{ds_id}["{label}"]', file=file)
-    print(f"class {ds_id} ds;", file=file)
-
-
 def pipeline2mermaid(
     pipeline: Pipeline | Iterable[TaskDef],
     file: Any,
@@ -329,7 +173,7 @@ def pipeline2mermaid(
     ImportError
         Raised if the task class cannot be imported.
     """
-    universe = DimensionUniverse()
+    from .pipeline_graph import PipelineGraph, visualization
 
     # Ensure that pipeline is iterable of task definitions.
     if isinstance(pipeline, Pipeline):
@@ -341,154 +185,29 @@ def pipeline2mermaid(
         file = open(file, "w")
         close = True
 
-    # Begin the Mermaid code block with top-down layout.
-    print("flowchart TD", file=file)
+    if isinstance(pipeline, Pipeline):
+        pg = pipeline.to_graph(visualization_only=True)
+    else:
+        pg = PipelineGraph()
+        for task_def in pipeline:
+            pg.add_task(
+                task_def.label,
+                task_class=task_def.taskClass,
+                config=task_def.config,
+                connections=task_def.connections,
+            )
+        pg.resolve(visualization_only=True)
+
+    dimensions: Literal["full", "concise"] | None = None
+    if show_dimensions:
+        if expand_dimensions:
+            dimensions = "full"
+        else:
+            dimensions = "concise"
 
-    # Define classes for tasks and datasets.
-    print(
-        "classDef task fill:#B1F2EF,color:#000,stroke:#000,stroke-width:3px,"
-        "font-family:Monospace,font-size:14px,text-align:left;",
-        file=file,
+    visualization.show_mermaid(
+        pg, stream=file, dataset_types=True, dimensions=dimensions, storage_classes=show_storage
     )
-    print(
-        "classDef ds fill:#F5F5F5,color:#000,stroke:#00BABC,stroke-width:3px,"
-        "font-family:Monospace,font-size:14px,text-align:left,rx:10,ry:10;",
-        file=file,
-    )
-
-    # Track which datasets have been rendered to avoid duplicates.
-    allDatasets: set[str | tuple[str, str]] = set()
-
-    # Used for linking metadata datasets after tasks are processed.
-    labelToTaskName = {}
-    metadataNodesToLink = set()
-
-    # We'll store edges as (from_node, to_node, is_prerequisite) tuples.
-    edges: list[tuple[str, str, bool]] = []
-
-    def get_task_id(idx: int) -> str:
-        """Generate a safe Mermaid node ID for a task.
-
-        Parameters
-        ----------
-        idx : `int`
-            Task index.
-
-        Returns
-        -------
-        id : `str`
-            Node ID for a task.
-        """
-        return f"TASK_{idx}"
-
-    def get_dataset_id(name: str) -> str:
-        """Generate a safe Mermaid node ID for a dataset.
-
-        Parameters
-        ----------
-        name : `str`
-            Dataset name.
-
-        Returns
-        -------
-        id : `str`
-            Node ID for the dataset.
-        """
-        # Replace non-alphanumerics with underscores.
-        return "DATASET_" + re.sub(r"[^0-9A-Za-z_]", "_", name)
-
-    metadata_pattern = re.compile(r"^(.*)_metadata$")
-
-    # Sort tasks by label for consistent diagram ordering.
-    pipeline_tasks = sorted(pipeline, key=lambda x: x.label)
-
-    # Process each task and its connections.
-    for idx, taskDef in enumerate(pipeline_tasks):
-        task_id = get_task_id(idx)
-        labelToTaskName[taskDef.label] = task_id
-
-        # Render the task node.
-        _render_task_node(task_id, taskDef, universe, file, show_dimensions, expand_dimensions)
-
-        # Handle standard inputs (non-prerequisite).
-        for attr in sorted(iterConnections(taskDef.connections, "inputs"), key=lambda x: x.name):
-            ds_id = get_dataset_id(attr.name)
-            if attr.name not in allDatasets:
-                _render_dataset_node(
-                    ds_id, attr.name, attr, universe, file, show_dimensions, expand_dimensions, show_storage
-                )
-                allDatasets.add(attr.name)
-            edges.append((ds_id, task_id, False))
-
-            # Handle component datasets (composite -> component).
-            nodeName, component = DatasetType.splitDatasetTypeName(attr.name)
-            if component is not None and (nodeName, attr.name) not in allDatasets:
-                ds_id_parent = get_dataset_id(nodeName)
-                if nodeName not in allDatasets:
-                    _render_dataset_node(
-                        ds_id_parent,
-                        nodeName,
-                        attr,
-                        universe,
-                        file,
-                        show_dimensions,
-                        expand_dimensions,
-                        show_storage,
-                    )
-                    allDatasets.add(nodeName)
-                edges.append((ds_id_parent, ds_id, False))
-                allDatasets.add((nodeName, attr.name))
-
-            # If this is a metadata dataset, record it for linking later.
-            if (match := metadata_pattern.match(attr.name)) is not None:
-                matchTaskLabel = match.group(1)
-                metadataNodesToLink.add((matchTaskLabel, attr.name))
-
-        # Handle prerequisite inputs (to be drawn with a dashed line).
-        for attr in sorted(iterConnections(taskDef.connections, "prerequisiteInputs"), key=lambda x: x.name):
-            ds_id = get_dataset_id(attr.name)
-            if attr.name not in allDatasets:
-                _render_dataset_node(
-                    ds_id, attr.name, attr, universe, file, show_dimensions, expand_dimensions, show_storage
-                )
-                allDatasets.add(attr.name)
-            edges.append((ds_id, task_id, True))
-
-            # If this is a metadata dataset, record it for linking later.
-            if (match := metadata_pattern.match(attr.name)) is not None:
-                matchTaskLabel = match.group(1)
-                metadataNodesToLink.add((matchTaskLabel, attr.name))
-
-        # Handle outputs (task -> dataset).
-        for attr in sorted(iterConnections(taskDef.connections, "outputs"), key=lambda x: x.name):
-            ds_id = get_dataset_id(attr.name)
-            if attr.name not in allDatasets:
-                _render_dataset_node(
-                    ds_id, attr.name, attr, universe, file, show_dimensions, expand_dimensions, show_storage
-                )
-                allDatasets.add(attr.name)
-            edges.append((task_id, ds_id, False))
-
-    # Link metadata datasets after all tasks processed.
-    for matchLabel, dsTypeName in metadataNodesToLink:
-        if (result := labelToTaskName.get(matchLabel)) is not None:
-            ds_id = get_dataset_id(dsTypeName)
-            edges.append((result, ds_id, False))
-
-    # Print all edges and track which are prerequisite.
-    prereq_indices = []
-    for i, (f, t, p) in enumerate(edges):
-        print(f"{f} --> {t}", file=file)
-        if p:
-            prereq_indices.append(i)
-
-    # Apply default edge style
-    print("linkStyle default stroke:#000,stroke-width:1.5px,font-family:Monospace,font-size:14px;", file=file)
-
-    # Apply dashed style for all prerequisite edges in one line.
-    if prereq_indices:
-        prereq_str = ",".join(str(i) for i in prereq_indices)
-        print(f"linkStyle {prereq_str} stroke-dasharray:5;", file=file)
 
     if close:
         file.close()

lsst/pipe/base/mp_graph_executor.py

@@ -159,7 +159,7 @@ class _Job:
         quantumExecutor_pickle: bytes,
         task_node_pickle: bytes,
         quantum_pickle: bytes,
-        quantum_id: uuid.UUID | None,
+        quantum_id: uuid.UUID,
         logConfigState: list,
         snd_conn: multiprocessing.connection.Connection,
         fail_fast: bool,
@@ -174,6 +174,8 @@ class _Job:
             Task definition structure, pickled.
         quantum_pickle : `bytes`
             Quantum for this task execution in pickled form.
+        quantum_id : `uuid.UUID`
+            Unique ID for the quantum.
         logConfigState : `list`
             Logging state from parent process.
         snd_conn : `multiprocessing.Connection`
@@ -205,6 +207,7 @@ class _Job:
             _, report = quantumExecutor.execute(task_node, quantum, quantum_id=quantum_id)
         except RepeatableQuantumError as exc:
             report = QuantumReport.from_exception(
+                quantumId=quantum_id,
                 exception=exc,
                 dataId=quantum.dataId,
                 taskLabel=task_node.label,
@@ -220,6 +223,7 @@ class _Job:
             _LOG.fatal("Invalid quantum error for %s (%s): %s", task_node.label, quantum.dataId)
             _LOG.fatal(exc, exc_info=True)
             report = QuantumReport.from_exception(
+                quantumId=quantum_id,
                 exception=exc,
                 dataId=quantum.dataId,
                 taskLabel=task_node.label,
@@ -229,6 +233,7 @@ class _Job:
         except Exception as exc:
             _LOG.debug("exception from task %s dataId %s: %s", task_node.label, quantum.dataId, exc)
             report = QuantumReport.from_exception(
+                quantumId=quantum_id,
                 exception=exc,
                 dataId=quantum.dataId,
                 taskLabel=task_node.label,
@@ -282,6 +287,7 @@ class _Job:
             exitcode = self.process.exitcode if self.process.exitcode is not None else -1
             assert self.qnode.quantum.dataId is not None, "Quantum DataId cannot be None"
             report = QuantumReport.from_exit_code(
+                quantumId=self.qnode.nodeId,
                 exitCode=exitcode,
                 dataId=self.qnode.quantum.dataId,
                 taskLabel=self.qnode.task_node.label,
@@ -539,6 +545,7 @@ class MPGraphExecutor(QuantumGraphExecutor):
                 )
                 failedNodes.add(qnode)
                 failed_quantum_report = QuantumReport(
+                    quantumId=qnode.nodeId,
                     status=ExecutionStatus.SKIPPED,
                     dataId=qnode.quantum.dataId,
                     taskLabel=task_node.label,
@@ -576,6 +583,7 @@ class MPGraphExecutor(QuantumGraphExecutor):
                     raise
             except Exception as exc:
                 quantum_report = QuantumReport.from_exception(
+                    quantumId=qnode.nodeId,
                     exception=exc,
                     dataId=qnode.quantum.dataId,
                     taskLabel=task_node.label,
@@ -722,6 +730,7 @@ class MPGraphExecutor(QuantumGraphExecutor):
                     assert job.qnode.quantum.dataId is not None, "Quantum DataId cannot be None"
                     if jobInputNodes & jobs.failedNodes:
                         quantum_report = QuantumReport(
+                            quantumId=job.qnode.nodeId,
                             status=ExecutionStatus.SKIPPED,
                             dataId=job.qnode.quantum.dataId,
                             taskLabel=job.qnode.task_node.label,

lsst/pipe/base/pipeline_graph/_edges.py

@@ -258,6 +258,7 @@ class Edge(ABC):
         in exported networkx graphs.
         """
         return {
+            "connection_name": self.connection_name,
             "parent_dataset_type_name": self.parent_dataset_type_name,
             "storage_class_name": self.storage_class_name,
             "is_init": bool,
@@ -606,7 +607,18 @@ class ReadEdge(Edge):
                         "type is registered."
                     )
             else:
-                all_current_components = current.storageClass.allComponents()
+                try:
+                    all_current_components = current.storageClass.allComponents()
+                except (KeyError, ImportError):
+                    if visualization_only:
+                        current = DatasetType(
+                            self.parent_dataset_type_name,
+                            dimensions,
+                            storageClass="<UNKNOWN>",
+                            isCalibration=self.is_calibration,
+                        )
+                        return current, is_initial_query_constraint, is_prerequisite
+                    raise
                 if self.component not in all_current_components:
                     raise IncompatibleDatasetTypeError(
                         f"Dataset type {self.parent_dataset_type_name!r} has storage class "
@@ -618,8 +630,10 @@ class ReadEdge(Edge):
                 # for the component the task wants, because we don't have the
                 # parent storage class.
                 current_component = all_current_components[self.component]
+
                 if (
-                    current_component.name != self.storage_class_name
+                    not visualization_only
+                    and current_component.name != self.storage_class_name
                     and not StorageClassFactory()
                     .getStorageClass(self.storage_class_name)
                     .can_convert(current_component)
@@ -652,7 +666,7 @@ class ReadEdge(Edge):
                             "compatible but different, registering the dataset type in the data repository "
                             "in advance will avoid this error."
                         )
-                elif not dataset_type.is_compatible_with(current):
+                elif not visualization_only and not dataset_type.is_compatible_with(current):
                     raise IncompatibleDatasetTypeError(
                         f"Incompatible definition for input dataset type {self.parent_dataset_type_name!r}; "
                         f"task {self.task_label!r} has {dataset_type}, but the definition "

lsst/pipe/base/pipeline_graph/_nodes.py

@@ -27,12 +27,39 @@
 from __future__ import annotations
 
 __all__ = (
+    "NodeBipartite",
     "NodeKey",
     "NodeType",
 )
 
 import enum
-from typing import NamedTuple
+import sys
+from typing import Any, NamedTuple
+
+
+class NodeBipartite(enum.IntEnum):
+    """Constants for the 'bipartite' key in NetworkX graph views."""
+
+    DATASET_OR_TYPE = 0
+    """Value for nodes that represent dataset types (in pipeline graphs)
+    or datasets (in quantum graphs).
+    """
+
+    TASK_OR_QUANTUM = 1
+    """Value for nodes that represent tasks (in pipeline graphs) or quanta
+    (in quantum graphs).
+    """
+
+    if "sphinx" in sys.modules:
+
+        @classmethod
+        def from_bytes(cls, *args: Any, **kwargs: Any) -> Any:  # pragma: no cover
+            """See `IntEnum.from_bytes`."""
+            return super().from_bytes(*args, **kwargs)
+
+        def to_bytes(self, *args: Any, **kwargs: Any) -> Any:  # pragma: no cover
+            """See `IntEnum.to_bytes`."""
+            return super().to_bytes(self, *args, **kwargs)
 
 
 class NodeType(enum.Enum):
@@ -43,13 +70,13 @@ class NodeType(enum.Enum):
     TASK = 2
 
     @property
-    def bipartite(self) -> int:
+    def bipartite(self) -> NodeBipartite:
         """The integer used as the "bipartite" key in networkx exports of a
         `PipelineGraph`.
 
         This key is used by the `networkx.algorithms.bipartite` module.
         """
-        return int(self is not NodeType.DATASET_TYPE)
+        return NodeBipartite(self is not NodeType.DATASET_TYPE)
 
     def __lt__(self, other: NodeType) -> bool:
         # We define __lt__ only to be able to provide deterministic tiebreaking

lsst/pipe/base/pipeline_graph/_tasks.py

@@ -806,7 +806,9 @@ class TaskNode:
         edge : `ReadEdge`
             Input edge.
         """
-        return self.inputs[connection_name]
+        if (edge := self.inputs.get(connection_name)) is not None:
+            return edge
+        return self.prerequisite_inputs[connection_name]
 
     def get_output_edge(self, connection_name: str) -> WriteEdge:
         """Look up an output edge by connection name.

lsst/pipe/base/pipeline_graph/visualization/_dot.py

@@ -57,6 +57,7 @@ _OVERFLOW_MAX_LINES = 20
 def show_dot(
     pipeline_graph: PipelineGraph,
     stream: TextIO = sys.stdout,
+    label_edge_connections: bool = False,
     **kwargs: Any,
 ) -> None:
     """Write a DOT representation of the pipeline graph to a stream.
@@ -67,6 +68,8 @@ def show_dot(
         Pipeline graph to show.
     stream : `TextIO`, optional
         Stream to write the DOT representation to.
+    label_edge_connections : `bool`, optional
+        If `True`, label edges with their connection names.
     **kwargs
         Additional keyword arguments to pass to `parse_display_args`.
     """
@@ -96,12 +99,19 @@ def show_dot(
         formatted_overflow_ids = [f'"{overflow_id}"' for overflow_id in overflow_ids]
         print(f"{{rank=sink; {'; '.join(formatted_overflow_ids)};}}", file=stream)
 
-    for from_node, to_node, *_ in xgraph.edges:
-        if xgraph.nodes[from_node].get("is_prerequisite", False):
-            edge_data = dict(style="dashed")
-        else:
-            edge_data = {}
-        _render_edge(from_node.node_id, to_node.node_id, stream, **edge_data)
+    for from_node, to_node, edge_data in xgraph.edges(data=True):
+        edge_kwargs = {}
+        if edge_data.get("is_prerequisite", False):
+            edge_kwargs["style"] = "dashed"
+        if (connection_name := edge_data.get("connection_name", None)) is not None:
+            if (component := edge_data.get("component", None)) is not None:
+                if label_edge_connections:
+                    edge_kwargs["xlabel"] = f"{connection_name} (.{component})"
+                else:
+                    edge_kwargs["xlabel"] = f".{component}"
+            elif label_edge_connections:
+                edge_kwargs["xlabel"] = connection_name
+        _render_edge(from_node.node_id, to_node.node_id, stream, **edge_kwargs)
 
     print("}", file=stream)
 

lsst/pipe/base/quantum_graph_builder.py

@@ -364,6 +364,9 @@ class QuantumGraphBuilder(ABC):
             # with the quanta because no quantum knows if its the only
             # consumer).
             full_skeleton.remove_orphan_datasets()
+            # Add any dimension records not handled by the subclass, and
+            # aggregate any that were added directly to data IDs.
+            full_skeleton.attach_dimension_records(self.butler, self._pipeline_graph.get_all_dimensions())
             if attach_datastore_records:
                 self._attach_datastore_records(full_skeleton)
             # TODO initialize most metadata here instead of in ctrl_mpexec.
@@ -939,7 +942,7 @@ class QuantumGraphBuilder(ABC):
         inputs: dict[DatasetKey | PrerequisiteDatasetKey, DatasetRef] = {}
         outputs_for_skip: dict[DatasetKey, DatasetRef] = {}
         outputs_in_the_way: dict[DatasetKey, DatasetRef] = {}
-        _, dataset_type_nodes = self._pipeline_graph.group_by_dimensions()[self.universe.empty]
+        _, dataset_type_nodes = self._pipeline_graph.group_by_dimensions().get(self.universe.empty, ({}, {}))
         dataset_types = [node.dataset_type for node in dataset_type_nodes.values()]
         dataset_types.extend(self._global_init_output_types.values())
         for dataset_type in dataset_types:

lsst/pipe/base/quantum_graph_skeleton.py

@@ -52,6 +52,7 @@ from lsst.daf.butler import (
     DataIdValue,
     DatasetRef,
     DimensionDataAttacher,
+    DimensionDataExtractor,
     DimensionGroup,
     DimensionRecordSet,
 )
@@ -726,10 +727,18 @@ class QuantumGraphSkeleton:
         return self._xgraph.nodes[key]["data_id"]
 
     def attach_dimension_records(
-        self, butler: Butler, dimensions: DimensionGroup, dimension_records: Iterable[DimensionRecordSet]
+        self,
+        butler: Butler,
+        dimensions: DimensionGroup,
+        dimension_records: Iterable[DimensionRecordSet] = (),
     ) -> None:
         """Attach dimension records to the data IDs in the skeleton.
 
+        This both attaches records to data IDs in the skeleton and aggregates
+        any existing records on data IDS, so `get_dimension_data` returns all
+        dimension records used in the skeleton.  It can be called multiple
+        times.
+
         Parameters
         ----------
         butler : `lsst.daf.butler.Butler`
@@ -737,7 +746,7 @@ class QuantumGraphSkeleton:
         dimensions : `lsst.daf.butler.DimensionGroup`
             Superset of all of the dimensions of all data IDs.
         dimension_records : `~collections.abc.Iterable` [ \
-                `lsst.daf.butler.DimensionRecordSet` ]
+                `lsst.daf.butler.DimensionRecordSet` ], optional
             Iterable of sets of dimension records to attach.
         """
         for record_set in dimension_records:
@@ -748,10 +757,20 @@ class QuantumGraphSkeleton:
         data_ids_to_expand: defaultdict[DimensionGroup, defaultdict[DataCoordinate, list[Key]]] = defaultdict(
             lambda: defaultdict(list)
         )
+        extractor = DimensionDataExtractor.from_dimension_group(dimensions)
         data_id: DataCoordinate | None
         for node_key in self:
             if data_id := self[node_key].get("data_id"):
-                data_ids_to_expand[data_id.dimensions][data_id].append(node_key)
+                if data_id.hasRecords():
+                    extractor.update([data_id])
+                else:
+                    data_ids_to_expand[data_id.dimensions][data_id].append(node_key)
+        # Add records we extracted from data IDs that were already expanded, in
+        # case other nodes want them.
+        for record_set in extractor.records.values():
+            self._dimension_data.setdefault(
+                record_set.element.name, DimensionRecordSet(record_set.element)
+            ).update(record_set)
         attacher = DimensionDataAttacher(records=self._dimension_data.values(), dimensions=dimensions)
         for dimensions, data_ids in data_ids_to_expand.items():
             with butler.query() as query:
@@ -763,7 +782,7 @@ class QuantumGraphSkeleton:
             for expanded_data_id, node_keys in zip(expanded_data_ids, data_ids.values()):
                 for node_key in node_keys:
                     self.set_data_id(node_key, expanded_data_id)
-        # Hold on to any records that we had to query for.
+        # Hold on to any records that we had to query for or extracted.
         self._dimension_data = attacher.records
 
     def get_dimension_data(self) -> list[DimensionRecordSet]:

lsst/pipe/base/quantum_reports.py

@@ -31,6 +31,7 @@ __all__ = ["ExceptionInfo", "ExecutionStatus", "QuantumReport", "Report"]
 
 import enum
 import sys
+import uuid
 from typing import Any
 
 import pydantic
@@ -137,6 +138,8 @@ class QuantumReport(pydantic.BaseModel):
         in-process execution. Negative if process was killed by a signal.
     exceptionInfo : `ExceptionInfo` or `None`, optional
         Exception information if an exception was raised.
+    quantumId : `uuid.UUID`, optional
+        Unique identifier for the quantum.
     """
 
     status: ExecutionStatus = ExecutionStatus.SUCCESS
@@ -156,6 +159,9 @@ class QuantumReport(pydantic.BaseModel):
     exceptionInfo: ExceptionInfo | None = None
     """Exception information if exception was raised."""
 
+    quantumId: uuid.UUID | None = None
+    """Unique identifier for the quantum."""
+
     def __init__(
         self,
         dataId: DataId,
@@ -163,8 +169,10 @@ class QuantumReport(pydantic.BaseModel):
         status: ExecutionStatus = ExecutionStatus.SUCCESS,
         exitCode: int | None = None,
         exceptionInfo: ExceptionInfo | None = None,
+        quantumId: uuid.UUID | None = None,
     ):
         super().__init__(
+            quantumId=quantumId,
             status=status,
             dataId=_serializeDataId(dataId),
             taskLabel=taskLabel,
@@ -180,6 +188,7 @@ class QuantumReport(pydantic.BaseModel):
         taskLabel: str,
         *,
         exitCode: int | None = None,
+        quantumId: uuid.UUID | None = None,
     ) -> QuantumReport:
         """Construct report instance from an exception and other pieces of
         data.
@@ -195,6 +204,8 @@ class QuantumReport(pydantic.BaseModel):
         exitCode : `int`, optional
             Exit code for the process, used when it is known that the process
             will exit with that exit code.
+        quantumId : `uuid.UUID`, optional
+            Unique identifier for the quantum.
         """
         return cls(
             status=ExecutionStatus.FAILURE,
@@ -202,6 +213,7 @@ class QuantumReport(pydantic.BaseModel):
             taskLabel=taskLabel,
             exitCode=exitCode,
             exceptionInfo=ExceptionInfo.from_exception(exception),
+            quantumId=quantumId,
         )
 
     @classmethod
@@ -210,6 +222,7 @@ class QuantumReport(pydantic.BaseModel):
         exitCode: int,
         dataId: DataId,
         taskLabel: str,
+        quantumId: uuid.UUID | None = None,
     ) -> QuantumReport:
         """Construct report instance from an exit code and other pieces of
         data.
@@ -222,12 +235,15 @@ class QuantumReport(pydantic.BaseModel):
             The quantum Data ID.
         taskLabel : `str`
             The task label.
+        quantumId : `uuid.UUID`, optional
+            Unique identifier for the quantum.
         """
         return cls(
             status=ExecutionStatus.SUCCESS if exitCode == 0 else ExecutionStatus.FAILURE,
             dataId=dataId,
             taskLabel=taskLabel,
             exitCode=exitCode,
+            quantumId=quantumId,
         )
 
     # Work around the fact that Sphinx chokes on Pydantic docstring formatting,

lsst/pipe/base/simple_pipeline_executor.py

@@ -641,7 +641,8 @@ class SimplePipelineExecutor:
         # be useful for callers who want to check the state of the repo in
         # between.
         return (
-            single_quantum_executor.execute(qnode.task_node, qnode.quantum)[0] for qnode in self.quantum_graph
+            single_quantum_executor.execute(qnode.task_node, qnode.quantum, qnode.nodeId)[0]
+            for qnode in self.quantum_graph
         )
 
     def _transfer_qg_dimension_records(self, out_butler: Butler) -> None:

lsst/pipe/base/single_quantum_executor.py

@@ -159,7 +159,7 @@ class SingleQuantumExecutor(QuantumExecutor):
             self._butler.registry.refresh()
 
         result = self._execute(task_node, quantum, quantum_id=quantum_id)
-        report = QuantumReport(dataId=quantum.dataId, taskLabel=task_node.label)
+        report = QuantumReport(quantumId=quantum_id, dataId=quantum.dataId, taskLabel=task_node.label)
         return result, report
 
     def _execute(

lsst/pipe/base/tests/mocks/_in_memory_repo.py

@@ -243,7 +243,7 @@ class InMemoryRepo:
         builder = AllDimensionsQuantumGraphBuilder(
             self.pipeline_graph,
             self.butler,
-            input_collections=self.input_chain,
+            input_collections=[self.input_chain],
             output_run=self.output_run,
         )
         if register_output_dataset_types:

lsst/pipe/base/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.3400"
+__version__ = "29.2025.3500"

{lsst_pipe_base-29.2025.3400.dist-info → lsst_pipe_base-29.2025.3500.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-pipe-base
-Version: 29.2025.3400
+Version: 29.2025.3500
 Summary: Pipeline infrastructure for the Rubin Science Pipelines.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_pipe_base-29.2025.3400.dist-info → lsst_pipe_base-29.2025.3500.dist-info}/RECORD

@@ -15,32 +15,32 @@ lsst/pipe/base/config.py,sha256=yNipVEc6awwhU_O9I01g20OnvQrs28dAwkXuI1hrlYE,1198
 lsst/pipe/base/configOverrides.py,sha256=B0An8EaX76VzWnC5dJxvyZ2AhVzawMtq7qlE9ma5lkc,14661
 lsst/pipe/base/connectionTypes.py,sha256=inUDyzbM1sKMCtHaRkhx3dWSPHPBIDVMHOPhzB13Kdw,16720
 lsst/pipe/base/connections.py,sha256=S_PgywIYoPlaCtGtDtD6S24yewVaPfdS_QgrhUAty7g,66725
-lsst/pipe/base/dot_tools.py,sha256=o_bDp9vW-4PelE7kWodH6pWVIRuyGlTRFv-kR_YKfLo,13824
+lsst/pipe/base/dot_tools.py,sha256=bxwJTIfG58LAxPvBzORgp99kYKJUQFK4mNVjEuj-Pgc,9862
 lsst/pipe/base/exec_fixup_data_id.py,sha256=UG-yZboZijOjrPh0bKnAjEYJMpRqGAIgNZxIDYVa0l0,5048
 lsst/pipe/base/execution_graph_fixup.py,sha256=_orQ_GT5f-VyRarcpaPD_cNEfo9AIWgum9HkMkcvNG8,2811
 lsst/pipe/base/execution_reports.py,sha256=jYtWCD4PkEAeVUpKIxuiJJVgsCm7qiwCorWVgNHkVgU,17270
 lsst/pipe/base/log_capture.py,sha256=tgJcq_eOIwywktagYXL0sCnafqNR0CJ7rfW09iXQ63k,9390
-lsst/pipe/base/mermaid_tools.py,sha256=b_15oqCcxSom4ecMTDX8tfEtxe8W-juPVL65HOMywJ8,17695
-lsst/pipe/base/mp_graph_executor.py,sha256=JIlL04eucKv6Vr0-ZGO8-ABp1Ll2s-P-EsWJipdk4AQ,31762
+lsst/pipe/base/mermaid_tools.py,sha256=s6TQCBjvrkw2t9yxjm3YEYsBKnUW2yHmt6SawQJ9Bto,7494
+lsst/pipe/base/mp_graph_executor.py,sha256=45v915qU1dYQsvtAXtfms6kF3k49bptDe9IZNRpzfOQ,32130
 lsst/pipe/base/pipeline.py,sha256=FVaiLhgw9Pzo-nzXKS0dLNafegP0AMZKLtPlSvOSkRU,37563
 lsst/pipe/base/pipelineIR.py,sha256=DDOAYHnMP-iw021RDMYsZnvb21tWumLjYqO5d38q_Zk,44300
 lsst/pipe/base/pipelineTask.py,sha256=K3GdjJLvy8A7I-jzQiERQZaYF7mC1LM3iB5TmUtbOCI,8394
 lsst/pipe/base/prerequisite_helpers.py,sha256=bmiebQ4veSrypZgAXjmCBFfj8fUtPW9eRQaVShhxdBQ,28446
 lsst/pipe/base/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lsst/pipe/base/quantum_graph_builder.py,sha256=wBR4NZhToz40eXHQ_LRGv-Lf8vYwSsVRpxpVlaM8w9Y,56361
+lsst/pipe/base/quantum_graph_builder.py,sha256=Na8uLsOzPqvQqi9pI9bgHjWREhvWPWIA3_MvLLKl-R0,56621
 lsst/pipe/base/quantum_graph_executor.py,sha256=KOOjko2weju02oXnvWTvwXDxbPJp3U1F0KTgDSOJgKg,4342
-lsst/pipe/base/quantum_graph_skeleton.py,sha256=pUaeuBFUsG3r2ZiovgMuPDMmlujlBtuHicU6dWF0Hz4,27737
+lsst/pipe/base/quantum_graph_skeleton.py,sha256=GhSQjRHaErneGY4A4E0tERqg9QPEeYrlpmdLzqFXy6E,28586
 lsst/pipe/base/quantum_provenance_graph.py,sha256=llXcqu-50dtjkt_sVqAhBU10htfkxMiiArNN0_GqL1g,93034
-lsst/pipe/base/quantum_reports.py,sha256=ambqr4CggvjVvVCcmHDrnEZgbbnYqkOMIMXWozl2JMo,11643
+lsst/pipe/base/quantum_reports.py,sha256=GRAjhUa7L595AjBywJz95XT7K4OUFa-rudWQtQTrUlU,12230
 lsst/pipe/base/separable_pipeline_executor.py,sha256=w7-cZ9koJNDhEVu2lMXqjNMhZvFVn5QbJfsqvxHkQFE,11928
-lsst/pipe/base/simple_pipeline_executor.py,sha256=5CIO9tS0PYeUJp7GGYi94SOFJnI6XMkUBx4WD2Qxq_Y,29571
-lsst/pipe/base/single_quantum_executor.py,sha256=IE4zMsEHJoGuMm90aTQiktOo28BfDAWOdJce5gk_-eQ,28255
+lsst/pipe/base/simple_pipeline_executor.py,sha256=IYda1g258FWWESN5nQv6xwZJL5AZXhnDGC5iN_IohUg,29597
+lsst/pipe/base/single_quantum_executor.py,sha256=4Uhg83vZU9P74K6wER4qisDB-dZukdrkJ7hxNjEF-rQ,28277
 lsst/pipe/base/struct.py,sha256=Fa-UkpuXOxdzKWbHrMUkJYOszZuBXCm2NesXNR0IOPQ,5048
 lsst/pipe/base/task.py,sha256=XHBd-7m1a4-6LgobBYA1DgY4H7EV-_RWKfxbhZbMmD4,15145
 lsst/pipe/base/taskFactory.py,sha256=MsDGECJqZLSZk8SGhpuVhNaP32UWuNvxZiDcZExPFG8,3412
 lsst/pipe/base/testUtils.py,sha256=lSBKMhoKflbi8JkMNYfEqqHNl-rtFI8UYT3QneDYpLo,18477
 lsst/pipe/base/utils.py,sha256=JmEt3l0xrh9uayKrSXuQEq12aXOhDr2YXmbYduaxCko,1940
-lsst/pipe/base/version.py,sha256=I85NfXGXrIHDL-kkxKGyHltD0yfSxXDKLv7joJrC86w,55
+lsst/pipe/base/version.py,sha256=UwJkYVJhfyZPaD0yyjLkfsS3KQL2uaxZwFIeRntHr30,55
 lsst/pipe/base/cli/__init__.py,sha256=861tXIAW7SqtqNUYkjbeEdfg8lDswXsjJQca0gVCFz4,54
 lsst/pipe/base/cli/_get_cli_subcommands.py,sha256=g_af64klRybBGKAg7fmBSZBdw2LYBAsFON_yQIMZON0,1289
 lsst/pipe/base/cli/cmd/__init__.py,sha256=BGicstnryQ48rYcNRh4fa6Vy63ZIlZ_pPAEa17jhkwY,1519
@@ -54,23 +54,23 @@ lsst/pipe/base/graph/__init__.py,sha256=Zs2vwSFNiu1bYDsgrWQZ0qegG5F6PIjiQ5ZGT3Eq
 lsst/pipe/base/graph/_implDetails.py,sha256=QQHVnCW78UnIbALXX_v7EW7g6MTUTuuR1Q_Ss_squUw,6784
 lsst/pipe/base/graph/_loadHelpers.py,sha256=qUfjIgFezaXZRCFV7PFzmz1SSKFjRWOMWJePuyKiD24,12064
 lsst/pipe/base/graph/_versionDeserializers.py,sha256=pXk63v6jkQSghSOoU1hpPkxVa82WVGitm2jrop85SeM,27992
-lsst/pipe/base/graph/graph.py,sha256=CIM7ij7I51rVtVj0jd5dPgOWByALoFZh2Cp61mOEnyQ,74200
+lsst/pipe/base/graph/graph.py,sha256=GEauk42yFXVkFfHxo0EKofQmAKLhfnfe0UzlwuvUsVQ,74240
 lsst/pipe/base/graph/graphSummary.py,sha256=S3O84MddiXrmOD7U9Ek7rR22kdveGLhsor69FRvDjh4,5032
 lsst/pipe/base/graph/quantumNode.py,sha256=l4mslxBgyUzBAqwjpx6XRP-UPxe-oRMxHJWt-_y3Dm0,7196
 lsst/pipe/base/pipeline_graph/__init__.py,sha256=yTEuvlzbeKIHIm7GeRmGSsma1wpZFNv8j12WfSH-deY,1516
 lsst/pipe/base/pipeline_graph/__main__.py,sha256=E6ugEwJbds22wjgcfcgzeyO04JofQwVhn_Y8kZYY1lQ,20769
 lsst/pipe/base/pipeline_graph/_dataset_types.py,sha256=MzpiI4bOUgwUpnse4Bj_KFAUFm_uERCHWd0BwAhKksc,11333
-lsst/pipe/base/pipeline_graph/_edges.py,sha256=VQSG74Er5CiyIDyodfxixVaSXfh-tSEPkk1u8VeMqe0,34656
+lsst/pipe/base/pipeline_graph/_edges.py,sha256=n6iCYql-TvAyM1xrINt7m02efjebJlIwhk254CCzfn8,35300
 lsst/pipe/base/pipeline_graph/_exceptions.py,sha256=3jvCXms0_5ThLGtsOlKxsI1vWiq3gY4hba8fRBW0tgI,3943
 lsst/pipe/base/pipeline_graph/_mapping_views.py,sha256=9nLKPA8j7sS09haShbJnEtGXbb4vy_cWpbLeMLBmVvs,9194
-lsst/pipe/base/pipeline_graph/_nodes.py,sha256=WcP31yIRCNvFh9lhEtKJ_8bsgX2u_B_qwyV7DaHJ8JI,3376
+lsst/pipe/base/pipeline_graph/_nodes.py,sha256=GGXfzXvrjNbwPt-0w8cC0l_I6CCNskoDNjA8Ds4ILS0,4236
 lsst/pipe/base/pipeline_graph/_pipeline_graph.py,sha256=G-P3r-AHBM1cMP7ex75M-Xtu4HlQiaIqly3er6BZC0A,121536
 lsst/pipe/base/pipeline_graph/_task_subsets.py,sha256=lLvcndSGcZigteWd4eeAM8LxQ1lHPBoysY8PjJTxx1c,13244
-lsst/pipe/base/pipeline_graph/_tasks.py,sha256=XsqY0Z8WPpryJHaJtcIfqDBARzKeNT7MWdX-16sbXXY,42698
+lsst/pipe/base/pipeline_graph/_tasks.py,sha256=jTLpm5dZMXRNrGi3L45-3DtF95PGwhmejWLZ-zcSTzo,42802
 lsst/pipe/base/pipeline_graph/expressions.py,sha256=MZ0qxGA4ctu_WqVjdjjezZF8Jd5174PWbio7EF2wdl0,7717
 lsst/pipe/base/pipeline_graph/io.py,sha256=8s20Z0hYhO8AZpDJJrd6LR2iBx7ICm9uL7O7PsQMT0M,30925
 lsst/pipe/base/pipeline_graph/visualization/__init__.py,sha256=qQctfWuFpcmgRdgu8Y6OsJ_pXpLKrCK-alqfVtIecls,1551
-lsst/pipe/base/pipeline_graph/visualization/_dot.py,sha256=quja94wafmbCPJvC7HrHRE0Dsvhgz1Odx2MvVEpZup0,12936
+lsst/pipe/base/pipeline_graph/visualization/_dot.py,sha256=hgy5Wk4GXptb9GbjPn8-0D9EjWsXKBEEVs1ocHLh_MA,13535
 lsst/pipe/base/pipeline_graph/visualization/_formatting.py,sha256=NsBxXwdmISitr8_4wPc-T8CqVB-Mq4pv7DmUefFm3JU,17845
 lsst/pipe/base/pipeline_graph/visualization/_layout.py,sha256=aMFl2Sgw_2-AfCBr_JBIWSs7VbSfSP7Nuol0mP9lkUo,17157
 lsst/pipe/base/pipeline_graph/visualization/_merge.py,sha256=cBKhNjgymDkzYtVutrXd9IGa-eE4Q9jnHO9F18e64dY,15435
@@ -93,16 +93,16 @@ lsst/pipe/base/tests/simpleQGraph.py,sha256=G9C69caX8479JR9h48ERhOFvLTPJCoj5gKf_
 lsst/pipe/base/tests/util.py,sha256=eWuIRz55HYgNmMkexinN9HjUFmPC3uapO8jMjcQY-ao,4010
 lsst/pipe/base/tests/mocks/__init__.py,sha256=YheEqtwDsjkqLNLCYbDrbZmLj9y942fOWC_xKF3xmCk,1582
 lsst/pipe/base/tests/mocks/_data_id_match.py,sha256=v33QZhZm-srXZAXZ8NbNKGN-_ql4AzaArBUk1lxhyss,7474
-lsst/pipe/base/tests/mocks/_in_memory_repo.py,sha256=IchXxY6jhd9dU8jHrG_zMUf1Ptftme7SCLrmgvgGvTo,16662
+lsst/pipe/base/tests/mocks/_in_memory_repo.py,sha256=l5j5b4ff_ATRTskIlzhlHr-w_GiIJ5-rfUd37vT2esA,16664
 lsst/pipe/base/tests/mocks/_pipeline_task.py,sha256=xa2vy3HuMQifV0KR5sKfKRySqxSFhy-f1cP4bJ9EXZg,30010
 lsst/pipe/base/tests/mocks/_storage_class.py,sha256=gC0czHURMk7PWj8N6dLxnY5V4HWX5i8ukb5SZbgWKy8,25257
-lsst_pipe_base-29.2025.3400.dist-info/licenses/COPYRIGHT,sha256=kB3Z9_f6a6uFLGpEmNJT_n186CE65H6wHu4F6BNt_zA,368
-lsst_pipe_base-29.2025.3400.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_pipe_base-29.2025.3400.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_pipe_base-29.2025.3400.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_pipe_base-29.2025.3400.dist-info/METADATA,sha256=zPBIVX8Mytz-KGIbLTWRFF4Hr0dSwwSpqCeSbSkODbo,2195
-lsst_pipe_base-29.2025.3400.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_pipe_base-29.2025.3400.dist-info/entry_points.txt,sha256=bnmUhJBsChxMdqST9VmFBYYKxLQoToOfqW1wjW7khjk,64
-lsst_pipe_base-29.2025.3400.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_pipe_base-29.2025.3400.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_pipe_base-29.2025.3400.dist-info/RECORD,,
+lsst_pipe_base-29.2025.3500.dist-info/licenses/COPYRIGHT,sha256=kB3Z9_f6a6uFLGpEmNJT_n186CE65H6wHu4F6BNt_zA,368
+lsst_pipe_base-29.2025.3500.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_pipe_base-29.2025.3500.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_pipe_base-29.2025.3500.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_pipe_base-29.2025.3500.dist-info/METADATA,sha256=GKunBUX56NevthsaNTuHJxK3v49G9e9eQSmjcer3qPU,2195
+lsst_pipe_base-29.2025.3500.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_pipe_base-29.2025.3500.dist-info/entry_points.txt,sha256=bnmUhJBsChxMdqST9VmFBYYKxLQoToOfqW1wjW7khjk,64
+lsst_pipe_base-29.2025.3500.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_pipe_base-29.2025.3500.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_pipe_base-29.2025.3500.dist-info/RECORD,,