Merge pull request #1098 from lsst/tickets/DM-46711

DM-46711: Allow numpy integers to be used as literals

doc/changes/DM-46711.bugfix.md

@@ -0,0 +1 @@
+Fix an issue where the new query system was rejecting numpy integers used in data IDs or bind values.

python/lsst/daf/butler/queries/tree/_column_literal.py

@@ -34,6 +34,7 @@
 )
 
 import datetime
+import numbers
 import uuid
 import warnings
 from base64 import b64decode, b64encode
@@ -400,6 +401,9 @@ def make_column_literal(value: LiteralValue) -> ColumnLiteral:
             dec = icrs.dec.degree
             lon_lat = lsst.sphgeom.LonLat.fromDegrees(ra, dec)
             return _make_region_literal_from_lonlat(lon_lat)
+        case numbers.Integral():
+            # numpy.int64 and other integer-like values.
+            return IntColumnLiteral.from_value(int(value))
 
     raise TypeError(f"Invalid type {type(value).__name__!r} of value {value!r} for column literal.")
 

python/lsst/daf/butler/tests/butler_queries.py

@@ -40,6 +40,7 @@
 import astropy.coordinates
 import astropy.time
 from lsst.sphgeom import LonLat, Region
+from numpy import int64
 
 from .._butler import Butler
 from .._collection_type import CollectionType
@@ -1964,6 +1965,30 @@ def test_default_data_id(self) -> None:
         names = [x.name for x in result]
         self.assertCountEqual(names, ["Cam2-G"])
 
+    def test_unusual_column_literals(self) -> None:
+        butler = self.make_butler("base.yaml")
+
+        # Users frequently use numpy integer types as literals in queries.
+        result = butler.query_dimension_records(
+            "detector", data_id={"instrument": "Cam1", "detector": int64(1)}
+        )
+        names = [x.full_name for x in result]
+        self.assertEqual(names, ["Aa"])
+
+        result = butler.query_dimension_records(
+            "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"])
+
+        with butler.query() as query:
+            x = query.expression_factory
+            result = list(
+                query.dimension_records("detector").where(x.instrument == "Cam1", x.detector == int64(3))
+            )
+            names = [x.full_name for x in result]
+            self.assertEqual(names, ["Ba"])
+
 
 def _get_exposure_ids_from_dimension_records(dimension_records: Iterable[DimensionRecord]) -> list[int]:
     output = []