Merge branch 'release/1.5.3'

Author: s3rius

pyproject.toml

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

taskiq_dependencies/dependency.py

@@ -1,11 +1,10 @@
 import inspect
 import uuid
+from contextlib import _AsyncGeneratorContextManager, _GeneratorContextManager
 from typing import (
     Any,
-    AsyncContextManager,
     AsyncGenerator,
     Callable,
-    ContextManager,
     Coroutine,
     Dict,
     Generator,
@@ -21,7 +20,7 @@
 
 @overload
 def Depends(
-    dependency: Optional[Callable[..., ContextManager[_T]]] = None,
+    dependency: Optional[Callable[..., "_GeneratorContextManager[_T]"]] = None,
     *,
     use_cache: bool = True,
     kwargs: Optional[Dict[str, Any]] = None,
@@ -31,7 +30,7 @@ def Depends(
 
 @overload
 def Depends(
-    dependency: Optional[Callable[..., AsyncContextManager[_T]]] = None,
+    dependency: Optional[Callable[..., "_AsyncGeneratorContextManager[_T]"]] = None,
     *,
     use_cache: bool = True,
     kwargs: Optional[Dict[str, Any]] = None,

taskiq_dependencies/utils.py

@@ -1,5 +1,6 @@
 import inspect
 import sys
+from contextlib import _AsyncGeneratorContextManager, _GeneratorContextManager
 from typing import Any, AsyncContextManager, ContextManager, Optional
 
 if sys.version_info >= (3, 10):
@@ -38,9 +39,7 @@ def iscontextmanager(obj: Any) -> TypeGuard[ContextManager[Any]]:
     :param obj: object to check.
     :return: bool that indicates whether the object is a context manager or not.
     """
-    if not hasattr(obj, "__enter__") or not hasattr(obj, "__exit__"):
-        return False
-    return True
+    return issubclass(obj.__class__, _GeneratorContextManager)
 
 
 def isasynccontextmanager(obj: Any) -> TypeGuard[AsyncContextManager[Any]]:
@@ -50,6 +49,4 @@ def isasynccontextmanager(obj: Any) -> TypeGuard[AsyncContextManager[Any]]:
     :param obj: object to check.
     :return: bool that indicates whether the object is a async context manager or not.
     """
-    if not hasattr(obj, "__aenter__") or not hasattr(obj, "__aexit__"):
-        return False
-    return True
+    return issubclass(obj.__class__, _AsyncGeneratorContextManager)

tests/test_annotated.py

@@ -216,3 +216,74 @@ def test_func(
         assert id(value[0]) != id(value[1])
         assert isinstance(value[0], TestClass)
         assert isinstance(value[1], TestClass)
+
+
+def test_skip_not_decorated_managers() -> None:
+    """
+    Test that synct context skip context managers.
+
+    Tests that even is class implements a context manager,
+    it won't be called during the context resolution,
+    because it's not annotated with contextmanager decorator.
+    """
+
+    class TestCM:
+        def __init__(self) -> None:
+            self.opened = False
+
+        def __enter__(self) -> None:
+            self.opened = True
+
+        def __exit__(self, *args: object) -> None:
+            pass
+
+    test_cm = TestCM()
+
+    def get_test_cm() -> TestCM:
+        nonlocal test_cm
+        return test_cm
+
+    def target(cm: Annotated[TestCM, Depends(get_test_cm)]) -> None:
+        pass
+
+    graph = DependencyGraph(target=target)
+    with graph.sync_ctx() as ctx:
+        kwargs = ctx.resolve_kwargs()
+        assert kwargs["cm"] == test_cm
+        assert not test_cm.opened
+
+
+@pytest.mark.anyio
+async def test_skip_not_decorated_async_managers() -> None:
+    """
+    Test that synct context skip context managers.
+
+    Tests that even is class implements a context manager,
+    it won't be called during the context resolution,
+    because it's not annotated with contextmanager decorator.
+    """
+
+    class TestACM:
+        def __init__(self) -> None:
+            self.opened = False
+
+        async def __aenter__(self) -> None:
+            self.opened = True
+
+        async def __aexit__(self, *args: object) -> None:
+            pass
+
+    test_acm = TestACM()
+
+    def get_test_acm() -> TestACM:
+        nonlocal test_acm
+        return test_acm
+
+    def target(acm: Annotated[TestACM, Depends(get_test_acm)]) -> None:
+        pass
+
+    graph = DependencyGraph(target=target)
+    async with graph.async_ctx() as ctx:
+        kwargs = await ctx.resolve_kwargs()
+        assert kwargs["acm"] == test_acm
+        assert not test_acm.opened

tests/test_graph.py

@@ -792,3 +792,74 @@ def target(a: int = A, b: int = B) -> int:
     with graph.sync_ctx() as ctx:
         kwargs = ctx.resolve_kwargs()
         assert target(**kwargs) == 3
+
+
+def test_skip_not_decorated_managers() -> None:
+    """
+    Test that synct context skip context managers.
+
+    Tests that even is class implements a context manager,
+    it won't be called during the context resolution,
+    because it's not annotated with contextmanager decorator.
+    """
+
+    class TestCM:
+        def __init__(self) -> None:
+            self.opened = False
+
+        def __enter__(self) -> None:
+            self.opened = True
+
+        def __exit__(self, *args: object) -> None:
+            pass
+
+    test_cm = TestCM()
+
+    def get_test_cm() -> TestCM:
+        nonlocal test_cm
+        return test_cm
+
+    def target(cm: TestCM = Depends(get_test_cm)) -> None:
+        pass
+
+    graph = DependencyGraph(target=target)
+    with graph.sync_ctx() as ctx:
+        kwargs = ctx.resolve_kwargs()
+        assert kwargs["cm"] == test_cm
+        assert not test_cm.opened
+
+
+@pytest.mark.anyio
+async def test_skip_not_decorated_async_managers() -> None:
+    """
+    Test that synct context skip context managers.
+
+    Tests that even is class implements a context manager,
+    it won't be called during the context resolution,
+    because it's not annotated with contextmanager decorator.
+    """
+
+    class TestACM:
+        def __init__(self) -> None:
+            self.opened = False
+
+        async def __aenter__(self) -> None:
+            self.opened = True
+
+        async def __aexit__(self, *args: object) -> None:
+            pass
+
+    test_acm = TestACM()
+
+    def get_test_acm() -> TestACM:
+        nonlocal test_acm
+        return test_acm
+
+    def target(acm: TestACM = Depends(get_test_acm)) -> None:
+        pass
+
+    graph = DependencyGraph(target=target)
+    async with graph.async_ctx() as ctx:
+        kwargs = await ctx.resolve_kwargs()
+        assert kwargs["acm"] == test_acm
+        assert not test_acm.opened