Merge branch 'release/1.2.4'

Author: s3rius

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "taskiq-dependencies"
-version = "1.2.3"
+version = "1.2.4"
 description = "FastAPI like dependency injection implementation"
 authors = ["Pavel Kirilin <[email protected]>"]
 readme = "README.md"

taskiq_dependencies/ctx.py

@@ -142,6 +142,8 @@ def close(self, *args: Any) -> None:  # noqa: C901
                 if exception_found:
                     try:
                         dep.throw(*args)
+                    except StopIteration:
+                        continue
                     except BaseException as exc:
                         logger.warning(
                             "Exception found on dependency teardown %s",
@@ -243,6 +245,8 @@ async def close(self, *args: Any) -> None:  # noqa: C901
                 if exception_found:
                     try:
                         dep.throw(*args)
+                    except StopIteration:
+                        continue
                     except BaseException as exc:
                         logger.warning(
                             "Exception found on dependency teardown %s",
@@ -257,6 +261,8 @@ async def close(self, *args: Any) -> None:  # noqa: C901
                 if exception_found:
                     try:
                         await dep.athrow(*args)
+                    except StopAsyncIteration:
+                        continue
                     except BaseException as exc:
                         logger.warning(
                             "Exception found on dependency teardown %s",

tests/test_graph.py

@@ -1,6 +1,6 @@
 import asyncio
 import uuid
-from typing import Any, AsyncGenerator, Generator, Generic, TypeVar
+from typing import Any, AsyncGenerator, Generator, Generic, Tuple, TypeVar
 
 import pytest
 
@@ -571,3 +571,43 @@ def target(my_dep: GenericClass[int] = Depends(func_dep)) -> int:
         result = target(**g.resolve_kwargs())
 
     assert result == 123
+
+
+@pytest.mark.anyio
+async def test_graph_type_hints() -> None:
+    def dep() -> int:
+        return 123
+
+    def target(class_val: int = Depends(dep, use_cache=False)) -> None:
+        return None
+
+    g = DependencyGraph(target=target)
+    for dep_obj in g.subgraphs.keys():
+        assert dep_obj.param_name == "class_val"
+        assert dep_obj.dependency == dep
+        assert dep_obj.signature.name == "class_val"
+        assert dep_obj.signature.annotation == int
+
+
+@pytest.mark.anyio
+async def test_graph_generic_type_hints() -> None:
+    _T = TypeVar("_T")
+
+    def dep3() -> int:
+        return 123
+
+    class GenericClass(Generic[_T]):
+        def __init__(self, class_val: int = Depends(dep3)):
+            self.return_val = class_val
+
+    def target(
+        class_val: GenericClass[Tuple[str, int]] = Depends(use_cache=False),
+    ) -> None:
+        return None
+
+    g = DependencyGraph(target=target)
+    for dep_obj in g.subgraphs.keys():
+        assert dep_obj.param_name == "class_val"
+        assert dep_obj.dependency == GenericClass[Tuple[str, int]]
+        assert dep_obj.signature.name == "class_val"
+        assert dep_obj.signature.annotation == GenericClass[Tuple[str, int]]