lsst-ctrl-mpexec 29.2025.3600__tar.gz → 29.2025.3800__tar.gz

{lsst_ctrl_mpexec-29.2025.3600/python/lsst_ctrl_mpexec.egg-info → lsst_ctrl_mpexec-29.2025.3800}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.3600
+Version: 29.2025.3800
 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.3600 → lsst_ctrl_mpexec-29.2025.3800}/python/lsst/ctrl/mpexec/cli/opt/options.py

@@ -318,7 +318,8 @@ show_option = MWOptionDecorator(
         given its label or all tasks; ``pipeline`` to show pipeline
         composition; ``graph`` to show information about quanta;
         ``workflow`` to show information about quanta and their
-        dependency; ``tasks`` to show task composition; ``uri`` to show
+        dependency; ``tasks`` to show task composition; ``subsets`` to
+        show subset labels and associated tasks; ``uri`` to show
         predicted dataset URIs of quanta; ``pipeline-graph`` for a
         text-based visualization of the pipeline (tasks and dataset types);
         ``task-graph`` for a text-based visualization of just the tasks.

{lsst_ctrl_mpexec-29.2025.3600 → lsst_ctrl_mpexec-29.2025.3800}/python/lsst/ctrl/mpexec/showInfo.py

@@ -111,6 +111,7 @@ class ShowInfo:
         "dump-config",
         "pipeline-graph",
         "task-graph",
+        "subsets",
     }
     graph_commands = {"graph", "workflow", "uri"}
 
@@ -131,7 +132,9 @@ class ShowInfo:
         known = self.pipeline_commands | self.graph_commands
         unknown = set(commands) - known
         if unknown:
-            raise ValueError(f"Unknown value(s) for show: {unknown} (choose from '{', '.join(known)}')")
+            raise ValueError(
+                f"Unknown value(s) for show: {unknown} (choose from '{', '.join(sorted(known))}')"
+            )
 
     @property
     def unhandled(self) -> frozenset[str]:
@@ -151,7 +154,6 @@ class ShowInfo:
             if command not in self.commands:
                 continue
             args = self.commands[command]
-
             match command:
                 case "pipeline":
                     print(pipeline_graph_factory.pipeline, file=self.stream)
@@ -166,6 +168,14 @@ class ShowInfo:
                         self._showConfigHistory(pipeline_graph_factory(visualization_only=True), arg)
                 case "tasks":
                     self._showTaskHierarchy(pipeline_graph_factory(visualization_only=True))
+                case "subsets":
+                    print(
+                        "\n".join(
+                            f"{subset}:\n" + "\n".join(f"  - {s}" for s in sorted(tasks))
+                            for subset, tasks in dict(pipeline_graph_factory.pipeline.subsets).items()
+                        ),
+                        file=self.stream,
+                    )
                 case "pipeline-graph":
                     visualization.show(
                         pipeline_graph_factory(visualization_only=True), self.stream, dataset_types=True

lsst_ctrl_mpexec-29.2025.3800/python/lsst/ctrl/mpexec/version.py

@@ -0,0 +1,2 @@
+__all__ = ["__version__"]
+__version__ = "29.2025.3800"

{lsst_ctrl_mpexec-29.2025.3600 → lsst_ctrl_mpexec-29.2025.3800/python/lsst_ctrl_mpexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.3600
+Version: 29.2025.3800
 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.3600 → lsst_ctrl_mpexec-29.2025.3800}/tests/test_cmdLineFwk.py

@@ -439,13 +439,22 @@ class CmdLineFwkTestCase(unittest.TestCase):
         actions = [_ACTION_ADD_TASK(f"{_TASK_CLASS}:task"), _ACTION_CONFIG("task:addend=100")]
         kwargs = _makeArgs(pipeline_actions=actions).__dict__
         pipeline_graph_factory = build(**kwargs)
+        pipeline_graph_factory.pipeline.addLabeledSubset("test_subset", "test description", {"task"})
 
         with self.assertRaises(ValueError):
             ShowInfo(["unrecognized", "config"])
 
         stream = StringIO()
         show = ShowInfo(
-            ["pipeline", "config", "history=task::addend", "tasks", "dump-config", "config=task::add*"],
+            [
+                "pipeline",
+                "config",
+                "history=task::addend",
+                "tasks",
+                "subsets",
+                "dump-config",
+                "config=task::add*",
+            ],
             stream=stream,
         )
         show.show_pipeline_info(pipeline_graph_factory)
@@ -522,6 +531,20 @@ class CmdLineFwkTestCase(unittest.TestCase):
             show.show_pipeline_info(pipeline_graph_factory)
         self.assertIn("Pipeline has no tasks named notask", str(cm.exception))
 
+        stream = StringIO()
+        show = ShowInfo(["tasks"], stream=stream)
+        show.show_pipeline_info(pipeline_graph_factory)
+        stream.seek(0)
+        output = stream.read().strip()
+        self.assertIn("### Subtasks for task `lsst.pipe.base.tests.simpleQGraph.AddTask'", output)
+
+        stream = StringIO()
+        show = ShowInfo(["subsets"], stream=stream)
+        show.show_pipeline_info(pipeline_graph_factory)
+        stream.seek(0)
+        output = stream.read().strip()
+        self.assertIn("test_subset", output)
+
 
 class CmdLineFwkTestCaseWithButler(unittest.TestCase):
     """A test case for CmdLineFwk."""
@@ -537,7 +560,7 @@ class CmdLineFwkTestCaseWithButler(unittest.TestCase):
         super().tearDownClass()
 
     def testSimpleQGraph(self):
-        """Test successfull execution of trivial quantum graph."""
+        """Test successful execution of trivial quantum graph."""
         args = _makeArgs(butler_config=self.root, input="test", output="output")
         butler = makeSimpleButler(self.root, run=args.input, inMemory=False)
         populateButler(self.pipeline, butler)

lsst_ctrl_mpexec-29.2025.3600/python/lsst/ctrl/mpexec/version.py

@@ -1,2 +0,0 @@
-__all__ = ["__version__"]
-__version__ = "29.2025.3600"