fix: use Annotated from typing_extensions for compatibility

docs/img/internals.excalidraw

@@ -4157,4 +4157,4 @@
     "viewBackgroundColor": "#ffffff"
   },
   "files": {}
-}
+}

odmantic/bson.py

@@ -2,7 +2,7 @@
 import re
 from dataclasses import dataclass
 from datetime import datetime, timedelta
-from typing import Annotated, Any, Callable, Pattern, Sequence, Tuple, Type, Union
+from typing import Any, Callable, Pattern, Sequence, Tuple, Type, Union
 
 import bson
 import bson.binary
@@ -15,7 +15,7 @@
 from pydantic.main import BaseModel
 from pydantic_core import core_schema
 
-from odmantic.typing import get_args, get_origin, lenient_issubclass
+from odmantic.typing import Annotated, get_args, get_origin
 
 
 @dataclass(frozen=True)

odmantic/typing.py

@@ -15,7 +15,7 @@
     _eval_type,
 )
 
-from typing_extensions import TypeAlias
+from typing_extensions import Annotated, TypeAlias
 
 if TYPE_CHECKING:
     NoArgAnyCallable: TypeAlias = TypingCallable[[], Any]

tests/integration/test_types.py

@@ -2,18 +2,7 @@
 import re
 from datetime import datetime
 from decimal import Decimal
-from typing import (
-    Annotated,
-    Any,
-    Dict,
-    Generic,
-    List,
-    Pattern,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-)
+from typing import Any, Dict, Generic, List, Pattern, Tuple, Type, TypeVar, Union
 
 import pytest
 from bson import Binary, Decimal128, Int64, ObjectId, Regex
@@ -23,6 +12,7 @@
 from odmantic.bson import WithBsonSerializer
 from odmantic.engine import AIOEngine, SyncEngine
 from odmantic.model import Model
+from odmantic.typing import Annotated
 
 pytestmark = pytest.mark.asyncio
 

tests/unit/test_bson_fields.py

@@ -1,7 +1,7 @@
 import re
 from datetime import datetime
 from decimal import Decimal
-from typing import Annotated, Pattern
+from typing import Pattern
 
 import pytest
 import pytz
@@ -13,6 +13,7 @@
 from odmantic.bson import WithBsonSerializer
 from odmantic.field import Field
 from odmantic.model import Model
+from odmantic.typing import Annotated
 
 pytestmark = pytest.mark.asyncio