Rework some tests

Author: Gawaboumga

pyiceberg/utils/schema_conversion.py

@@ -379,6 +379,10 @@ def _convert_logical_type(self, avro_logical_type: Dict[str, Any]) -> IcebergTyp
         physical_type = avro_logical_type["type"]
         if logical_type == "decimal":
             return self._convert_logical_decimal_type(avro_logical_type)
+        elif logical_type == "geography":
+            return self._convert_logical_geography_type(avro_logical_type)
+        elif logical_type == "geometry":
+            return self._convert_logical_geometry_type(avro_logical_type)
         elif logical_type == "map":
             return self._convert_logical_map_type(avro_logical_type)
         elif logical_type == "timestamp-micros":
@@ -418,6 +422,58 @@ def _convert_logical_decimal_type(self, avro_type: Dict[str, Any]) -> DecimalTyp
         """
         return DecimalType(precision=avro_type["precision"], scale=avro_type["scale"])
 
+    def _convert_logical_geography_type(self, avro_type: Dict[str, Any]) -> GeographyType:
+        """Convert an avro type to an Iceberg GeographyType.
+
+        Args:
+            avro_type: The Avro type.
+
+        Examples:
+            >>> from pyiceberg.utils.schema_conversion import AvroSchemaConversion
+            >>> avro_geography_type = {
+            ...     "type": "bytes",
+            ...     "logicalType": "geography",
+            ...     "crs": 'OGC:CRS84',
+            ...     "edge_algorithm": 'spherical'
+            ... }
+            >>> actual = AvroSchemaConversion()._convert_logical_decimal_type(geography)
+            >>> expected = GeographyType(
+            ...     crs='OGC:CRS84',
+            ...     edge_algorithm=EdgeAlgorithm.SPHERICAL
+            ... )
+            >>> actual == expected
+            True
+
+        Returns:
+            A Iceberg GeographyType.
+        """
+        return GeographyType(crs=avro_type["crs"], edge_algorithm=avro_type["edge_algorithm"])
+
+    def _convert_logical_geometry_type(self, avro_type: Dict[str, Any]) -> GeometryType:
+        """Convert an avro type to an Iceberg GeometryType.
+
+        Args:
+            avro_type: The Avro type.
+
+        Examples:
+            >>> from pyiceberg.utils.schema_conversion import AvroSchemaConversion
+            >>> avro_geometry_type = {
+            ...     "type": "bytes",
+            ...     "logicalType": "geometry",
+            ...     "crs": "OGC:CRS84
+            ... }
+            >>> actual = AvroSchemaConversion()._convert_logical_decimal_type(avro_geometry_type)
+            >>> expected = GeometryType(
+            ...     crs="OGC:CRS84"
+            ... )
+            >>> actual == expected
+            True
+
+        Returns:
+            A Iceberg GeometryType.
+        """
+        return GeometryType(crs=avro_type["crs"])
+
     def _convert_logical_map_type(self, avro_type: Dict[str, Any]) -> MapType:
         """Convert an avro map type to an Iceberg MapType.
 
@@ -643,17 +699,17 @@ def visit_binary(self, binary_type: BinaryType) -> AvroType:
 
     def visit_geography(self, geography_type: GeographyType) -> AvroType:
         return {
-            "type": "bytes", 
-            "logicalType": "geography", 
-            "crs": geography_type.crs, 
+            "type": "bytes",
+            "logicalType": "geography",
+            "crs": geography_type.crs,
             "edge_algorithm": geography_type.edge_algorithm,
         }
 
     def visit_geometry(self, geometry_type: GeometryType) -> AvroType:
         return {
-            "type": "bytes", 
-            "logicalType": "geometry", 
-            "crs": geometry_type.crs, 
+            "type": "bytes",
+            "logicalType": "geometry",
+            "crs": geometry_type.crs,
         }
 
     def visit_unknown(self, unknown_type: UnknownType) -> AvroType:

tests/conftest.py

@@ -82,6 +82,8 @@
     DoubleType,
     FixedType,
     FloatType,
+    GeographyType,
+    GeometryType,
     IntegerType,
     ListType,
     LongType,
@@ -352,6 +354,8 @@ def table_schema_with_all_types() -> Schema:
                 NestedField(field_id=22, name="inner_int", field_type=IntegerType(), required=True),
             ),
         ),
+        NestedField(field_id=23, name="geography", field_type=GeographyType(), required=True),
+        NestedField(field_id=24, name="geometry", field_type=GeometryType(), required=True),
         schema_id=1,
         identifier_field_ids=[2],
     )

tests/test_transforms.py

@@ -100,6 +100,8 @@
     DoubleType,
     FixedType,
     FloatType,
+    GeographyType,
+    GeometryType,
     IntegerType,
     LongType,
     NestedField,
@@ -168,6 +170,16 @@
             TimestamptzNanoType(),
             -1207196810,
         ),
+        (
+            b"\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\xf0?", # POINT (1 1) in WKB
+            GeographyType(),
+            -1769831280
+        ),
+        (
+            b"\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\xf0?", # POINT (1 1) in WKB
+            GeometryType(),
+            -1769831280
+        )
     ],
 )
 def test_bucket_hash_values(test_input: Any, test_type: PrimitiveType, expected: Any) -> None:

tests/test_types.py

@@ -62,8 +62,6 @@
     (10, StringType),
     (11, UUIDType),
     (12, BinaryType),
-    (13, GeographyType),
-    (14, GeometryType),
 ]
 
 primitive_types = {
@@ -79,8 +77,6 @@
     "string": StringType,
     "uuid": UUIDType,
     "binary": BinaryType,
-    "geography": GeographyType,
-    "geometry": GeometryType,
 }
 
 
@@ -105,8 +101,6 @@ def test_repr_primitive_types(input_index: int, input_type: Type[PrimitiveType])
         (StringType(), True),
         (UUIDType(), True),
         (BinaryType(), True),
-        (GeographyType(), True),
-        (GeometryType(), True),
         (DecimalType(32, 3), True),
         (FixedType(8), True),
         (ListType(1, StringType(), True), False),
@@ -520,7 +514,7 @@ def test_str_geography() -> None:
 
 
 def test_repr_geography() -> None:
-    assert repr(GeographyType()) == "GeographyType()"
+    assert repr(GeographyType()) == "GeographyType(crs=None, edge_algorithm=None)"
 
 
 def test_serialization_geometry() -> None:
@@ -536,7 +530,7 @@ def test_str_geometry() -> None:
 
 
 def test_repr_geometry() -> None:
-    assert repr(GeometryType()) == "GeometryType()"
+    assert repr(GeometryType()) == "GeometryType(crs=None)"
 
 
 def test_serialization_decimal() -> None:

tests/utils/test_schema_conversion.py

@@ -26,6 +26,8 @@
     DateType,
     DecimalType,
     FixedType,
+    GeographyType,
+    GeometryType,
     IntegerType,
     ListType,
     LongType,
@@ -347,6 +349,18 @@ def test_convert_timestamp_micros_type() -> None:
     assert actual == TimestampType()
 
 
+def test_convert_geography_type() -> None:
+    avro_logical_type = {"type": "bytes", "logicalType": "geography", "crs": "OGC:CRS84", "edge_algorithm": None}
+    actual = AvroSchemaConversion()._convert_logical_type(avro_logical_type)
+    assert actual == GeographyType()
+
+
+def test_convert_geometry_type() -> None:
+    avro_logical_type = {"type": "string", "logicalType": "geometry", "crs": "OGC:CRS84"}
+    actual = AvroSchemaConversion()._convert_logical_type(avro_logical_type)
+    assert actual == GeometryType()
+
+
 def test_unknown_logical_type() -> None:
     """Test raising a ValueError when converting an unknown logical type as part of an Avro schema conversion"""
     avro_logical_type = {"type": "bytes", "logicalType": "date"}