✨ Add support for PEP695 type alias syntax

sqlmodel/_compat.py

@@ -74,6 +74,9 @@ def partial_init() -> Generator[None, None, None]:
 
 
 if IS_PYDANTIC_V2:
+    if sys.version_info >= (3, 12):
+        from typing import TypeAliasType
+
     from annotated_types import MaxLen
     from pydantic import ConfigDict as BaseConfig
     from pydantic._internal._fields import PydanticMetadata
@@ -203,6 +206,8 @@ def get_sa_type_from_type_annotation(annotation: Any) -> Any:
         # Resolve Optional fields
         if annotation is None:
             raise ValueError("Missing field type")
+        if sys.version_info >= (3, 12) and isinstance(annotation, TypeAliasType):
+            annotation = annotation.__value__
         origin = get_origin(annotation)
         if origin is None:
             return annotation

tests/conftest.py

@@ -93,3 +93,6 @@ def print_mock_fixture() -> Generator[PrintMock, None, None]:
 needs_py310 = pytest.mark.skipif(
     sys.version_info < (3, 10), reason="requires python3.10+"
 )
+needs_py312 = pytest.mark.skipif(
+    sys.version_info < (3, 12), reason="requires python3.12+"
+)

tests/test_field_sa_type.py

@@ -0,0 +1,63 @@
+import sys
+from typing import Annotated, TypeAlias
+
+from sqlmodel import Field, SQLModel
+
+from tests.conftest import needs_py312
+
+
+@needs_py312
+def test_sa_type_1() -> None:
+    Type1 = str
+
+    class Hero1(SQLModel, table=True):
+        pk: int = Field(primary_key=True)
+        weapon: Type1 = "sword"
+
+
+@needs_py312
+def test_sa_type_2() -> None:
+    Type2 = Annotated[str, "Just a comment"]
+
+    class Hero(SQLModel, table=True):
+        pk: int = Field(primary_key=True)
+        weapon: Type2 = "sword"
+
+
+Type3: TypeAlias = str
+
+
+@needs_py312
+def test_sa_type_3() -> None:
+    class Hero(SQLModel, table=True):
+        pk: int = Field(primary_key=True)
+        weapon: Type3 = "sword"
+
+
+Type4: TypeAlias = Annotated[str, "Just a comment"]
+
+
+@needs_py312
+def test_sa_type_4() -> None:
+    class Hero(SQLModel, table=True):
+        pk: int = Field(primary_key=True)
+        weapon: Type4 = "sword"
+
+
+if sys.version_info >= (3, 12):
+
+    @needs_py312
+    def test_sa_type_5() -> None:
+        type Type5 = str
+
+        class Hero(SQLModel, table=True):
+            pk: int = Field(primary_key=True)
+            weapon: Type5 = "sword"
+
+    @needs_py312
+    def test_sa_type_6() -> None:
+        type Type6 = Annotated[str, "Just a comment"]
+
+        class Hero(SQLModel, table=True):
+            pk: int = Field(primary_key=True)
+            weapon: Type6 = "sword"