fixup! fix: use Annotated from typing_extensions for compatibility

odmantic/bson.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import decimal
 import re
 from dataclasses import dataclass

odmantic/field.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import abc
-from copy import deepcopy
 from typing import (
     TYPE_CHECKING,
     Any,

odmantic/model.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 import decimal
 import enum
@@ -217,7 +219,7 @@ def __validate_cls_namespace__(  # noqa C901
         config = validate_config(namespace.get("model_config", ODMConfigDict()), name)
         odm_fields: Dict[str, ODMBaseField] = {}
         references: List[str] = []
-        bson_serializers = dict[str, Callable[[Any], Any]]()
+        bson_serializers: Dict[str, Callable[[Any], Any]] = {}
         mutable_fields: Set[str] = set()
 
         # Make sure all fields are defined with type annotation

odmantic/typing.py

@@ -14,8 +14,6 @@
     TypeVar,
     Union,
     _eval_type,
-    get_args,
-    get_origin,
 )
 
 if sys.version_info < (3, 11):
@@ -31,10 +29,12 @@
 if sys.version_info < (3, 9):
     from typing import _GenericAlias as GenericAlias  # type: ignore # noqa: F401
 
-    from typing_extensions import Annotated
+    # Even if get_args and get_origin are available in typing, it's important to
+    # import them from typing_extensions to have proper origins with Annotated fields
+    from typing_extensions import Annotated, get_args, get_origin
 else:
-    from typing import Annotated  # noqa: F401
     from typing import GenericAlias  # type: ignore
+    from typing import Annotated, get_args, get_origin  # noqa: F401
 
 
 if TYPE_CHECKING:

tests/integration/test_types.py

@@ -74,7 +74,7 @@ class TypeTestCase(Generic[T]):
 
 
 def id_from_test_case(case: TypeTestCase):
-    return f"{case.python_type.__name__}|{case.bson_type}"
+    return f"{case.bson_type}"
 
 
 @pytest.mark.parametrize("case", type_test_data, ids=id_from_test_case)

tests/unit/test_model_type_validation.py

@@ -1,3 +1,4 @@
+import sys
 from typing import (
     Callable,
     Dict,
@@ -91,26 +92,34 @@ def test_mutable_types_immutables(t: Type):
     assert not is_type_mutable(t)
 
 
-@pytest.mark.parametrize(
-    "t",
-    (
-        List,
-        Set,
-        List[int],
-        Tuple[List[int]],
-        FrozenSet[Set[int]],
-        Dict[Tuple[int, ...], str],
-        DummyEmbedded,
-        Tuple[DummyEmbedded, ...],
-        Dict[str, DummyEmbedded],
-        FrozenSet[DummyEmbedded],
+TEST_TYPES = [
+    List,
+    Set,
+    List[int],
+    Tuple[List[int]],
+    FrozenSet[Set[int]],
+    Dict[Tuple[int, ...], str],
+    DummyEmbedded,
+    Tuple[DummyEmbedded, ...],
+    Dict[str, DummyEmbedded],
+    FrozenSet[DummyEmbedded],
+]
+
+# if generic with builtin types are supported add them to the list
+if sys.version_info >= (3, 9):
+    TEST_TYPES += [
         list,
         set,
         list[int],
         tuple[list[int]],
         frozenset[set[int]],
         dict[tuple[int, ...], str],
-    ),
+    ]
+
+
+@pytest.mark.parametrize(
+    "t",
+    TEST_TYPES,
 )
 def test_mutable_types_mutables(t: Type):
     assert is_type_mutable(t)