lsst-daf-butler 29.2025.1800__tar.gz → 29.2025.1900__tar.gz

{lsst_daf_butler-29.2025.1800/python/lsst_daf_butler.egg-info → lsst_daf_butler-29.2025.1900}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.1800
+Version: 29.2025.1900
 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.1800 → lsst_daf_butler-29.2025.1900}/doc/lsst.daf.butler/queries.rst

@@ -136,6 +136,16 @@ Time literals
     time scale. For detailed description of supported time specification
     check section :ref:`time-literals-syntax`.
 
+UUID literals
+    UUID values are produced by ``UUID()`` function which accepts a string
+    representation of the UUID. The string can have any format acceptable
+    by Python ``uuid.UUID()`` method.
+
+    Examples:
+
+    - ``UUID('12345678-1234-5678-1234-567812345678')``
+    - ``UUID('12345678123456781234567812345678')``
+
 Range literals
     This sort of literal is allowed inside ``IN`` expressions only. It consists
     of two integer literals separated by double dots and optionally followed by
@@ -442,6 +452,8 @@ Few examples of valid expressions using some of the constructs:
 
     ingest_date < T'2020-11-06 21:10:00'
 
+    flat.dataset_id = UUID('e15ab039-bc8b-4135-87c5-90902a7c0b22')
+
 
 .. _daf_butler_query_ordering:
 

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/datastores/fileDatastore.py

@@ -422,6 +422,32 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
             raise
         log.debug("Successfully deleted file: %s", location.uri)
 
+    def _delete_artifacts(self, locations: list[Location]) -> None:
+        """Delete multiple artifacts from the datastore."""
+        # Filter out all artifacts that are direct.
+        n_locations = len(locations)
+        filtered = [loc.uri for loc in locations if not loc.pathInStore.isabs()]
+        n_direct = n_locations - len(filtered)
+        if n_direct > 0:
+            log.info(
+                "Not deleting %d artifact%s out of %d using absolute URIs",
+                n_direct,
+                "s" if n_direct != 1 else "",
+                n_locations,
+            )
+        if not filtered:
+            return
+
+        try:
+            ResourcePath.mremove(filtered, do_raise=True)
+        except* FileNotFoundError as e:
+            # File not there is counted as "success" because we don't want
+            # the file to be there.
+            n_except = len(e.exceptions)
+            s = "s" if n_except != 1 else ""
+            log.debug("%d artifact%s did not exist and so could not be deleted.", n_except, s)
+        log.debug("Successfully deleted %d file%s", len(filtered), "s" if len(filtered) != 1 else "")
+
     def addStoredItemInfo(
         self,
         refs: Iterable[DatasetRef],
@@ -2596,6 +2622,7 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
                 else:
                     artifacts_to_keep = slow_artifacts_to_keep
 
+            artifacts_to_delete: list[Location] = []
             for ref, info in trashed_list:
                 # Should not happen for this implementation but need
                 # to keep mypy happy.
@@ -2609,42 +2636,56 @@ class FileDatastore(GenericBaseDatastore[StoredFileInfo]):
                 # Only trashed refs still known to datastore will be returned.
                 location = info.file_location(self.locationFactory)
 
-                # Point of no return for this artifact
-                log.debug("Removing artifact %s from datastore %s", location.uri, self.name)
-                try:
-                    self._delete_artifact(location)
-                except FileNotFoundError:
-                    # If the file itself has been deleted there is nothing
-                    # we can do about it. It is possible that trash has
-                    # been run in parallel in another process or someone
-                    # decided to delete the file. It is unlikely to come
-                    # back and so we should still continue with the removal
-                    # of the entry from the trash table. It is also possible
-                    # we removed it in a previous iteration if it was
-                    # a multi-dataset artifact. The delete artifact method
-                    # will log a debug message in this scenario.
-                    # Distinguishing file missing before trash started and
-                    # file already removed previously as part of this trash
-                    # is not worth the distinction with regards to potential
-                    # memory cost.
-                    pass
-                except Exception as e:
-                    if ignore_errors:
-                        # Use a debug message here even though it's not
-                        # a good situation. In some cases this can be
-                        # caused by a race between user A and user B
-                        # and neither of them has permissions for the
-                        # other's files. Butler does not know about users
-                        # and trash has no idea what collections these
-                        # files were in (without guessing from a path).
-                        log.debug(
-                            "Encountered error removing artifact %s from datastore %s: %s",
-                            location.uri,
-                            self.name,
-                            e,
-                        )
-                    else:
-                        raise
+                artifacts_to_delete.append(location)
+
+            # Now do the deleting.
+            s_del = "s" if len(artifacts_to_delete) != 1 else ""
+            log.debug(
+                "Now removing %d file artifact%s from datastore %s",
+                len(artifacts_to_delete),
+                s_del,
+                self.name,
+            )
+
+            try:
+                self._delete_artifacts(artifacts_to_delete)
+            except* FileNotFoundError:
+                # If the file itself has been deleted there is nothing
+                # we can do about it. It is possible that trash has
+                # been run in parallel in another process or someone
+                # decided to delete the file. It is unlikely to come
+                # back and so we should still continue with the removal
+                # of the entry from the trash table. It is also possible
+                # we removed it in a previous iteration if it was
+                # a multi-dataset artifact. The delete artifact method
+                # will log a debug message in this scenario.
+                # Distinguishing file missing before trash started and
+                # file already removed previously as part of this trash
+                # is not worth the distinction with regards to potential
+                # memory cost. These should already be caught but just in case
+                # filter them out here.
+                pass
+            except* Exception as e:
+                if ignore_errors:
+                    # Use a debug message here even though it's not
+                    # a good situation. In some cases this can be
+                    # caused by a race between user A and user B
+                    # and neither of them has permissions for the
+                    # other's files. Butler does not know about users
+                    # and trash has no idea what collections these
+                    # files were in (without guessing from a path).
+                    s_err = "s" if len(e.exceptions) != 1 else ""
+                    log.debug(
+                        "Encountered %d error%s removing %d artifact%s from datastore %s: %s",
+                        len(e.exceptions),
+                        s_err,
+                        len(artifacts_to_delete),
+                        s_del,
+                        self.name,
+                        e,
+                    )
+                else:
+                    raise
 
     @transactional
     def transfer_from(

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/queries/_expression_strings.py

@@ -29,6 +29,7 @@ from __future__ import annotations
 
 from collections.abc import Set
 from typing import Literal, NamedTuple, TypeAlias
+from uuid import UUID
 
 import astropy.time
 
@@ -268,6 +269,9 @@ class _ConversionVisitor(TreeVisitor[_VisitorResult]):
     def visitTimeLiteral(self, value: astropy.time.Time, node: Node) -> _VisitorResult:
         return _make_literal(value)
 
+    def visitUuidLiteral(self, value: UUID, node: Node) -> _VisitorResult:
+        return _make_literal(value)
+
     def visitTupleNode(self, items: tuple[_VisitorResult, ...], node: Node) -> _VisitorResult:
         if len(items) != 2:
             raise InvalidQueryError(f"Timespan tuple should have exactly two items (begin, end) in '{node}'")

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/registry/queries/expressions/_predicate.py

@@ -34,6 +34,7 @@ import types
 import warnings
 from collections.abc import Mapping, Set
 from typing import Any, cast
+from uuid import UUID
 
 import astropy.time
 import astropy.utils.exceptions
@@ -468,6 +469,10 @@ class PredicateConversionVisitor(TreeVisitor[VisitorResult]):
         # Docstring inherited.
         return ColumnExpression.literal(value, dtype=astropy.time.Time)
 
+    def visitUuidLiteral(self, value: UUID, node: Node) -> VisitorResult:
+        # Docstring inherited.
+        return ColumnExpression.literal(value, dtype=UUID)
+
     def visitTupleNode(self, items: tuple[VisitorResult, ...], node: Node) -> VisitorResult:
         # Docstring inherited.
         match items:

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/registry/queries/expressions/check.py

@@ -35,6 +35,7 @@ __all__ = (
 import dataclasses
 from collections.abc import Mapping, Sequence, Set
 from typing import TYPE_CHECKING, Any
+from uuid import UUID
 
 from ...._column_tags import DatasetColumnTag, DimensionKeyColumnTag, DimensionRecordColumnTag
 from ....dimensions import DataCoordinate, DataIdValue, Dimension, DimensionGroup, DimensionUniverse
@@ -209,6 +210,10 @@ class InspectionVisitor(TreeVisitor[TreeSummary]):
         # Docstring inherited from TreeVisitor.visitTimeLiteral
         return TreeSummary()
 
+    def visitUuidLiteral(self, value: UUID, node: Node) -> TreeSummary:
+        # Docstring inherited from TreeVisitor.visitUuidLiteral
+        return TreeSummary()
+
     def visitIdentifier(self, name: str, node: Node) -> TreeSummary:
         # Docstring inherited from TreeVisitor.visitIdentifier
         if name in self.bind:

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/registry/queries/expressions/normalForm.py

@@ -37,6 +37,7 @@ import enum
 from abc import ABC, abstractmethod
 from collections.abc import Iterator, Sequence
 from typing import Generic, TypeVar
+from uuid import UUID
 
 import astropy.time
 
@@ -1030,6 +1031,10 @@ class TransformationVisitor(TreeVisitor[TransformationWrapper]):
         # Docstring inherited from TreeVisitor.visitTimeLiteral
         return Opaque(node, PrecedenceTier.TOKEN)
 
+    def visitUuidLiteral(self, value: UUID, node: Node) -> TransformationWrapper:
+        # Docstring inherited from TreeVisitor.visitUuidLiteral
+        return Opaque(node, PrecedenceTier.TOKEN)
+
     def visitRangeLiteral(
         self, start: int, stop: int, stride: int | None, node: Node
     ) -> TransformationWrapper:

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/registry/queries/expressions/parser/exprTree.py

@@ -59,6 +59,7 @@ __all__ = [
 # -------------------------------
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any
+from uuid import UUID
 
 # -----------------------------
 #  Imports for other modules --
@@ -114,6 +115,10 @@ class Node(ABC):
         """
 
 
+class LiteralNode(Node):
+    """Intermediate base class for nodes representing literals of any knid."""
+
+
 class BinaryOp(Node):
     """Node representing binary operator.
 
@@ -131,7 +136,7 @@ class BinaryOp(Node):
     """
 
     def __init__(self, lhs: Node, op: str, rhs: Node):
-        Node.__init__(self, (lhs, rhs))
+        super().__init__((lhs, rhs))
         self.lhs = lhs
         self.op = op
         self.rhs = rhs
@@ -161,7 +166,7 @@ class UnaryOp(Node):
     """
 
     def __init__(self, op: str, operand: Node):
-        Node.__init__(self, (operand,))
+        super().__init__((operand,))
         self.op = op
         self.operand = operand
 
@@ -174,7 +179,7 @@ class UnaryOp(Node):
         return "{op} {operand}".format(**vars(self))
 
 
-class StringLiteral(Node):
+class StringLiteral(LiteralNode):
     """Node representing string literal.
 
     Parameters
@@ -184,7 +189,7 @@ class StringLiteral(Node):
     """
 
     def __init__(self, value: str):
-        Node.__init__(self)
+        super().__init__()
         self.value = value
 
     def visit(self, visitor: TreeVisitor) -> Any:
@@ -195,7 +200,7 @@ class StringLiteral(Node):
         return "'{value}'".format(**vars(self))
 
 
-class TimeLiteral(Node):
+class TimeLiteral(LiteralNode):
     """Node representing time literal.
 
     Parameters
@@ -205,7 +210,7 @@ class TimeLiteral(Node):
     """
 
     def __init__(self, value: astropy.time.Time):
-        Node.__init__(self)
+        super().__init__()
         self.value = value
 
     def visit(self, visitor: TreeVisitor) -> Any:
@@ -216,8 +221,8 @@ class TimeLiteral(Node):
         return "'{value}'".format(**vars(self))
 
 
-class NumericLiteral(Node):
-    """Node representing string literal.
+class NumericLiteral(LiteralNode):
+    """Node representing a numeric literal.
 
     We do not convert literals to numbers, their text representation
     is stored literally.
@@ -229,7 +234,7 @@ class NumericLiteral(Node):
     """
 
     def __init__(self, value: str):
-        Node.__init__(self)
+        super().__init__()
         self.value = value
 
     def visit(self, visitor: TreeVisitor) -> Any:
@@ -240,11 +245,32 @@ class NumericLiteral(Node):
         return "{value}".format(**vars(self))
 
 
+class UuidLiteral(LiteralNode):
+    """Node representing a UUID literal.
+
+    Parameters
+    ----------
+    value : `UUID`
+        Literal value.
+    """
+
+    def __init__(self, value: UUID):
+        super().__init__()
+        self.value = value
+
+    def visit(self, visitor: TreeVisitor) -> Any:
+        # Docstring inherited from Node.visit
+        return visitor.visitUuidLiteral(self.value, self)
+
+    def __str__(self) -> str:
+        return str(self.value)
+
+
 class Identifier(Node):
     """Node representing identifier.
 
-    Value of the identifier is its name, it may contain zero or one dot
-    character.
+    Value of the identifier is its name, it may contain zero, one, or two dot
+    characters.
 
     Parameters
     ----------
@@ -253,7 +279,7 @@ class Identifier(Node):
     """
 
     def __init__(self, name: str):
-        Node.__init__(self)
+        super().__init__()
         self.name = name
 
     def visit(self, visitor: TreeVisitor) -> Any:
@@ -276,7 +302,7 @@ class BindName(Node):
     """
 
     def __init__(self, name: str):
-        Node.__init__(self)
+        super().__init__()
         self.name = name
 
     def visit(self, visitor: TreeVisitor) -> Any:
@@ -287,7 +313,7 @@ class BindName(Node):
         return "{name}".format(**vars(self))
 
 
-class RangeLiteral(Node):
+class RangeLiteral(LiteralNode):
     """Node representing range literal appearing in `IN` list.
 
     Range literal defines a range of integer numbers with start and
@@ -308,6 +334,7 @@ class RangeLiteral(Node):
     """
 
     def __init__(self, start: int, stop: int, stride: int | None = None):
+        super().__init__()
         self.start = start
         self.stop = stop
         self.stride = stride
@@ -335,7 +362,13 @@ class IsIn(Node):
     """
 
     def __init__(self, lhs: Node, values: list[Node], not_in: bool = False):
-        Node.__init__(self, (lhs,) + tuple(values))
+        # All values must be literals or binds (and we allow simple identifiers
+        # as binds).
+        for node in values:
+            node = _strip_parens(node)
+            if not isinstance(node, LiteralNode | BindName | Identifier):
+                raise TypeError(f"Unsupported type of expression in IN operator: {node}")
+        super().__init__((lhs,) + tuple(values))
         self.lhs = lhs
         self.values = values
         self.not_in = not_in
@@ -364,7 +397,7 @@ class Parens(Node):
     """
 
     def __init__(self, expr: Node):
-        Node.__init__(self, (expr,))
+        super().__init__((expr,))
         self.expr = expr
 
     def visit(self, visitor: TreeVisitor) -> Any:
@@ -390,7 +423,7 @@ class TupleNode(Node):
     """
 
     def __init__(self, items: tuple[Node, ...]):
-        Node.__init__(self, items)
+        super().__init__(items)
         self.items = items
 
     def visit(self, visitor: TreeVisitor) -> Any:
@@ -415,7 +448,7 @@ class FunctionCall(Node):
     """
 
     def __init__(self, function: str, args: list[Node]):
-        Node.__init__(self, tuple(args))
+        super().__init__(tuple(args))
         self.name = function
         self.args = args[:]
 
@@ -441,7 +474,7 @@ class PointNode(Node):
     """
 
     def __init__(self, ra: Node, dec: Node):
-        Node.__init__(self, (ra, dec))
+        super().__init__((ra, dec))
         self.ra = ra
         self.dec = dec
 
@@ -469,7 +502,7 @@ class GlobNode(Node):
     """
 
     def __init__(self, expression: Identifier, pattern: StringLiteral | BindName):
-        Node.__init__(self, (expression, pattern))
+        super().__init__((expression, pattern))
         self.expression = expression
         self.pattern = pattern
 
@@ -516,6 +549,17 @@ def function_call(function: str, args: list[Node]) -> Node:
         if not isinstance(pattern, StringLiteral | BindName):
             raise TypeError("glob() second argument must be a string or a bind name (prefixed with colon)")
         return GlobNode(expression, pattern)
+    elif function.upper() == "UUID":
+        if len(args) != 1:
+            raise ValueError("UUID() requires a single arguments (uuid-string)")
+        argument = _strip_parens(args[0])
+        # Potentially we could allow BindName as argument but it's too
+        # complicated and people should use bind with UUID instead.
+        if not isinstance(argument, StringLiteral):
+            raise TypeError("UUID() argument must be a string literal")
+        # This will raise ValueError if string is not good.
+        uuid = UUID(argument.value)
+        return UuidLiteral(uuid)
     else:
         # generic function call
         return FunctionCall(function, args)

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/registry/queries/expressions/parser/parserYacc.py

@@ -354,8 +354,8 @@ class ParserYacc:
 
     @classmethod
     def p_predicate(cls, p: YaccProduction) -> None:
-        """predicate : bit_expr IN LPAREN literal_or_id_list RPAREN
-        | bit_expr NOT IN LPAREN literal_or_id_list RPAREN
+        """predicate : bit_expr IN LPAREN literal_or_bind_list RPAREN
+        | bit_expr NOT IN LPAREN literal_or_bind_list RPAREN
         | bit_expr
         """
         if len(p) == 6:
@@ -365,22 +365,39 @@ class ParserYacc:
         else:
             p[0] = p[1]
 
+    @classmethod
+    def p_simple_id(cls, p: YaccProduction) -> None:
+        """simple_id : SIMPLE_IDENTIFIER"""
+        p[0] = Identifier(p[1])
+
+    @classmethod
+    def p_qualified_id(cls, p: YaccProduction) -> None:
+        """qualified_id : QUALIFIED_IDENTIFIER"""
+        p[0] = Identifier(p[1])
+
     @classmethod
     def p_identifier(cls, p: YaccProduction) -> None:
-        """identifier : SIMPLE_IDENTIFIER
-        | QUALIFIED_IDENTIFIER
+        """identifier : simple_id
+        | qualified_id
         """
-        p[0] = Identifier(p[1])
+        p[0] = p[1]
 
     @classmethod
     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_or_bind_list : literal_or_bind_list COMMA literal
+        | literal_or_bind_list COMMA simple_id
+        | literal_or_bind_list COMMA bind_name
+        | literal_or_bind_list COMMA function_call
         | literal
-        | identifier
+        | simple_id
         | bind_name
+        | function_call
         """
+        # This expression is only used in IN() operator and it is supposed to
+        # include only literals and bind names (and identifiers as we still
+        # allow simple identifiers as bind names). UUID literal is implemented
+        # via UUID() function call, so we need to allow function calls here
+        # too. IsIn will check that all operands are literals or binds.
         if len(p) == 2:
             p[0] = [p[1]]
         else:

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/registry/queries/expressions/parser/treeVisitor.py

@@ -31,6 +31,7 @@ __all__ = ["TreeVisitor"]
 
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Generic, TypeVar
+from uuid import UUID
 
 if TYPE_CHECKING:
     import astropy.time
@@ -80,6 +81,18 @@ class TreeVisitor(Generic[T], ABC):
             Corresponding tree node, mostly useful for diagnostics.
         """
 
+    @abstractmethod
+    def visitUuidLiteral(self, value: UUID, node: Node) -> T:
+        """Visit UuidLiteral node.
+
+        Parameters
+        ----------
+        value : `UUID`
+            The value associated with the visited node, the value is UUID.
+        node : `Node`
+            Corresponding tree node, mostly useful for diagnostics.
+        """
+
     @abstractmethod
     def visitTimeLiteral(self, value: astropy.time.Time, node: Node) -> T:
         """Visit TimeLiteral node.

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900}/python/lsst/daf/butler/tests/butler_queries.py

@@ -2469,6 +2469,57 @@ class ButlerQueryTests(ABC, TestCaseMixin):
         with self.assertRaisesRegex(InvalidQueryError, "Failed to parse expression"):
             butler.query_dimension_records("detector", instrument="Cam1", where="GLOB(full_name, full_name)")
 
+    def test_dataset_id_queries(self) -> None:
+        """Test queries on dataset_id."""
+        butler = self.make_butler("base.yaml", "datasets.yaml")
+
+        dataset_id = UUID("e15ab039-bc8b-4135-87c5-90902a7c0b22")
+
+        refs = butler.query_datasets(
+            "bias",
+            "imported_g",
+            instrument="Cam1",
+            where="dataset_id = :ID",
+            bind={"ID": dataset_id},
+        )
+        self.assertEqual({ref.id for ref in refs}, {dataset_id})
+
+        dataset_ids = {
+            UUID("87f3e68d-258d-41b7-8ea5-edf3557ccb30"),
+            UUID("dc0ef017-dc94-4118-b431-d65b1ef89a5f"),
+            UUID("e255067d-dcc5-4f39-9824-0baa5817d3e5"),
+        }
+        refs = butler.query_datasets(
+            "bias",
+            "imported_r",
+            instrument="Cam1",
+            where="bias.dataset_id IN (:IDS)",
+            bind={"IDS": dataset_ids},
+        )
+        self.assertEqual({ref.id for ref in refs}, dataset_ids)
+
+        refs = butler.query_datasets(
+            "bias",
+            "imported_g",
+            instrument="Cam1",
+            where="dataset_id = UUID('e15ab039-bc8b-4135-87c5-90902a7c0b22')",
+        )
+        self.assertEqual({ref.id for ref in refs}, {dataset_id})
+
+        refs = butler.query_datasets(
+            "bias",
+            "imported_r",
+            instrument="Cam1",
+            where=(
+                "bias.dataset_id IN ("
+                "UUID('87f3e68d-258d-41b7-8ea5-edf3557ccb30'), "
+                "UUID('dc0ef017-dc94-4118-b431-d65b1ef89a5f'), "
+                "UUID('e255067d-dcc5-4f39-9824-0baa5817d3e5')"
+                ")"
+            ),
+        )
+        self.assertEqual({ref.id for ref in refs}, dataset_ids)
+
 
 def _get_exposure_ids_from_dimension_records(dimension_records: Iterable[DimensionRecord]) -> list[int]:
     output = []

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

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

{lsst_daf_butler-29.2025.1800 → lsst_daf_butler-29.2025.1900/python/lsst_daf_butler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 29.2025.1800
+Version: 29.2025.1900
 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.1800 → lsst_daf_butler-29.2025.1900}/tests/test_exprParserYacc.py

@@ -53,6 +53,9 @@ class _Visitor(TreeVisitor):
     def visitTimeLiteral(self, value, node):
         return f"T({value})"
 
+    def visitUuidLiteral(self, value, node):
+        return f"UUID({value})"
+
     def visitRangeLiteral(self, start, stop, stride, node):
         if stride is None:
             return f"R({start}..{stop})"
@@ -355,6 +358,21 @@ class ParserYaccTestCase(unittest.TestCase):
         self.assertIsInstance(tree.values[2], exprTree.Identifier)
         self.assertIsInstance(tree.values[3], exprTree.NumericLiteral)
 
+        expr = (
+            "id in ("
+            "UUID('38a42b54-0822-4dce-93b7-47e9b0d8ad66'), "
+            "UUID('782fb690-281a-4787-9b6e-f5324a9b6369'), "
+            ":uuid"
+            ")"
+        )
+        tree = parser.parse(expr)
+        self.assertIsInstance(tree, exprTree.IsIn)
+        self.assertIsInstance(tree.lhs, exprTree.Identifier)
+        self.assertEqual(len(tree.values), 3)
+        self.assertIsInstance(tree.values[0], exprTree.UuidLiteral)
+        self.assertIsInstance(tree.values[1], exprTree.UuidLiteral)
+        self.assertIsInstance(tree.values[2], exprTree.BindName)
+
         # parens on right hand side are required
         with self.assertRaises(ParseError):
             parser.parse("point(1, 2) in region1")