From 957051cf9a89d3171e9004f589a87ed9cc2f7322 Mon Sep 17 00:00:00 2001 From: ZipFile Date: Mon, 16 Jun 2025 06:51:59 +0000 Subject: [PATCH] Style fixes --- docs/examples/fastdepends.rst | 2 -- src/dependency_injector/wiring.py | 34 ++++++++++--------- .../unit/samples/wiringfastdepends/sample.py | 11 +++--- tests/unit/wiring/test_fastdepends.py | 4 +-- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/docs/examples/fastdepends.rst b/docs/examples/fastdepends.rst index 327ecfc7..a25292f6 100644 --- a/docs/examples/fastdepends.rst +++ b/docs/examples/fastdepends.rst @@ -48,5 +48,3 @@ Just use it within ``Depends`` container.wire(modules=[sys.modules[__name__]]) apply_coefficient(100) == 120.0 - - diff --git a/src/dependency_injector/wiring.py b/src/dependency_injector/wiring.py index ccb2cdc9..7311b76a 100644 --- a/src/dependency_injector/wiring.py +++ b/src/dependency_injector/wiring.py @@ -47,20 +47,35 @@ else: def get_origin(tp): return None + MARKER_EXTRACTORS = [] try: - from fastapi.params import Depends as FastApiDepends + from fastapi.params import Depends as FastAPIDepends except ImportError: pass else: + def extract_marker_from_fastapi(param: Any) -> Any: - if isinstance(param, FastApiDepends): + if isinstance(param, FastAPIDepends): return param.dependency return None MARKER_EXTRACTORS.append(extract_marker_from_fastapi) +try: + from fast_depends.dependencies import Depends as FastDepends +except ImportError: + pass +else: + + def extract_marker_from_fast_depends(param: Any) -> Any: + if isinstance(param, FastDepends): + return param.dependency + return None + + MARKER_EXTRACTORS.append(extract_marker_from_fast_depends) + try: import starlette.requests @@ -73,20 +88,7 @@ try: except ImportError: werkzeug = None - -try: - from fast_depends.dependencies import Depends as FastDepends -except ImportError: - pass -else: - def extract_marker_from_fast_depends(param: Any) -> Any: - if isinstance(param, FastDepends): - return param.dependency - return None - - MARKER_EXTRACTORS.append(extract_marker_from_fast_depends) - -from . import providers +from . import providers # noqa: E402 __all__ = ( "wire", diff --git a/tests/unit/samples/wiringfastdepends/sample.py b/tests/unit/samples/wiringfastdepends/sample.py index 28310052..4d2b3d61 100644 --- a/tests/unit/samples/wiringfastdepends/sample.py +++ b/tests/unit/samples/wiringfastdepends/sample.py @@ -1,10 +1,11 @@ import sys -from dependency_injector import containers, providers -from dependency_injector.wiring import inject, Provide from fast_depends import Depends from typing_extensions import Annotated +from dependency_injector import containers, providers +from dependency_injector.wiring import Provide, inject + class CoefficientService: @staticmethod @@ -27,10 +28,12 @@ def apply_coefficient( @inject def apply_coefficient_annotated( a: int, - coefficient_provider: Annotated[CoefficientService, Depends(Provide[Container.service])], + coefficient_provider: Annotated[ + CoefficientService, Depends(Provide[Container.service]) + ], ) -> float: return a * coefficient_provider.get_coefficient() container = Container() -container.wire(modules=[sys.modules[__name__]]) \ No newline at end of file +container.wire(modules=[sys.modules[__name__]]) diff --git a/tests/unit/wiring/test_fastdepends.py b/tests/unit/wiring/test_fastdepends.py index 2c326143..9c9e2ad6 100644 --- a/tests/unit/wiring/test_fastdepends.py +++ b/tests/unit/wiring/test_fastdepends.py @@ -1,5 +1,3 @@ -from dependency_injector.wiring import inject, Provide - from wiringfastdepends import sample @@ -8,4 +6,4 @@ def test_apply_coefficient() -> None: def test_apply_coefficient_annotated() -> None: - assert sample.apply_coefficient_annotated(100) == 120.0 \ No newline at end of file + assert sample.apply_coefficient_annotated(100) == 120.0