Merge branch 'release/4.5.3' into master

docs/main/changelog.rst

@@ -7,6 +7,13 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
+4.5.3
+-----
+- Fix ``4.5.2`` degradation bug in wiring ``@inject`` with not working ``FastAPI.Depends`` directive.
+  See issue `#331 <https://github.com/ets-labs/python-dependency-injector/issues/331>`_ for details.
+  Thanks to `Juan Esteban Marín <https://github.com/juanmarin96>`_ for reporting the issue.
+- Add ``FastAPI`` tests.
+
 4.5.2
 -----
 - Fix a bug in wiring ``@inject`` with not properly working ``FastAPI.Depends`` directive.

src/dependency_injector/__init__.py

@@ -1,6 +1,6 @@
 """Top-level package."""
 
-__version__ = '4.5.2'
+__version__ = '4.5.3'
 """Version number.
 
 :type: str

src/dependency_injector/wiring.py

@@ -336,7 +336,7 @@ def _fetch_reference_injections(
         if _is_fastapi_depends(marker):
             marker = marker.dependency
 
-            if not isinstance(marker, providers.Provider):
+            if not isinstance(marker, _Marker):
                 continue
 
         if isinstance(marker, Closing):

tests/unit/samples/wiringfastapi/web.py

@@ -0,0 +1,39 @@
+import sys
+
+from fastapi import FastAPI, Depends
+from fastapi.security import HTTPBasic, HTTPBasicCredentials
+from dependency_injector import containers, providers
+from dependency_injector.wiring import inject, Provide
+
+
+class Service:
+    async def process(self) -> str:
+        return 'Ok'
+
+
+class Container(containers.DeclarativeContainer):
+
+    service = providers.Factory(Service)
+
+
+app = FastAPI()
+security = HTTPBasic()
+
+
+@app.api_route('/')
+@inject
+async def index(service: Service = Depends(Provide[Container.service])):
+    result = await service.process()
+    return {'result': result}
+
+
+@app.get('/auth')
+@inject
+def read_current_user(
+        credentials: HTTPBasicCredentials = Depends(security)
+):
+    return {'username': credentials.username, 'password': credentials.password}
+
+
+container = Container()
+container.wire(modules=[sys.modules[__name__]])

tests/unit/wiring/test_wiringfastapi_py36.py

@@ -0,0 +1,96 @@
+import asyncio
+import contextlib
+import gc
+import unittest
+from unittest import mock
+
+from httpx import AsyncClient
+
+# Runtime import to avoid syntax errors in samples on Python < 3.5
+import os
+_SAMPLES_DIR = os.path.abspath(
+    os.path.sep.join((
+        os.path.dirname(__file__),
+        '../samples/',
+    )),
+)
+import sys
+sys.path.append(_SAMPLES_DIR)
+
+from wiringfastapi import web
+
+
+# TODO: Refactor to use common async test case
+def setup_test_loop(
+        loop_factory=asyncio.new_event_loop
+) -> asyncio.AbstractEventLoop:
+    loop = loop_factory()
+    try:
+        module = loop.__class__.__module__
+        skip_watcher = 'uvloop' in module
+    except AttributeError:  # pragma: no cover
+        # Just in case
+        skip_watcher = True
+    asyncio.set_event_loop(loop)
+    if sys.platform != "win32" and not skip_watcher:
+        policy = asyncio.get_event_loop_policy()
+        watcher = asyncio.SafeChildWatcher()  # type: ignore
+        watcher.attach_loop(loop)
+        with contextlib.suppress(NotImplementedError):
+            policy.set_child_watcher(watcher)
+    return loop
+
+
+def teardown_test_loop(loop: asyncio.AbstractEventLoop,
+                       fast: bool=False) -> None:
+    closed = loop.is_closed()
+    if not closed:
+        loop.call_soon(loop.stop)
+        loop.run_forever()
+        loop.close()
+
+    if not fast:
+        gc.collect()
+
+    asyncio.set_event_loop(None)
+
+
+class AsyncTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.loop = setup_test_loop()
+
+    def tearDown(self):
+        teardown_test_loop(self.loop)
+
+    def _run(self, f):
+        return self.loop.run_until_complete(f)
+
+
+class WiringFastAPITest(AsyncTestCase):
+
+    client: AsyncClient
+
+    def setUp(self) -> None:
+        super().setUp()
+        self.client = AsyncClient(app=web.app, base_url='http://test')
+
+    def tearDown(self) -> None:
+        self._run(self.client.aclose())
+        super().tearDown()
+
+    def test_depends_marker_injection(self):
+        class ServiceMock:
+            async def process(self):
+                return 'Foo'
+
+        with web.container.service.override(ServiceMock()):
+            response = self._run(self.client.get('/'))
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {'result': 'Foo'})
+
+    def test_depends_injection(self):
+        response = self._run(self.client.get('/auth', auth=('john_smith', 'secret')))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {'username': 'john_smith', 'password': 'secret'})

tox.ini

@@ -7,6 +7,8 @@ deps=
     unittest2
     # TODO: Hotfix, remove when fixed https://github.com/aio-libs/aiohttp/issues/5107
     typing_extensions
+    httpx
+    fastapi
 extras=
     yaml
     flask
@@ -47,6 +49,8 @@ commands=
     unit2 discover -s tests/unit -p test_*_py3.py
 
 [testenv:py35]
+deps=
+    unittest2
 extras=
     yaml
     flask