lsst-ctrl-mpexec 29.2025.4000__py3-none-any.whl → 29.2025.4200__py3-none-any.whl

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/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/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/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.4000"
+__version__ = "29.2025.4200"

{lsst_ctrl_mpexec-29.2025.4000.dist-info → lsst_ctrl_mpexec-29.2025.4200.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.4000
+Version: 29.2025.4200
 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.4000.dist-info → lsst_ctrl_mpexec-29.2025.4200.dist-info}/RECORD

@@ -16,11 +16,11 @@ lsst/ctrl/mpexec/simple_pipeline_executor.py,sha256=aVWgOds0ILCTzXdrWy0KFyjcIuqw
 lsst/ctrl/mpexec/singleQuantumExecutor.py,sha256=Y70xs5f06sEeDXF3cKNjxL4gdG69Osu8Xbol-vm-VIo,8616
 lsst/ctrl/mpexec/taskFactory.py,sha256=0TdCM-le7CXhobVbWPTqcq9sOrGceUY6mmkzzWhi0dM,1707
 lsst/ctrl/mpexec/util.py,sha256=y2Rw5PL40_EuLtVxiqSVX0JfPV4IrFl1LfOMUWx2u30,4236
-lsst/ctrl/mpexec/version.py,sha256=OZgl6BR-Rxy62NJlHO2yg_Rq4EhfmRSKDkEEnAyc-3Q,55
+lsst/ctrl/mpexec/version.py,sha256=loN_SewEappJtRr1bfMkUAloXYiZtM4w0O03FF5yeZQ,55
 lsst/ctrl/mpexec/cli/__init__.py,sha256=6dpDHNBzyicVpFi1fsaiYVbYEMeoL57IHKkPaej24gs,1301
 lsst/ctrl/mpexec/cli/butler_factory.py,sha256=-Nlm5nVcWK_JbW8oc5qudu9yuZg5Pknf1LmtkxTkHJs,26713
 lsst/ctrl/mpexec/cli/pipetask.py,sha256=4HnhX9dCizCihVbpHVJX5WXO9TEli9oL6wA-tPh1_vA,2209
-lsst/ctrl/mpexec/cli/utils.py,sha256=Oiw4yOpsR7_kJObhZAZu8hm81NFmaLaRAv86v4smadk,9833
+lsst/ctrl/mpexec/cli/utils.py,sha256=WvpVompkHFbk-EAOVNTWXDd_OfWgp0bvzKKCcX1o5r8,9890
 lsst/ctrl/mpexec/cli/cmd/__init__.py,sha256=nRmwwW5d55gAEkyE7NpSK8mxa56HcfEta2r-Y9I07F8,1661
 lsst/ctrl/mpexec/cli/cmd/commands.py,sha256=dO0WMFEwAAGoiNBgkQXu1oW-N89Eah89X2XR84PKQBg,17063
 lsst/ctrl/mpexec/cli/opt/__init__.py,sha256=IzUInuJj9igiaNcEqMx0adelgJtQC5_XMYnaiizBn0A,1378
@@ -33,18 +33,18 @@ lsst/ctrl/mpexec/cli/script/cleanup.py,sha256=D7W-azf4mNJcIWhbU5uCRCi94mkb8-Q2ks
 lsst/ctrl/mpexec/cli/script/confirmable.py,sha256=Bo1GSTZQn44d_TRj6N3YfpYcZiuHEYoz26WZQwMyb4A,3918
 lsst/ctrl/mpexec/cli/script/pre_exec_init_qbb.py,sha256=3cNw5BKMT4_YWo1GeuH4VmvKeYOoyDcjH7QgBEoiPmA,4140
 lsst/ctrl/mpexec/cli/script/purge.py,sha256=gYwSsZfTBP6oDcDp_YdqQEKGvAStvsj5hwNw42S8ptE,10637
-lsst/ctrl/mpexec/cli/script/qgraph.py,sha256=aaWRxqQHWWg8hRYlMZmKxQMq5arZNIYa4rHvQmENRUs,14905
+lsst/ctrl/mpexec/cli/script/qgraph.py,sha256=4mWtSF375XW2-Gm5DPdvSwbjeNRYhG19FHN66q2sjGc,14813
 lsst/ctrl/mpexec/cli/script/report.py,sha256=ItJitmYmWIDjj7PxRtP4qXLx-z5FAU6nSfI2gx0GS5k,12800
 lsst/ctrl/mpexec/cli/script/run.py,sha256=d_oSGl6t9qEPeFPsZxlPQkUsGLNNl5wB1PXGn71Fw-s,14135
-lsst/ctrl/mpexec/cli/script/run_qbb.py,sha256=lz4PMezfyDjFzyjrOnk0i-BULj_Tn8axHHDPQ20KgVo,10862
+lsst/ctrl/mpexec/cli/script/run_qbb.py,sha256=W1MvzoUBKvHNx17s1dvyGXaC7C5uGvbvDrF9meXbvok,10855
 lsst/ctrl/mpexec/cli/script/update_graph_run.py,sha256=2b0Q0j5yPC4bWxq0tsd4et2VmOnu-dQLQa94340z78Y,2623
-lsst_ctrl_mpexec-29.2025.4000.dist-info/licenses/COPYRIGHT,sha256=pGCjnRAnyt02a6_9PLzXQikpvYmvMmK9fCdOKlRSV6k,369
-lsst_ctrl_mpexec-29.2025.4000.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_mpexec-29.2025.4000.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_mpexec-29.2025.4000.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_mpexec-29.2025.4000.dist-info/METADATA,sha256=ccuSpT6JGbaAbBp6qCSkQMJYnLPaY_aMKR4drY_2eaU,2302
-lsst_ctrl_mpexec-29.2025.4000.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_ctrl_mpexec-29.2025.4000.dist-info/entry_points.txt,sha256=aYE38yqZU8qvpLUUkXzgmUxDJYYknEqPxgxYkowrL4s,64
-lsst_ctrl_mpexec-29.2025.4000.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_mpexec-29.2025.4000.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_mpexec-29.2025.4000.dist-info/RECORD,,
+lsst_ctrl_mpexec-29.2025.4200.dist-info/licenses/COPYRIGHT,sha256=pGCjnRAnyt02a6_9PLzXQikpvYmvMmK9fCdOKlRSV6k,369
+lsst_ctrl_mpexec-29.2025.4200.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_mpexec-29.2025.4200.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_mpexec-29.2025.4200.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_mpexec-29.2025.4200.dist-info/METADATA,sha256=H6qLgq5Im388p4enDvweMHYuo_JAFM_qnNCfUVleN6U,2302
+lsst_ctrl_mpexec-29.2025.4200.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_ctrl_mpexec-29.2025.4200.dist-info/entry_points.txt,sha256=aYE38yqZU8qvpLUUkXzgmUxDJYYknEqPxgxYkowrL4s,64
+lsst_ctrl_mpexec-29.2025.4200.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_mpexec-29.2025.4200.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_mpexec-29.2025.4200.dist-info/RECORD,,