A GIFT THAT KEEPS ON GIVING

Author: Fokko

pyiceberg/expressions/literals.py

@@ -154,7 +154,7 @@ def literal(value: L) -> Literal[L]:
     elif isinstance(value, date):
         return DateLiteral(date_to_days(value))  # type: ignore
     elif isinstance(value, time):
-        return TimeLiteral(time_to_micros(value))
+        return TimeLiteral(time_to_micros(value))  # type: ignore
     else:
         raise TypeError(f"Invalid literal value: {repr(value)}")
 

pyiceberg/table/update/schema.py

@@ -48,6 +48,7 @@
     UpdatesAndRequirements,
     UpdateTableMetadata,
 )
+from pyiceberg.typedef import L
 from pyiceberg.types import IcebergType, ListType, MapType, NestedField, PrimitiveType, StructType
 
 if TYPE_CHECKING:
@@ -159,7 +160,7 @@ def add_column(
         field_type: IcebergType,
         doc: Optional[str] = None,
         required: bool = False,
-        default_value: Optional[Any] = None,
+        default_value: Optional[L] = None,
     ) -> UpdateSchema:
         """Add a new column to a nested struct or Add a new top-level column.
 
@@ -224,7 +225,7 @@ def add_column(
             except ValueError as e:
                 raise ValueError(f"Invalid default value: {e}") from e
         else:
-            initial_default = default_value
+            initial_default = default_value  # type: ignore
 
         if (required and initial_default is None) and not self._allow_incompatible_changes:
             # Table format version 1 and 2 cannot add required column because there is no initial value
@@ -274,7 +275,7 @@ def delete_column(self, path: Union[str, Tuple[str, ...]]) -> UpdateSchema:
 
         return self
 
-    def set_default_value(self, path: Union[str, Tuple[str, ...]], default_value: Any) -> UpdateSchema:
+    def set_default_value(self, path: Union[str, Tuple[str, ...]], default_value: Optional[L]) -> UpdateSchema:
         """Set the default value of a column.
 
         Args:

pyiceberg/typedef.py

@@ -17,7 +17,7 @@
 from __future__ import annotations
 
 from abc import abstractmethod
-from datetime import date, datetime
+from datetime import date, datetime, time
 from decimal import Decimal
 from functools import lru_cache
 from typing import (
@@ -94,7 +94,7 @@ def __missing__(self, key: K) -> V:
 """A recursive dictionary type for nested structures in PyIceberg."""
 
 # Represents the literal value
-L = TypeVar("L", str, bool, int, float, bytes, UUID, Decimal, datetime, date, covariant=True)
+L = TypeVar("L", str, bool, int, float, bytes, UUID, Decimal, datetime, date, time, covariant=True)
 
 
 @runtime_checkable

tests/integration/test_rest_schema.py

@@ -1145,26 +1145,20 @@ def test_initial_default_all_columns(
 @pytest.mark.integration
 def test_add_required_column_initial_default(catalog: Catalog) -> None:
     schema_ = Schema(NestedField(field_id=1, name="a", field_type=BooleanType(), required=False))
-    table = _create_table_with_schema(catalog, schema_)
-    new_schema = (
-        UpdateSchema(transaction=table.transaction())
-        .add_column(path="data", field_type=IntegerType(), required=True, default_value=22)
-        ._apply()
-    )
-    assert new_schema == Schema(
-        NestedField(field_id=1, name="a", field_type=BooleanType(), required=True, initial_default=True),
+    table = _create_table_with_schema(catalog, schema_, properties={TableProperties.FORMAT_VERSION: 3})
+
+    table.update_schema().add_column(path="data", field_type=IntegerType(), required=True, default_value=22).commit()
+
+    assert table.schema() == Schema(
+        NestedField(field_id=1, name="a", field_type=BooleanType(), required=False),
         NestedField(field_id=2, name="data", field_type=IntegerType(), required=True, initial_default=22, write_default=22),
         schema_id=1,
     )
 
     # Update
-    new_schema = (
-        UpdateSchema(transaction=table.transaction())
-        .update_column(path="data", field_type=LongType())
-        .rename_column("a", "bool")
-        ._apply()
-    )
-    assert new_schema == Schema(
+    table.update_schema().update_column(path="data", field_type=LongType()).rename_column("a", "bool").commit()
+
+    assert table.schema() == Schema(
         NestedField(field_id=1, name="bool", field_type=BooleanType(), required=False),
         NestedField(field_id=2, name="data", field_type=LongType(), required=True, initial_default=22, write_default=22),
         schema_id=1,