lsst-ctrl-mpexec 29.2025.3100__py3-none-any.whl → 29.2025.3300__py3-none-any.whl

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

@@ -25,28 +25,31 @@
 # 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 types import SimpleNamespace
+from __future__ import annotations
+
+__all__ = ("build",)
 
 from lsst.daf.butler import Butler
+from lsst.pipe.base import Pipeline
 from lsst.pipe.base.pipeline_graph import visualization
+from lsst.resources import ResourcePathExpression
 
-from ... import CmdLineFwk
 from ..._pipeline_graph_factory import PipelineGraphFactory
+from ...showInfo import ShowInfo
 from ..utils import _PipelineAction
 
 
-def build(  # type: ignore
+def build(
     *,
-    order_pipeline,
-    pipeline,
-    pipeline_actions,
-    pipeline_dot,
-    pipeline_mermaid,
-    save_pipeline,
-    show,
-    butler_config=None,
-    select_tasks="",
-    **kwargs,
+    pipeline: ResourcePathExpression | Pipeline,
+    pipeline_actions: list[_PipelineAction] | _PipelineAction,
+    pipeline_dot: str,
+    pipeline_mermaid: str,
+    save_pipeline: str,
+    show: ShowInfo,
+    butler_config: ResourcePathExpression | None = None,
+    select_tasks: str = "",
+    **kwargs: object,
 ) -> PipelineGraphFactory:
     """Implement the command line interface `pipetask build` subcommand.
 
@@ -60,12 +63,9 @@ def build(  # type: ignore
 
     Parameters
     ----------
-    order_pipeline : `bool`
-        If true, order tasks in pipeline based on their data dependencies,
-        ordering is performed as last step before saving or executing pipeline.
-    pipeline : `str`
+    pipeline : `str` or `lsst.pipe.base.Pipeline`
         Path location of a pipeline definition file in YAML format.
-    pipeline_actions : `list` [`PipelineAction`]] or `PipelineAction`
+    pipeline_actions : `list` [`PipelineAction`] or `PipelineAction`
         A list of pipeline actions in the order they should be executed.
     pipeline_dot : `str`
         Path location for storing GraphViz DOT representation of a pipeline.
@@ -87,7 +87,7 @@ def build(  # type: ignore
     **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
-        which ingore these unused kwargs.
+        which ignore these unused kwargs.
 
     Returns
     -------
@@ -105,25 +105,38 @@ def build(  # type: ignore
     # `lsst.utils.iteration.iterable` because a namedtuple *is* iterable,
     # but we need a list of _PipelineAction.
     if isinstance(pipeline_actions, _PipelineAction):
-        pipeline_actions = (pipeline_actions,)
-
-    args = SimpleNamespace(
-        pipeline=pipeline,
-        pipeline_actions=pipeline_actions,
-        pipeline_dot=pipeline_dot,
-        pipeline_mermaid=pipeline_mermaid,
-        save_pipeline=save_pipeline,
-    )
-
-    f = CmdLineFwk()
+        pipeline_actions = [pipeline_actions]
 
-    # Will raise an exception if it fails to build the pipeline.
-    pipeline = f.makePipeline(args)
-
-    if butler_config is not None:
-        butler = Butler.from_config(butler_config, writeable=False)
+    if pipeline:
+        if not isinstance(pipeline, Pipeline):
+            pipeline = Pipeline.from_uri(pipeline)
     else:
-        butler = None
+        pipeline = Pipeline("anonymous")
+
+    # loop over all pipeline actions and apply them in order
+    for action in pipeline_actions:
+        match action.action:
+            case "add_instrument":
+                pipeline.addInstrument(action.value)
+            case "new_task":
+                pipeline.addTask(action.value, action.label)
+            case "delete_task":
+                pipeline.removeTask(action.label)
+            case "config":
+                # action value string is "field=value", split it at '='
+                field, _, value = action.value.partition("=")
+                pipeline.addConfigOverride(action.label, field, value)
+            case "configfile":
+                pipeline.addConfigFile(action.label, action.value)
+            case _:
+                raise ValueError(f"Unexpected pipeline action: {action.action}")
+
+    if save_pipeline:
+        pipeline.write_to_uri(save_pipeline)
+
+    butler: Butler | None = None
+    if butler_config:
+        butler = Butler.from_config(butler_config, writeable=False)
 
     pipeline_graph_factory = PipelineGraphFactory(pipeline, butler, select_tasks)
 

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

@@ -45,7 +45,6 @@ def qgraph(  # type: ignore
     skip_existing_in,
     skip_existing,
     save_qgraph,
-    save_single_quanta,
     qgraph_dot,
     qgraph_mermaid,
     butler_config,
@@ -58,10 +57,6 @@ def qgraph(  # type: ignore
     data_query,
     data_id_table=(),
     show,
-    save_execution_butler,
-    clobber_execution_butler,
-    target_datastore_root,
-    transfer,
     clobber_outputs,
     dataset_query_constraint,
     rebase,
@@ -102,10 +97,6 @@ def qgraph(  # type: ignore
     save_qgraph : `str` or `None`
         URI location for storing a serialized quantum graph definition as a
         pickle file.
-    save_single_quanta : `str` or `None`
-        Format string of URI locations for storing individual quantum graph
-        definition (pickle files). The curly brace {} in the input string will
-        be replaced by a quantum number.
     qgraph_dot : `str` or `None`
         Path location for storing GraphViz DOT representation of a quantum
         graph.
@@ -152,17 +143,6 @@ def qgraph(  # type: ignore
         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`
-        URI location for storing an execution Butler build from the
-        QuantumGraph.
-    clobber_execution_butler : `bool`
-        It True overwrite existing execution butler files if present.
-    target_datastore_root : `str` or `None`
-        URI location for the execution butler's datastore.
-    transfer : `str` or `None`
-        Transfer mode for execution butler creation.  This should be a
-        ``transfer`` string recognized by
-        :func:`lsst.resources.ResourcePath.transfer_from`.
     clobber_outputs : `bool`
         Remove outputs from previous execution of the same quantum before new
         execution.  If ``skip_existing`` is also passed, then only failed
@@ -200,7 +180,6 @@ def qgraph(  # type: ignore
         qgraph_node_id=qgraph_node_id,
         qgraph_datastore_records=qgraph_datastore_records,
         save_qgraph=save_qgraph,
-        save_single_quanta=save_single_quanta,
         qgraph_dot=qgraph_dot,
         qgraph_mermaid=qgraph_mermaid,
         butler_config=butler_config,
@@ -214,10 +193,6 @@ def qgraph(  # type: ignore
         data_id_table=data_id_table,
         skip_existing_in=skip_existing_in,
         skip_existing=skip_existing,
-        execution_butler_location=save_execution_butler,
-        clobber_execution_butler=clobber_execution_butler,
-        target_datastore_root=target_datastore_root,
-        transfer=transfer,
         clobber_outputs=clobber_outputs,
         dataset_query_constraint=dataset_query_constraint,
         rebase=rebase,