Make SetPredicate and subclasses JSON serializable

Author: Aniketsy

pyiceberg/expressions/__init__.py

@@ -577,15 +577,14 @@ def as_bound(self) -> Type[BoundNotNaN[L]]:
         return BoundNotNaN[L]
 
 
-class SetPredicate(UnboundPredicate[L], IcebergBaseModel, ABC):
+class SetPredicate(IcebergBaseModel, UnboundPredicate[L], ABC):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    type: TypingLiteral["in", "not-in"] = Field(default="in", alias="type")
+    type: TypingLiteral["in", "not-in"] = Field(default="in")
     literals: Set[Literal[L]] = Field(alias="items")
 
     def __init__(self, term: Union[str, UnboundTerm[Any]], literals: Union[Iterable[L], Iterable[Literal[L]]]):
-        super().__init__(term)
-        self.literals = _to_literal_set(literals)
+        super().__init__(term=_to_unbound_term(term), items=_to_literal_set(literals))  # type: ignore
 
     def bind(self, schema: Schema, case_sensitive: bool = True) -> BoundSetPredicate[L]:
         bound_term = self.term.bind(schema, case_sensitive)
@@ -737,7 +736,7 @@ def __new__(  # type: ignore  # pylint: disable=W0221
 
     def __invert__(self) -> In[L]:
         """Transform the Expression into its negated version."""
-        return NotIn[L](self.term, self.literals)
+        return In[L](self.term, self.literals)
 
     @property
     def as_bound(self) -> Type[BoundNotIn[L]]:

tests/expressions/test_expressions.py

@@ -875,12 +875,12 @@ def test_not_in() -> None:
 
 def test_serialize_in() -> None:
     pred = In(term="foo", literals=[1, 2, 3])
-    assert pred.model_dump_json() == '{"type":"in","term":"foo","value":[1,2,3]}'
+    assert pred.model_dump_json() == '{"term":"foo","type":"in","items":[1,2,3]}'
 
 
 def test_serialize_not_in() -> None:
     pred = NotIn(term="foo", literals=[1, 2, 3])
-    assert pred.model_dump_json() == '{"type":"not-in","term":"foo","value":[1,2,3]}'
+    assert pred.model_dump_json() == '{"term":"foo","type":"not-in","items":[1,2,3]}'
 
 
 def test_bound_equal_to(term: BoundReference[Any]) -> None: