lsst-ctrl-mpexec 29.2025.4100__tar.gz → 29.2025.4300__tar.gz

{lsst_ctrl_mpexec-29.2025.4100/python/lsst_ctrl_mpexec.egg-info → lsst_ctrl_mpexec-29.2025.4300}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.4100
+Version: 29.2025.4300
 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.4100 → lsst_ctrl_mpexec-29.2025.4300}/python/lsst/ctrl/mpexec/cli/script/qgraph.py

@@ -251,7 +251,7 @@ def qgraph(
                 else:
                     import_mode = TaskImportMode.DO_NOT_IMPORT
                 with PredictedQuantumGraph.open(qgraph, import_mode=import_mode) as reader:
-                    if for_execution or qgraph_dot or qgraph_mermaid or show.needs_full_qg:
+                    if for_execution or qgraph_dot or qgraph_mermaid or show.needs_full_qg or qgraph_node_id:
                         # This reads everything for the given quanta.
                         reader.read_execution_quanta(quantum_ids)
                     elif for_init_output_run:
@@ -316,24 +316,24 @@ def qgraph(
             output, metadata=metadata, attach_datastore_records=qgraph_datastore_records
         )
 
-    if not summarize_quantum_graph(qgc.header):
-        return None
-
     if save_qgraph:
         _LOG.verbose("Writing quantum graph to %r.", save_qgraph)
         qgc.write(save_qgraph)
 
     qg = qgc.assemble()
 
+    if not summarize_quantum_graph(qg):
+        return None
+
     if qgraph_dot:
         _LOG.verbose("Writing quantum graph DOT visualization to %r.", qgraph_dot)
-        graph2dot(qg, qgraph_dot)  # TODO[DM-51850]: make this work
+        graph2dot(qg, qgraph_dot)
 
     if qgraph_mermaid:
         _LOG.verbose("Writing quantum graph Mermaid visualization to %r.", qgraph_mermaid)
-        graph2mermaid(qg, qgraph_mermaid)  # TODO[DM-51850]: make this work
+        graph2mermaid(qg, qgraph_mermaid)
 
     # optionally dump some info.
-    show.show_graph_info(qg, butler_config)  # TODO[DM-51850]: make this work
+    show.show_graph_info(qg, butler_config)
 
     return qg

{lsst_ctrl_mpexec-29.2025.4100 → lsst_ctrl_mpexec-29.2025.4300}/python/lsst/ctrl/mpexec/cli/script/run_qbb.py

@@ -163,7 +163,7 @@ def run_qbb(
         qg = PredictedQuantumGraph.read_execution_quanta(qgraph, quantum_ids=quantum_ids)
     job_metadata = {"qg_read_time": qg_read_time.duration, "qg_size": len(qg)}
 
-    summarize_quantum_graph(qg.header)
+    summarize_quantum_graph(qg)
 
     dataset_types = {dtn.name: dtn.dataset_type for dtn in qg.pipeline_graph.dataset_types.values()}
 

{lsst_ctrl_mpexec-29.2025.4100 → lsst_ctrl_mpexec-29.2025.4300}/python/lsst/ctrl/mpexec/cli/utils.py

@@ -38,7 +38,7 @@ from astropy.table import Table
 from lsst.daf.butler.cli.opt import config_file_option, config_option
 from lsst.daf.butler.cli.utils import MWCommand, MWCtxObj, split_commas
 from lsst.pipe.base.cli.opt import instrument_option
-from lsst.pipe.base.quantum_graph import HeaderModel
+from lsst.pipe.base.quantum_graph import BaseQuantumGraph
 from lsst.utils.logging import getLogger
 
 from .opt import delete_option, task_option
@@ -219,32 +219,36 @@ class PipetaskCommand(MWCommand):
     extra_epilog = "See 'pipetask --help' for more options."
 
 
-def summarize_quantum_graph(qg_header: HeaderModel) -> int:
+def summarize_quantum_graph(qg: BaseQuantumGraph) -> int:
     """Report a summary of the quanta in the graph.
 
+    This only reports quanta that were actually loaded.
+
     Parameters
     ----------
-    qg_header : `lsst.pipe.base.quantum_graph.HeaderModel`
-        Header of the quantum graph.
+    qg : `lsst.pipe.base.quantum_graph.BaseQuantumGraph`
+        Quantum graph object
 
     Returns
     -------
     n_quanta : `int`
         The number of quanta in the graph.
     """
-    n_quanta = qg_header.n_quanta
+    n_task_quanta = {
+        task_label: len(quanta_for_task)
+        for task_label, quanta_for_task in qg.quanta_by_task.items()
+        if quanta_for_task
+    }
+    n_quanta = sum(n_task_quanta.values())
     if n_quanta == 0:
         _LOG.info("QuantumGraph contains no quanta.")
     else:
         if _LOG.isEnabledFor(logging.INFO):
-            qg_quanta, qg_tasks = [], []
-            for task_label, n_quanta_for_task in qg_header.n_task_quanta.items():
-                qg_tasks.append(task_label)
-                qg_quanta.append(n_quanta_for_task)
+            qg_tasks, qg_quanta = zip(*n_task_quanta.items())
             qg_task_table = Table(dict(Quanta=qg_quanta, Tasks=qg_tasks))
             qg_task_table_formatted = "\n".join(qg_task_table.pformat())
             quanta_str = "quantum" if n_quanta == 1 else "quanta"
-            n_tasks = len(qg_header.n_task_quanta)
+            n_tasks = len(n_task_quanta)
             n_tasks_plural = "" if n_tasks == 1 else "s"
             _LOG.info(
                 "QuantumGraph contains %d %s for %d task%s\n%s",

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

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

{lsst_ctrl_mpexec-29.2025.4100 → lsst_ctrl_mpexec-29.2025.4300/python/lsst_ctrl_mpexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.4100
+Version: 29.2025.4300
 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.4100 → lsst_ctrl_mpexec-29.2025.4300}/tests/test_qgraph.py

@@ -71,6 +71,41 @@ class QgraphTest(unittest.TestCase):
             self.assertEqual(summary.qgraphSummary.outputRun, "output_run")
             self.assertEqual(len(summary.qgraphSummary.qgraphTaskSummaries), 2)
 
+    def test_partial_read_counts(self):
+        """Test reading only one node from a saved graph and check that the
+        printed task/quantum counts reflect only that node.
+        """
+        with DirectButlerRepo.make_temporary() as (helper, root):
+            helper.add_task()
+            helper.add_task()
+            qgc = helper.make_quantum_graph_builder().finish(attach_datastore_records=False)
+            quantum_id = next(iter(qgc.quantum_datasets.keys()))
+            graph_uri = os.path.join(root, "graph.qg")
+            qgc.write(graph_uri)
+            log_filename = os.path.join(root, "qgraph.log")
+            runner = LogCliRunner()
+            result = runner.invoke(
+                pipetask_cli,
+                [
+                    "--log-level",
+                    "lsst.ctrl.mpexec.cli.utils=INFO",
+                    "--log-file",
+                    log_filename,
+                    "qgraph",
+                    "--butler-config",
+                    root,
+                    "--qgraph",
+                    graph_uri,
+                    "--qgraph-node-id",
+                    str(quantum_id),
+                ],
+                input="no",
+            )
+            self.assertEqual(result.exit_code, 0, clickResultMsg(result))
+            with open(log_filename) as log_file:
+                log = log_file.read()
+            self.assertIn("1 quantum for 1 task", log)
+
     def test_qgraph_show(self):
         with DirectButlerRepo.make_temporary() as (helper, root):
             helper.add_task()

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

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