refactor: update type hints to use union syntax for optional types

Author: allmonday

src/sqlmodel_graphql/introspection.py

@@ -5,7 +5,7 @@
 import inspect
 from collections.abc import Callable
 from enum import Enum
-from typing import TYPE_CHECKING, Any, get_args, get_origin, get_type_hints
+from typing import TYPE_CHECKING, Any, get_type_hints
 
 from sqlmodel import SQLModel
 

src/sqlmodel_graphql/sdl_generator.py

@@ -6,7 +6,6 @@
 from enum import Enum
 from typing import TYPE_CHECKING, Any, get_args, get_origin, get_type_hints
 
-from pydantic import BaseModel
 from sqlmodel import SQLModel
 
 from sqlmodel_graphql.type_converter import TypeConverter

src/sqlmodel_graphql/utils/type_utils.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import Any, ParamSpec, get_args, get_origin, get_type_hints
+from typing import Any, ParamSpec, get_origin, get_type_hints
 
 from sqlmodel_graphql.type_converter import TypeConverter
 

tests/test_sdl_generator.py

@@ -166,12 +166,12 @@ def test_get_core_types_list(self) -> None:
 
     def test_get_core_types_list_of_optional(self) -> None:
         """Test extracting core types from list[Optional[T]]."""
-        result = get_core_types(list[Optional[int]])
+        result = get_core_types(list[int | None])
         assert result == [int]
 
     def test_get_core_types_nested(self) -> None:
         """Test extracting core types from nested types."""
-        result = get_core_types(list[Union[int, str, None]])
+        result = get_core_types(list[int | str | None])
         assert set(result) == {int, str}
 
     def test_get_core_types_none_in_union(self) -> None:
@@ -271,7 +271,7 @@ def test_list_optional_int(self) -> None:
         Note: Current implementation doesn't unwrap Optional inside list,
         so it falls back to String. This is a known edge case.
         """
-        result = _python_type_to_graphql(list[Optional[int]], self.converter)
+        result = _python_type_to_graphql(list[int | None], self.converter)
         # Current behavior: Optional inside list is not handled, defaults to String
         assert result == "[String!]!"
 

tests/test_type_converter.py

@@ -126,7 +126,7 @@ def test_get_list_inner_type_entity(self) -> None:
     def test_get_list_inner_type_optional(self) -> None:
         """Test getting inner type from list[Optional[int]]."""
         converter = TypeConverter({"UserForConverterTest"})
-        result = converter.get_list_inner_type(list[Optional[int]])
+        result = converter.get_list_inner_type(list[int | None])
         assert result == int
 
     def test_get_list_inner_type_empty(self) -> None:
@@ -250,7 +250,7 @@ def test_is_relationship_list_entity(self) -> None:
     def test_is_relationship_list_optional_entity(self) -> None:
         """Test detecting list of optional entities relationship."""
         converter = TypeConverter({"UserForConverterTest"})
-        assert converter.is_relationship(list[Optional[UserForConverterTest]]) is True
+        assert converter.is_relationship(list[UserForConverterTest | None]) is True
 
     def test_is_relationship_non_entity(self) -> None:
         """Test non-entity type is not a relationship."""
@@ -278,7 +278,7 @@ def test_unwrap_to_base_type_list(self) -> None:
     def test_unwrap_to_base_type_list_optional(self) -> None:
         """Test unwrapping list[Optional[T]] to T."""
         converter = TypeConverter({"UserForConverterTest"})
-        result = converter.unwrap_to_base_type(list[Optional[int]])
+        result = converter.unwrap_to_base_type(list[int | None])
         assert result == int
 
     def test_unwrap_to_base_type_entity(self) -> None:

tests/test_type_utils.py

@@ -1,6 +1,5 @@
 """Tests for type_utils module."""
 
-from typing import Optional
 
 from sqlmodel import Field, SQLModel
 
@@ -15,7 +14,7 @@ class EntityForUtilsTest(SQLModel):
 
     id: int | None = Field(default=None, primary_key=True)
     name: str
-    optional_field: Optional[str] = None
+    optional_field: str | None = None
 
 
 class AnotherEntityForUtilsTest(SQLModel):
@@ -94,7 +93,7 @@ def test_get_return_entity_type_optional_entity(self) -> None:
         class TestEntityOptional(SQLModel):
             id: int | None
 
-        def find(cls, id: int) -> Optional[TestEntityOptional]:  # type: ignore
+        def find(cls, id: int) -> TestEntityOptional | None:  # type: ignore
             return None
 
         TestEntityOptional.find = classmethod(find)  # type: ignore
@@ -157,7 +156,7 @@ def test_get_return_entity_type_list_optional(self) -> None:
         class TestEntityListOpt(SQLModel):
             id: int | None
 
-        def search(cls) -> list[Optional[TestEntityListOpt]]:  # type: ignore
+        def search(cls) -> list[TestEntityListOpt | None]:  # type: ignore
             return []
 
         TestEntityListOpt.search = classmethod(search)  # type: ignore