Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions pyiceberg/expressions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,17 @@
from abc import ABC, abstractmethod
from collections.abc import Callable, Iterable, Sequence
from functools import cached_property
from typing import TYPE_CHECKING, Any, cast
from typing import Any
from typing import Literal as TypingLiteral

from pydantic import ConfigDict, Field

from pyiceberg.expressions.literals import AboveMax, BelowMin, Literal, literal
from pyiceberg.schema import Accessor, Schema
from pyiceberg.typedef import IcebergBaseModel, IcebergRootModel, L, StructProtocol
from pyiceberg.typedef import IcebergBaseModel, IcebergRootModel, L, LiteralValue, StructProtocol
from pyiceberg.types import DoubleType, FloatType, NestedField
from pyiceberg.utils.singleton import Singleton

try:
from pydantic import ConfigDict
except ImportError:
ConfigDict = dict

if TYPE_CHECKING:
LiteralValue = Literal[Any]
else:
LiteralValue = Literal


def _to_unbound_term(term: str | UnboundTerm) -> UnboundTerm:
return Reference(term) if isinstance(term, str) else term
Expand Down Expand Up @@ -606,7 +596,7 @@ class SetPredicate(IcebergBaseModel, UnboundPredicate, ABC):
model_config = ConfigDict(arbitrary_types_allowed=True)

type: TypingLiteral["in", "not-in"] = Field(default="in")
literals: set[Any] = Field(alias="items")
literals: set[LiteralValue] = Field(alias="items")

def __init__(self, term: str | UnboundTerm, literals: Iterable[Any] | Iterable[LiteralValue]):
literal_set = _to_literal_set(literals)
Expand All @@ -615,7 +605,7 @@ def __init__(self, term: str | UnboundTerm, literals: Iterable[Any] | Iterable[L

def bind(self, schema: Schema, case_sensitive: bool = True) -> BoundSetPredicate:
bound_term = self.term.bind(schema, case_sensitive)
literal_set = cast(set[LiteralValue], self.literals)
literal_set = self.literals
return self.as_bound(bound_term, {lit.to(bound_term.ref().field.field_type) for lit in literal_set})

def __str__(self) -> str:
Expand Down
Loading