lsst-daf-butler 29.2025.2800__py3-none-any.whl → 29.2025.3000__py3-none-any.whl

lsst/daf/butler/registry/collections/_base.py

@@ -427,11 +427,13 @@ class DefaultCollectionManager(CollectionManager[K]):
         cache: CollectionRecordCache | None = None
         result: list[CollectionRecord[K]] = []
         done_keys: set[K] = set()
+        explicit_names = list(wildcard.strings)
         if wildcard.patterns:
-            if wildcard.strings:
+            if explicit_names or flatten_chains:
                 # To be efficient in case both patterns and strings are
                 # specified we want to have caching enabled for at least the
-                # duration of this call.
+                # duration of this call. Chains flattening can also produce
+                # additional names to look for.
                 cache = self._caching_context.collection_records or CollectionRecordCache()
             all_records = self._fetch_all(cache)
             for record in filter_types(all_records):
@@ -439,11 +441,17 @@ class DefaultCollectionManager(CollectionManager[K]):
                     if any(p.fullmatch(record.name) for p in wildcard.patterns):
                         result.append(record)
                         done_keys.add(record.key)
-
-        if wildcard.strings:
+            if flatten_chains:
+                # If flattening include children names of all matching chains.
+                for record in all_records:
+                    if isinstance(record, ChainedCollectionRecord):
+                        if any(p.fullmatch(record.name) for p in wildcard.patterns):
+                            explicit_names.extend(record.children)
+
+        if explicit_names:
             # _find_many() returns correctly ordered records, but there may be
             # duplicates.
-            for record in filter_types(self._find_many(wildcard.strings, flatten_chains, cache)):
+            for record in filter_types(self._find_many(explicit_names, flatten_chains, cache)):
                 if record.key not in done_keys:
                     result.append(record)
                     done_keys.add(record.key)

lsst/daf/butler/registry/interfaces/_database.py

@@ -561,8 +561,6 @@ class Database(ABC):
             try:
                 yield table
             finally:
-                with self._transaction():
-                    table.drop(connection)
                 self._temp_tables.remove(table.key)
                 self._metadata.remove_table(table.name)
 

lsst/daf/butler/registry/tests/_registry.py

@@ -838,9 +838,13 @@ class RegistryTests(ABC):
         # Chained collection exists, but has no collections in it.
         self.assertFalse(registry.getCollectionChain(chain1))
         # If we query for all collections, we should get the chained collection
-        # only if we don't ask to flatten it (i.e. yield only its children).
+        # if we don't ask to flatten it (i.e. yield only its children) or if we
+        # explicitly ask to include it too.
         self.assertEqual(set(registry.queryCollections(flattenChains=False)), {tag1, run1, run2, chain1})
         self.assertEqual(set(registry.queryCollections(flattenChains=True)), {tag1, run1, run2})
+        self.assertEqual(
+            set(registry.queryCollections(flattenChains=True, includeChains=True)), {tag1, run1, run2, chain1}
+        )
         # Attempt to set its child collections to something circular; that
         # should fail.
         with self.assertRaises(ValueError):
@@ -904,6 +908,26 @@ class RegistryTests(ABC):
             list(registry.queryCollections(["imported_*", "chain1"], flattenChains=False)),
             ["imported_r", "imported_g", "chain1"],
         )
+        # Query for collection matching chain names, by flattening it should
+        # only return non-chain names.
+        self.assertCountEqual(list(registry.queryCollections("chain?", flattenChains=True)), [tag1, run2])
+        # Query for collection matching chain name, by flattening and
+        # asking to include chains it should return everything.
+        self.assertCountEqual(
+            list(registry.queryCollections("chain*", flattenChains=True, includeChains=True)),
+            [tag1, run2, chain1, chain2],
+        )
+        # Order of children in chained collections is preserved.
+        self.assertEqual(list(registry.queryCollections("chain1", flattenChains=True)), [tag1, run2])
+        self.assertEqual(list(registry.queryCollections("cha*2", flattenChains=True)), [run2, tag1])
+        self.assertEqual(
+            list(registry.queryCollections("chain1", flattenChains=True, includeChains=True)),
+            [chain1, tag1, run2],
+        )
+        self.assertEqual(
+            list(registry.queryCollections("chain2", flattenChains=True, includeChains=True)),
+            [chain2, run2, chain1, tag1],
+        )
 
         # Search for bias with dataId1 should find it via tag1 in chain2,
         # recursing, because is not in run1.

lsst/daf/butler/version.py

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

{lsst_daf_butler-29.2025.2800.dist-info → lsst_daf_butler-29.2025.3000.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.2800
+Version: 29.2025.3000
 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.2800.dist-info → lsst_daf_butler-29.2025.3000.dist-info}/RECORD

@@ -52,7 +52,7 @@ lsst/daf/butler/repo_relocation.py,sha256=Ivhx2xU4slc53Z6RExhNnquMr2Hx-S8h62emml
 lsst/daf/butler/time_utils.py,sha256=MVTfOFI2xt3IeA46pa-fWY2kJRwSzaQyq1uzeUABcTM,11805
 lsst/daf/butler/timespan_database_representation.py,sha256=MWDusjIQIL2RH1CDpWSW5sYvdHCJKzAfpg1rm1DfgEU,24302
 lsst/daf/butler/utils.py,sha256=5u50COK5z4u31grOhmQF7mFz55biNLOvSMRdQjEdsjo,5140
-lsst/daf/butler/version.py,sha256=zkbtcIsz6tbu7rmamcut51DoG62vyYwam95urGw5Lis,55
+lsst/daf/butler/version.py,sha256=GKnpddvvmGJ8yPsnT--mhT32jeA31BaGZsJcw6cTK7k,55
 lsst/daf/butler/_utilities/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw2166yOpq0iPMSdAvw,1298
 lsst/daf/butler/_utilities/locked_object.py,sha256=3RQf0Ish55mfQAfBy3V4Tfnfq5Q7-cxrwTlQMUhrIno,1931
 lsst/daf/butler/_utilities/named_locks.py,sha256=Zj_u1rZELaiWec3wJfkgmGD_YiZMLVxbMQmdbbVgk5E,2286
@@ -193,7 +193,7 @@ lsst/daf/butler/registry/bridge/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw216
 lsst/daf/butler/registry/bridge/ephemeral.py,sha256=QSKMRwQTAHnMOwdigH5tSNrQaM2dK-IXymb7x87bY-w,5845
 lsst/daf/butler/registry/bridge/monolithic.py,sha256=JvVhMH0K9lfzOTaVe9k34JaTAXAHKLP8e2XvRANWEZg,18148
 lsst/daf/butler/registry/collections/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw2166yOpq0iPMSdAvw,1298
-lsst/daf/butler/registry/collections/_base.py,sha256=ZDDwHNjlyuQ5jKHSWr8KxqpcgCOCex7I8imhfz_1HPg,36964
+lsst/daf/butler/registry/collections/_base.py,sha256=MxrvTh81aHUULXtf5hHzK6iAjwkes5NckouHMhTFdPM,37480
 lsst/daf/butler/registry/collections/nameKey.py,sha256=7knssy-9kmynprNdN9309jc7bFn4deAFaXIZsvVACf8,12411
 lsst/daf/butler/registry/collections/synthIntKey.py,sha256=N27SkPcXIDfo6Qy-xS-M5nSFscNpuBKpThHTKn-aVAg,13179
 lsst/daf/butler/registry/databases/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw2166yOpq0iPMSdAvw,1298
@@ -211,7 +211,7 @@ lsst/daf/butler/registry/interfaces/__init__.py,sha256=IBMBBb1gyAx3o9uTufhQHtMrh
 lsst/daf/butler/registry/interfaces/_attributes.py,sha256=z-njEpWLhmKU4S0KOCplrY4QeBGoKUhlPRtSdNS_4uw,7258
 lsst/daf/butler/registry/interfaces/_bridge.py,sha256=pds0AhEXZVO3YguU-tkZ8J_NZrBj55HCGkHpBTXbBFQ,15924
 lsst/daf/butler/registry/interfaces/_collections.py,sha256=7I0e0Pi4UylET5Nr3keRFve7NToafHxJafiwn81lt6U,27008
-lsst/daf/butler/registry/interfaces/_database.py,sha256=grDIlySMfgq3K6egTx3qixsI7EmL-4Y7UqB5euopVXM,84478
+lsst/daf/butler/registry/interfaces/_database.py,sha256=7RrBHGhryLrRhEYXInEZHeIz93JGdi6Ru48hXEE7foc,84393
 lsst/daf/butler/registry/interfaces/_database_explain.py,sha256=CkALWwNeyrjRvKizWrxvcGDunIhB77kLtEuXscrXVOY,3052
 lsst/daf/butler/registry/interfaces/_datasets.py,sha256=7vv_gZHc-JNrEtKc1dVZhh45OtJVSbw6SN8AH0vgBEw,25595
 lsst/daf/butler/registry/interfaces/_dimensions.py,sha256=VIVFfMGnBeUxSruvy9vU72Csk7hTE7HsnzLvCbevR10,18028
@@ -254,7 +254,7 @@ lsst/daf/butler/registry/queries/expressions/parser/ply/lex.py,sha256=Y9SoJv-_0X
 lsst/daf/butler/registry/queries/expressions/parser/ply/yacc.py,sha256=aGhbTj66OEYILEApQtwyfDunWoAPJ3QWZu6mD8uEB3s,137077
 lsst/daf/butler/registry/tests/__init__.py,sha256=uWJM-8Yv52Ox6e9rKGTaTVRdJc3fIfAyI5WnZQp81EA,1349
 lsst/daf/butler/registry/tests/_database.py,sha256=0lbzjDUj3n2UPvAktiKcc3G1TE0TK867cASezUISN6I,65218
-lsst/daf/butler/registry/tests/_registry.py,sha256=33is9gEiP2K4J3C26qFCD8KF32xnHdlib6c0vuN0zVk,204125
+lsst/daf/butler/registry/tests/_registry.py,sha256=b1Gela-oTvd7inzKJyqZJLQzsQ4jGTf61BtEM5d515w,205460
 lsst/daf/butler/remote_butler/__init__.py,sha256=9fCJ-DmQGuktoGnmBBM_BygjIkgFWsROlbJ870uc9ak,1401
 lsst/daf/butler/remote_butler/_authentication.py,sha256=dnc4UGIGIdkkH6RLbq33CLZ2IWwPCEUmDxGHPauxSao,3932
 lsst/daf/butler/remote_butler/_collection_args.py,sha256=_ToE6jplUCzmmqwWvkl1cwrXRJkNU8Qrl2hqwIqHibw,4969
@@ -343,13 +343,13 @@ lsst/daf/butler/transfers/__init__.py,sha256=M1YcFszSkNB5hB2pZwwGXqbJE2dKt4YXDin
 lsst/daf/butler/transfers/_context.py,sha256=1oOlKWj53bjcVioOIzRNPZSC_Q0dLDI_R4syI9gMOkg,16938
 lsst/daf/butler/transfers/_interfaces.py,sha256=Ia1NqcFR5E-Ik4zsXEe2fuMtNCJj5Yfe_gVHLTBtJDw,7490
 lsst/daf/butler/transfers/_yaml.py,sha256=w_0GmrueuHVLfOfAXGHFBbWAl18tX6eSElbTC-2jRoc,32632
-lsst_daf_butler-29.2025.2800.dist-info/licenses/COPYRIGHT,sha256=k1Vq0-Be_K-puaeW4UZnckPjksEL-MJh4XKiWcjMxJE,312
-lsst_daf_butler-29.2025.2800.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_daf_butler-29.2025.2800.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_daf_butler-29.2025.2800.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_daf_butler-29.2025.2800.dist-info/METADATA,sha256=01X3w9hpkZw2iP91ERRkJB2aPTQRJw6sBCnDxeht4aM,3265
-lsst_daf_butler-29.2025.2800.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_daf_butler-29.2025.2800.dist-info/entry_points.txt,sha256=XsRxyTK3c-jGlKVuVnbpch3gtaO0lAA_fS3i2NGS5rw,59
-lsst_daf_butler-29.2025.2800.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_daf_butler-29.2025.2800.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_daf_butler-29.2025.2800.dist-info/RECORD,,
+lsst_daf_butler-29.2025.3000.dist-info/licenses/COPYRIGHT,sha256=k1Vq0-Be_K-puaeW4UZnckPjksEL-MJh4XKiWcjMxJE,312
+lsst_daf_butler-29.2025.3000.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_daf_butler-29.2025.3000.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_daf_butler-29.2025.3000.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_daf_butler-29.2025.3000.dist-info/METADATA,sha256=7o8k9jyQHnAy8yhvbtSjE5cxGn14rlMtHVFwZFqX7Xk,3265
+lsst_daf_butler-29.2025.3000.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_daf_butler-29.2025.3000.dist-info/entry_points.txt,sha256=XsRxyTK3c-jGlKVuVnbpch3gtaO0lAA_fS3i2NGS5rw,59
+lsst_daf_butler-29.2025.3000.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_daf_butler-29.2025.3000.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_daf_butler-29.2025.3000.dist-info/RECORD,,