lsst-ctrl-mpexec 29.2025.1400__py3-none-any.whl → 29.2025.1600__py3-none-any.whl

lsst/ctrl/mpexec/__init__.py

@@ -25,6 +25,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+from ._pipeline_graph_factory import PipelineGraphFactory
 from .cmdLineFwk import *
 from .dotTools import *
 from .executionGraphFixup import *

lsst/ctrl/mpexec/_pipeline_graph_factory.py

@@ -0,0 +1,82 @@
+# This file is part of ctrl_mpexec.
+#
+# Developed for the LSST Data Management System.
+# This product includes software developed by the LSST Project
+# (http://www.lsst.org).
+# See the COPYRIGHT file at the top-level directory of this distribution
+# for details of code ownership.
+#
+# This software is dual licensed under the GNU General Public License and also
+# under a 3-clause BSD license. Recipients may choose which of these licenses
+# to use; please see the files gpl-3.0.txt and/or bsd_license.txt,
+# respectively.  If you choose the GPL option then the following text applies
+# (but note that there is still no warranty even if you opt for BSD instead):
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import annotations
+
+__all__ = ("PipelineGraphFactory",)
+
+from lsst.daf.butler import Butler
+from lsst.pipe.base import Pipeline, PipelineGraph
+
+
+class PipelineGraphFactory:
+    """A factory for building and caching a PipelineGraph.
+
+    Parameters
+    ----------
+    pipeline : `lsst.pipe.base.Pipeline`
+        Pipeline definition to start from.
+    butler : `lsst.daf.butler.Butler` or `None`, optional
+        Butler that can be used to resolve dataset type definitions and get
+        dimension schema.
+    select_tasks : `str`, optional
+        String expression that filters the tasks in the pipeline graph.
+    """
+
+    def __init__(self, pipeline: Pipeline, butler: Butler | None = None, select_tasks: str = ""):
+        self._pipeline = pipeline
+        self._registry = butler.registry if butler is not None else None
+        self._select_tasks = select_tasks
+        self._pipeline_graph: PipelineGraph | None = None
+        self._resolved: bool = False
+        self._for_visualization_only: bool = False
+
+    def __call__(self, *, resolve: bool = True, visualization_only: bool = False) -> PipelineGraph:
+        if self._pipeline_graph is None:
+            self._pipeline_graph = self._pipeline.to_graph()
+            if self._select_tasks:
+                self._pipeline_graph = self._pipeline_graph.select(self._select_tasks)
+        if resolve and not self._resolved:
+            self._pipeline_graph.resolve(self._registry, visualization_only=visualization_only)
+            self._resolved = True
+            self._for_visualization_only = self._registry is None
+        elif resolve and not visualization_only and self._for_visualization_only:
+            raise RuntimeError("Cannot resolve pipeline graph without butler.")
+        return self._pipeline_graph
+
+    @property
+    def pipeline(self) -> Pipeline:
+        """The original pipeline definition."""
+        if self._select_tasks:
+            raise RuntimeError(
+                "The --select-tasks option cannot be used with operations that return or display a "
+                "pipeline as YAML, since it only operates on the pipeline graph."
+            )
+        return self._pipeline
+
+    def __bool__(self) -> bool:
+        return bool(self._pipeline)

lsst/ctrl/mpexec/cli/cmd/commands.py

@@ -191,14 +191,14 @@ def qgraph(ctx: click.Context, **kwargs: Any) -> None:
     summary = kwargs.pop("summary", None)
     with coverage_context(kwargs):
         show = ShowInfo(kwargs.pop("show", []))
-        pipeline = script.build(**kwargs, show=show)
+        pipeline_graph_factory = script.build(**kwargs, show=show)
         if show.handled and not show.unhandled:
             print(
                 "No quantum graph generated. The --show option was given and all options were processed.",
                 file=sys.stderr,
             )
             return
-        if (qgraph := script.qgraph(pipelineObj=pipeline, **kwargs, show=show)) is None:
+        if (qgraph := script.qgraph(pipeline_graph_factory, **kwargs, show=show)) is None:
             raise click.ClickException("QuantumGraph was empty; ERROR logs above should provide details.")
         # QuantumGraph-only summary call here since script.qgraph also called
         # by run methods.
@@ -219,7 +219,7 @@ def run(ctx: click.Context, **kwargs: Any) -> None:
     kwargs = _collectActions(ctx, **kwargs)
     with coverage_context(kwargs):
         show = ShowInfo(kwargs.pop("show", []))
-        pipeline = script.build(**kwargs, show=show)
+        pipeline_graph_factory = script.build(**kwargs, show=show)
         if show.handled and not show.unhandled:
             print(
                 "No quantum graph generated or pipeline executed. "
@@ -227,7 +227,7 @@ def run(ctx: click.Context, **kwargs: Any) -> None:
                 file=sys.stderr,
             )
             return
-        if (qgraph := script.qgraph(pipelineObj=pipeline, **kwargs, show=show)) is None:
+        if (qgraph := script.qgraph(pipeline_graph_factory, **kwargs, show=show)) is None:
             raise click.ClickException("QuantumGraph was empty; ERROR logs above should provide details.")
         _unhandledShow(show, "run")
         if show.handled:
@@ -393,6 +393,12 @@ def update_graph_run(
     default=True,
     help="Whether to use a quantum-backed butler for metadata and log reads.",
 )
+@click.option(
+    "--view-graph",
+    is_flag=True,
+    default=False,
+    help="Display pipeline processing status as a graph on stdout instead of a plain-text summary.",
+)
 @processes_option()
 def report(
     repo: str,
@@ -407,6 +413,7 @@ def report(
     read_caveats: str = "lazy",
     use_qbb: bool = True,
     processes: int = 1,
+    view_graph: bool = False,
 ) -> None:
     """Summarize the state of executed quantum graph(s), with counts of failed,
     successful and expected quanta, as well as counts of output datasets and
@@ -443,6 +450,7 @@ def report(
             read_caveats=(read_caveats if read_caveats != "none" else None),  # type: ignore[arg-type]
             use_qbb=use_qbb,
             n_cores=processes,
+            view_graph=view_graph,
         )
     else:
         assert len(qgraphs) == 1, "Cannot make a report without a quantum graph."

lsst/ctrl/mpexec/cli/opt/optionGroups.py

@@ -74,6 +74,7 @@ class pipeline_build_options(OptionGroup):  # noqa: N801
             ),
             ctrlMpExecOpts.order_pipeline_option(),
             ctrlMpExecOpts.save_pipeline_option(),
+            ctrlMpExecOpts.select_tasks_option(),
             ctrlMpExecOpts.pipeline_dot_option(),
             ctrlMpExecOpts.pipeline_mermaid_option(),
             pipeBaseOpts.instrument_option(help=instrumentOptionHelp, metavar="instrument", multiple=True),
@@ -124,6 +125,7 @@ class qgraph_options(OptionGroup):  # noqa: N801
                 ),
             ),
             ctrlMpExecOpts.dataset_query_constraint(),
+            ctrlMpExecOpts.data_id_table_option(),
             ctrlMpExecOpts.qgraph_header_data_option(),
             ctrlMpExecOpts.mock_option(),
             ctrlMpExecOpts.mock_failure_option(),

lsst/ctrl/mpexec/cli/opt/options.py

@@ -51,6 +51,18 @@ data_query_option = MWOptionDecorator(
 )
 
 
+data_id_table_option = MWOptionDecorator(
+    "--data-id-table",
+    multiple=True,
+    default=(),
+    help=(
+        "URI to table of data IDs to join as a constraint; may be any format accepted by astropy.table.  "
+        "May be passed multiple times."
+    ),
+    metavar="URI",
+)
+
+
 debug_option = MWOptionDecorator(
     "--debug", help="Enable debugging output using lsstDebug facility (imports debug.py).", is_flag=True
 )
@@ -442,6 +454,17 @@ task_option = MWOptionDecorator(
     multiple=True,
 )
 
+select_tasks_option = MWOptionDecorator(
+    "--select-tasks",
+    metavar="EXPR",
+    default="",
+    help=(
+        "A string expression that filters the tasks to run from the pipeline. "
+        "See https://pipelines.lsst.io/v/weekly/modules/lsst.pipe.base/working-with-pipeline-graphs.html"
+        "#pipeline-graph-subset-expressions for details."
+    ),
+)
+
 
 timeout_option = MWOptionDecorator(
     "--timeout", type=click.IntRange(min=0), help="Timeout for multiprocessing; maximum wall time (sec)."

lsst/ctrl/mpexec/cli/script/build.py

@@ -31,10 +31,12 @@ from lsst.daf.butler import Butler
 from lsst.pipe.base.pipeline_graph import visualization
 
 from ... import CmdLineFwk
+from ..._pipeline_graph_factory import PipelineGraphFactory
 from ..utils import _PipelineAction
 
 
 def build(  # type: ignore
+    *,
     order_pipeline,
     pipeline,
     pipeline_actions,
@@ -43,8 +45,9 @@ def build(  # type: ignore
     save_pipeline,
     show,
     butler_config=None,
+    select_tasks="",
     **kwargs,
-):
+) -> PipelineGraphFactory:
     """Implement the command line interface `pipetask build` subcommand.
 
     Should only be called by command line tools and unit test code that tests
@@ -79,6 +82,8 @@ def build(  # type: ignore
         `Config`, it is the object used to configure a Butler.
         Only used to resolve pipeline graphs for --show pipeline-graph and
         --show task-graph.
+    select_tasks : `str`, optional
+        String expression that filters the tasks in the pipeline.
     **kwargs
         Ignored; click commands may accept options for more than one script
         function and pass all the option kwargs to each of the script functions
@@ -86,8 +91,9 @@ def build(  # type: ignore
 
     Returns
     -------
-    pipeline : `lsst.pipe.base.Pipeline`
-        The pipeline instance that was built.
+    pipeline_graph_factory : `..PipelineGraphFactory`
+        A helper object that holds the built pipeline and can turn it into a
+        pipeline graph.
 
     Raises
     ------
@@ -119,10 +125,12 @@ def build(  # type: ignore
     else:
         butler = None
 
+    pipeline_graph_factory = PipelineGraphFactory(pipeline, butler, select_tasks)
+
     if pipeline_dot:
         with open(pipeline_dot, "w") as stream:
             visualization.show_dot(
-                pipeline.to_graph(butler.registry if butler is not None else None, visualization_only=True),
+                pipeline_graph_factory(visualization_only=True),
                 stream,
                 dataset_types=True,
                 task_classes="full",
@@ -142,7 +150,7 @@ def build(  # type: ignore
 
         with open(pipeline_mermaid, file_mode) as stream:
             visualization.show_mermaid(
-                pipeline.to_graph(butler.registry if butler is not None else None, visualization_only=True),
+                pipeline_graph_factory(visualization_only=True),
                 stream,
                 output_format=output_format,
                 width=4500 if output_format != "mmd" else None,
@@ -150,6 +158,6 @@ def build(  # type: ignore
                 task_classes="full",
             )
 
-    show.show_pipeline_info(pipeline, butler=butler)
+    show.show_pipeline_info(pipeline_graph_factory)
 
-    return pipeline
+    return pipeline_graph_factory

lsst/ctrl/mpexec/cli/script/qgraph.py

@@ -36,7 +36,8 @@ _log = logging.getLogger(__name__)
 
 
 def qgraph(  # type: ignore
-    pipelineObj,
+    pipeline_graph_factory,
+    *,
     qgraph,
     qgraph_id,
     qgraph_node_id,
@@ -55,6 +56,7 @@ def qgraph(  # type: ignore
     replace_run,
     prune_replaced,
     data_query,
+    data_id_table=(),
     show,
     save_execution_butler,
     clobber_execution_butler,
@@ -76,12 +78,13 @@ def qgraph(  # type: ignore
 
     Parameters
     ----------
-    pipelineObj : `lsst.pipe.base.Pipeline` or None
-        The pipeline object used to generate a qgraph. If this is not `None`
-        then `qgraph` should be `None`.
+    pipeline_graph_factory : `..PipelineGraphFactory` or None
+        A factory that holds the pipeline and can produce a pipeline graph.
+        If this is not `None` then `qgraph` should be `None`.
     qgraph : `str` or `None`
         URI location for a serialized quantum graph definition as a pickle
-        file. If this option is not None then `pipeline` should be `None`.
+        file. If this option is not None then ``pipeline_graph_factory`` should
+        be `None`.
     qgraph_id : `str` or `None`
         Quantum graph identifier, if specified must match the identifier of the
         graph loaded from a file. Ignored if graph is not loaded from a file.
@@ -145,6 +148,8 @@ def qgraph(  # type: ignore
         ``replace_run`` to be `True`.
     data_query : `str`
         User query selection expression.
+    data_id_table : `~collections.abc.Iterable` [`str`]
+        Paths to data ID tables to join in.
     show : `lsst.ctrl.mpexec.showInfo.ShowInfo`
         Descriptions of what to dump to stdout.
     save_execution_butler : `str` or `None`
@@ -206,6 +211,7 @@ def qgraph(  # type: ignore
         replace_run=replace_run,
         prune_replaced=prune_replaced,
         data_query=data_query,
+        data_id_table=data_id_table,
         skip_existing_in=skip_existing_in,
         skip_existing=skip_existing,
         execution_butler_location=save_execution_butler,
@@ -222,7 +228,7 @@ def qgraph(  # type: ignore
     )
 
     f = CmdLineFwk()
-    qgraph = f.makeGraph(pipelineObj, args)
+    qgraph = f.makeGraph(pipeline_graph_factory, args)
 
     if qgraph is None:
         return None

lsst/ctrl/mpexec/cli/script/report.py

@@ -128,6 +128,7 @@ def report_v2(
     read_caveats: Literal["lazy", "exhaustive"] | None = "lazy",
     use_qbb: bool = True,
     n_cores: int = 1,
+    view_graph: bool = False,
 ) -> None:
     """Summarize the state of executed quantum graph(s), with counts of failed,
     successful and expected quanta, as well as counts of output datasets and
@@ -182,6 +183,12 @@ def report_v2(
         This should reduce the number of database operations.
     n_cores : `int`, optional
         Number of cores for metadata and log reads.
+    view_graph : `bool`
+        Display a graph representation of `QuantumProvenanceGraph.Summary` on
+        stdout instead of the default plain-text summary. Pipeline graph nodes
+        are then annotated with their status. This is a useful way to visualize
+        the flow of quanta and datasets through the graph and to identify where
+        problems may be occurring.
     """
     butler = Butler.from_config(butler_config, writeable=False)
     qpg = QuantumProvenanceGraph(
@@ -195,7 +202,34 @@ def report_v2(
         n_cores=n_cores,
     )
     summary = qpg.to_summary(butler, do_store_logs=logs)
-    print_summary(summary, full_output_filename, brief)
+
+    if view_graph:
+        from lsst.pipe.base.pipeline_graph.visualization import (
+            QuantumProvenanceGraphStatusAnnotator,
+            QuantumProvenanceGraphStatusOptions,
+            show,
+        )
+
+        # Use any of the quantum graphs to get the `PipelineGraph`
+        # representation of the pipeline.
+        qgraph = QuantumGraph.loadUri(qgraph_uris[0])
+        pipeline_graph = qgraph.pipeline_graph
+
+        # Annotate the pipeline graph with the status information from the
+        # quantum provenance graph summary.
+        status_annotator = QuantumProvenanceGraphStatusAnnotator(summary)
+        status_options = QuantumProvenanceGraphStatusOptions(
+            display_percent=True, display_counts=True, abbreviate=True, visualize=True
+        )
+
+        show(
+            pipeline_graph,
+            dataset_types=True,
+            status_annotator=status_annotator,
+            status_options=status_options,
+        )
+    else:
+        print_summary(summary, full_output_filename, brief)
 
 
 def aggregate_reports(

lsst/ctrl/mpexec/cmdLineFwk.py

@@ -73,10 +73,12 @@ from lsst.pipe.base.all_dimensions_quantum_graph_builder import AllDimensionsQua
 from lsst.pipe.base.dot_tools import graph2dot
 from lsst.pipe.base.mermaid_tools import graph2mermaid
 from lsst.pipe.base.pipeline_graph import NodeType
+from lsst.resources import ResourcePath
 from lsst.utils import doImportType
 from lsst.utils.logging import getLogger
 from lsst.utils.threads import disable_implicit_threading
 
+from ._pipeline_graph_factory import PipelineGraphFactory
 from .executionGraphFixup import ExecutionGraphFixup
 from .mpGraphExecutor import MPGraphExecutor
 from .preExecInit import PreExecInit, PreExecInitLimited
@@ -615,13 +617,16 @@ class CmdLineFwk:
 
         return pipeline
 
-    def makeGraph(self, pipeline: Pipeline, args: SimpleNamespace) -> QuantumGraph | None:
+    def makeGraph(
+        self, pipeline_graph_factory: PipelineGraphFactory | None, args: SimpleNamespace
+    ) -> QuantumGraph | None:
         """Build a graph from command line arguments.
 
         Parameters
         ----------
-        pipeline : `~lsst.pipe.base.Pipeline`
-            Pipeline, can be empty or ``None`` if graph is read from a file.
+        pipeline_graph_factory : `PipelineGraphFactory`
+            Factory that holds a pipeline and can produce a pipeline graph.
+            Must be ``None`` if and only if graph is read from a file.
         args : `types.SimpleNamespace`
             Parsed command line.
 
@@ -645,12 +650,20 @@ class CmdLineFwk:
             qgraph = QuantumGraph.loadUri(args.qgraph, butler.dimensions, nodes=nodes, graphID=args.qgraph_id)
 
             # pipeline can not be provided in this case
-            if pipeline:
-                raise ValueError("Pipeline must not be given when quantum graph is read from file.")
+            if pipeline_graph_factory:
+                raise ValueError(
+                    "Pipeline must not be given when quantum graph is read from "
+                    f"file: {bool(pipeline_graph_factory)}"
+                )
             if args.show_qgraph_header:
                 print(QuantumGraph.readHeader(args.qgraph))
         else:
-            pipeline_graph = pipeline.to_graph()
+            if pipeline_graph_factory is None:
+                raise ValueError("Pipeline must be given when quantum graph is not read from file.")
+            # We can't resolve the pipeline graph if we're mocking until after
+            # we've done the mocking (and the QG build will resolve on its own
+            # anyway).
+            pipeline_graph = pipeline_graph_factory(resolve=False)
             if args.mock:
                 from lsst.pipe.base.tests.mocks import mock_pipeline_graph
 
@@ -659,6 +672,14 @@ class CmdLineFwk:
                     unmocked_dataset_types=args.unmocked_dataset_types,
                     force_failures=args.mock_failure,
                 )
+            data_id_tables = []
+            for table_file in args.data_id_table:
+                with ResourcePath(table_file).as_local() as local_path:
+                    table = Table.read(local_path.ospath)
+                    # Add the filename to the metadata for more logging
+                    # information down in the QG builder.
+                    table.meta["filename"] = table_file
+                    data_id_tables.append(table)
             # make execution plan (a.k.a. DAG) for pipeline
             graph_builder = AllDimensionsQuantumGraphBuilder(
                 pipeline_graph,
@@ -669,6 +690,7 @@ class CmdLineFwk:
                 dataset_query_constraint=args.dataset_query_constraint,
                 input_collections=collections,
                 output_run=run,
+                data_id_tables=data_id_tables,
             )
             # accumulate metadata
             metadata = {
@@ -959,6 +981,10 @@ class CmdLineFwk:
         # but we need datastore records for initInputs, and those are only
         # available from Quanta, so load the whole thing.
         qgraph = QuantumGraph.loadUri(args.qgraph, graphID=args.qgraph_id)
+
+        # Ensure that QBB uses shared datastore cache for writes.
+        _ButlerFactory.defineDatastoreCache()
+
         # Make QBB.
         butler = qgraph.make_init_qbb(args.butler_config, config_search_paths=args.config_search_path)
         # Save all InitOutputs, configs, etc.
@@ -980,6 +1006,9 @@ class CmdLineFwk:
 
         dataset_types = {dstype.name: dstype for dstype in qgraph.registryDatasetTypes()}
 
+        # Ensure that QBB uses shared datastore cache.
+        _ButlerFactory.defineDatastoreCache()
+
         _butler_factory = _QBBFactory(
             butler_config=args.butler_config,
             dimensions=qgraph.universe,

lsst/ctrl/mpexec/showInfo.py

@@ -39,12 +39,13 @@ from typing import Any
 
 import lsst.pex.config as pexConfig
 import lsst.pex.config.history as pexConfigHistory
-from lsst.daf.butler import Butler, DatasetRef, DatasetType, NamedKeyMapping
+from lsst.daf.butler import DatasetRef, DatasetType, NamedKeyMapping
 from lsst.daf.butler.datastore.record_data import DatastoreRecordData
-from lsst.pipe.base import Pipeline, QuantumGraph
+from lsst.pipe.base import PipelineGraph, QuantumGraph
 from lsst.pipe.base.pipeline_graph import visualization
 
 from . import util
+from ._pipeline_graph_factory import PipelineGraphFactory
 from .cmdLineFwk import _ButlerFactory
 
 
@@ -138,20 +139,15 @@ class ShowInfo:
         """Return the commands that have not yet been processed."""
         return frozenset(set(self.commands) - self.handled)
 
-    def show_pipeline_info(self, pipeline: Pipeline, butler: Butler | None) -> None:
+    def show_pipeline_info(self, pipeline_graph_factory: PipelineGraphFactory) -> None:
         """Display useful information about the pipeline.
 
         Parameters
         ----------
-        pipeline : `lsst.pipe.base.Pipeline`
-            The pipeline to use when reporting information.
-        butler : `~lsst.daf.butler.Butler`
-            Butler to use for querying.
+        pipeline_graph_factory : `PipelineGraphFactory`
+            Factory object that holds the pipeline and can produce a pipeline
+            graph.
         """
-        if butler is not None:
-            registry = butler.registry
-        else:
-            registry = None
         for command in self.pipeline_commands:
             if command not in self.commands:
                 continue
@@ -159,25 +155,25 @@ class ShowInfo:
 
             match command:
                 case "pipeline":
-                    print(pipeline, file=self.stream)
+                    print(pipeline_graph_factory.pipeline, file=self.stream)
                 case "config":
                     for arg in args:
-                        self._showConfig(pipeline, arg, False)
+                        self._showConfig(pipeline_graph_factory(visualization_only=True), arg, False)
                 case "dump-config":
                     for arg in args:
-                        self._showConfig(pipeline, arg, True)
+                        self._showConfig(pipeline_graph_factory(visualization_only=True), arg, True)
                 case "history":
                     for arg in args:
-                        self._showConfigHistory(pipeline, arg)
+                        self._showConfigHistory(pipeline_graph_factory(visualization_only=True), arg)
                 case "tasks":
-                    self._showTaskHierarchy(pipeline)
+                    self._showTaskHierarchy(pipeline_graph_factory(visualization_only=True))
                 case "pipeline-graph":
                     visualization.show(
-                        pipeline.to_graph(registry, visualization_only=True), self.stream, dataset_types=True
+                        pipeline_graph_factory(visualization_only=True), self.stream, dataset_types=True
                     )
                 case "task-graph":
                     visualization.show(
-                        pipeline.to_graph(registry, visualization_only=True), self.stream, dataset_types=False
+                        pipeline_graph_factory(visualization_only=True), self.stream, dataset_types=False
                     )
                 case _:
                     raise RuntimeError(f"Unexpectedly tried to process command {command!r}.")
@@ -210,13 +206,13 @@ class ShowInfo:
                     raise RuntimeError(f"Unexpectedly tried to process command {command!r}.")
             self.handled.add(command)
 
-    def _showConfig(self, pipeline: Pipeline, showArgs: str, dumpFullConfig: bool) -> None:
+    def _showConfig(self, pipeline_graph: PipelineGraph, showArgs: str, dumpFullConfig: bool) -> None:
         """Show task configuration
 
         Parameters
         ----------
-        pipeline : `lsst.pipe.base.Pipeline`
-            Pipeline definition
+        pipeline : `lsst.pipe.base.pipeline_graph.Pipeline`
+            Pipeline definition as a graph.
         showArgs : `str`
             Defines what to show
         dumpFullConfig : `bool`
@@ -235,7 +231,7 @@ class ShowInfo:
             if pattern:
                 stream = _FilteredStream(pattern, stream=stream)
 
-        tasks = util.filterTaskNodes(pipeline.to_graph(), taskName)
+        tasks = util.filterTaskNodes(pipeline_graph, taskName)
         if not tasks:
             raise ValueError(f"Pipeline has no tasks named {taskName}")
 
@@ -243,13 +239,13 @@ class ShowInfo:
             print(f"### Configuration for task `{task_node.label}'", file=self.stream)
             task_node.config.saveToStream(stream, root="config", skipImports=not dumpFullConfig)
 
-    def _showConfigHistory(self, pipeline: Pipeline, showArgs: str) -> None:
+    def _showConfigHistory(self, pipeline_graph: PipelineGraph, showArgs: str) -> None:
         """Show history for task configuration.
 
         Parameters
         ----------
-        pipeline : `lsst.pipe.base.Pipeline`
-            Pipeline definition
+        pipeline_graph : `lsst.pipe.base.pipeline_graph.PipelineGraph`
+            Pipeline definition as a graph.
         showArgs : `str`
             Defines what to show
         """
@@ -262,7 +258,7 @@ class ShowInfo:
         if not pattern:
             raise ValueError("Please provide a value with --show history (e.g. history=Task::param)")
 
-        tasks = util.filterTaskNodes(pipeline.to_graph(), taskName)
+        tasks = util.filterTaskNodes(pipeline_graph, taskName)
         if not tasks:
             raise ValueError(f"Pipeline has no tasks named {taskName}")
 
@@ -300,15 +296,15 @@ class ShowInfo:
         if not found:
             raise ValueError(f"None of the tasks has field matching {pattern}")
 
-    def _showTaskHierarchy(self, pipeline: Pipeline) -> None:
+    def _showTaskHierarchy(self, pipeline_graph: PipelineGraph) -> None:
         """Print task hierarchy to stdout
 
         Parameters
         ----------
-        pipeline : `lsst.pipe.base.Pipeline`
-            Pipeline definition.
+        pipeline_graph : `lsst.pipe.base.pipeline_graph.PipelineGraph`
+            Pipeline definition as a graph.
         """
-        for task_node in pipeline.to_graph().tasks.values():
+        for task_node in pipeline_graph.tasks.values():
             print(f"### Subtasks for task `{task_node.task_class_name}'", file=self.stream)
 
             for configName, taskName in util.subTaskIter(task_node.config):

lsst/ctrl/mpexec/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.1400"
+__version__ = "29.2025.1600"

{lsst_ctrl_mpexec-29.2025.1400.dist-info → lsst_ctrl_mpexec-29.2025.1600.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.1400
+Version: 29.2025.1600
 Summary: Pipeline execution infrastructure for the Rubin Observatory LSST Science Pipelines.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_ctrl_mpexec-29.2025.1400.dist-info → lsst_ctrl_mpexec-29.2025.1600.dist-info}/RECORD

@@ -1,7 +1,8 @@
 lsst/__init__.py,sha256=aXdEOZVrBQISQi6XPS9s1NhBjIJaIwNNxCFRiGchRAw,1369
 lsst/ctrl/__init__.py,sha256=aXdEOZVrBQISQi6XPS9s1NhBjIJaIwNNxCFRiGchRAw,1369
-lsst/ctrl/mpexec/__init__.py,sha256=34loiOJc5I_65Npo6zsO1Bf8dB5zV1y1MQid6W65cV8,1699
-lsst/ctrl/mpexec/cmdLineFwk.py,sha256=4h3qqzUjYRuI8oJehjwa5_ytrxhf0JlBLdDeQYOTGx4,41743
+lsst/ctrl/mpexec/__init__.py,sha256=c2mK9--wemp2AEa81CSMkrqaIjJ1_iOs_M-O8CHJxB4,1757
+lsst/ctrl/mpexec/_pipeline_graph_factory.py,sha256=suzWUn9YGn0CTA_3N1Wd-sUo7TFxuo_6VZ2nO0CJ5a8,3552
+lsst/ctrl/mpexec/cmdLineFwk.py,sha256=L8CaSTLZDe9cz4KGSlelMGDjpTKXxC4DTBEw6u9YPS8,43132
 lsst/ctrl/mpexec/dotTools.py,sha256=nx31DC7NkQM766sC97lPQMI22snVaWS7USFMFVLChqk,3421
 lsst/ctrl/mpexec/execFixupDataId.py,sha256=MUirmuoQiWj7C7wQ23QGkgMqx_5_CP4_UMV6h_gVfxk,5056
 lsst/ctrl/mpexec/executionGraphFixup.py,sha256=1z4P4YmtLTMPoMxmFiOnzljLcP9B5V1SCG9haqR_TyI,2830
@@ -12,39 +13,39 @@ lsst/ctrl/mpexec/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsst/ctrl/mpexec/quantumGraphExecutor.py,sha256=DV0j_CNjS8CNMR-kiVIWj1vyzLKZzi4wilc_r0z2L0Q,4386
 lsst/ctrl/mpexec/reports.py,sha256=zxZOkJWhTFdl4eJTOYsM-58tqRbbyF5-cQ-zF-zIR9Y,7677
 lsst/ctrl/mpexec/separablePipelineExecutor.py,sha256=6QvZ9EFHoqXwYjHbcNe9wWMssFbAg2I9mNpjFnTSiM0,12074
-lsst/ctrl/mpexec/showInfo.py,sha256=3GmRcerbKg3zXpEGiIWKY8z2mXoxZ3w6Qs1DCX73slE,16207
+lsst/ctrl/mpexec/showInfo.py,sha256=elrWQ8QPusZguLqYhvmMjYaNmoJgWpQDr3uQ0QhB1HI,16407
 lsst/ctrl/mpexec/simple_pipeline_executor.py,sha256=scqQ1MDS6FcZvFTwxtCkmTSg0zJmKIfah91lawr7Dhc,20454
 lsst/ctrl/mpexec/singleQuantumExecutor.py,sha256=mlv3nF29N1meiHie3r072Ynz5k6XTpFO8jfhq7BufF8,28036
 lsst/ctrl/mpexec/taskFactory.py,sha256=c4xj8cR_Ts5uzzGovh87ZKdVeeXy5E3lIjCwJnDuOqg,2720
 lsst/ctrl/mpexec/util.py,sha256=y2Rw5PL40_EuLtVxiqSVX0JfPV4IrFl1LfOMUWx2u30,4236
-lsst/ctrl/mpexec/version.py,sha256=tG0U8v8pqFE3UYsFMTK1so9Djnk6SthXSsn8LMVzAoQ,55
+lsst/ctrl/mpexec/version.py,sha256=DWDCyavYRMZByGPGMYcnpz6piNv1sQvCKH8yohX_F3c,55
 lsst/ctrl/mpexec/cli/__init__.py,sha256=6dpDHNBzyicVpFi1fsaiYVbYEMeoL57IHKkPaej24gs,1301
 lsst/ctrl/mpexec/cli/pipetask.py,sha256=4HnhX9dCizCihVbpHVJX5WXO9TEli9oL6wA-tPh1_vA,2209
 lsst/ctrl/mpexec/cli/utils.py,sha256=5iOrlj5jJTWtZS0BMLsuiCGAvxbfrjd1MSyXxBthWcc,6503
 lsst/ctrl/mpexec/cli/cmd/__init__.py,sha256=nRmwwW5d55gAEkyE7NpSK8mxa56HcfEta2r-Y9I07F8,1661
-lsst/ctrl/mpexec/cli/cmd/commands.py,sha256=7ohYuNeUhnnyNvWYWYBdHLkNm5VWsOQiOh6HjzBBYXc,17539
+lsst/ctrl/mpexec/cli/cmd/commands.py,sha256=Wevv7Wu3hgLY2tNA4RJdMpOFur9rbH5JtwgtNLPnqiY,17811
 lsst/ctrl/mpexec/cli/opt/__init__.py,sha256=IzUInuJj9igiaNcEqMx0adelgJtQC5_XMYnaiizBn0A,1378
 lsst/ctrl/mpexec/cli/opt/arguments.py,sha256=vjUw0ZN_4HStp-_3ne6AT5S_eH7sly3OVfL07tgrJnY,1572
-lsst/ctrl/mpexec/cli/opt/optionGroups.py,sha256=z1vrRsNlk11cGulbD9qsBOuPhZgryPrka_IxIeVW9TM,8031
-lsst/ctrl/mpexec/cli/opt/options.py,sha256=TyTYxDrFqhUqfnLPfjr_2kJLPNlBbQ86nX2SuOlqAts,19911
+lsst/ctrl/mpexec/cli/opt/optionGroups.py,sha256=qtpwlgfvEzAs0CNav7t9ylywWBavoeWlZfYhRQEuZTw,8132
+lsst/ctrl/mpexec/cli/opt/options.py,sha256=8gu-QYCblBO_RlPGYFw__teRWxtRCyasGKz7wNhv_dc,20563
 lsst/ctrl/mpexec/cli/script/__init__.py,sha256=eCuF4FAI5D3pl05IMJj7TCkZq-hireua2mA5Ui-mKSI,1624
-lsst/ctrl/mpexec/cli/script/build.py,sha256=fTa4veqSfUR5nONedmS14q4N5Y_E3nDP1Q-chJvC5IA,5860
+lsst/ctrl/mpexec/cli/script/build.py,sha256=Ff_8ffBmxuJi45x7-rUb-f0axucagYs6rNvBowwVmq0,6149
 lsst/ctrl/mpexec/cli/script/cleanup.py,sha256=D7W-azf4mNJcIWhbU5uCRCi94mkb8-Q2ksRFblQGrUw,4990
 lsst/ctrl/mpexec/cli/script/confirmable.py,sha256=Bo1GSTZQn44d_TRj6N3YfpYcZiuHEYoz26WZQwMyb4A,3918
 lsst/ctrl/mpexec/cli/script/pre_exec_init_qbb.py,sha256=DGNseiavrI1VxR_o6vCelbPvr9kCQZzroZHHSQe-RTE,2479
 lsst/ctrl/mpexec/cli/script/purge.py,sha256=gYwSsZfTBP6oDcDp_YdqQEKGvAStvsj5hwNw42S8ptE,10637
-lsst/ctrl/mpexec/cli/script/qgraph.py,sha256=p5z84bmRBbZXIEql76nXYnRQcLau-VNTUVkfOhdqjfU,9805
-lsst/ctrl/mpexec/cli/script/report.py,sha256=AssS4S99LFrPZtATsu7lsXVdxk7mOwfrdM9LXmUxgZ0,11427
+lsst/ctrl/mpexec/cli/script/qgraph.py,sha256=ncjbtJ7AMp-Obo524HAC2E4Hnqyk1Aji4mJPAZUGMDM,10048
+lsst/ctrl/mpexec/cli/script/report.py,sha256=ItJitmYmWIDjj7PxRtP4qXLx-z5FAU6nSfI2gx0GS5k,12800
 lsst/ctrl/mpexec/cli/script/run.py,sha256=22g7vBhGDGsFSQq7CtruTf-bivo3t53decBAV0wAg1g,9767
 lsst/ctrl/mpexec/cli/script/run_qbb.py,sha256=oCEydg13zNAtci8XB0IwXx_D5PPsHbjCPATWoBlhcPk,5294
 lsst/ctrl/mpexec/cli/script/update_graph_run.py,sha256=v_EdOaD6jR_vSlgm_5-pwUjoNEFMrAuYFM1xIaHVU3Q,2597
-lsst_ctrl_mpexec-29.2025.1400.dist-info/licenses/COPYRIGHT,sha256=pGCjnRAnyt02a6_9PLzXQikpvYmvMmK9fCdOKlRSV6k,369
-lsst_ctrl_mpexec-29.2025.1400.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_mpexec-29.2025.1400.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_mpexec-29.2025.1400.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_mpexec-29.2025.1400.dist-info/METADATA,sha256=_uyvLF22t89cfq1rXy2t61VzCsjMJ2f14EzNbfiiUYs,2302
-lsst_ctrl_mpexec-29.2025.1400.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-lsst_ctrl_mpexec-29.2025.1400.dist-info/entry_points.txt,sha256=aYE38yqZU8qvpLUUkXzgmUxDJYYknEqPxgxYkowrL4s,64
-lsst_ctrl_mpexec-29.2025.1400.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_mpexec-29.2025.1400.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_mpexec-29.2025.1400.dist-info/RECORD,,
+lsst_ctrl_mpexec-29.2025.1600.dist-info/licenses/COPYRIGHT,sha256=pGCjnRAnyt02a6_9PLzXQikpvYmvMmK9fCdOKlRSV6k,369
+lsst_ctrl_mpexec-29.2025.1600.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_mpexec-29.2025.1600.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_mpexec-29.2025.1600.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_mpexec-29.2025.1600.dist-info/METADATA,sha256=4w8JjdeOxf8HVCuGdbBxHxYx0DTb-RiKmQZ9rqkLLlk,2302
+lsst_ctrl_mpexec-29.2025.1600.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+lsst_ctrl_mpexec-29.2025.1600.dist-info/entry_points.txt,sha256=aYE38yqZU8qvpLUUkXzgmUxDJYYknEqPxgxYkowrL4s,64
+lsst_ctrl_mpexec-29.2025.1600.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_mpexec-29.2025.1600.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_mpexec-29.2025.1600.dist-info/RECORD,,