lsst-daf-butler 29.0.0rc1__py3-none-any.whl → 29.2025.1100__py3-none-any.whl

lsst/daf/butler/datastores/fileDatastore.py

@@ -2649,6 +2649,7 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
         artifact_existence: dict[ResourcePath, bool] | None = None,
         dry_run: bool = False,
     ) -> tuple[set[DatasetRef], set[DatasetRef]]:
+        log.verbose("transfer_from %s to %s", source_datastore.name, self.name)
         # Docstring inherited
         if type(self) is not type(source_datastore):
             raise TypeError(
@@ -2693,6 +2694,7 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
         # What we really want is all the records in the source datastore
         # associated with these refs. Or derived ones if they don't exist
         # in the source.
+        log.verbose("Looking up source datastore records in %s", source_datastore.name)
         source_records = source_datastore._get_stored_records_associated_with_refs(
             refs, ignore_datastore_records=True
         )
@@ -2726,6 +2728,9 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
             source_records.update(found_records)
 
         # See if we already have these records
+        log.verbose(
+            "Looking up existing datastore records in target %s for %d refs", self.name, len(requested_ids)
+        )
         target_records = self._get_stored_records_associated_with_refs(refs, ignore_datastore_records=True)
 
         # The artifacts to register
@@ -2744,6 +2749,7 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
         direct_transfers = []
 
         # Now can transfer the artifacts
+        log.verbose("Transferring artifacts")
         for ref in refs:
             if not self.constraints.isAcceptable(ref):
                 # This datastore should not be accepting this dataset.
@@ -2818,6 +2824,7 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
         # to difficulties if the dataset has previously been ingested
         # disassembled and is somehow now assembled, or vice versa.
         if not dry_run:
+            log.verbose("Registering datastore records in database")
             self._register_datasets(artifacts, insert_mode=DatabaseInsertMode.REPLACE)
 
         if already_present:
@@ -2828,6 +2835,13 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
                 "" if n_skipped == 1 else "s",
             )
 
+        log.verbose(
+            "Finished transfer_from %s to %s with %d accepted, %d rejected",
+            source_datastore.name,
+            self.name,
+            len(accepted),
+            len(rejected),
+        )
         return accepted, rejected
 
     @transactional

lsst/daf/butler/direct_query_driver/_driver.py

@@ -156,7 +156,7 @@ class DirectQueryDriver(QueryDriver):
         self._exit_stack: ExitStack | None = None
         self._raw_page_size = raw_page_size
         self._postprocessing_filter_factor = postprocessing_filter_factor
-        self._constant_rows_limit = constant_rows_limit
+        self._constant_rows_limit = min(constant_rows_limit, db.get_constant_rows_max())
         self._cursors: set[_Cursor] = set()
 
     def __enter__(self) -> None:

lsst/daf/butler/queries/_expression_strings.py

@@ -230,6 +230,13 @@ class _ConversionVisitor(TreeVisitor[_VisitorResult]):
         else:
             return _ColExpr(column_expression)
 
+    def visitBind(self, name: str, node: Node) -> _VisitorResult:
+        name = name.lower()
+        if name not in self.context.bind:
+            raise InvalidQueryError("Name {name!r} is not in the bind map.")
+        # Logic in visitIdentifier handles binds.
+        return self.visitIdentifier(name, node)
+
     def visitNumericLiteral(self, value: str, node: Node) -> _VisitorResult:
         numeric: int | float
         try:

lsst/daf/butler/registry/databases/sqlite.py

@@ -398,6 +398,12 @@ class SqliteDatabase(Database):
         ]
         return sqlalchemy.sql.union_all(*selects).alias(name)
 
+    def get_constant_rows_max(self) -> int:
+        # Docstring inherited.
+        # This is the default SQLITE_MAX_COMPOUND_SELECT (see
+        # https://www.sqlite.org/limits.html):
+        return 500
+
     @property
     def has_distinct_on(self) -> bool:
         # Docstring inherited.

lsst/daf/butler/registry/datasets/byDimensions/_manager.py

@@ -317,6 +317,16 @@ class ByDimensionsDatasetRecordStorageManagerUUID(DatasetRecordStorageManager):
             raise ValueError(
                 f"Component dataset types can not be stored in registry. Rejecting {dataset_type.name}"
             )
+
+        # If database universe and dimension group universe are different it
+        # can cause unexpected effects.
+        if dataset_type.dimensions.universe is not self._dimensions.universe:
+            raise ValueError(
+                "Incompatible dimension universe versions - "
+                f"database universe: {self._dimensions.universe}, "
+                f"dataset type universe: {dataset_type.dimensions.universe}."
+            )
+
         record = self._fetch_dataset_type_record(dataset_type.name)
         if record is None:
             if (dynamic_tables := self._cache.get_by_dimensions(dataset_type.dimensions)) is None:

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

@@ -1918,7 +1918,7 @@ class Database(ABC):
         This should reflect typical performance profiles (or a guess at these),
         not just hard database engine limits.
         """
-        return 100
+        return 1000
 
     @property
     @abstractmethod

lsst/daf/butler/registry/queries/expressions/_predicate.py

@@ -353,25 +353,7 @@ class PredicateConversionVisitor(TreeVisitor[VisitorResult]):
     def visitIdentifier(self, name: str, node: Node) -> VisitorResult:
         # Docstring inherited.
         if name in self.bind:
-            value = self.bind[name]
-            if isinstance(value, list | tuple | Set):
-                elements = []
-                all_dtypes = set()
-                for item in value:
-                    dtype = type(item)
-                    all_dtypes.add(dtype)
-                    elements.append(ColumnExpression.literal(item, dtype=dtype))
-                if len(all_dtypes) > 1:
-                    raise ExpressionTypeError(
-                        f"Mismatched types in bind iterable: {value} has a mix of {all_dtypes}."
-                    )
-                elif not elements:
-                    # Empty container
-                    return ColumnContainer.sequence([])
-                else:
-                    (dtype,) = all_dtypes
-                    return ColumnContainer.sequence(elements, dtype=dtype)
-            return ColumnExpression.literal(value, dtype=type(value))
+            return self.visitBind(name, node)
         tag: ColumnTag
         match categorizeConstant(name):
             case ExpressionConstant.INGEST_DATE:
@@ -403,6 +385,31 @@ class PredicateConversionVisitor(TreeVisitor[VisitorResult]):
             assert isinstance(element, Dimension)
             return ColumnExpression.reference(tag, element.primaryKey.getPythonType())
 
+    def visitBind(self, name: str, node: Node) -> VisitorResult:
+        # Docstring inherited.
+        if name not in self.bind:
+            raise UserExpressionError(f"Name {name!r} is not in the bind map.")
+
+        value = self.bind[name]
+        if isinstance(value, list | tuple | Set):
+            elements = []
+            all_dtypes = set()
+            for item in value:
+                dtype = type(item)
+                all_dtypes.add(dtype)
+                elements.append(ColumnExpression.literal(item, dtype=dtype))
+            if len(all_dtypes) > 1:
+                raise ExpressionTypeError(
+                    f"Mismatched types in bind iterable: {value} has a mix of {all_dtypes}."
+                )
+            elif not elements:
+                # Empty container
+                return ColumnContainer.sequence([])
+            else:
+                (dtype,) = all_dtypes
+                return ColumnContainer.sequence(elements, dtype=dtype)
+        return ColumnExpression.literal(value, dtype=type(value))
+
     def visitIsIn(
         self, lhs: VisitorResult, values: list[VisitorResult], not_in: bool, node: Node
     ) -> VisitorResult:

lsst/daf/butler/registry/queries/expressions/check.py

@@ -212,16 +212,8 @@ class InspectionVisitor(TreeVisitor[TreeSummary]):
     def visitIdentifier(self, name: str, node: Node) -> TreeSummary:
         # Docstring inherited from TreeVisitor.visitIdentifier
         if name in self.bind:
-            value = self.bind[name]
-            if isinstance(value, list | tuple | Set):
-                # This can happen on rhs of IN operator, if there is only one
-                # element in the list then take it.
-                if len(value) == 1:
-                    return TreeSummary(dataIdValue=next(iter(value)))
-                else:
-                    return TreeSummary()
-            else:
-                return TreeSummary(dataIdValue=value)
+            return self.visitBind(name, node)
+
         constant = categorizeConstant(name)
         if constant is ExpressionConstant.INGEST_DATE:
             return TreeSummary(hasIngestDate=True)
@@ -238,6 +230,23 @@ class InspectionVisitor(TreeVisitor[TreeSummary]):
         else:
             return TreeSummary(dimensions=set(element.minimal_group.names), columns={element.name: {column}})
 
+    def visitBind(self, name: str, node: Node) -> TreeSummary:
+        if name not in self.bind:
+            raise UserExpressionError(f"Name {name!r} is not in the bind map.")
+        value = self.bind[name]
+        match value:
+            case list() | tuple() | Set():
+                # This can happen on rhs of IN operator, if there is only one
+                # element in the list then take it.
+                match len(value):
+                    case 1:
+                        (value,) = value
+                        return TreeSummary(dataIdValue=value)
+                    case _:
+                        return TreeSummary()
+            case _:
+                return TreeSummary(dataIdValue=value)
+
     def visitUnaryOp(self, operator: str, operand: TreeSummary, node: Node) -> TreeSummary:
         # Docstring inherited from TreeVisitor.visitUnaryOp
         return operand

lsst/daf/butler/registry/queries/expressions/normalForm.py

@@ -1040,6 +1040,10 @@ class TransformationVisitor(TreeVisitor[TransformationWrapper]):
         # Docstring inherited from TreeVisitor.visitIdentifier
         return Opaque(node, PrecedenceTier.TOKEN)
 
+    def visitBind(self, name: str, node: Node) -> TransformationWrapper:
+        # Docstring inherited from TreeVisitor.visitBind
+        return Opaque(node, PrecedenceTier.TOKEN)
+
     def visitUnaryOp(
         self,
         operator: str,

lsst/daf/butler/registry/queries/expressions/parser/exprTree.py

@@ -256,6 +256,29 @@ class Identifier(Node):
         return "{name}".format(**vars(self))
 
 
+class BindName(Node):
+    """Node representing a bind name.
+
+    Value of the bind is its name, which is a simple identifier.
+
+    Parameters
+    ----------
+    name : str
+        Bind name.
+    """
+
+    def __init__(self, name: str):
+        Node.__init__(self)
+        self.name = name
+
+    def visit(self, visitor: TreeVisitor) -> Any:
+        # Docstring inherited from Node.visit
+        return visitor.visitBind(self.name, self)
+
+    def __str__(self) -> str:
+        return "{name}".format(**vars(self))
+
+
 class RangeLiteral(Node):
     """Node representing range literal appearing in `IN` list.
 

lsst/daf/butler/registry/queries/expressions/parser/parserLex.py

@@ -128,6 +128,7 @@ class ParserLex:
         # 'DURATION_LITERAL',
         "QUALIFIED_IDENTIFIER",
         "SIMPLE_IDENTIFIER",
+        "BIND_NAME",
         "LPAREN",
         "RPAREN",
         "EQ",
@@ -221,6 +222,14 @@ class ParserLex:
             t.type = "SIMPLE_IDENTIFIER"
         return t
 
+    # we only support ASCII in identifier names
+    def t_BIND_NAME(self, t: LexToken) -> LexToken:
+        """[:][a-zA-Z_][a-zA-Z0-9_]*"""
+        # Drop colon to get the name.
+        t.value = t.value[1:]
+        t.type = "BIND_NAME"
+        return t
+
     def t_error(self, t: LexToken) -> None:
         """Error handling rule"""
         lexer = t.lexer

lsst/daf/butler/registry/queries/expressions/parser/parserYacc.py

@@ -47,6 +47,7 @@ except ImportError:
 
 from .exprTree import (
     BinaryOp,
+    BindName,
     Identifier,
     IsIn,
     Node,
@@ -59,7 +60,7 @@ from .exprTree import (
     UnaryOp,
     function_call,
 )
-from .parserLex import LexToken, ParserLex
+from .parserLex import LexToken, ParserLex, ParserLexError
 from .ply import yacc
 
 
@@ -223,8 +224,7 @@ class ParseError(ParserYaccError):
         self.pos = pos
         self.lineno = lineno
         self.posInLine = self._posInLine()
-        msg = "Syntax error at or near '{0}' (line: {1}, pos: {2})"
-        msg = msg.format(token, lineno, self.posInLine + 1)
+        msg = f"Syntax error at or near '{token}' (line: {lineno}, pos: {self.posInLine + 1})"
         ParserYaccError.__init__(self, msg)
 
     def _posInLine(self) -> int:
@@ -288,7 +288,11 @@ class ParserYacc:
         # make lexer
         if lexer is None:
             lexer = ParserLex.make_lexer()
-        tree = self.parser.parse(input=input, lexer=lexer, debug=debug, tracking=tracking)
+        try:
+            tree = self.parser.parse(input=input, lexer=lexer, debug=debug, tracking=tracking)
+        except ParserLexError as exc:
+            # Convert it into ParserYaccError
+            raise ParserYaccError(str(exc)) from exc
         return tree
 
     tokens = ParserLex.tokens[:]
@@ -371,14 +375,21 @@ class ParserYacc:
     def p_literal_or_id_list(cls, p: YaccProduction) -> None:
         """literal_or_id_list : literal_or_id_list COMMA literal
         | literal_or_id_list COMMA identifier
+        | literal_or_id_list COMMA bind_name
         | literal
         | identifier
+        | bind_name
         """
         if len(p) == 2:
             p[0] = [p[1]]
         else:
             p[0] = p[1] + [p[3]]
 
+    @classmethod
+    def p_bind_name(cls, p: YaccProduction) -> None:
+        """bind_name : BIND_NAME"""
+        p[0] = BindName(p[1])
+
     @classmethod
     def p_bit_expr(cls, p: YaccProduction) -> None:
         """bit_expr : bit_expr ADD bit_expr
@@ -395,17 +406,11 @@ class ParserYacc:
 
     @classmethod
     def p_simple_expr_lit(cls, p: YaccProduction) -> None:
-        """simple_expr : literal"""
-        p[0] = p[1]
-
-    @classmethod
-    def p_simple_expr_id(cls, p: YaccProduction) -> None:
-        """simple_expr : identifier"""
-        p[0] = p[1]
-
-    @classmethod
-    def p_simple_expr_function_call(cls, p: YaccProduction) -> None:
-        """simple_expr : function_call"""
+        """simple_expr : literal
+        | identifier
+        | bind_name
+        | function_call
+        """
         p[0] = p[1]
 
     @classmethod

lsst/daf/butler/registry/queries/expressions/parser/treeVisitor.py

@@ -29,7 +29,7 @@ from __future__ import annotations
 
 __all__ = ["TreeVisitor"]
 
-from abc import abstractmethod
+from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Generic, TypeVar
 
 if TYPE_CHECKING:
@@ -41,7 +41,7 @@ if TYPE_CHECKING:
 T = TypeVar("T")
 
 
-class TreeVisitor(Generic[T]):
+class TreeVisitor(Generic[T], ABC):
     """Definition of interface for visitor classes.
 
     Visitors and tree node classes implement Visitor pattern for tree
@@ -121,6 +121,18 @@ class TreeVisitor(Generic[T]):
             Corresponding tree node, mostly useful for diagnostics.
         """
 
+    @abstractmethod
+    def visitBind(self, name: str, node: Node) -> T:
+        """Visit BindName node.
+
+        Parameters
+        ----------
+        name : `str`
+            Bind name.
+        node : `Node`
+            Corresponding tree node, mostly useful for diagnostics.
+        """
+
     @abstractmethod
     def visitUnaryOp(self, operator: str, operand: T, node: Node) -> T:
         """Visit UnaryOp node.

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

@@ -75,7 +75,7 @@ from ..._exceptions import (
 from ..._exceptions_legacy import DatasetTypeError
 from ..._storage_class import StorageClass
 from ..._timespan import Timespan
-from ...dimensions import DataCoordinate, DataCoordinateSet, SkyPixDimension
+from ...dimensions import DataCoordinate, DataCoordinateSet, DimensionUniverse, SkyPixDimension
 from .._collection_summary import CollectionSummary
 from .._config import RegistryConfig
 from .._exceptions import (
@@ -326,6 +326,17 @@ class RegistryTests(ABC):
         self.assertCountEqual([dt.name for dt in types], ["test", "testNoneTemplate"])
         self.assertEqual(missing, ["notarealdatasettype"])
 
+        # Trying to register a dataset type with different universe version or
+        # namespace will raise.
+        wrong_universes = (DimensionUniverse(version=-1), DimensionUniverse(namespace="🔭"))
+        for universe in wrong_universes:
+            storageClass = StorageClass("testDatasetType")
+            dataset_type = DatasetType(
+                "wrong_universe", ("instrument", "visit"), storageClass, universe=universe
+            )
+            with self.assertRaisesRegex(ValueError, "Incompatible dimension universe versions"):
+                registry.registerDatasetType(dataset_type)
+
     def testDatasetTypeCache(self):
         """Test for dataset type cache update logic after a cache miss."""
         butler1 = self.make_butler()
@@ -2801,7 +2812,7 @@ class RegistryTests(ABC):
             self.assertEqual(len(datasets), expect_len)
 
             # same with bind using datetime or astropy Time
-            where = f"ingest_date {op} ingest_time"
+            where = f"ingest_date {op} :ingest_time"
             datasets = list(
                 registry.queryDatasets(..., collections=..., where=where, bind={"ingest_time": dt})
             )
@@ -2870,33 +2881,33 @@ class RegistryTests(ABC):
         # the expression.
 
         # t1 is before the start of i1, so this should not include i1.
-        self.assertEqual(ids[:i1], query("visit.timespan OVERLAPS (null, t1)"))
+        self.assertEqual(ids[:i1], query("visit.timespan OVERLAPS (null, :t1)"))
         # t2 is exactly at the start of i2, but ends are exclusive, so these
         # should not include i2.
-        self.assertEqual(ids[i1:i2], query("(t1, t2) OVERLAPS visit.timespan"))
+        self.assertEqual(ids[i1:i2], query("(:t1, :t2) OVERLAPS visit.timespan"))
         if self.supportsExtendedTimeQueryOperators:
-            self.assertEqual(ids[:i2], query("visit.timespan < (t2, t4)"))
+            self.assertEqual(ids[:i2], query("visit.timespan < (:t2, :t4)"))
         # t3 is in the middle of i3, so this should include i3.
-        self.assertEqual(ids[i2 : i3 + 1], query("visit.timespan OVERLAPS ts23"))
+        self.assertEqual(ids[i2 : i3 + 1], query("visit.timespan OVERLAPS :ts23"))
         # This one should not include t3 by the same reasoning.
         if self.supportsExtendedTimeQueryOperators:
-            self.assertEqual(ids[i3 + 1 :], query("visit.timespan > (t1, t3)"))
+            self.assertEqual(ids[i3 + 1 :], query("visit.timespan > (:t1, :t3)"))
         # t4 is exactly at the end of i4, so this should include i4.
-        self.assertEqual(ids[i3 : i4 + 1], query(f"visit.timespan OVERLAPS (T'{t3.tai.isot}', t4)"))
+        self.assertEqual(ids[i3 : i4 + 1], query(f"visit.timespan OVERLAPS (T'{t3.tai.isot}', :t4)"))
         # i4's upper bound of t4 is exclusive so this should not include t4.
-        self.assertEqual(ids[i4 + 1 :], query("visit.timespan OVERLAPS (t4, NULL)"))
+        self.assertEqual(ids[i4 + 1 :], query("visit.timespan OVERLAPS (:t4, NULL)"))
 
         # Now some timespan vs. time scalar queries.
-        self.assertEqual(ids[i3 : i3 + 1], query("visit.timespan OVERLAPS t3"))
+        self.assertEqual(ids[i3 : i3 + 1], query("visit.timespan OVERLAPS :t3"))
         self.assertEqual(ids[i3 : i3 + 1], query(f"T'{t3.tai.isot}' OVERLAPS visit.timespan"))
         if self.supportsExtendedTimeQueryOperators:
-            self.assertEqual(ids[:i2], query("visit.timespan < t2"))
-            self.assertEqual(ids[:i2], query("t2 > visit.timespan"))
-            self.assertEqual(ids[i3 + 1 :], query("visit.timespan > t3"))
-            self.assertEqual(ids[i3 + 1 :], query("t3 < visit.timespan"))
+            self.assertEqual(ids[:i2], query("visit.timespan < :t2"))
+            self.assertEqual(ids[:i2], query(":t2 > visit.timespan"))
+            self.assertEqual(ids[i3 + 1 :], query("visit.timespan > :t3"))
+            self.assertEqual(ids[i3 + 1 :], query(":t3 < visit.timespan"))
 
         # Empty timespans should not overlap anything.
-        self.assertEqual([], query("visit.timespan OVERLAPS (t3, t2)"))
+        self.assertEqual([], query("visit.timespan OVERLAPS (:t3, :t2)"))
 
         # Make sure that expanded data IDs include the timespans.
         results = list(
@@ -2973,7 +2984,9 @@ class RegistryTests(ABC):
         self.load_data(butler, "base.yaml", "datasets.yaml")
         self.assertEqual(
             set(registry.queryDatasets("flat", band="r", collections=...)),
-            set(registry.queryDatasets("flat", where="band=my_band", bind={"my_band": "r"}, collections=...)),
+            set(
+                registry.queryDatasets("flat", where="band=:my_band", bind={"my_band": "r"}, collections=...)
+            ),
         )
 
     def testQueryIntRangeExpressions(self):
@@ -3212,7 +3225,7 @@ class RegistryTests(ABC):
             "(Dimension element name cannot be inferred in this context.)"
             "|(Unrecognized identifier 'timespan')",
         ):
-            list(registry.queryDataIds(["detector"], where="timespan.end < time", bind=bind))
+            list(registry.queryDataIds(["detector"], where="timespan.end < :time", bind=bind))
 
     def testQueryDataIdsOrderBy(self):
         """Test order_by and limit on result returned by queryDataIds()."""
@@ -3390,13 +3403,13 @@ class RegistryTests(ABC):
             Test("tract,visit", where="instrument='Cam1' AND skymap='SkyMap5'", exception=DataIdValueError),
             Test(
                 "tract,visit",
-                where="instrument=cam AND skymap=map",
+                where="instrument=:cam AND skymap=:map",
                 bind={"cam": "Cam1", "map": "SkyMap1"},
                 count=6,
             ),
             Test(
                 "tract,visit",
-                where="instrument=cam AND skymap=map",
+                where="instrument=:cam AND skymap=:map",
                 bind={"cam": "Cam", "map": "SkyMap"},
                 exception=DataIdValueError,
             ),
@@ -3530,7 +3543,7 @@ class RegistryTests(ABC):
 
         result = registry.queryDimensionRecords("detector", where="instrument='Cam1'")
         self.assertEqual(result.count(), 4)
-        result = registry.queryDimensionRecords("detector", where="instrument=instr", bind={"instr": "Cam1"})
+        result = registry.queryDimensionRecords("detector", where="instrument=:instr", bind={"instr": "Cam1"})
         self.assertTrue(result.any())
         self.assertEqual(result.count(), 4)
 
@@ -3557,7 +3570,7 @@ class RegistryTests(ABC):
                     DataIdValueError, "Unknown values specified for governor dimension"
                 ):
                     result = registry.queryDimensionRecords(
-                        "detector", where="instrument=instr", bind={"instr": "NotCam1"}
+                        "detector", where="instrument=:instr", bind={"instr": "NotCam1"}
                     )
                     result.count()
 

lsst/daf/butler/tests/butler_queries.py

@@ -219,7 +219,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             self.check_detector_records(results.where(_x.detector.raft == "B", instrument="Cam1"), [3, 4])
             self.check_detector_records_returned(
                 butler.query_dimension_records(
-                    "detector", where="detector.raft = R", bind={"R": "B"}, instrument="Cam1"
+                    "detector", where="detector.raft = :R", bind={"R": "B"}, instrument="Cam1"
                 ),
                 ids=[3, 4],
             )
@@ -572,10 +572,10 @@ class ButlerQueryTests(ABC, TestCaseMixin):
         # Check that WHERE accepts astropy time
         with butler.query() as query:
             query = query.join_dataset_search("flat", "imported_g")
-            query1 = query.where("flat.ingest_date < before_ingest", bind={"before_ingest": before_ingest})
+            query1 = query.where("flat.ingest_date < :before_ingest", bind={"before_ingest": before_ingest})
             rows = list(query1.general(dimensions))
             self.assertEqual(len(rows), 0)
-            query1 = query.where("flat.ingest_date >= before_ingest", bind={"before_ingest": before_ingest})
+            query1 = query.where("flat.ingest_date >= :before_ingest", bind={"before_ingest": before_ingest})
             rows = list(query1.general(dimensions))
             self.assertEqual(len(rows), 3)
             # Same with a time in string literal.
@@ -736,7 +736,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             self.check_detector_records_returned(
                 butler.query_dimension_records(
                     "detector",
-                    where="visit_detector_region.region OVERLAPS region",
+                    where="visit_detector_region.region OVERLAPS :region",
                     bind={"region": htm7.pixelization.pixel(253954)},
                     visit=1,
                 ),
@@ -788,7 +788,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             self.check_detector_records_returned(
                 butler.query_dimension_records(
                     "detector",
-                    where="visit_detector_region.region OVERLAPS region",
+                    where="visit_detector_region.region OVERLAPS :region",
                     bind={"region": htm7.pixelization.pixel(253954)},
                 ),
                 ids=[1, 2, 3, 4],
@@ -846,7 +846,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             self.check_detector_records_returned(
                 butler.query_dimension_records(
                     "detector",
-                    where="visit_detector_region.region OVERLAPS region",
+                    where="visit_detector_region.region OVERLAPS :region",
                     bind={"region": patch_record.region},
                 ),
                 ids=[1, 2, 3],
@@ -880,7 +880,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             self.check_detector_records_returned(
                 butler.query_dimension_records(
                     "detector",
-                    where="visit_detector_region.region OVERLAPS region",
+                    where="visit_detector_region.region OVERLAPS :region",
                     bind={"region": patch_record.region},
                     order_by="-detector",
                     limit=2,
@@ -900,7 +900,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             self.check_detector_records_returned(
                 butler.query_dimension_records(
                     "detector",
-                    where="visit_detector_region.region OVERLAPS region",
+                    where="visit_detector_region.region OVERLAPS :region",
                     bind={"region": patch_record.region},
                     detector=4,
                     explain=False,
@@ -946,20 +946,20 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             # string.
             _check_visit_id(
                 query.where(
-                    "visit_detector_region.region OVERLAPS POINT(ra, dec)", bind={"ra": ra, "dec": dec}
+                    "visit_detector_region.region OVERLAPS POINT(:ra, :dec)", bind={"ra": ra, "dec": dec}
                 )
             )
 
             # Bind in a point object instead of specifying ra/dec separately.
             _check_visit_id(
                 query.where(
-                    "visit_detector_region.region OVERLAPS my_point",
+                    "visit_detector_region.region OVERLAPS :my_point",
                     bind={"my_point": LonLat.fromDegrees(ra, dec)},
                 )
             )
             _check_visit_id(
                 query.where(
-                    "visit_detector_region.region OVERLAPS my_point",
+                    "visit_detector_region.region OVERLAPS :my_point",
                     bind={"my_point": astropy.coordinates.SkyCoord(ra, dec, frame="icrs", unit="deg")},
                 )
             )
@@ -967,7 +967,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             # handled.
             _check_visit_id(
                 query.where(
-                    "visit_detector_region.region OVERLAPS my_point",
+                    "visit_detector_region.region OVERLAPS :my_point",
                     bind={
                         "my_point": astropy.coordinates.SkyCoord(
                             ra, dec, frame="icrs", unit="deg"
@@ -1005,7 +1005,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             )
             with self.assertRaisesRegex(ValueError, "Astropy SkyCoord contained an array of points"):
                 query.where(
-                    "visit_detector_region.region OVERLAPS my_point",
+                    "visit_detector_region.region OVERLAPS :my_point",
                     bind={"my_point": array_point},
                 )
 
@@ -1587,7 +1587,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
                     for record in butler.query_dimension_records(
                         # In the middle of the timespan.
                         "visit",
-                        where="visit.timespan OVERLAPS(ts)",
+                        where="visit.timespan OVERLAPS(:ts)",
                         bind={"ts": astropy.time.Time("2021-09-09T03:02:30", format="isot", scale="tai")},
                     )
                 ],
@@ -1673,7 +1673,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             )
             self.check_detector_records_returned(
                 butler.query_dimension_records(
-                    "detector", where="detector IN (det)", bind={"det": [1, 3, 4]}
+                    "detector", where="detector IN (:det)", bind={"det": [1, 3, 4]}
                 ),
                 [1, 3, 4],
             )
@@ -1873,7 +1873,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
             with butler.query() as query:
                 results = query.datasets("calexp", collections=run)
                 results = results.where(
-                    "instrument = 'HSC' AND visit_detector_region.region OVERLAPS(POS)",
+                    "instrument = 'HSC' AND visit_detector_region.region OVERLAPS(:POS)",
                     bind={"POS": Region.from_ivoa_pos(pos)},
                 )
                 refs = list(results)
@@ -1883,7 +1883,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
                     "calexp",
                     collections=run,
                     instrument="HSC",
-                    where="visit_detector_region.region OVERLAPS(POS)",
+                    where="visit_detector_region.region OVERLAPS(:POS)",
                     bind={"POS": Region.from_ivoa_pos(pos)},
                     explain=False,
                 )
@@ -1906,20 +1906,20 @@ class ButlerQueryTests(ABC, TestCaseMixin):
 
             # Use a time during the middle of a visit.
             v_903334 = results.where(
-                "instrument = 'HSC' and visit.timespan OVERLAPS(ts)", bind={"ts": v_903334_mid}
+                "instrument = 'HSC' and visit.timespan OVERLAPS(:ts)", bind={"ts": v_903334_mid}
             )
             self.assertEqual(len(list(v_903334)), 4)
 
             # Timespan covering first half of the data.
             first_half = results.where(
-                "instrument = 'HSC' and visit.timespan OVERLAPS(t1, t2)",
+                "instrument = 'HSC' and visit.timespan OVERLAPS(:t1, :t2)",
                 bind={"t1": v_903334_pre, "t2": v_904014_pre},
             )
             self.assertEqual(len(list(first_half)), 17)
 
             # Query using a timespan object.
             with_ts = results.where(
-                "instrument = 'HSC' and visit.timespan OVERLAPS(ts)",
+                "instrument = 'HSC' and visit.timespan OVERLAPS(:ts)",
                 bind={"ts": Timespan(v_904014_pre, v_904014_post)},
             )
             self.assertEqual(len(list(with_ts)), 16)
@@ -2136,7 +2136,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
         self.assertCountEqual(
             butler.query_data_ids(
                 ["detector"],
-                where="(instrument='Cam1' OR instrument='Cam2') AND visit.region OVERLAPS region",
+                where="(instrument='Cam1' OR instrument='Cam2') AND visit.region OVERLAPS :region",
                 bind={"region": Region.from_ivoa_pos("CIRCLE 320. -0.25 10.")},
                 explain=False,
             ),
@@ -2236,7 +2236,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
         self.assertEqual(names, ["Aa"])
 
         result = butler.query_dimension_records(
-            "detector", where="instrument='Cam1' and detector=an_integer", bind={"an_integer": int64(2)}
+            "detector", where="instrument='Cam1' and detector=:an_integer", bind={"an_integer": int64(2)}
         )
         names = [x.full_name for x in result]
         self.assertEqual(names, ["Ab"])
@@ -2284,7 +2284,7 @@ class ButlerQueryTests(ABC, TestCaseMixin):
 
         # bind values work.
         results = butler._query_all_datasets(
-            "*", where="detector=my_bind and instrument='Cam1'", bind={"my_bind": 1}, find_first=False
+            "*", where="detector=:my_bind and instrument='Cam1'", bind={"my_bind": 1}, find_first=False
         )
         self.assertCountEqual(detector_1_ids, _ref_uuids(results))
 

lsst/daf/butler/tests/hybrid_butler_registry.py

@@ -144,6 +144,16 @@ class HybridButlerRegistry(Registry):
         return self._remote.getCollectionSummary(collection)
 
     def registerDatasetType(self, datasetType: DatasetType) -> bool:
+        # We need to make sure that dataset type universe is the same as
+        # direct registry universe.
+        if datasetType.dimensions.universe is self._remote.dimensions:
+            datasetType = DatasetType(
+                datasetType.name,
+                datasetType.dimensions.names,
+                datasetType.storageClass,
+                universe=self._direct.dimensions,
+                isCalibration=datasetType.isCalibration(),
+            )
         return self._direct.registerDatasetType(datasetType)
 
     def removeDatasetType(self, name: str | tuple[str, ...]) -> None:

lsst/daf/butler/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.0.0rc1"
+__version__ = "29.2025.1100"

{lsst_daf_butler-29.0.0rc1.dist-info → lsst_daf_butler-29.2025.1100.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lsst-daf-butler
-Version: 29.0.0rc1
+Version: 29.2025.1100
 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.0.0rc1.dist-info → lsst_daf_butler-29.2025.1100.dist-info}/RECORD

@@ -51,7 +51,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=7RDErOq5RGNAoQY53vvlgNSl38poXunVsozwg-tQkrU,52
+lsst/daf/butler/version.py,sha256=sHiUhHRfi72yQHyY-cFkHWLqVyELO1VeQ3Uo0NmIBCc,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
@@ -97,7 +97,7 @@ lsst/daf/butler/datastore/record_data.py,sha256=Jvv2Gpfcr43w97Ub4PT4N0fQQcqPni-w
 lsst/daf/butler/datastore/stored_file_info.py,sha256=jdS7IfupaciWiMOVWB8QAMN-qfKPCnr_wFqZwilSteE,13587
 lsst/daf/butler/datastores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsst/daf/butler/datastores/chainedDatastore.py,sha256=u8jz65pKNlpi7Luvq9FIyZOgD3mIXridq0-J3-cdONk,54953
-lsst/daf/butler/datastores/fileDatastore.py,sha256=6vhVbG9aJxKZVjDLSxQSDcyU5_KexxlHLuM-zQOv2rc,131598
+lsst/daf/butler/datastores/fileDatastore.py,sha256=MfjV4HxnffXf9n0UEkddB2T4CH2BKuPqiL4gSMgivD0,132240
 lsst/daf/butler/datastores/fileDatastoreClient.py,sha256=DyLc0SqPMzhOEdfHGeGfgO0Zx9glOeI-l9UcZDfpkg4,3132
 lsst/daf/butler/datastores/inMemoryDatastore.py,sha256=DnVqqKMdWcvml3Bfr2EINDyf630kOqIBWw3PF6MRid4,28730
 lsst/daf/butler/datastores/file_datastore/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw2166yOpq0iPMSdAvw,1298
@@ -126,7 +126,7 @@ lsst/daf/butler/direct_butler/__init__.py,sha256=8uPQWbFoKDpP2T2fvjV794JUITtdcDH
 lsst/daf/butler/direct_butler/_direct_butler.py,sha256=eex_ul4H_yekaQkekSlom7kOThPoonug_-OmsYhz7sM,107095
 lsst/daf/butler/direct_butler/_direct_butler_collections.py,sha256=6XvdvYqNSPAwva8vgR1bEqF8vYTfaNXUW3sb03NRwOM,8143
 lsst/daf/butler/direct_query_driver/__init__.py,sha256=hurmYGcTsnlqR4Hkh2xO_M544eEpCGeIJte0GXY3RFQ,1443
-lsst/daf/butler/direct_query_driver/_driver.py,sha256=X0LitlwV0-zMWTduPcV0GI3iy7ILIo4nEm2jdMa8Phk,74971
+lsst/daf/butler/direct_query_driver/_driver.py,sha256=su9R4aExA5tnq6OZZcpEYxDxtJyUXVvLQFr2qGa6EAc,75004
 lsst/daf/butler/direct_query_driver/_postprocessing.py,sha256=CdLrzd0vHHCLaHntZJyMZEv0GlUvu3QZAA7YMVv5X3k,8826
 lsst/daf/butler/direct_query_driver/_predicate_constraints_summary.py,sha256=vdcjLamCEtIrcEFVuMa-HPbuWP0OArxO19tFHkaYdO0,9011
 lsst/daf/butler/direct_query_driver/_query_analysis.py,sha256=Kl_i_438R6LnAqwooSCXi17tEHYg6sZtDghFjMH-lCE,9540
@@ -150,7 +150,7 @@ lsst/daf/butler/queries/_base.py,sha256=lk_xLoN08nmxj0N5aKCm-qI5gWjq8lY3UaLuCWbd
 lsst/daf/butler/queries/_data_coordinate_query_results.py,sha256=S_81y4EkSJw34ekuiHW7RSl0LKNWoV-ZM-C5FLIM-nk,3913
 lsst/daf/butler/queries/_dataset_query_results.py,sha256=SAJsI-KQsEziaNtfu3Zdp0iX4zF2BoDIF4mtb-xvtxQ,5113
 lsst/daf/butler/queries/_dimension_record_query_results.py,sha256=N89s23jBhSMEbr0uxlhMZykiw91O1bLTbdzwv-0Az14,4405
-lsst/daf/butler/queries/_expression_strings.py,sha256=npGnjkwmVpvsCs8VyvT_ixeV9eAVJqBDMvdKZOVXobc,14766
+lsst/daf/butler/queries/_expression_strings.py,sha256=i4qnhRFRoZNf00l_5rXN1Cshxs2rGmIFbFO45DgGWkE,15078
 lsst/daf/butler/queries/_general_query_results.py,sha256=Q1-BQFS6V_Uihwdv1t77GOV1M8idZr63WpZMOOmDXT8,9780
 lsst/daf/butler/queries/_identifiers.py,sha256=SjsEkgF3B8b2bf9drOzg5ogwa32Efy7MMLfUq7H26dE,7880
 lsst/daf/butler/queries/_query.py,sha256=r2pIwiRvpK4YgwKBzWW125lw_6Pew4uXfrrYwHhXQBU,36171
@@ -195,11 +195,11 @@ lsst/daf/butler/registry/collections/nameKey.py,sha256=7knssy-9kmynprNdN9309jc7b
 lsst/daf/butler/registry/collections/synthIntKey.py,sha256=N27SkPcXIDfo6Qy-xS-M5nSFscNpuBKpThHTKn-aVAg,13179
 lsst/daf/butler/registry/databases/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw2166yOpq0iPMSdAvw,1298
 lsst/daf/butler/registry/databases/postgresql.py,sha256=-qUH-kynmavIs5jAWCEl93LRhQmslIXX61SQ0NxEIn0,25987
-lsst/daf/butler/registry/databases/sqlite.py,sha256=SVZ-4HspSFxedOlyJpopKs_iedeXj3IY14wxhnn15YE,18208
+lsst/daf/butler/registry/databases/sqlite.py,sha256=qxMHvQMJ9kNLPdWrMyVaRLeJJxddER7Wz7UnJnbdA_o,18412
 lsst/daf/butler/registry/datasets/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw2166yOpq0iPMSdAvw,1298
 lsst/daf/butler/registry/datasets/byDimensions/__init__.py,sha256=BG4C7mhKFbCzvfQSI31CIV_iTMc1gYL_LT4Plyu6LdE,1323
 lsst/daf/butler/registry/datasets/byDimensions/_dataset_type_cache.py,sha256=WdbU7ZTAqvpjyouIaKsEEi62P_0Y-zQZjdvzDahKLuw,9653
-lsst/daf/butler/registry/datasets/byDimensions/_manager.py,sha256=H7UsDZEijOP42tfoaL6jDok339I5CldiTy22sX9_3kY,80299
+lsst/daf/butler/registry/datasets/byDimensions/_manager.py,sha256=QrT6suda9h4Yqnf5gpgwWHlKa8Bqqeh4OlnIMKRMtUs,80748
 lsst/daf/butler/registry/datasets/byDimensions/summaries.py,sha256=i0GXbKymSAAPYLfaQdRZ3r4E1ANG5hQYXOqB6ZeLrBo,18494
 lsst/daf/butler/registry/datasets/byDimensions/tables.py,sha256=40Z-kWTHAZNdxO-PxByidOtpEpTvnAtjsZLgChSI4SU,25537
 lsst/daf/butler/registry/dimensions/__init__.py,sha256=vLzPZYAJ-9r1cnqsP64MVpFgSw2166yOpq0iPMSdAvw,1298
@@ -208,7 +208,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=Ktc5oNM5DYJejXraAP_kb5nrHxH-adR4JkCMmm1jOBQ,15192
 lsst/daf/butler/registry/interfaces/_collections.py,sha256=7I0e0Pi4UylET5Nr3keRFve7NToafHxJafiwn81lt6U,27008
-lsst/daf/butler/registry/interfaces/_database.py,sha256=otEEp9bCjoOXQ0C4TZ1I2JeRk2f3ILayLizq8bwGp8g,82875
+lsst/daf/butler/registry/interfaces/_database.py,sha256=EKNLyAM969fGI7m3iZt3tmH-l8s-XiExs5ktu9bg8ec,82876
 lsst/daf/butler/registry/interfaces/_database_explain.py,sha256=CkALWwNeyrjRvKizWrxvcGDunIhB77kLtEuXscrXVOY,3052
 lsst/daf/butler/registry/interfaces/_datasets.py,sha256=JoVaPClPbe91PVFeR_taXbPZA-8f8PVK7hXP1ZaYsEM,25889
 lsst/daf/butler/registry/interfaces/_dimensions.py,sha256=GkgJ38ju7oB6SdnWVGmi-08k8gNdHR47hTRAk6n2vk4,17770
@@ -236,22 +236,22 @@ lsst/daf/butler/registry/queries/_structs.py,sha256=RuLWCw74_6L5BS9QkBbBYOGGzNUD
 lsst/daf/butler/registry/queries/butler_sql_engine.py,sha256=AxWDAAu0rGhzwrVQawuV31FpkLNDXWrZt9rf3eQTADY,10182
 lsst/daf/butler/registry/queries/find_first_dataset.py,sha256=Wd4Aa0aJF0OLgScscEhEbUo-jlCk4gLeOqEuTCyJXj4,3682
 lsst/daf/butler/registry/queries/expressions/__init__.py,sha256=7tKQ5LwRhjriICjZBPNubtMG3r4JE8xu-BHe9oQwSGs,1381
-lsst/daf/butler/registry/queries/expressions/_predicate.py,sha256=2KLKGLWVA6YQQeoLbeX3jsDKSbR6B2l3D3IJ3B3TdZQ,22802
+lsst/daf/butler/registry/queries/expressions/_predicate.py,sha256=QIno9yyW8_xdAAv_DSG95Tmx6-jp9MX3weLwQ-hjo9A,22984
 lsst/daf/butler/registry/queries/expressions/categorize.py,sha256=wUUTkDv__T_Rs3v7aO9tw8UIY2R7P5xhQc3vUClCuJI,13972
-lsst/daf/butler/registry/queries/expressions/check.py,sha256=4RvpZL-FkmjOvlcnuNHyR19kGHIK2leuD_AaJHz9wUg,22923
-lsst/daf/butler/registry/queries/expressions/normalForm.py,sha256=Nv3bTwyH246OS5zMzQhmvE3HjaBscegxyUryQKZ-Quc,41024
+lsst/daf/butler/registry/queries/expressions/check.py,sha256=pPL-Mbp_7ORlHVaCvDqNkvBlLi82HRw5rGzl8hEhWIU,23225
+lsst/daf/butler/registry/queries/expressions/normalForm.py,sha256=EPdVP5ccjKmJTkyFLXHqhaWHriqSQFXyqMURElU8azo,41205
 lsst/daf/butler/registry/queries/expressions/parser/__init__.py,sha256=o-z7yiQ4HhZayFOpseBclqqkjgg9VQ2Wq-Rs3gPwLYI,1423
-lsst/daf/butler/registry/queries/expressions/parser/exprTree.py,sha256=yrMJWHOoIrcd0ahoqxKB55RpwvJiQziF1j-45NVR5M8,12961
+lsst/daf/butler/registry/queries/expressions/parser/exprTree.py,sha256=z2zAmO08bMR0mCZ-2lnwz_qv13TCu9iHvu0cCTx2pPc,13474
 lsst/daf/butler/registry/queries/expressions/parser/parser.py,sha256=q6fDFG96ClhKtIGXAKYrBR9SF085Bk051epGkjwgmVw,1767
-lsst/daf/butler/registry/queries/expressions/parser/parserLex.py,sha256=mJKC-PnPT3kumzlBN6ixhd-uSzUqUKJkNkKgrjW_TOo,6696
-lsst/daf/butler/registry/queries/expressions/parser/parserYacc.py,sha256=502aiNPpcWnDrD5gxcxz8XC1VKwWsiHNpcZtU9AXZXo,15087
-lsst/daf/butler/registry/queries/expressions/parser/treeVisitor.py,sha256=xO-cchum-qLKRDV98Z8CafYcsmHCyhIg4uff94SulNk,8530
+lsst/daf/butler/registry/queries/expressions/parser/parserLex.py,sha256=RNH9YA_0x2AEGgC6LPkygto_2ob5RCB5HbvBP4wGLuw,6972
+lsst/daf/butler/registry/queries/expressions/parser/parserYacc.py,sha256=dEHhQncJi_NglFPyRwRgdr0NSKRPuhWfNwLNdrqrJwU,15230
+lsst/daf/butler/registry/queries/expressions/parser/treeVisitor.py,sha256=sx1dEp4H4OI1DFoNQ1JQJFNjGWWWNnItJRI-QuLXYAk,8831
 lsst/daf/butler/registry/queries/expressions/parser/ply/__init__.py,sha256=TADR0Z9IftaLFnU7tIHfDE0rwT5uonRbQ6WnU57dWFU,104
 lsst/daf/butler/registry/queries/expressions/parser/ply/lex.py,sha256=Y9SoJv-_0XUNNgVA-4R530PjPZzmxpslTzHs0axKNIY,43384
 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=0WGCCq0c-aB8ra-4g84n5m1bm6ng-FNyAfpQQJ31FOM,202217
+lsst/daf/butler/registry/tests/_registry.py,sha256=h6DI4VYSm5846l7adbPnLQMo-6d1jk34GOL5UkBFy_s,202900
 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
@@ -311,14 +311,14 @@ lsst/daf/butler/tests/_datasetsHelper.py,sha256=LH1ZPuzSpRijAPtAiwBoSZZPzI-aSaHN
 lsst/daf/butler/tests/_dummyRegistry.py,sha256=CowulEeirnWwSJf-AnutvOLvGSr3ITgShlYj9f_IuYk,9509
 lsst/daf/butler/tests/_examplePythonTypes.py,sha256=OkKf8e16T4xSBVjN05qvfrukowqJ6BICTmQZZFdskaI,13508
 lsst/daf/butler/tests/_testRepo.py,sha256=MVkQwXJ5vI86--Npa7SDHRblpJC5pig6vpGxv-dgGvE,23755
-lsst/daf/butler/tests/butler_queries.py,sha256=l_ZaCooxXOYVCScil70bggn9J9VvKgCSC7rIddFD8cc,111104
+lsst/daf/butler/tests/butler_queries.py,sha256=EoWOR9hUrYmqwzAAAVvWf_ZVpsC98LascueeJ990MP8,111129
 lsst/daf/butler/tests/cliCmdTestBase.py,sha256=G4e264xRYbPW5cXk4xS_yOaoVsfvfmsLmbqlgA5SPxc,6994
 lsst/daf/butler/tests/cliLogTestBase.py,sha256=sgpOMQV21ItF4ElE7Z1rMAi0rzAcBEOfe2Yu62bujBU,18325
 lsst/daf/butler/tests/deferredFormatter.py,sha256=EtUnxNy90n5ouESBbcFBLOt4mrHhmxvHS2vP6Y3dF0w,1920
 lsst/daf/butler/tests/dict_convertible_model.py,sha256=dJ1TDdj8KRuuoZHz3ismfjURWfjY-hgUGGAz5js5u9M,2732
 lsst/daf/butler/tests/hybrid_butler.py,sha256=GCglTVBZozAW9nGNbcOfeUXX8mXg6GHRflLp6Hqe1T0,13854
 lsst/daf/butler/tests/hybrid_butler_collections.py,sha256=XzuZzqKLKkVVY6Y96RdrwkJnAyRkNNEuYVqvKoq2E2I,4604
-lsst/daf/butler/tests/hybrid_butler_registry.py,sha256=1BaKeOJChQO5-IkRqPudEvryTp7VD9fk34VXIWrCz40,16256
+lsst/daf/butler/tests/hybrid_butler_registry.py,sha256=t6X-kRfDl-tv6H9YskHmMZ-U_ke1gx8qNPfpOsHOlVE,16720
 lsst/daf/butler/tests/postgresql.py,sha256=6-84OPoysRtsborTdsyu5HcVfVWZqHaU8azFPSxu0Wc,4331
 lsst/daf/butler/tests/server.py,sha256=dLnYc6_fzr-SkOxxOpnHKC90k6foPruIdBiDI_74aIg,8012
 lsst/daf/butler/tests/server_utils.py,sha256=sneYxThLhvc7KaFdHJXV15j-R3JtC6yOjDfVptJw6x4,2833
@@ -328,13 +328,13 @@ lsst/daf/butler/transfers/__init__.py,sha256=M1YcFszSkNB5hB2pZwwGXqbJE2dKt4YXDin
 lsst/daf/butler/transfers/_context.py,sha256=h1XDJpdg64R7DRHo7mb9xgaLiHDs_AIJmZbyo66qSSw,17278
 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.0.0rc1.dist-info/COPYRIGHT,sha256=k1Vq0-Be_K-puaeW4UZnckPjksEL-MJh4XKiWcjMxJE,312
-lsst_daf_butler-29.0.0rc1.dist-info/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_daf_butler-29.0.0rc1.dist-info/METADATA,sha256=RfM--L9bMCLZU_M69mYGOgj0GUtrRmC7UMVSGFmeXbU,3240
-lsst_daf_butler-29.0.0rc1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-lsst_daf_butler-29.0.0rc1.dist-info/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_daf_butler-29.0.0rc1.dist-info/entry_points.txt,sha256=XsRxyTK3c-jGlKVuVnbpch3gtaO0lAA_fS3i2NGS5rw,59
-lsst_daf_butler-29.0.0rc1.dist-info/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_daf_butler-29.0.0rc1.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_daf_butler-29.0.0rc1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_daf_butler-29.0.0rc1.dist-info/RECORD,,
+lsst_daf_butler-29.2025.1100.dist-info/COPYRIGHT,sha256=k1Vq0-Be_K-puaeW4UZnckPjksEL-MJh4XKiWcjMxJE,312
+lsst_daf_butler-29.2025.1100.dist-info/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_daf_butler-29.2025.1100.dist-info/METADATA,sha256=pN-MFYlaX4VDGQ9CwRHfdoymPz6wfoLYmYDymb9shcM,3243
+lsst_daf_butler-29.2025.1100.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+lsst_daf_butler-29.2025.1100.dist-info/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_daf_butler-29.2025.1100.dist-info/entry_points.txt,sha256=XsRxyTK3c-jGlKVuVnbpch3gtaO0lAA_fS3i2NGS5rw,59
+lsst_daf_butler-29.2025.1100.dist-info/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_daf_butler-29.2025.1100.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_daf_butler-29.2025.1100.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_daf_butler-29.2025.1100.dist-info/RECORD,,

{lsst_daf_butler-29.0.0rc1.dist-info → lsst_daf_butler-29.2025.1100.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any