lsst-pipe-base 29.2025.2900__py3-none-any.whl → 29.2025.3000__py3-none-any.whl

lsst/pipe/base/script/transfer_from_graph.py

@@ -29,8 +29,7 @@ __all__ = ["transfer_from_graph"]
 
 import math
 
-from lsst.daf.butler import Butler, CollectionType, QuantumBackedButler, Registry
-from lsst.daf.butler.registry import MissingCollectionError
+from lsst.daf.butler import Butler, CollectionType, MissingCollectionError, QuantumBackedButler
 from lsst.pipe.base import QuantumGraph
 from lsst.utils.iteration import chunk_iterable
 from lsst.utils.logging import getLogger
@@ -124,45 +123,55 @@ def transfer_from_graph(
         )
         count += len(transferred)
 
-    # If anything was transferred then update output chain definition if asked.
-    if count > 0 and update_output_chain and (metadata := qgraph.metadata) is not None:
+    # If asked to do so, update output chain definition.
+    if update_output_chain and (metadata := qgraph.metadata) is not None:
         # These are defined in CmdLineFwk.
         output_run = metadata.get("output_run")
         output = metadata.get("output")
         input = metadata.get("input")
         if output_run is not None and output is not None:
-            _update_chain(dest_butler.registry, output, output_run, input)
+            _update_chain(dest_butler, output, output_run, input)
 
     return count
 
 
-def _update_chain(registry: Registry, output_chain: str, output_run: str, inputs: list[str] | None) -> None:
+def _update_chain(butler: Butler, output_chain: str, output_run: str, inputs: list[str] | None) -> None:
     """Update chain definition if it exists to include run as the first item
     in a chain. If it does not exist then create it to include all inputs and
     output.
+
+    Parameters
+    ----------
+    butler : `lsst.daf.butler.Butler`
+        Butler where to update the collection chain.
+    output_chain : `str`
+        Name of the output CHAINED collection.
+    output_run : `str`
+        Name of the output RUN collection.
+    inputs : `list` [`str`] | None
+        All the input collections to be included in the chain if the
+        chain is created.
     """
+    # Do not need to update chain if output_run does not already exist.
     try:
-        # If output_chain is not a chain the exception will be raised.
-        chain_definition = list(registry.getCollectionChain(output_chain))
+        _ = butler.collections.get_info(output_run)
     except MissingCollectionError:
-        # We have to create chained collection to include inputs and output run
-        # (this reproduces logic in CmdLineFwk).
-        registry.registerCollection(output_chain, type=CollectionType.CHAINED)
-        chain_definition = list(registry.queryCollections(inputs, flattenChains=True)) if inputs else []
-        chain_definition = [output_run] + [run for run in chain_definition if run != output_run]
-        registry.setCollectionChain(output_chain, chain_definition)
-    else:
-        # If run is in the chain but not the first item then remove it, will
-        # re-insert at front below.
-        try:
-            index = chain_definition.index(output_run)
-            if index == 0:
-                # It is already at the top.
-                return
-            else:
-                del chain_definition[index]
-        except ValueError:
-            pass
-
-        chain_definition.insert(0, output_run)
-        registry.setCollectionChain(output_chain, chain_definition)
+        _LOG.verbose(
+            "Output RUN collection (%s) does not exist.  Skipping updating the output chain.",
+            output_run,
+        )
+        return
+
+    # Make chain collection if doesn't exist before calling prepend_chain.
+    created_now = butler.collections.register(output_chain, CollectionType.CHAINED)
+    if created_now:
+        _LOG.verbose("Registered chain collection: %s", output_chain)
+        if inputs:
+            # Add input collections to chain collection just made.  Using
+            # extend instead of prepend in case of race condition where another
+            # execution adds a run before this adds the inputs to the chain.
+            butler.collections.extend_chain(output_chain, inputs)
+    _LOG.verbose(
+        "Prepending output chain collection (%s) with output RUN collection (%s)", output_chain, output_run
+    )
+    butler.collections.prepend_chain(output_chain, output_run)

lsst/pipe/base/version.py

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

{lsst_pipe_base-29.2025.2900.dist-info → lsst_pipe_base-29.2025.3000.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-pipe-base
-Version: 29.2025.2900
+Version: 29.2025.3000
 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.2900.dist-info → lsst_pipe_base-29.2025.3000.dist-info}/RECORD

@@ -32,7 +32,7 @@ lsst/pipe/base/task.py,sha256=XHBd-7m1a4-6LgobBYA1DgY4H7EV-_RWKfxbhZbMmD4,15145
 lsst/pipe/base/taskFactory.py,sha256=4GhN2DozPM8suBYIvoKN4E6VP0I3mYZHBjCUO5JcCGk,2901
 lsst/pipe/base/testUtils.py,sha256=lSBKMhoKflbi8JkMNYfEqqHNl-rtFI8UYT3QneDYpLo,18477
 lsst/pipe/base/utils.py,sha256=JmEt3l0xrh9uayKrSXuQEq12aXOhDr2YXmbYduaxCko,1940
-lsst/pipe/base/version.py,sha256=BkpxVcOPL9P6Qn_EFUUQAdB03ij-q8vMFePg6-6B224,55
+lsst/pipe/base/version.py,sha256=GKnpddvvmGJ8yPsnT--mhT32jeA31BaGZsJcw6cTK7k,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=BGicstnryQ48rYcNRh4fa6Vy63ZIlZ_pPAEa17jhkwY,1519
@@ -74,7 +74,7 @@ lsst/pipe/base/pipeline_graph/visualization/_status_annotator.py,sha256=dp7PXl9C
 lsst/pipe/base/script/__init__.py,sha256=cLEXE7aq5UZ0juL_ScmRw0weFgp4tDgwEX_ts-NEYic,1522
 lsst/pipe/base/script/register_instrument.py,sha256=TRC2r2tSoYBNWNVQya01ELxAtGH8WVk9Ya-uNgCIL5U,2426
 lsst/pipe/base/script/retrieve_artifacts_for_quanta.py,sha256=pYI0wNl5PU8ImgzWfGEDrRz3PSKSg2szWLEIVKdm7Og,3939
-lsst/pipe/base/script/transfer_from_graph.py,sha256=WMpmzaN8hdW4FoZPNL6LRiPW9gvxf9mw20Z1i-KCkWI,6740
+lsst/pipe/base/script/transfer_from_graph.py,sha256=_7zuKf6NdeIzXafkOAFwdkx2zM1H-2uXJSi676WaSdM,6954
 lsst/pipe/base/script/utils.py,sha256=zNqpHG3kXA8OaNXnwYIo0Hu_LCie1qoBAARAME3WEjs,3739
 lsst/pipe/base/script/zip_from_graph.py,sha256=rbH_5Jk7Yc-YFD3X4mbDE4Vzddtu5y90Z77wha94mdM,3228
 lsst/pipe/base/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -86,13 +86,13 @@ lsst/pipe/base/tests/mocks/__init__.py,sha256=NrIJYDeYgR3HsOJXBEXi8EXDhhV7iw7dgw
 lsst/pipe/base/tests/mocks/_data_id_match.py,sha256=v33QZhZm-srXZAXZ8NbNKGN-_ql4AzaArBUk1lxhyss,7474
 lsst/pipe/base/tests/mocks/_pipeline_task.py,sha256=fqaJ-tB7K3jxlfCvCSnVd_GNrz-JhX7FB914h7nHLXc,29366
 lsst/pipe/base/tests/mocks/_storage_class.py,sha256=gC0czHURMk7PWj8N6dLxnY5V4HWX5i8ukb5SZbgWKy8,25257
-lsst_pipe_base-29.2025.2900.dist-info/licenses/COPYRIGHT,sha256=kB3Z9_f6a6uFLGpEmNJT_n186CE65H6wHu4F6BNt_zA,368
-lsst_pipe_base-29.2025.2900.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_pipe_base-29.2025.2900.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_pipe_base-29.2025.2900.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_pipe_base-29.2025.2900.dist-info/METADATA,sha256=0x-2fKPnTuJeCbcnZ_pi91bxzF1rbMXSmhOObDh90Sw,2195
-lsst_pipe_base-29.2025.2900.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_pipe_base-29.2025.2900.dist-info/entry_points.txt,sha256=bnmUhJBsChxMdqST9VmFBYYKxLQoToOfqW1wjW7khjk,64
-lsst_pipe_base-29.2025.2900.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_pipe_base-29.2025.2900.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_pipe_base-29.2025.2900.dist-info/RECORD,,
+lsst_pipe_base-29.2025.3000.dist-info/licenses/COPYRIGHT,sha256=kB3Z9_f6a6uFLGpEmNJT_n186CE65H6wHu4F6BNt_zA,368
+lsst_pipe_base-29.2025.3000.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_pipe_base-29.2025.3000.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_pipe_base-29.2025.3000.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_pipe_base-29.2025.3000.dist-info/METADATA,sha256=ErHeFechV8GyMQBh9Se8mLflvi9VDImXeOt5AAUhHt4,2195
+lsst_pipe_base-29.2025.3000.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_pipe_base-29.2025.3000.dist-info/entry_points.txt,sha256=bnmUhJBsChxMdqST9VmFBYYKxLQoToOfqW1wjW7khjk,64
+lsst_pipe_base-29.2025.3000.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_pipe_base-29.2025.3000.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_pipe_base-29.2025.3000.dist-info/RECORD,,