lsst-daf-butler 29.2025.3600__tar.gz → 29.2025.3700__tar.gz

{lsst_daf_butler-29.2025.3600/python/lsst_daf_butler.egg-info → lsst_daf_butler-29.2025.3700}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.3600
+Version: 29.2025.3700
 Summary: An abstraction layer for reading and writing astronomical data to datastores.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_daf_butler-29.2025.3600 → lsst_daf_butler-29.2025.3700}/python/lsst/daf/butler/datastores/chainedDatastore.py

@@ -562,9 +562,6 @@ class ChainedDatastore(Datastore):
 
     def _prepIngest(self, *datasets: FileDataset, transfer: str | None = None) -> _IngestPrepData:
         # Docstring inherited from Datastore._prepIngest.
-        if transfer is None:
-            raise NotImplementedError("ChainedDatastore does not support transfer=None.")
-
         def isDatasetAcceptable(dataset: FileDataset, *, name: str, constraints: Constraints) -> bool:
             acceptable = [ref for ref in dataset.refs if constraints.isAcceptable(ref)]
             if not acceptable:

lsst_daf_butler-29.2025.3700/python/lsst/daf/butler/version.py

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

{lsst_daf_butler-29.2025.3600 → lsst_daf_butler-29.2025.3700/python/lsst_daf_butler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.3600
+Version: 29.2025.3700
 Summary: An abstraction layer for reading and writing astronomical data to datastores.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_daf_butler-29.2025.3600 → lsst_daf_butler-29.2025.3700}/tests/test_butler.py

@@ -2281,6 +2281,7 @@ class PosixDatastoreButlerTestCase(FileDatastoreButlerTests, unittest.TestCase):
         )
         source_butler = repo.butler
 
+        # Test writing outputs to a FileDatastore.
         with tempfile.TemporaryDirectory() as tempdir:
             target_repo_config = Butler.makeRepo(tempdir)
             refs = [repo.ref1, repo.ref2]
@@ -2294,10 +2295,71 @@ class PosixDatastoreButlerTestCase(FileDatastoreButlerTests, unittest.TestCase):
                 # Files should have been copied into the target datastore
                 self.assertTrue(ResourcePath(tempdir).join(path).exists())
 
+            # Make sure the target Butler can ingest the datasets.
+            target_butler = Butler(target_repo_config, writeable=True)
+            target_butler.transfer_dimension_records_from(source_butler, refs)
+            target_butler.ingest(*datasets, transfer=None)
+            self.assertIsNotNone(target_butler.get(repo.ref1))
+            self.assertIsNotNone(target_butler.get(repo.ref2))
+
             # Giving an empty list of files is a no-op.
             no_datasets = transfer_datasets_to_datastore(source_butler, ButlerConfig(target_repo_config), [])
             self.assertEqual(len(no_datasets), 0)
 
+        # Test writing outputs to a ChainedDatastore.
+        with tempfile.TemporaryDirectory() as tempdir:
+            # Set up a second dataset type, so we can split the files across
+            # multiple datastore roots.
+            dt1 = repo.datasetType
+            dt2 = DatasetType("other", dt1.dimensions, dt1.storageClass)
+            source_butler.registry.registerDatasetType(dt2)
+            other_ref = repo.addDataset(repo.ref1.dataId, datasetType=dt2)
+            config = Config.fromString(
+                f"""
+            datastore:
+                cls: lsst.daf.butler.datastores.chainedDatastore.ChainedDatastore
+                datastore_constraints:
+                  - constraints:
+                      accept:
+                        - {dt1.name}
+                  - constraints:
+                      accept:
+                        - {dt2.name}
+                datastores:
+                  - datastore:
+                      cls: lsst.daf.butler.datastores.fileDatastore.FileDatastore
+                      root: <butlerRoot>/FileDatastore_0
+                  - datastore:
+                      cls: lsst.daf.butler.datastores.fileDatastore.FileDatastore
+                      root: <butlerRoot>/FileDatastore_1
+            """
+            )
+            target_repo_config = Butler.makeRepo(tempdir, config)
+            refs = [repo.ref1, repo.ref2, other_ref]
+            datasets = transfer_datasets_to_datastore(source_butler, ButlerConfig(target_repo_config), refs)
+            self.assertEqual(len(datasets), 3)
+            self.assertEqual({ref.id for ref in refs}, {dataset.refs[0].id for dataset in datasets})
+            for dataset in datasets:
+                path = ResourcePath(dataset.path, forceAbsolute=False)
+                # Paths should be relative paths to the target datastore.
+                self.assertFalse(path.isabs())
+                # Files should have been split up between the two datastores
+                # in the chain.
+                datastore_root = ResourcePath(tempdir)
+                if dataset.refs[0].datasetType.name == dt1.name:
+                    datastore_root = datastore_root.join("FileDatastore_0")
+                else:
+                    datastore_root = datastore_root.join("FileDatastore_1")
+                self.assertTrue(datastore_root.join(path).exists())
+
+            # Make sure the target Butler can ingest the datasets.
+            target_butler = Butler(target_repo_config, writeable=True)
+            target_butler.transfer_dimension_records_from(source_butler, refs)
+            target_butler.ingest(*datasets, transfer=None)
+            self.assertIsNotNone(target_butler.get(repo.ref1))
+            self.assertIsNotNone(target_butler.get(repo.ref2))
+            self.assertIsNotNone(target_butler.get(other_ref))
+
 
 class PostgresPosixDatastoreButlerTestCase(FileDatastoreButlerTests, unittest.TestCase):
     """PosixDatastore specialization of a butler using Postgres"""

{lsst_daf_butler-29.2025.3600 → lsst_daf_butler-29.2025.3700}/tests/test_datastore.py

@@ -767,10 +767,19 @@ class DatastoreTests(DatastoreTestsBase):
                 ) -> None:
                     """Ingest a file already in the datastore root."""
                     # first move it into the root, and adjust the path
-                    # accordingly
-                    path = shutil.copy(path, datastore.root.ospath)
-                    path = os.path.relpath(path, start=datastore.root.ospath)
-                    datastore.ingest(FileDataset(path=path, refs=ref), transfer=mode)
+                    # accordingly.
+                    # In the case of a ChainedDatastore, we have multiple
+                    # roots, all of which will accept the file, so we
+                    # have to copy it into all the roots.
+                    relative_path = None
+                    for root in datastore.roots.values():
+                        if root is not None:
+                            copied_path = shutil.copy(path, root.ospath)
+                            relative_path = os.path.relpath(copied_path, start=root.ospath)
+                    assert relative_path is not None, (
+                        "Running a FileDatastore test on a Datastore instance without any roots"
+                    )
+                    datastore.ingest(FileDataset(path=relative_path, refs=ref), transfer=mode)
                     self.assertEqual(obj, datastore.get(ref))
 
                 def failInputDoesNotExist(
@@ -1394,7 +1403,7 @@ class ChainedDatastoreTestCase(PosixDatastoreTestCase):
     configFile = os.path.join(TESTDIR, "config/basic/chainedDatastore.yaml")
     hasUnsupportedPut = False
     canIngestNoTransferAuto = False
-    ingestTransferModes = ("copy", "move", "hardlink", "symlink", "relsymlink", "link", "auto")
+    ingestTransferModes = (None, "copy", "move", "hardlink", "symlink", "relsymlink", "link", "auto")
     isEphemeral = False
     rootKeys = (".datastores.1.root", ".datastores.2.root")
     validationCanFail = True

lsst_daf_butler-29.2025.3600/python/lsst/daf/butler/version.py

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