Make And expression JSON serializable using Pydantic

Author: Aniketsy

pyiceberg/expressions/__init__.py

@@ -31,8 +31,9 @@
     TypeVar,
     Union,
 )
+from typing import Literal as TypingLiteral
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from pyiceberg.expressions.literals import (
     AboveMax,
@@ -249,13 +250,18 @@ def as_bound(self) -> Type[BoundReference[L]]:
         return BoundReference[L]
 
 
-class And(BooleanExpression, IcebergBaseModel):
+class And(IcebergBaseModel, BooleanExpression):
     """AND operation expression - logical conjunction."""
 
-    type: str = Field(default="and", alias="type")
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    type: TypingLiteral["and"] = Field(default="and", alias="type")
     left: BooleanExpression
     right: BooleanExpression
 
+    def __init__(self, left: BooleanExpression, right: BooleanExpression, *rest: BooleanExpression) -> None:
+        super().__init__(left=left, right=right)
+
     def __new__(cls, left: BooleanExpression, right: BooleanExpression, *rest: BooleanExpression) -> BooleanExpression:  # type: ignore
         if rest:
             return _build_balanced_tree(And, (left, right, *rest))
@@ -292,12 +298,6 @@ def __getnewargs__(self) -> Tuple[BooleanExpression, BooleanExpression]:
         """Pickle the And class."""
         return (self.left, self.right)
 
-    class Config:
-        """Pydantic configuration for And expression serialization."""
-
-        arbitrary_types_allowed = True
-        json_encoders = {BooleanExpression: lambda v: v.model_dump(by_alias=True) if isinstance(v, IcebergBaseModel) else str(v)}
-
 
 class Or(BooleanExpression):
     """OR operation expression - logical disjunction."""