lsst-pipe-base 29.2025.2800__tar.gz → 29.2025.2900__tar.gz

{lsst_pipe_base-29.2025.2800/python/lsst_pipe_base.egg-info → lsst_pipe_base-29.2025.2900}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-pipe-base
-Version: 29.2025.2800
+Version: 29.2025.2900
 Summary: Pipeline infrastructure for the Rubin Science Pipelines.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_pipe_base-29.2025.2800 → lsst_pipe_base-29.2025.2900}/python/lsst/pipe/base/connections.py

@@ -45,6 +45,7 @@ __all__ = [
 import dataclasses
 import itertools
 import string
+import uuid
 import warnings
 from collections import UserDict, defaultdict
 from collections.abc import Collection, Generator, Iterable, Iterator, Mapping, Sequence, Set
@@ -1271,6 +1272,52 @@ class QuantaAdjuster:
             for edge in self._task_node.iter_all_inputs()
         }
 
+    def get_prerequisite_inputs(
+        self,
+        quantum_data_id: DataCoordinate,
+    ) -> dict[str, dict[uuid.UUID, DataCoordinate]]:
+        """Return the data IDs of all prerequisite inputs to a quantum.
+
+        Parameters
+        ----------
+        quantum_data_id : `~lsst.daf.butler.DataCoordinate`
+            Data ID of the quantum to get the inputs of.
+
+        Returns
+        -------
+        inputs : `dict` [ `str`, \
+            `dict` [ `uuid.UUID`, `~lsst.daf.butler.DataCoordinate` ] ]
+            Dataset IDs and and data IDs of prerequisite inputs, keyed by the
+            connection name (the internal task name, not the dataset type
+            name).  This only contains prerequisite inputs, not init-inputs or
+            regular inputs.
+
+        Notes
+        -----
+        If two connections have the same dataset type, the current
+        implementation assumes the set of datasets is the same for the two
+        connections.  This limitation may be removed in the future.
+
+        Unlike regular inputs, prerequisite inputs are not looked up from input
+        collections or indexed by data ID.  Instead, they are uniquely
+        identified by dataset UUID and reused directly between quanta.
+        """
+        from .quantum_graph_skeleton import PrerequisiteDatasetKey, QuantumKey
+
+        by_dataset_type_name: defaultdict[str, dict[uuid.UUID, DataCoordinate]] = defaultdict(dict)
+        quantum_key = QuantumKey(self._task_node.label, quantum_data_id.required_values)
+
+        for dataset_key in self._skeleton.iter_inputs_of(quantum_key):
+            if not isinstance(dataset_key, PrerequisiteDatasetKey):
+                continue
+            by_dataset_type_name[dataset_key.parent_dataset_type_name][
+                uuid.UUID(bytes=dataset_key.dataset_id_bytes)
+            ] = self._skeleton.get_data_id(dataset_key)
+        return {
+            edge.connection_name: by_dataset_type_name[edge.parent_dataset_type_name]
+            for edge in self._task_node.iter_all_inputs()
+        }
+
     def get_outputs(self, quantum_data_id: DataCoordinate) -> dict[str, list[DataCoordinate]]:
         """Return the data IDs of all regular outputs to a quantum.
 
@@ -1340,6 +1387,45 @@ class QuantaAdjuster:
             )
         self._skeleton.add_input_edge(quantum_key, dataset_key)
 
+    def add_prerequisite_input(
+        self, quantum_data_id: DataCoordinate, connection_name: str, dataset_uuid: uuid.UUID
+    ) -> None:
+        """Add a new prerequisite input to a quantum.
+
+        Parameters
+        ----------
+        quantum_data_id : `~lsst.daf.butler.DataCoordinate`
+            Data ID of the quantum to add an input to.
+        connection_name : `str`
+            Name of the connection (the task-internal name, not the butler
+            dataset type name).
+        dataset_uuid : `uuid.UUID`
+            UUID of the prerequisite input dataset.  Must already exist in the
+            graph as an input to a different quantum of this task, and must be
+            a prerequisite input, not a regular input or init-input.
+
+        Notes
+        -----
+        If two connections have the same dataset type, the current
+        implementation assumes the set of datasets is the same for the two
+        connections.  This limitation may be removed in the future.
+
+        Unlike regular inputs, prerequisite inputs are not looked up from input
+        collections or indexed by data ID.  Instead, they are uniquely
+        identified by dataset UUID and reused directly between quanta.
+        """
+        from .quantum_graph_skeleton import PrerequisiteDatasetKey, QuantumKey
+
+        quantum_key = QuantumKey(self._task_node.label, quantum_data_id.required_values)
+        read_edge = self._task_node.prerequisite_inputs[connection_name]
+        dataset_key = PrerequisiteDatasetKey(read_edge.parent_dataset_type_name, dataset_uuid.bytes)
+        if dataset_key not in self._skeleton:
+            raise LookupError(
+                f"Prerequisite Dataset {read_edge.parent_dataset_type_name}@{dataset_uuid} "
+                "is not already in the graph."
+            )
+        self._skeleton.add_input_edge(quantum_key, dataset_key)
+
     def move_output(
         self, quantum_data_id: DataCoordinate, connection_name: str, dataset_data_id: DataCoordinate
     ) -> None:

{lsst_pipe_base-29.2025.2800 → lsst_pipe_base-29.2025.2900}/python/lsst/pipe/base/prerequisite_helpers.py

@@ -353,6 +353,8 @@ class PrerequisiteFinder:
                         where=" AND ".join(where_terms),
                         bind=bind,
                         with_dimension_records=True,
+                        limit=None,
+                        explain=False,
                     )
                 except MissingDatasetTypeError:
                     return []
@@ -383,6 +385,8 @@ class PrerequisiteFinder:
                 collections=input_collections,
                 data_id=data_id,
                 with_dimension_records=True,
+                limit=None,
+                explain=False,
             )
         except MissingDatasetTypeError:
             return []

lsst_pipe_base-29.2025.2900/python/lsst/pipe/base/version.py

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

{lsst_pipe_base-29.2025.2800 → lsst_pipe_base-29.2025.2900/python/lsst_pipe_base.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-pipe-base
-Version: 29.2025.2800
+Version: 29.2025.2900
 Summary: Pipeline infrastructure for the Rubin Science Pipelines.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_pipe_base-29.2025.2800 → lsst_pipe_base-29.2025.2900}/tests/test_adjust_all_quanta.py

@@ -49,10 +49,10 @@ from lsst.resources import ResourcePath
 
 class GroupTestConnections(PipelineTaskConnections, dimensions=("detector",)):
     """Connections for a task whose quanta read in all of the biases for all
-    detectors with the same purpose and (theoretically) writes both a single
-    summary output for all inputs and another output for each input. The data
-    IDs of the quanta and the summary outputs using the detector with the
-    lowest ID in that group.
+    detectors with the same purpose, use flat-field exposures as prerequisites,
+    and (theoretically) writes both a single summary output for all inputs and
+    another output for each input. The data IDs of the quanta and the summary
+    outputs using the detector with the lowest ID in that group.
     """
 
     input_group = cT.Input(
@@ -62,6 +62,13 @@ class GroupTestConnections(PipelineTaskConnections, dimensions=("detector",)):
         dimensions=("detector",),
         isCalibration=True,
     )
+    prereq_input_group = cT.PrerequisiteInput(
+        "flat",
+        "Exposure",
+        multiple=True,
+        dimensions=("detector", "physical_filter", "band"),
+        isCalibration=True,
+    )
     output_group = cT.Output(
         "bias_stuff",
         "StructuredDataDict",
@@ -90,6 +97,8 @@ class GroupTestConnections(PipelineTaskConnections, dimensions=("detector",)):
             for drop_data_id in drop:
                 for input_data_id in adjuster.get_inputs(drop_data_id)["input_group"]:
                     adjuster.add_input(keep, "input_group", input_data_id)
+                for input_uuid in adjuster.get_prerequisite_inputs(drop_data_id)["prereq_input_group"]:
+                    adjuster.add_prerequisite_input(keep, "prereq_input_group", input_uuid)
                 for output_data_id in adjuster.get_outputs(drop_data_id)["output_group"]:
                     adjuster.move_output(keep, "output_group", output_data_id)
                 adjuster.remove_quantum(drop_data_id)
@@ -135,18 +144,28 @@ class AdjustAllQuantaTestCase(unittest.TestCase):
         # 1-3 have purpose=SCIENCE, and 4 has purpose=WAVEFRONT.
         self.assertEqual(quanta.keys(), {1, 4})
         self.assertEqual(len(quanta[1].inputs["bias"]), 3)
+        self.assertEqual(len(quanta[1].inputs["flat"]), 5)
         self.assertEqual(len(quanta[1].outputs["bias_stuff"]), 3)
         self.assertCountEqual(
             quanta[1].inputs["bias"],
             butler.query_datasets("bias", collections=collections, where="detector.purpose = 'SCIENCE'"),
         )
+        self.assertCountEqual(
+            quanta[1].inputs["flat"],
+            butler.query_datasets("flat", collections=collections, where="detector.purpose = 'SCIENCE'"),
+        )
         self.assertEqual(len(quanta[1].outputs["bias_summary"]), 1)
         self.assertEqual(quanta[1].outputs["bias_summary"][0].dataId["detector"], 1)
         self.assertEqual(len(quanta[4].inputs["bias"]), 1)
+        self.assertEqual(len(quanta[4].inputs["flat"]), 2)
         self.assertEqual(len(quanta[4].outputs["bias_stuff"]), 1)
         self.assertCountEqual(
             quanta[4].inputs["bias"],
             butler.query_datasets("bias", collections=collections, where="detector.purpose = 'WAVEFRONT'"),
         )
+        self.assertCountEqual(
+            quanta[4].inputs["flat"],
+            butler.query_datasets("flat", collections=collections, where="detector.purpose = 'WAVEFRONT'"),
+        )
         self.assertEqual(len(quanta[4].outputs["bias_summary"]), 1)
         self.assertEqual(quanta[4].outputs["bias_summary"][0].dataId["detector"], 4)

lsst_pipe_base-29.2025.2800/python/lsst/pipe/base/version.py

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