fixed type annotations

Author: kevinjqliu

pyiceberg/avro/codecs/__init__.py

@@ -26,7 +26,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, Literal, Optional, Type
+from typing import Dict, Literal, Type
 
 from typing_extensions import TypeAlias
 

pyiceberg/catalog/__init__.py

@@ -30,11 +30,9 @@
     Callable,
     Dict,
     List,
-    Optional,
     Set,
     Tuple,
     Type,
-    Union,
     cast,
 )
 

pyiceberg/catalog/rest/__init__.py

@@ -20,7 +20,6 @@
     Any,
     Dict,
     List,
-    Optional,
     Set,
     Tuple,
     Union,

pyiceberg/expressions/__init__.py

@@ -29,7 +29,6 @@
     Tuple,
     Type,
     TypeVar,
-    Union,
 )
 from typing import Literal as TypingLiteral
 

pyiceberg/io/__init__.py

@@ -34,10 +34,8 @@
 from typing import (
     Dict,
     List,
-    Optional,
     Protocol,
     Type,
-    Union,
     runtime_checkable,
 )
 from urllib.parse import urlparse

pyiceberg/io/pyarrow.py

@@ -49,11 +49,9 @@
     Iterable,
     Iterator,
     List,
-    Optional,
     Set,
     Tuple,
     TypeVar,
-    Union,
     cast,
 )
 from urllib.parse import urlparse
@@ -1291,7 +1289,7 @@ def primitive(self, primitive: pa.DataType) -> bool:
         return True
 
 
-class _ConvertToIceberg(PyArrowSchemaVisitor[Union[IcebergType, Schema]]):
+class _ConvertToIceberg(PyArrowSchemaVisitor[IcebergType | Schema]):
     """Converts PyArrowSchema to Iceberg Schema. Applies the IDs from name_mapping if provided."""
 
     _field_names: List[str]
@@ -1428,7 +1426,7 @@ def after_map_value(self, element: pa.Field) -> None:
         self._field_names.pop()
 
 
-class _ConvertToLargeTypes(PyArrowSchemaVisitor[Union[pa.DataType, pa.Schema]]):
+class _ConvertToLargeTypes(PyArrowSchemaVisitor[IcebergType | pa.Schema]):
     def schema(self, schema: pa.Schema, struct_result: pa.StructType) -> pa.Schema:
         return pa.schema(struct_result)
 
@@ -1452,7 +1450,7 @@ def primitive(self, primitive: pa.DataType) -> pa.DataType:
         return primitive
 
 
-class _ConvertToSmallTypes(PyArrowSchemaVisitor[Union[pa.DataType, pa.Schema]]):
+class _ConvertToSmallTypes(PyArrowSchemaVisitor[IcebergType | pa.Schema]):
     def schema(self, schema: pa.Schema, struct_result: pa.StructType) -> pa.Schema:
         return pa.schema(struct_result)
 
@@ -1807,7 +1805,7 @@ def _to_requested_schema(
     return pa.RecordBatch.from_struct_array(struct_array)
 
 
-class ArrowProjectionVisitor(SchemaWithPartnerVisitor[pa.Array, Optional[pa.Array]]):
+class ArrowProjectionVisitor(SchemaWithPartnerVisitor[pa.Array, pa.Array | None]):
     _file_schema: Schema
     _include_field_ids: bool
     _downcast_ns_timestamp_to_us: bool

pyiceberg/schema.py

@@ -29,7 +29,6 @@
     Generic,
     List,
     Literal,
-    Optional,
     Set,
     Tuple,
     TypeVar,
@@ -1433,7 +1432,7 @@ def sanitize_column_names(schema: Schema) -> Schema:
     )
 
 
-class _SanitizeColumnsVisitor(SchemaVisitor[Optional[IcebergType]]):
+class _SanitizeColumnsVisitor(SchemaVisitor[IcebergType | None]):
     def schema(self, schema: Schema, struct_result: IcebergType | None) -> IcebergType | None:
         return struct_result
 
@@ -1484,7 +1483,7 @@ def prune_columns(schema: Schema, selected: Set[int], select_full_types: bool =
     )
 
 
-class _PruneColumnsVisitor(SchemaVisitor[Optional[IcebergType]]):
+class _PruneColumnsVisitor(SchemaVisitor[IcebergType | None]):
     selected: Set[int]
     select_full_types: bool
 

pyiceberg/table/__init__.py

@@ -33,12 +33,10 @@
     Iterable,
     Iterator,
     List,
-    Optional,
     Set,
     Tuple,
     Type,
     TypeVar,
-    Union,
 )
 
 from pydantic import Field

pyiceberg/table/update/__init__.py

@@ -21,7 +21,7 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
 from functools import singledispatch
-from typing import TYPE_CHECKING, Annotated, Any, Dict, Generic, List, Literal, Optional, Tuple, TypeVar, Union, cast
+from typing import TYPE_CHECKING, Annotated, Any, Dict, Generic, List, Literal, Tuple, TypeVar, cast
 
 from pydantic import Field, field_validator, model_serializer, model_validator
 

pyiceberg/table/update/schema.py

@@ -20,7 +20,7 @@
 from copy import copy
 from dataclasses import dataclass
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Any, Dict, List, Set, Tuple
 
 from pyiceberg.exceptions import ResolveError, ValidationError
 from pyiceberg.expressions import literal  # type: ignore
@@ -693,7 +693,7 @@ def assign_new_column_id(self) -> int:
         return next(self._last_column_id)
 
 
-class _ApplyChanges(SchemaVisitor[Optional[IcebergType]]):
+class _ApplyChanges(SchemaVisitor[IcebergType | None]):
     _adds: Dict[int, List[NestedField]]
     _updates: Dict[int, NestedField]
     _deletes: Set[int]