update: reduce code and supress errors

Author: jaimeferj

pyiceberg/expressions/__init__.py

@@ -30,11 +30,10 @@
     Type,
     TypeVar,
     Union,
-    cast,
 )
 from typing import Literal as TypingLiteral
 
-from pydantic import ConfigDict, Field, field_validator
+from pydantic import Field
 
 from pyiceberg.expressions.literals import (
     AboveMax,
@@ -753,45 +752,11 @@ def as_bound(self) -> Type[BoundNotIn[L]]:
 class LiteralPredicate(IcebergBaseModel, UnboundPredicate[L], ABC):
     type: TypingLiteral["lt", "lt-eq", "gt", "gt-eq", "eq", "not-eq", "starts-with", "not-starts-with"] = Field(alias="type")
     term: UnboundTerm[Any]
-    value: Literal[L] = Field(alias="literal", serialization_alias="value")
-
+    value: Literal[L] = Field()
     model_config = ConfigDict(populate_by_name=True, frozen=True, arbitrary_types_allowed=True)
 
-    def __init__(
-        self,
-        term: Union[str, UnboundTerm[Any], BoundReference[Any]],
-        literal: Union[L, Literal[L], None] = None,
-        **data: Any,
-    ) -> None:  # pylint: disable=W0621
-        extra = dict(data)
-
-        literal_candidates = []
-        if literal is not None:
-            literal_candidates.append(literal)
-        if "literal" in extra:
-            literal_candidates.append(extra.pop("literal"))
-        if "value" in extra:
-            literal_candidates.append(extra.pop("value"))
-
-        literal_candidates = [candidate for candidate in literal_candidates if candidate is not None]
-
-        if not literal_candidates:
-            raise TypeError("LiteralPredicate requires a literal or value argument")
-        if len(literal_candidates) > 1:
-            raise TypeError("literal/value provided multiple times")
-
-        init = cast("Callable[..., None]", IcebergBaseModel.__init__)
-        init(self, term=_to_unbound_term(term), literal=_to_literal(literal_candidates[0]), **extra)
-
-    @field_validator("term", mode="before")
-    @classmethod
-    def _convert_term(cls, value: Any) -> UnboundTerm[Any]:
-        return _to_unbound_term(value)
-
-    @field_validator("value", mode="before")
-    @classmethod
-    def _convert_value(cls, value: Any) -> Literal[Any]:
-        return _to_literal(value)
+    def __init__(self, term: Union[str, UnboundTerm[Any], BoundReference[Any]], literal: Union[L, Literal[L]]):
+        super().__init__(term=_to_unbound_term(term), value=_to_literal(literal))  # type: ignore[call-arg]
 
     @property
     def literal(self) -> Literal[L]: