fix: remove typing_extensions dependency and update codegen

Author: giospada

Makefile

@@ -10,6 +10,7 @@ codegen-extensions:
 		--input third_party/substrait/text/simple_extensions_schema.yaml \
 		--output src/substrait/gen/json/simple_extensions.py \
 		--output-model-type dataclasses.dataclass \
+		--target-python-version 3.10  \
 		--disable-timestamp
 
 lint:

pyproject.toml

@@ -5,7 +5,7 @@ authors = [{name = "Substrait contributors", email = "[email protected]
 license = {text = "Apache-2.0"}
 readme = "README.md"
 requires-python = ">=3.10"
-dependencies = ["protobuf >=3.19.1,<6", "typing_extensions"]
+dependencies = ["protobuf >=3.19.1,<6"]
 dynamic = ["version"]
 
 [tool.setuptools_scm]

src/substrait/builders/plan.py

@@ -5,7 +5,6 @@
 See `examples/builder_example.py` for usage.
 """
 
-
 from typing import Callable, Iterable, Optional, TypedDict, Union
 import substrait.gen.proto.algebra_pb2 as stalg
 from substrait.gen.proto.extensions.extensions_pb2 import AdvancedExtension

src/substrait/builders/type.py

@@ -221,6 +221,7 @@ def precision_timestamp_tz(precision: int, nullable=True) -> stt.Type:
         )
     )
 
+
 def timestamp(nullable=True) -> stt.Type:
     return stt.Type(
         timestamp=stt.Type.Timestamp(
@@ -230,6 +231,7 @@ def timestamp(nullable=True) -> stt.Type:
         )
     )
 
+
 def struct(types: Iterable[stt.Type], nullable=True) -> stt.Type:
     return stt.Type(
         struct=stt.Type.Struct(

src/substrait/extension_registry.py

@@ -324,12 +324,14 @@ def satisfies_signature(self, signature: tuple | list) -> Optional[str]:
         output_type = evaluate(self.impl.return_, parameters)
 
         if self.nullability == se.NullabilityHandling.MIRROR:
-            sig_contains_nullable = any([
-                p.__getattribute__(p.WhichOneof("kind")).nullability
-                == Type.NULLABILITY_NULLABLE
-                for p in signature
-                if isinstance(p, Type)
-            ])
+            sig_contains_nullable = any(
+                [
+                    p.__getattribute__(p.WhichOneof("kind")).nullability
+                    == Type.NULLABILITY_NULLABLE
+                    for p in signature
+                    if isinstance(p, Type)
+                ]
+            )
             output_type.__getattribute__(output_type.WhichOneof("kind")).nullability = (
                 Type.NULLABILITY_NULLABLE
                 if sig_contains_nullable

src/substrait/gen/json/simple_extensions.py

@@ -129,11 +129,12 @@
 )
 
 
-
 def test_non_existing_urn():
     assert (
         registry.lookup_function(
-            urn="non_existent", function_name="add", signature=[i8(nullable=False), i8(nullable=False)]
+            urn="non_existent",
+            function_name="add",
+            signature=[i8(nullable=False), i8(nullable=False)],
         )
         is None
     )
@@ -142,8 +143,9 @@ def test_non_existing_urn():
 def test_non_existing_function():
     assert (
         registry.lookup_function(
-
-        urn="extension:test:functions", function_name="sub", signature=[i8(nullable=False), i8(nullable=False)]
+            urn="extension:test:functions",
+            function_name="sub",
+            signature=[i8(nullable=False), i8(nullable=False)],
         )
         is None
     )
@@ -152,15 +154,19 @@ def test_non_existing_function():
 def test_non_existing_function_signature():
     assert (
         registry.lookup_function(
-            urn="extension:test:functions", function_name="add", signature=[i8(nullable=False)]
+            urn="extension:test:functions",
+            function_name="add",
+            signature=[i8(nullable=False)],
         )
         is None
     )
 
 
 def test_exact_match():
     assert registry.lookup_function(
-        urn="extension:test:functions", function_name="add", signature=[i8(nullable=False), i8(nullable=False)]
+        urn="extension:test:functions",
+        function_name="add",
+        signature=[i8(nullable=False), i8(nullable=False)],
     )[1] == Type(i8=Type.I8(nullability=Type.NULLABILITY_REQUIRED))
 
 
@@ -184,43 +190,35 @@ def test_wildcard_match_fails_with_constraits():
 
 
 def test_wildcard_match_with_constraits():
-    assert (
-        registry.lookup_function(
-            urn="extension:test:functions",
-            function_name="add",
-            signature=[i16(nullable=False), i16(nullable=False), i8(nullable=False)],
-        )[1]
-        == i8(nullable=False)
-    )
+    assert registry.lookup_function(
+        urn="extension:test:functions",
+        function_name="add",
+        signature=[i16(nullable=False), i16(nullable=False), i8(nullable=False)],
+    )[1] == i8(nullable=False)
 
 
 def test_variadic():
-    assert (
-        registry.lookup_function(
-            urn="extension:test:functions",
-            function_name="test_fn",
-            signature=[i8(nullable=False), i8(nullable=False), i8(nullable=False)],
-        )[1]
-        == i8(nullable=False)
-    )
+    assert registry.lookup_function(
+        urn="extension:test:functions",
+        function_name="test_fn",
+        signature=[i8(nullable=False), i8(nullable=False), i8(nullable=False)],
+    )[1] == i8(nullable=False)
 
 
 def test_variadic_any():
-    assert (
-        registry.lookup_function(
-            urn="extension:test:functions",
-            function_name="test_fn_variadic_any",
-            signature=[i16(nullable=False), i16(nullable=False), i16(nullable=False)],
-        )[1]
-        == i16(nullable=False)
-    )
+    assert registry.lookup_function(
+        urn="extension:test:functions",
+        function_name="test_fn_variadic_any",
+        signature=[i16(nullable=False), i16(nullable=False), i16(nullable=False)],
+    )[1] == i16(nullable=False)
 
 
 def test_variadic_fails_min_constraint():
     assert (
         registry.lookup_function(
-
-            urn="extension:test:functions", function_name="test_fn", signature=[i8(nullable=False)]
+            urn="extension:test:functions",
+            function_name="test_fn",
+            signature=[i8(nullable=False)],
         )
         is None
     )
@@ -254,14 +252,11 @@ def test_decimal_happy_path_discrete():
 
 
 def test_enum_with_valid_option():
-    assert (
-        registry.lookup_function(
-            urn="extension:test:functions",
-            function_name="test_enum",
-            signature=["FLIP", i8(nullable=False)],
-        )[1]
-        == i8(nullable=False)
-    )
+    assert registry.lookup_function(
+        urn="extension:test:functions",
+        function_name="test_enum",
+        signature=["FLIP", i8(nullable=False)],
+    )[1] == i8(nullable=False)
 
 
 def test_enum_with_nonexistent_option():
@@ -572,4 +567,4 @@ def test_register_requires_uri():
 
     # During migration, URI is required - this should fail with TypeError
     with pytest.raises(TypeError):
-        registry.register_extension_dict(yaml.safe_load(content))
+        registry.register_extension_dict(yaml.safe_load(content))

tests/test_extension_registry.py

@@ -0,0 +1 @@
+Subproject commit e26585f45cdfd0ed3bf03f700c354f04685398c6