Change types into dataclasses

python/setup.cfg

@@ -45,6 +45,7 @@ python_requires = >=3.7
 install_requires =
     mmh3
     singledispatch
+    cached-property; python_version <= '3.7'
 [options.extras_require]
 arrow =
     pyarrow

python/spellcheck-dictionary.txt

@@ -26,10 +26,13 @@ FileInfo
 filesystem
 fs
 func
+IcebergType
 io
 NativeFile
+NestedField
 nullability
 pragma
+PrimitiveType
 pyarrow
 repr
 schemas
@@ -42,4 +45,5 @@ StructType
 Timestamptz
 Timestamptzs
 unscaled
-URI
+URI
+

python/src/iceberg/schema.py

@@ -151,7 +151,7 @@ def find_type(self, name_or_id: str | int, case_sensitive: bool = True) -> Icebe
             NestedField: The type of the matched NestedField
         """
         field = self.find_field(name_or_id=name_or_id, case_sensitive=case_sensitive)
-        return field.type  # type: ignore
+        return field.field_type
 
     def find_column_name(self, column_id: int) -> str:
         """Find a column name given a column ID
@@ -323,7 +323,7 @@ def _(obj: StructType, visitor: SchemaVisitor[T]) -> T:
 
     for field in obj.fields:
         visitor.before_field(field)
-        result = visit(field.type, visitor)
+        result = visit(field.field_type, visitor)
         visitor.after_field(field)
         results.append(visitor.field(field, result))
 
@@ -335,7 +335,7 @@ def _(obj: ListType, visitor: SchemaVisitor[T]) -> T:
     """Visit a ListType with a concrete SchemaVisitor"""
 
     visitor.before_list_element(obj.element)
-    result = visit(obj.element.type, visitor)
+    result = visit(obj.element.field_type, visitor)
     visitor.after_list_element(obj.element)
 
     return visitor.list(obj, result)
@@ -345,11 +345,11 @@ def _(obj: ListType, visitor: SchemaVisitor[T]) -> T:
 def _(obj: MapType, visitor: SchemaVisitor[T]) -> T:
     """Visit a MapType with a concrete SchemaVisitor"""
     visitor.before_map_key(obj.key)
-    key_result = visit(obj.key.type, visitor)
+    key_result = visit(obj.key.field_type, visitor)
     visitor.after_map_key(obj.key)
 
     visitor.before_map_value(obj.value)
-    value_result = visit(obj.value.type, visitor)
+    value_result = visit(obj.value.field_type, visitor)
     visitor.after_list_element(obj.value)
 
     return visitor.map(obj, key_result, value_result)
@@ -417,12 +417,12 @@ def __init__(self) -> None:
 
     def before_list_element(self, element: NestedField) -> None:
         """Short field names omit element when the element is a StructType"""
-        if not isinstance(element.type, StructType):
+        if not isinstance(element.field_type, StructType):
             self._short_field_names.append(element.name)
         self._field_names.append(element.name)
 
     def after_list_element(self, element: NestedField) -> None:
-        if not isinstance(element.type, StructType):
+        if not isinstance(element.field_type, StructType):
             self._short_field_names.pop()
         self._field_names.pop()