Ruff ANN202: fixed private function return value type annotations

Author: evertlammerts

duckdb/experimental/spark/sql/dataframe.py

@@ -698,7 +698,7 @@ def join(
                 on = str(on)
             assert isinstance(how, str), "how should be a string"
 
-            def map_to_recognized_jointype(how: str):
+            def map_to_recognized_jointype(how: str) -> str:
                 known_aliases = {
                     "inner": [],
                     "outer": ["full", "fullouter", "full_outer"],
@@ -707,15 +707,10 @@ def map_to_recognized_jointype(how: str):
                     "anti": ["leftanti", "left_anti"],
                     "semi": ["leftsemi", "left_semi"],
                 }
-                mapped_type = None
                 for type, aliases in known_aliases.items():
                     if how == type or how in aliases:
-                        mapped_type = type
-                        break
-
-                if not mapped_type:
-                    mapped_type = how
-                return mapped_type
+                        return type
+                return how
 
             how = map_to_recognized_jointype(how)
             result = self.relation.join(other.relation, on, how)

duckdb/experimental/spark/sql/functions.py

@@ -147,7 +147,7 @@ def lit(col: Any) -> Column:  # noqa: D103
     return col if isinstance(col, Column) else Column(ConstantExpression(col))
 
 
-def _invoke_function(function: str, *arguments):
+def _invoke_function(function: str, *arguments) -> Column:
     return Column(FunctionExpression(function, *arguments))
 
 

duckdb/experimental/spark/sql/session.py

@@ -31,7 +31,7 @@
 
 # data is a List of rows
 # every value in each row needs to be turned into a Value
-def _combine_data_and_schema(data: Iterable[Any], schema: StructType):
+def _combine_data_and_schema(data: Iterable[Any], schema: StructType) -> list['duckdb.Value']:
     from duckdb import Value
 
     new_data = []
@@ -82,7 +82,7 @@ def verify_tuple_integrity(tuples: list[tuple]) -> None:
         verify_tuple_integrity(data)
 
         def construct_query(tuples: Iterable) -> str:
-            def construct_values_list(row: Sized, start_param_idx: int):
+            def construct_values_list(row: Sized, start_param_idx: int) -> str:
                 parameter_count = len(row)
                 parameters = [f"${x + start_param_idx}" for x in range(parameter_count)]
                 parameters = "(" + ", ".join(parameters) + ")"
@@ -99,7 +99,7 @@ def construct_values_list(row: Sized, start_param_idx: int):
 
         query = construct_query(data)
 
-        def construct_parameters(tuples: Iterable):
+        def construct_parameters(tuples: Iterable) -> list[list]:
             parameters = []
             for row in tuples:
                 parameters.extend(list(row))

duckdb_packaging/setuptools_scm_version.py

@@ -19,7 +19,7 @@
 OVERRIDE_GIT_DESCRIBE_ENV_VAR = "OVERRIDE_GIT_DESCRIBE"
 
 
-def _main_branch_versioning():
+def _main_branch_versioning() -> bool:
     from_env = os.getenv("MAIN_BRANCH_VERSIONING")
     return from_env == "1" if from_env is not None else MAIN_BRANCH_VERSIONING
 

scripts/generate_connection_methods.py

@@ -67,7 +67,7 @@ def generate():
         "FunctionNullHandling.DEFAULT": "FunctionNullHandling::DEFAULT_NULL_HANDLING",
     }
 
-    def map_default(val):
+    def map_default(val) -> str:
         if val in DEFAULT_ARGUMENT_MAP:
             return DEFAULT_ARGUMENT_MAP[val]
         return val

scripts/generate_connection_wrapper_methods.py

@@ -124,7 +124,7 @@ def generate():
         "FunctionNullHandling.DEFAULT": "FunctionNullHandling::DEFAULT_NULL_HANDLING",
     }
 
-    def map_default(val):
+    def map_default(val) -> str:
         if val in DEFAULT_ARGUMENT_MAP:
             return DEFAULT_ARGUMENT_MAP[val]
         return val

tests/conftest.py

@@ -189,7 +189,7 @@ def __getattr__(self, name: str) -> Any:
 
 @pytest.fixture(scope="function")
 def require():
-    def _require(extension_name, db_name=""):
+    def _require(extension_name, db_name="") -> duckdb.DuckDBPyConnection | None:
         # Paths to search for extensions
 
         build = normpath(join(dirname(__file__), "../../../build/"))