Added python 3.10 typing support.

Signed-off-by: Pavel Kirilin <win10@list.ru>

Author: s3rius

aiohttp_deps/swagger.py

@@ -1,11 +1,11 @@
 import inspect
 from collections import defaultdict
 from logging import getLogger
-from typing import Any, Awaitable, Callable, Dict, Optional, Union
+from typing import Any, Awaitable, Callable, Dict, Optional, get_type_hints
 
 import pydantic
 from aiohttp import web
-from pydantic.utils import deep_update
+from deepmerge import always_merger
 from taskiq_dependencies import DependencyGraph
 
 from aiohttp_deps.initializer import InjectableFuncHandler, InjectableViewHandler
@@ -67,16 +67,11 @@ def _is_optional(annotation: Optional[inspect.Parameter]) -> bool:
     if annotation is None or annotation.annotation == annotation.empty:
         return True
 
-    origin = getattr(annotation.annotation, "__origin__", None)
-    if origin is None:
-        return False
+    def dummy(_var: annotation.annotation) -> None:  # type: ignore
+        """Dummy function to use for type resolution."""
 
-    if origin == Union:
-        args = getattr(annotation.annotation, "__args__", ())
-        for arg in args:
-            if arg is type(None):  # noqa: E721, WPS516
-                return True
-    return False
+    var = get_type_hints(dummy).get("_var")
+    return var == Optional[var]
 
 
 def _add_route_def(  # noqa: C901
@@ -148,7 +143,7 @@ def _add_route_def(  # noqa: C901
             )
 
     openapi_schema["paths"][route.resource.canonical].update(
-        {method.lower(): deep_update(route_info, extra_openapi)},
+        {method.lower(): always_merger.merge(route_info, extra_openapi)},
     )
 
 

poetry.lock

@@ -28,6 +28,7 @@ python = "^3.8.1"
 aiohttp = "^3"
 taskiq-dependencies = "^1"
 pydantic = "^2"
+deepmerge = "^1.1.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.1.2"

pyproject.toml

@@ -1,8 +1,6 @@
 import inspect
 from typing import Optional, Union
 
-import pytest
-
 from aiohttp_deps.swagger import _is_optional
 
 
@@ -42,7 +40,7 @@ def tfunc(param: Union[int, str]):
     assert not _is_optional(param)
 
 
-@pytest.mark.skip("We doesn't support 3.10 annotation style yet.")
+# @pytest.mark.skip("We doesn't support 3.10 annotation style yet.")
 def test_new_type_style():
     def tfunc(param: "int | None"):
         """Nothing."""
@@ -52,7 +50,6 @@ def tfunc(param: "int | None"):
     assert _is_optional(param)
 
 
-@pytest.mark.skip("We doesn't support string annotations yet.")
 def test_string_annotation():
     def tfunc(param: "int | None"):
         """Nothing."""