lsst-pipe-base 30.0.0rc3__py3-none-any.whl → 30.2025.5100__py3-none-any.whl

lsst/pipe/base/separable_pipeline_executor.py

@@ -40,8 +40,7 @@ from collections.abc import Iterable
 from typing import Any
 
 import lsst.resources
-from lsst.daf.butler import Butler, DatasetRef
-from lsst.daf.butler._rubin.temporary_for_ingest import TemporaryForIngest
+from lsst.daf.butler import Butler
 
 from ._quantumContext import ExecutionResources
 from .all_dimensions_quantum_graph_builder import AllDimensionsQuantumGraphBuilder
@@ -363,8 +362,6 @@ class SeparablePipelineExecutor:
         fail_fast: bool = False,
         graph_executor: QuantumGraphExecutor | None = None,
         num_proc: int = 1,
-        *,
-        provenance_dataset_ref: DatasetRef | None = None,
     ) -> None:
         """Run a pipeline in the form of a prepared quantum graph.
 
@@ -387,14 +384,6 @@ class SeparablePipelineExecutor:
             The number of processes that can be used to run the pipeline. The
             default value ensures that no subprocess is created. Only used with
             the default graph executor.
-        provenance_dataset_ref : `lsst.daf.butler.DatasetRef`, optional
-            Dataset that should be used to save provenance.  Provenance is only
-            supported when running in a single process (at least for the
-            default quantum executor), and should not be used with
-            ``skip_existing_in=[output_run]`` when retrying a previous
-            execution attempt. The caller is responsible for registering the
-            dataset type and for ensuring that the dimensions of this dataset
-            do not lead to uniqueness conflicts.
         """
         if not graph_executor:
             quantum_executor = SingleQuantumExecutor(
@@ -415,9 +404,4 @@ class SeparablePipelineExecutor:
             # forked processes.
             self._butler.registry.resetConnectionPool()
 
-        if provenance_dataset_ref is not None:
-            with TemporaryForIngest(self._butler, provenance_dataset_ref) as temporary:
-                graph_executor.execute(graph, provenance_graph_file=temporary.ospath)
-                temporary.ingest()
-        else:
-            graph_executor.execute(graph)
+        graph_executor.execute(graph)

lsst/pipe/base/single_quantum_executor.py

@@ -37,13 +37,13 @@ from typing import Any
 
 from lsst.daf.butler import (
     Butler,
+    ButlerMetrics,
     DatasetRef,
     DatasetType,
     LimitedButler,
     NamedKeyDict,
     Quantum,
 )
-from lsst.daf.butler.logging import ButlerLogRecords
 from lsst.utils.introspection import get_full_type_name
 from lsst.utils.timer import logInfo
 
@@ -59,7 +59,7 @@ from .connections import AdjustQuantumHelper
 from .log_capture import LogCapture, _ExecutionLogRecordsExtra
 from .pipeline_graph import TaskNode
 from .pipelineTask import PipelineTask
-from .quantum_graph_executor import QuantumExecutionResult, QuantumExecutor
+from .quantum_graph_executor import QuantumExecutor
 from .quantum_reports import QuantumReport
 from .task import _TASK_FULL_METADATA_TYPE, _TASK_METADATA_TYPE
 from .taskFactory import TaskFactory
@@ -157,28 +157,21 @@ class SingleQuantumExecutor(QuantumExecutor):
         self._previous_process_quanta: list[uuid.UUID] = []
 
     def execute(
-        self,
-        task_node: TaskNode,
-        /,
-        quantum: Quantum,
-        quantum_id: uuid.UUID | None = None,
-        *,
-        log_records: ButlerLogRecords | None = None,
-    ) -> QuantumExecutionResult:
+        self, task_node: TaskNode, /, quantum: Quantum, quantum_id: uuid.UUID | None = None
+    ) -> tuple[Quantum, QuantumReport | None]:
         # Docstring inherited from QuantumExecutor.execute
+        assert quantum.dataId is not None, "Quantum DataId cannot be None"
+
         if self._butler is not None:
             self._butler.registry.refresh()
-        return self._execute(task_node, quantum, quantum_id=quantum_id, log_records=log_records)
+
+        result = self._execute(task_node, quantum, quantum_id=quantum_id)
+        report = QuantumReport(quantumId=quantum_id, dataId=quantum.dataId, taskLabel=task_node.label)
+        return result, report
 
     def _execute(
-        self,
-        task_node: TaskNode,
-        /,
-        quantum: Quantum,
-        quantum_id: uuid.UUID | None = None,
-        *,
-        log_records: ButlerLogRecords | None = None,
-    ) -> QuantumExecutionResult:
+        self, task_node: TaskNode, /, quantum: Quantum, quantum_id: uuid.UUID | None = None
+    ) -> Quantum:
         """Execute the quantum.
 
         Internal implementation of `execute()`.
@@ -196,7 +189,7 @@ class SingleQuantumExecutor(QuantumExecutor):
 
         try:
             return self._execute_with_limited_butler(
-                task_node, limited_butler, quantum=quantum, quantum_id=quantum_id, log_records=log_records
+                task_node, limited_butler, quantum=quantum, quantum_id=quantum_id
             )
         finally:
             if used_butler_factory:
@@ -209,17 +202,14 @@ class SingleQuantumExecutor(QuantumExecutor):
         /,
         quantum: Quantum,
         quantum_id: uuid.UUID | None = None,
-        *,
-        log_records: ButlerLogRecords | None = None,
-    ) -> QuantumExecutionResult:
+    ) -> Quantum:
         startTime = time.time()
-        assert quantum.dataId is not None, "Quantum DataId cannot be None"
-        report = QuantumReport(quantumId=quantum_id, dataId=quantum.dataId, taskLabel=task_node.label)
+
         if self._butler is not None:
             log_capture = LogCapture.from_full(self._butler)
         else:
             log_capture = LogCapture.from_limited(limited_butler)
-        with log_capture.capture_logging(task_node, quantum, records=log_records) as captureLog:
+        with log_capture.capture_logging(task_node, quantum) as captureLog:
             # Save detailed resource usage before task start to metadata.
             quantumMetadata = _TASK_METADATA_TYPE()
             logInfo(None, "prep", metadata=quantumMetadata)  # type: ignore[arg-type]
@@ -238,7 +228,7 @@ class SingleQuantumExecutor(QuantumExecutor):
                     task_node.label,
                     quantum.dataId,
                 )
-                return QuantumExecutionResult(quantum, report, skipped_existing=True, adjusted_no_work=False)
+                return quantum
             captureLog.store = True
 
             captureLog.extra.previous_process_quanta.extend(self._previous_process_quanta)
@@ -266,7 +256,7 @@ class SingleQuantumExecutor(QuantumExecutor):
                 if self._job_metadata is not None:
                     fullMetadata["job"] = self._job_metadata
                 self._write_metadata(quantum, fullMetadata, task_node, limited_butler)
-                return QuantumExecutionResult(quantum, report, skipped_existing=False, adjusted_no_work=True)
+                return quantum
 
             # enable lsstDebug debugging
             if self._enable_lsst_debug:
@@ -288,12 +278,10 @@ class SingleQuantumExecutor(QuantumExecutor):
             )
             task = self._task_factory.makeTask(task_node, limited_butler, init_input_refs)
             logInfo(None, "start", metadata=quantumMetadata)  # type: ignore[arg-type]
-            outputs_put: list[uuid.UUID] = []
             try:
-                with limited_butler.record_metrics() as butler_metrics:
-                    caveats = self._run_quantum(
-                        task, quantum, task_node, limited_butler, quantum_id=quantum_id, ids_put=outputs_put
-                    )
+                caveats, outputsPut, butler_metrics = self._run_quantum(
+                    task, quantum, task_node, limited_butler, quantum_id=quantum_id
+                )
             except Exception as e:
                 _LOG.error(
                     "Execution of task '%s' on quantum %s failed. Exception %s: %s",
@@ -313,10 +301,10 @@ class SingleQuantumExecutor(QuantumExecutor):
                 quantumMetadata["caveats"] = caveats.value
                 # Stringify the UUID for easier compatibility with
                 # PropertyList.
+                quantumMetadata["outputs"] = [str(output) for output in outputsPut]
             finally:
                 logInfo(None, "end", metadata=quantumMetadata)  # type: ignore[arg-type]
                 fullMetadata = task.getFullMetadata()
-                quantumMetadata["outputs"] = [str(output) for output in outputs_put]
                 fullMetadata["quantum"] = quantumMetadata
                 if self._job_metadata is not None:
                     fullMetadata["job"] = self._job_metadata
@@ -329,13 +317,7 @@ class SingleQuantumExecutor(QuantumExecutor):
                 quantum.dataId,
                 stopTime - startTime,
             )
-        return QuantumExecutionResult(
-            quantum,
-            report,
-            skipped_existing=False,
-            adjusted_no_work=False,
-            task_metadata=fullMetadata,
-        )
+        return quantum
 
     def _check_existing_outputs(
         self,
@@ -537,9 +519,8 @@ class SingleQuantumExecutor(QuantumExecutor):
         task_node: TaskNode,
         /,
         limited_butler: LimitedButler,
-        quantum_id: uuid.UUID | None,
-        ids_put: list[uuid.UUID],
-    ) -> QuantumSuccessCaveats:
+        quantum_id: uuid.UUID | None = None,
+    ) -> tuple[QuantumSuccessCaveats, list[uuid.UUID], ButlerMetrics]:
         """Execute task on a single quantum.
 
         Parameters
@@ -552,17 +533,18 @@ class SingleQuantumExecutor(QuantumExecutor):
             Task definition structure.
         limited_butler : `~lsst.daf.butler.LimitedButler`
             Butler to use for dataset I/O.
-        quantum_id : `uuid.UUID` or `None`
+        quantum_id : `uuid.UUID` or `None`, optional
             ID of the quantum being executed.
-        ids_put : list[ `uuid.UUID` ]
-            List to be populated with the dataset IDs that were written by this
-            quantum.  This is an output parameter in order to allow it to be
-            populated even when an exception is raised.
 
         Returns
         -------
         flags : `QuantumSuccessCaveats`
             Flags that describe qualified successes.
+        ids_put : list[ `uuid.UUID` ]
+            Record of all the dataset IDs that were written by this quantum
+            being executed.
+        metrics : `lsst.daf.butler.ButlerMetrics`
+            Butler metrics recorded for this quantum.
         """
         flags = QuantumSuccessCaveats.NO_CAVEATS
 
@@ -574,7 +556,8 @@ class SingleQuantumExecutor(QuantumExecutor):
 
         # Call task runQuantum() method.
         try:
-            task.runQuantum(butlerQC, inputRefs, outputRefs)
+            with limited_butler.record_metrics() as butler_metrics:
+                task.runQuantum(butlerQC, inputRefs, outputRefs)
         except NoWorkFound as err:
             # Not an error, just an early exit.
             _LOG.info(
@@ -612,13 +595,12 @@ class SingleQuantumExecutor(QuantumExecutor):
                 )
                 _LOG.error(error, exc_info=error)
                 flags |= caught.FLAGS
-        finally:
-            ids_put.extend(output[2] for output in butlerQC.outputsPut)
         if not butlerQC.outputsPut:
             flags |= QuantumSuccessCaveats.ALL_OUTPUTS_MISSING
         if not butlerQC.outputsPut == butlerQC.allOutputs:
             flags |= QuantumSuccessCaveats.ANY_OUTPUTS_MISSING
-        return flags
+        ids_put = [output[2] for output in butlerQC.outputsPut]
+        return flags, ids_put, butler_metrics
 
     def _write_metadata(
         self, quantum: Quantum, metadata: Any, task_node: TaskNode, /, limited_butler: LimitedButler

lsst/pipe/base/version.py

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

{lsst_pipe_base-30.0.0rc3.dist-info → lsst_pipe_base-30.2025.5100.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-pipe-base
-Version: 30.0.0rc3
+Version: 30.2025.5100
 Summary: Pipeline infrastructure for the Rubin Science Pipelines.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause OR GPL-3.0-or-later

{lsst_pipe_base-30.0.0rc3.dist-info → lsst_pipe_base-30.2025.5100.dist-info}/RECORD

@@ -3,7 +3,7 @@ lsst/pipe/__init__.py,sha256=_2bZAHuDVAx7MM7KA7pt3DYp641NY4RzSoRAwesWKfU,67
 lsst/pipe/base/__init__.py,sha256=qBLN0yYQjIcLBLb4jFKM_ppopuqTnCehcUdFcEe69Js,970
 lsst/pipe/base/_datasetQueryConstraints.py,sha256=bFH0_lVc49NS2_4v_i6r9POr500c0K-OHLMhMX5FjkQ,6373
 lsst/pipe/base/_dataset_handle.py,sha256=ft_ke1LbhLLndDPARsHSQJUA05LgUFnfWOq2vbwH3wI,11353
-lsst/pipe/base/_instrument.py,sha256=yZTTgEPmGcEKG4WnAkfWGM1K5f3PxALcQRFqrtVp57A,30215
+lsst/pipe/base/_instrument.py,sha256=I9UTaj81krR1zkTZ1owfOPBzHN29PY3Egg7fIE5obxQ,30057
 lsst/pipe/base/_observation_dimension_packer.py,sha256=78Jg2OVFOdXIK62TS2Y3X4095xqCzmiIx9o4TXyADYA,8027
 lsst/pipe/base/_quantumContext.py,sha256=gb60mTHbgOIEptYvJ64SaChvViXyeKJlG6kEHq4nYVw,19345
 lsst/pipe/base/_status.py,sha256=7gJPrqt03t1fO5tREc_sfQaN7XmDBvruihORXPnRqUE,21216
@@ -20,30 +20,29 @@ lsst/pipe/base/exec_fixup_data_id.py,sha256=9OjOcH-6AHZ1JnD_CemieI0wWX90J_VdaY9v
 lsst/pipe/base/execution_graph_fixup.py,sha256=ND0x4hlpeEW-gudo-i2K7HT7MoM5sp_mcoqRMCopSqQ,3815
 lsst/pipe/base/execution_reports.py,sha256=jYtWCD4PkEAeVUpKIxuiJJVgsCm7qiwCorWVgNHkVgU,17270
 lsst/pipe/base/graph_walker.py,sha256=Ij7JfYF0srA29VgM_DhbNBxUBeOHDOnujrTQPjVNha0,4694
-lsst/pipe/base/log_capture.py,sha256=6fq1L53FUYsbILX-tQixXUhxQjvKxFGDjYELRDAXnsw,11072
-lsst/pipe/base/log_on_close.py,sha256=rauQYvsWQF9GuxoaZRjPJJ7VjATGyRUo0RyHEoUVTnQ,2666
+lsst/pipe/base/log_capture.py,sha256=5r99_Ek2A75vYOMo-z52ltWLdfYfWExm55UU9a4nqmM,12909
 lsst/pipe/base/mermaid_tools.py,sha256=cdlDJQ1x8k7-VvCLEUqvSC3GR1zCsB-aUTxOjYejNWc,5216
-lsst/pipe/base/mp_graph_executor.py,sha256=bbsJD0i-WpW1Qc6lAvagIIx__jZfeOqN8dyt3IsyEq0,37350
+lsst/pipe/base/mp_graph_executor.py,sha256=FKlFxjtU2-6SFzX_wsdtMMAj5P09ZE8V65-Sg585g2Y,35501
 lsst/pipe/base/pipeline.py,sha256=FVaiLhgw9Pzo-nzXKS0dLNafegP0AMZKLtPlSvOSkRU,37563
 lsst/pipe/base/pipelineIR.py,sha256=UuZ02NLhVmzzekbuWlyar7cPLCf_4yfzD5qFEmGHs_A,45821
 lsst/pipe/base/pipelineTask.py,sha256=K3GdjJLvy8A7I-jzQiERQZaYF7mC1LM3iB5TmUtbOCI,8394
 lsst/pipe/base/prerequisite_helpers.py,sha256=bmiebQ4veSrypZgAXjmCBFfj8fUtPW9eRQaVShhxdBQ,28446
 lsst/pipe/base/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsst/pipe/base/quantum_graph_builder.py,sha256=YM3pvt4ignAZnpO9bpBc_Yl8V-y2r3SQmYJdWnyQQNI,68742
-lsst/pipe/base/quantum_graph_executor.py,sha256=-bbeR9wZ5_Etcqpx6cDS_R-oEvfUVv9gmW0Wc4QuQNc,8127
+lsst/pipe/base/quantum_graph_executor.py,sha256=WP41iQmihy1jfgaHV6eu2aSrqQx_Fydq3mbEF6CLQ-s,4419
 lsst/pipe/base/quantum_graph_skeleton.py,sha256=hxSbeNhdCSBO2aqdIMRyQaejiUxKQfE6bSn0S0qWBNo,28395
 lsst/pipe/base/quantum_provenance_graph.py,sha256=33S5iCVxD9Co4oJSU_N8AJXL14Nw0UwGzPEc3gpQiqk,91981
 lsst/pipe/base/quantum_reports.py,sha256=ut235L88v7SXaeVUvMA9qFl7tpeMwGnzob3X0QoOI_s,14210
 lsst/pipe/base/resource_usage.py,sha256=LfH7Qf6taI3lxw0aB90riRMn1UxUTMBSqtBjKPJ-XuY,6759
-lsst/pipe/base/separable_pipeline_executor.py,sha256=y3ZnQJApocxusHGG1R5Rnpke3B0vren1h4dcuyZLivs,17717
+lsst/pipe/base/separable_pipeline_executor.py,sha256=vXqJrRI5GNezzGV9QsiaRHEhioDF2Y_W7JQYQCzHR7A,16720
 lsst/pipe/base/simple_pipeline_executor.py,sha256=_HGeAOgHUiRdQwsmD_qira-vcHZXlLbf_LmhLJffh2U,29563
-lsst/pipe/base/single_quantum_executor.py,sha256=BgmRtouSIKMeh44hbihdyWsYG4sH1fvoN1PoyVNjxUI,29283
+lsst/pipe/base/single_quantum_executor.py,sha256=yCpDS_eHsJTOu34mHYv8DJjj8UG0GjPdCuXdb74A2p8,28543
 lsst/pipe/base/struct.py,sha256=Fa-UkpuXOxdzKWbHrMUkJYOszZuBXCm2NesXNR0IOPQ,5048
 lsst/pipe/base/task.py,sha256=XHBd-7m1a4-6LgobBYA1DgY4H7EV-_RWKfxbhZbMmD4,15145
 lsst/pipe/base/taskFactory.py,sha256=MsDGECJqZLSZk8SGhpuVhNaP32UWuNvxZiDcZExPFG8,3412
 lsst/pipe/base/testUtils.py,sha256=lSBKMhoKflbi8JkMNYfEqqHNl-rtFI8UYT3QneDYpLo,18477
 lsst/pipe/base/utils.py,sha256=JmEt3l0xrh9uayKrSXuQEq12aXOhDr2YXmbYduaxCko,1940
-lsst/pipe/base/version.py,sha256=Tt7y1Knxuicvk026_H8m0GXmxEFM8XEWyfbDoHcAxbs,52
+lsst/pipe/base/version.py,sha256=T_ii-AmyfLEzX_XiWTNw5GEFMy94NcXrbg2rkzKZg7g,55
 lsst/pipe/base/cli/__init__.py,sha256=861tXIAW7SqtqNUYkjbeEdfg8lDswXsjJQca0gVCFz4,54
 lsst/pipe/base/cli/_get_cli_subcommands.py,sha256=g_af64klRybBGKAg7fmBSZBdw2LYBAsFON_yQIMZON0,1289
 lsst/pipe/base/cli/cmd/__init__.py,sha256=3UF2IQEEBor4YMGRNPdcZAVCAI5yFyeHp5nGul4IoyM,1557
@@ -83,21 +82,20 @@ lsst/pipe/base/pipeline_graph/visualization/_printer.py,sha256=yJMRJ-aXd3nYDgs1F
 lsst/pipe/base/pipeline_graph/visualization/_show.py,sha256=lPRjO1To2n5r3f_Wgcwy-7TmyJ7UszGGFXAlOtN1wDs,10510
 lsst/pipe/base/pipeline_graph/visualization/_status_annotator.py,sha256=dp7PXl9Cu7GfWjBi5g8KjXZgnF1KGg_idKKxtICL53Q,8679
 lsst/pipe/base/quantum_graph/__init__.py,sha256=-Gp3LihB0AXCvhG387wKAEpHRM-NrHGSXMti8cHee90,1437
-lsst/pipe/base/quantum_graph/_common.py,sha256=jBNmuVK0RaD6nFNk2cmRQY5ej0v_wADRREcAPlhneNs,22841
-lsst/pipe/base/quantum_graph/_multiblock.py,sha256=lw--3Ol-nmQPkC5gzC95xUTkGXOVAfPoa1bb21cFHXE,27412
-lsst/pipe/base/quantum_graph/_predicted.py,sha256=vUbKXfIPLtH4YZmgAlxJBwCqwMJ9X-2dSFh35vgvntg,91216
-lsst/pipe/base/quantum_graph/_provenance.py,sha256=eGCs2K9UYg5bILEPY6x6xsoA1x-mTTgzn5opFq1bL6k,84207
-lsst/pipe/base/quantum_graph/formatter.py,sha256=PZhn6I7HAdBjhm-_vcWoXdhwm9hDsK5QQ07GnIGJtPU,3948
+lsst/pipe/base/quantum_graph/_common.py,sha256=tgQsIylvs5wSAKs3SVp5_XJ7XEBJwBcRUbBGR2EFuwU,22714
+lsst/pipe/base/quantum_graph/_multiblock.py,sha256=kc2pqezfU7xOAxYZa41mz3G4X5w4GVfovw3ZcjNgK2Y,27950
+lsst/pipe/base/quantum_graph/_predicted.py,sha256=ImcH5nYvbUD7bfEnm5sp9wTcEn01ZwseqK1UkQeZ1Sc,87933
+lsst/pipe/base/quantum_graph/_provenance.py,sha256=R1SoRxyi6cNi9fXSc7ybrbri9anuYnliJ6SBmVUrh40,55102
 lsst/pipe/base/quantum_graph/visualization.py,sha256=EbTWhk9aPq7sX6bcHmnEIsr2xuuR6d1SxspQbRe8D0Q,12235
 lsst/pipe/base/quantum_graph/aggregator/__init__.py,sha256=4CK8sP_ZjUKmxKS3LnCH1zG7XSk9IEwijrluRBHhEMU,7436
-lsst/pipe/base/quantum_graph/aggregator/_communicators.py,sha256=deLXCdKlSM2GXGW4LdtfzOS7aa3Yd9QVajtyjJE4u3s,35197
+lsst/pipe/base/quantum_graph/aggregator/_communicators.py,sha256=w7hNEQjE1Qjhi6u4Tx4wS_1RrV3-WQRCz1FACd-vmro,36396
 lsst/pipe/base/quantum_graph/aggregator/_config.py,sha256=iV1Ejfk-UnFoQ8TkpJE_jMZYHsmZcdLm5R-FnQEqO7s,5167
 lsst/pipe/base/quantum_graph/aggregator/_ingester.py,sha256=lhu8I0R3IwoLkVcrqF1ypoHAFamNapSoMcG9aYFjbQ4,14158
 lsst/pipe/base/quantum_graph/aggregator/_progress.py,sha256=jiz9Np73uUQ03CtH7pI6TXxXrwFUChh5hSj_gbMGHr0,7207
-lsst/pipe/base/quantum_graph/aggregator/_scanner.py,sha256=HxW8F4smuV3-0g4SFwlQ3SKrktpPDcRkvckz8oVV-s0,12872
-lsst/pipe/base/quantum_graph/aggregator/_structs.py,sha256=tkFh6-XaEoXGqfMH9RQq8rZqXXco1jUtiYCJKPsGus8,2401
-lsst/pipe/base/quantum_graph/aggregator/_supervisor.py,sha256=NuUQiC-ZtLQkK_sJ1bktRiRv4ObdwjeE6vOJLjDrepc,9559
-lsst/pipe/base/quantum_graph/aggregator/_writer.py,sha256=hd3zALTm9uTicQyPukN34fjcUJ3TIogf_EONy5nsywU,7917
+lsst/pipe/base/quantum_graph/aggregator/_scanner.py,sha256=4wg2cgVcAoqyuZZUBogHXWkSr9X6sVwnJLu_o96D204,22758
+lsst/pipe/base/quantum_graph/aggregator/_structs.py,sha256=bM-MejZz5DFUFQCH8kZDykuMBmBJYbQMl15nBm-3dtc,5499
+lsst/pipe/base/quantum_graph/aggregator/_supervisor.py,sha256=5-6CshU9RFyVEgYI3qJwuVEGw8YtT9Ei7cNkcghXzMk,9290
+lsst/pipe/base/quantum_graph/aggregator/_writer.py,sha256=fYQrJGCg3MQQQF1feWXCLyG6m5ucnzFrIINawWgnF8g,21504
 lsst/pipe/base/script/__init__.py,sha256=cLEXE7aq5UZ0juL_ScmRw0weFgp4tDgwEX_ts-NEYic,1522
 lsst/pipe/base/script/register_instrument.py,sha256=neQ2MTPtAiV_Hl2yatQ8-vQC24xHjhpI7VJUHf5kPX4,2445
 lsst/pipe/base/script/retrieve_artifacts_for_quanta.py,sha256=Cr0HpzXm_C3LnIOQg5tNJht02O6xoqtWWIphjugasMA,3957
@@ -115,13 +113,13 @@ lsst/pipe/base/tests/mocks/_data_id_match.py,sha256=jVekStcrItC0tqOCc01VjYaiE9ex
 lsst/pipe/base/tests/mocks/_pipeline_task.py,sha256=N3fC4OMAMWWnYtyLkVdMfb9ZiFse39HniRDvlAOofOY,30691
 lsst/pipe/base/tests/mocks/_repo.py,sha256=SH-jzynS-H2xc_3GLjF7ln-kHdRoSeVVaal5qLd2hXI,28359
 lsst/pipe/base/tests/mocks/_storage_class.py,sha256=12IFfJMbZ5GkYlMX6ZMWiG8pMZc2Jlxke3qQW-bljdU,27434
-lsst_pipe_base-30.0.0rc3.dist-info/licenses/COPYRIGHT,sha256=kB3Z9_f6a6uFLGpEmNJT_n186CE65H6wHu4F6BNt_zA,368
-lsst_pipe_base-30.0.0rc3.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_pipe_base-30.0.0rc3.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_pipe_base-30.0.0rc3.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_pipe_base-30.0.0rc3.dist-info/METADATA,sha256=v-PIw7-tNmgiZbq1LmCijq7c2EO70ugAcNVgBphTpdI,2254
-lsst_pipe_base-30.0.0rc3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_pipe_base-30.0.0rc3.dist-info/entry_points.txt,sha256=bnmUhJBsChxMdqST9VmFBYYKxLQoToOfqW1wjW7khjk,64
-lsst_pipe_base-30.0.0rc3.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_pipe_base-30.0.0rc3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_pipe_base-30.0.0rc3.dist-info/RECORD,,
+lsst_pipe_base-30.2025.5100.dist-info/licenses/COPYRIGHT,sha256=kB3Z9_f6a6uFLGpEmNJT_n186CE65H6wHu4F6BNt_zA,368
+lsst_pipe_base-30.2025.5100.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_pipe_base-30.2025.5100.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_pipe_base-30.2025.5100.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_pipe_base-30.2025.5100.dist-info/METADATA,sha256=AZu2-D91gCmfRmP0m2ETbsiRKZwX8DXqBiO-rvyDzFo,2257
+lsst_pipe_base-30.2025.5100.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_pipe_base-30.2025.5100.dist-info/entry_points.txt,sha256=bnmUhJBsChxMdqST9VmFBYYKxLQoToOfqW1wjW7khjk,64
+lsst_pipe_base-30.2025.5100.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_pipe_base-30.2025.5100.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_pipe_base-30.2025.5100.dist-info/RECORD,,

lsst/pipe/base/log_on_close.py

@@ -1,79 +0,0 @@
-# This file is part of pipe_base.
-#
-# Developed for the LSST Data Management System.
-# This product includes software developed by the LSST Project
-# (http://www.lsst.org).
-# See the COPYRIGHT file at the top-level directory of this distribution
-# for details of code ownership.
-#
-# This software is dual licensed under the GNU General Public License and also
-# under a 3-clause BSD license. Recipients may choose which of these licenses
-# to use; please see the files gpl-3.0.txt and/or bsd_license.txt,
-# respectively.  If you choose the GPL option then the following text applies
-# (but note that there is still no warranty even if you opt for BSD instead):
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# 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 __future__ import annotations
-
-__all__ = ("LogOnClose",)
-
-from collections.abc import Callable, Iterator
-from contextlib import AbstractContextManager, contextmanager
-from typing import TypeVar
-
-from lsst.utils.logging import VERBOSE
-
-_T = TypeVar("_T")
-
-
-class LogOnClose:
-    """A factory for context manager wrappers that emit a log message when
-    they are closed.
-
-    Parameters
-    ----------
-    log_func : `~collections.abc.Callable` [ `int`, `str` ]
-        Callable that takes an integer log level and a string message and emits
-        a log message.  Note that placeholder formatting is not supported.
-    """
-
-    def __init__(self, log_func: Callable[[int, str], None]):
-        self.log_func = log_func
-
-    def wrap(
-        self,
-        cm: AbstractContextManager[_T],
-        msg: str,
-        level: int = VERBOSE,
-    ) -> AbstractContextManager[_T]:
-        """Wrap a context manager to log when it is exited.
-
-        Parameters
-        ----------
-        cm : `contextlib.AbstractContextManager`
-            Context manager to wrap.
-        msg : `str`
-            Log message.
-        level : `int`, optional
-            Log level.
-        """
-
-        @contextmanager
-        def wrapper() -> Iterator[_T]:
-            with cm as result:
-                yield result
-                self.log_func(level, msg)
-
-        return wrapper()

lsst/pipe/base/quantum_graph/formatter.py

@@ -1,101 +0,0 @@
-# This file is part of pipe_base.
-#
-# Developed for the LSST Data Management System.
-# This product includes software developed by the LSST Project
-# (http://www.lsst.org).
-# See the COPYRIGHT file at the top-level directory of this distribution
-# for details of code ownership.
-#
-# This software is dual licensed under the GNU General Public License and also
-# under a 3-clause BSD license. Recipients may choose which of these licenses
-# to use; please see the files gpl-3.0.txt and/or bsd_license.txt,
-# respectively.  If you choose the GPL option then the following text applies
-# (but note that there is still no warranty even if you opt for BSD instead):
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# 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 __future__ import annotations
-
-__all__ = ("ProvenanceFormatter",)
-
-import uuid
-from typing import Any, ClassVar
-
-import pydantic
-
-from lsst.daf.butler import FormatterV2
-from lsst.resources import ResourcePath
-from lsst.utils.logging import getLogger
-
-from ..pipeline_graph import TaskImportMode
-from ._provenance import ProvenanceQuantumGraphReader
-
-_LOG = getLogger(__file__)
-
-
-class _ProvenanceFormatterParameters(pydantic.BaseModel):
-    """A Pydantic model for validating and applying defaults to the
-    read parameters of `ProvenanceFormatter`.
-    """
-
-    import_mode: TaskImportMode = TaskImportMode.DO_NOT_IMPORT
-    quanta: list[uuid.UUID] | None = None
-    datasets: list[uuid.UUID] | None = None
-    read_init_quanta: bool = True
-
-    @pydantic.field_validator("quanta", mode="before")
-    @classmethod
-    def quanta_to_list(cls, v: Any) -> list[uuid.UUID]:
-        return list(v)
-
-    @pydantic.field_validator("datasets", mode="before")
-    @classmethod
-    def datasets_to_list(cls, v: Any) -> list[uuid.UUID]:
-        return list(v)
-
-    @property
-    def nodes(self) -> list[uuid.UUID]:
-        if self.quanta is not None:
-            if self.datasets is not None:
-                return self.quanta + self.datasets
-            else:
-                return self.quanta
-        elif self.datasets is not None:
-            return self.datasets
-        raise ValueError("'datasets' and/or 'quanta' parameters are required for this component")
-
-
-class ProvenanceFormatter(FormatterV2):
-    """Butler interface for reading `ProvenanceQuantumGraph` objects."""
-
-    default_extension: ClassVar[str] = ".qg"
-    can_read_from_uri: ClassVar[bool] = True
-
-    def read_from_uri(self, uri: ResourcePath, component: str | None = None, expected_size: int = -1) -> Any:
-        parameters = _ProvenanceFormatterParameters.model_validate(self.file_descriptor.parameters or {})
-        with ProvenanceQuantumGraphReader.open(uri, import_mode=parameters.import_mode) as reader:
-            match component:
-                case None:
-                    if parameters.read_init_quanta:
-                        reader.read_init_quanta()
-                    reader.read_quanta(parameters.quanta)
-                    reader.read_datasets(parameters.datasets)
-                    return reader.graph
-                case "metadata":
-                    return reader.fetch_metadata(parameters.nodes)
-                case "logs":
-                    return reader.fetch_logs(parameters.nodes)
-                case "packages":
-                    return reader.fetch_packages()
-        raise AssertionError(f"Unexpected component {component!r}.")