feat: make and expression serializable

Author: geruh

pyiceberg/expressions/__init__.py

@@ -261,9 +261,6 @@ def __new__(cls, left: BooleanExpression, right: BooleanExpression, *rest: Boole
             return left
         else:
             obj = super().__new__(cls)
-            obj.__pydantic_fields_set__ = set()
-            obj.left = left
-            obj.right = right
             return obj
 
     def __eq__(self, other: Any) -> bool:
@@ -272,7 +269,7 @@ def __eq__(self, other: Any) -> bool:
 
     def __str__(self) -> str:
         """Return the string representation of the And class."""
-        return f"{str(self.__class__.__name__)}(left={repr(self.left)}, right={repr(self.right)})"
+        return f"And(left={str(self.left)}, right={str(self.right)})"
 
     def __repr__(self) -> str:
         """Return the string representation of the And class."""

tests/expressions/test_expressions.py

@@ -725,6 +725,15 @@ def test_and() -> None:
         null & "abc"
 
 
+def test_and_serialization() -> None:
+    expr = And(EqualTo("x", 1), GreaterThan("y", 2))
+
+    assert (
+        expr.model_dump_json()
+        == '{"type":"and","left":{"term":"x","type":"eq","value":1},"right":{"term":"y","type":"gt","value":2}}'
+    )
+
+
 def test_or() -> None:
     null = IsNull(Reference("a"))
     nan = IsNaN(Reference("b"))

tests/table/test_partitioning.py

@@ -21,7 +21,6 @@
 
 import pytest
 
-from pyiceberg.expressions import And, EqualTo
 from pyiceberg.partitioning import UNPARTITIONED_PARTITION_SPEC, PartitionField, PartitionSpec
 from pyiceberg.schema import Schema
 from pyiceberg.transforms import (
@@ -126,13 +125,6 @@ def test_serialize_partition_spec() -> None:
     )
 
 
-def test_serialize_and_expression() -> None:
-    expr = And(EqualTo("foo", 1), EqualTo("bar", 2))
-    assert expr.model_dump_json(by_alias=True) == (
-        '{"type":"and","left":{"type":"equal_to","term":"foo","literal":1},"right":{"type":"equal_to","term":"bar","literal":2}}'
-    )
-
-
 def test_deserialize_unpartition_spec() -> None:
     json_partition_spec = """{"spec-id":0,"fields":[]}"""
     spec = PartitionSpec.model_validate_json(json_partition_spec)