lsst-ctrl-bps 29.2025.4700__py3-none-any.whl → 30.0.0__py3-none-any.whl

lsst/ctrl/bps/drivers.py

@@ -55,6 +55,7 @@ from lsst.utils.timer import time_this
 from lsst.utils.usage import get_peak_mem_usage
 
 from . import BPS_DEFAULTS, BPS_SEARCH_ORDER, DEFAULT_MEM_FMT, DEFAULT_MEM_UNIT, BpsConfig
+from .bps_reports import compile_code_summary, compile_job_summary
 from .bps_utils import _dump_env_info, _dump_pkg_info, _make_id_link
 from .cancel import cancel
 from .construct import construct
@@ -68,7 +69,7 @@ from .initialize import (
 from .ping import ping
 from .pre_transform import acquire_quantum_graph, cluster_quanta
 from .prepare import prepare
-from .report import BPS_POSTPROCESSORS, display_report, retrieve_report
+from .report import display_report, retrieve_report
 from .restart import restart
 from .status import status
 from .submit import submit
@@ -400,20 +401,31 @@ def restart_driver(wms_service, run_id):
             print("Restart failed: Unknown error")
 
 
-def report_driver(wms_service, run_id, user, hist_days, pass_thru, is_global=False, return_exit_codes=False):
-    """Print out summary of jobs submitted for execution.
+def report_driver(
+    wms_service: str | None = None,
+    run_id: str | None = None,
+    user: str | None = None,
+    hist_days: float = 0.0,
+    pass_thru: str | None = None,
+    is_global: bool = False,
+    return_exit_codes: bool = False,
+):
+    """Print out the summary of jobs submitted for execution.
 
     Parameters
     ----------
-    wms_service : `str`
+    wms_service : `str`, optional
         Name of the class.
-    run_id : `str`
+    run_id : `str`, optional
         A run id the report will be restricted to.
-    user : `str`
+    user : `str`, optional
         A user the report will be restricted to.
-    hist_days : `float`
-        Number of days.
-    pass_thru : `str`
+    hist_days : `float`, optional
+        Number of past days to consider while preparing the report. By default,
+        only the currently running workflows are included in the report.
+        If the report is restricted to a single run (i.e., ``run_id`` is set),
+        the history search will be limited by default to two past days.
+    pass_thru : `str`, optional
         A string to pass directly to the WMS service class.
     is_global : `bool`, optional
         If set, all available job queues will be queried for job information.
@@ -430,17 +442,19 @@ def report_driver(wms_service, run_id, user, hist_days, pass_thru, is_global=Fal
         Only applicable in the context of a WMS with associated
         handlers to return exit codes from jobs.
     """
-    if wms_service is None:
+    if not wms_service:
         default_config = BpsConfig(BPS_DEFAULTS)
         wms_service = os.environ.get("BPS_WMS_SERVICE_CLASS", default_config["wmsServiceClass"])
 
-    # When reporting on single run:
-    # * increase history until better mechanism for handling completed jobs is
-    #   available.
+    # When reporting on a single run:
+    # * increase history until a better mechanism for handling completed jobs
+    #   is available.
     # * massage the retrieved reports using BPS report postprocessors.
     if run_id:
         hist_days = max(hist_days, 2)
-        postprocessors = BPS_POSTPROCESSORS
+        postprocessors = [compile_job_summary]
+        if return_exit_codes:
+            postprocessors.append(compile_code_summary)
     else:
         postprocessors = None
 

lsst/ctrl/bps/generic_workflow.py

@@ -332,6 +332,18 @@ class GenericWorkflow(DiGraph):
         self.run_id = None
         self._final: GenericWorkflowJob | GenericWorkflow | None = None
 
+    # Starting from ver. 3.6 of NetworkX, the DiGraph class defines its custom
+    # __new__ method that explicitly defines arguments it accepts. As a result,
+    # we need to override it to let our subclass use different ones.
+    #
+    # Notes
+    # -----
+    # Most likely overriding __new__ in this manner will prevent us from using
+    # different graph backends with our subclass. However, since we are not
+    # using any backends, this should not be a problem at the moment.
+    def __new__(cls, *args, **kwargs) -> "GenericWorkflow":
+        return object.__new__(cls)
+
     @property
     def name(self) -> str:
         """Retrieve name of generic workflow.

lsst/ctrl/bps/report.py

@@ -31,7 +31,7 @@ Note: Expectations are that future reporting effort will revolve around LSST
 oriented database tables.
 """
 
-__all__ = ["BPS_POSTPROCESSORS", "display_report", "retrieve_report"]
+__all__ = ["display_report", "retrieve_report"]
 
 import logging
 import sys
@@ -40,20 +40,9 @@ from typing import TextIO
 
 from lsst.utils import doImportType
 
-from .bps_reports import (
-    DetailedRunReport,
-    ExitCodesReport,
-    SummaryRunReport,
-    compile_code_summary,
-    compile_job_summary,
-)
+from .bps_reports import DetailedRunReport, ExitCodesReport, SummaryRunReport
 from .wms_service import BaseWmsService, WmsRunReport, WmsStates
 
-BPS_POSTPROCESSORS = (compile_job_summary, compile_code_summary)
-"""Postprocessors for massaging run reports
-(`tuple` [`Callable` [[`WmsRunReport`], None]).
-"""
-
 _LOG = logging.getLogger(__name__)
 
 
@@ -167,7 +156,7 @@ def retrieve_report(
     pass_thru: str | None = None,
     is_global: bool = False,
     return_exit_codes: bool = False,
-    postprocessors: Sequence[Callable[[WmsRunReport], None]] | None = None,
+    postprocessors: Sequence[Callable[[WmsRunReport], list[str]]] | None = None,
 ) -> tuple[list[WmsRunReport], list[str]]:
     """Retrieve summary of jobs submitted for execution.
 

lsst/ctrl/bps/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.4700"
+__version__ = "30.0.0"

{lsst_ctrl_bps-29.2025.4700.dist-info → lsst_ctrl_bps-30.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-bps
-Version: 29.2025.4700
+Version: 30.0.0
 Summary: Pluggable execution of workflow graphs from Rubin pipelines.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause OR GPL-3.0-or-later

{lsst_ctrl_bps-29.2025.4700.dist-info → lsst_ctrl_bps-30.0.0.dist-info}/RECORD

@@ -10,19 +10,19 @@ lsst/ctrl/bps/cancel.py,sha256=mAdBi-oUpepyo-1MCqx_I34dbm6cqT0VJu3d2-y9T2Y,3317
 lsst/ctrl/bps/clustered_quantum_graph.py,sha256=vpsjyzIr6e5as6rkRphrleY8q2I_8xXE3BawLGCtTlo,18167
 lsst/ctrl/bps/constants.py,sha256=dsnsNMqwU6Xl_ln6nQ0PmxsghlbBY9mLJWf2rlzYayQ,1733
 lsst/ctrl/bps/construct.py,sha256=o-JhTF_eehRiIxy3xe2UgBISyKNBg-kduthGiqfa50g,8100
-lsst/ctrl/bps/drivers.py,sha256=sgBIWw76WkErmtseveNzo19lHn6zJ0TcY-M9abpJ1Oo,22606
-lsst/ctrl/bps/generic_workflow.py,sha256=BwEFBudncziHTZaTTknOQroY_a-33mGf-mq9PzxH8G0,53720
+lsst/ctrl/bps/drivers.py,sha256=TKFEzg00ju7E_XeaXKtQWLVyZWzfwr-g5qu5twix5fI,23212
+lsst/ctrl/bps/generic_workflow.py,sha256=wqLzvFlYccXMb7HQ12dryCKCnPaswwmBmFEh6T0alzk,54299
 lsst/ctrl/bps/initialize.py,sha256=DCQwB9ZSo_36Ncs8jMJwxKZcYCu46jjww6rzyiuMFKY,7554
 lsst/ctrl/bps/ping.py,sha256=orwTZUNFtlexMYFcNWW_48jaa7Jo1oK4_eb_HuC-p5E,2235
 lsst/ctrl/bps/pre_transform.py,sha256=uxhSiG-_NyX175nL7d1dvOmLprdbN_gxaWr7X7nzhXE,10931
 lsst/ctrl/bps/prepare.py,sha256=Fa2OEQIo4Pa8R5WmRo0PvJgXWNjynRijATvu1x80qlw,3129
 lsst/ctrl/bps/quantum_clustering_funcs.py,sha256=UuVHtwsoSIUJnAPyoIGX46TzoZRD6gIzgNrPFPaq3G8,32143
-lsst/ctrl/bps/report.py,sha256=x31EMNr8w968_1XGkLfpqDsQLRDdXHUw31ZqYBdp6WY,9010
+lsst/ctrl/bps/report.py,sha256=h6LuOUdsqGiKRzge-oPX3RUD32Pen2IpmQRU9EsXuYY,8763
 lsst/ctrl/bps/restart.py,sha256=yVwxeviLiehyIfPmwU-H3tJ9ou7OWZZcrNf8PMxjr8o,2298
 lsst/ctrl/bps/status.py,sha256=Lrt0cAqROv77B8UvYXGimCa4cDHBD1N0K2Xx7oS6fXk,3362
 lsst/ctrl/bps/submit.py,sha256=Ev-yhcoZwtBPIo5bRt_4XFJRtgQBd8JHUurEfn01HpU,2880
 lsst/ctrl/bps/transform.py,sha256=y_78yBO17T4oBJ-3tCKtMwcgaT45XrLxwtEEr1vUIMQ,34687
-lsst/ctrl/bps/version.py,sha256=xCUcvtDm7ffryaF3_oc2AhBXCqIFOubJb8jOIg_6D6E,55
+lsst/ctrl/bps/version.py,sha256=--s7nTlXrHcUGZfOJGTF8_DCdIUv7QPWWD7as9kq0iY,49
 lsst/ctrl/bps/wms_service.py,sha256=l3T6i1MG72dhHY0KXMUlBjWUpCLOfaySs7o2W8oCwhs,18891
 lsst/ctrl/bps/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsst/ctrl/bps/cli/bps.py,sha256=CHfAL-U4mSi-FqeGKtmkX5nI5H9gkRre4XEWNVdeMRk,2559
@@ -35,13 +35,13 @@ lsst/ctrl/bps/cli/opt/options.py,sha256=pZQpjJ2Vrx6kYJGs5vVERBMFstPocwBXHffxkWkm
 lsst/ctrl/bps/etc/bps_defaults.yaml,sha256=6NNym1z1lF3FhVE2y6e0bixHPA6OISuPpaBVd83Va1A,4932
 lsst/ctrl/bps/tests/config_test_utils.py,sha256=WM8Vrigk4OO0TBoL1A73a6hLhf2a6-ACD20fROJ0U7A,3537
 lsst/ctrl/bps/tests/gw_test_utils.py,sha256=zVVQqzwSiQgPgk9TnqDzgR7uDnaTMeuBLYKA8vOp5RI,22452
-lsst_ctrl_bps-29.2025.4700.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
-lsst_ctrl_bps-29.2025.4700.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_bps-29.2025.4700.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_bps-29.2025.4700.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_bps-29.2025.4700.dist-info/METADATA,sha256=FlQjxLXMvGC_TgWuQI6JKRJgDk_4sbgkfdappaeYL4E,2213
-lsst_ctrl_bps-29.2025.4700.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_ctrl_bps-29.2025.4700.dist-info/entry_points.txt,sha256=d6FhN79h7s9frdBI7YkScsGEInwpGGub49pAjXWbIbI,51
-lsst_ctrl_bps-29.2025.4700.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_bps-29.2025.4700.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_bps-29.2025.4700.dist-info/RECORD,,
+lsst_ctrl_bps-30.0.0.dist-info/licenses/COPYRIGHT,sha256=Lc6NoAEFQ65v_SmtS9NwfHTOuSUtC2Umbjv5zyowiQM,61
+lsst_ctrl_bps-30.0.0.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_bps-30.0.0.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_bps-30.0.0.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_bps-30.0.0.dist-info/METADATA,sha256=CCUdXWdBFqij8nrtHRt4e04DTjUvxtmLXWDTqB_c5go,2207
+lsst_ctrl_bps-30.0.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+lsst_ctrl_bps-30.0.0.dist-info/entry_points.txt,sha256=d6FhN79h7s9frdBI7YkScsGEInwpGGub49pAjXWbIbI,51
+lsst_ctrl_bps-30.0.0.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_bps-30.0.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_bps-30.0.0.dist-info/RECORD,,

{lsst_ctrl_bps-29.2025.4700.dist-info → lsst_ctrl_bps-30.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any