modern-di-fastapi 0.1.0__tar.gz → 0.1.1__tar.gz

{modern_di_fastapi-0.1.0 → modern_di_fastapi-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: modern-di-fastapi
-Version: 0.1.0
+Version: 0.1.1
 Summary: Modern-DI integration for FastAPI
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io

{modern_di_fastapi-0.1.0 → modern_di_fastapi-0.1.1}/modern_di_fastapi/depends.py

@@ -2,7 +2,7 @@ import dataclasses
 import typing
 
 import fastapi
-import modern_di
+from modern_di import Container, providers
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
@@ -10,15 +10,15 @@ T_co = typing.TypeVar("T_co", covariant=True)
 
 @dataclasses.dataclass(slots=True, frozen=True)
 class Dependency(typing.Generic[T_co]):
-    dependency: modern_di.resolvers.AbstractResolver[T_co]
+    dependency: providers.AbstractProvider[T_co]
 
     async def __call__(self, request: fastapi.Request) -> T_co:
         return await self.dependency.async_resolve(request.state.modern_di_container)
 
 
-def FromDI(dependency: modern_di.resolvers.AbstractResolver[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802
+def FromDI(dependency: providers.AbstractProvider[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802
     return typing.cast(T_co, fastapi.Depends(dependency=Dependency(dependency), use_cache=use_cache))
 
 
-def setup_modern_di(container: modern_di.Container, app: fastapi.FastAPI) -> None:
+def setup_modern_di(container: Container, app: fastapi.FastAPI) -> None:
     app.state.modern_di_container = container

{modern_di_fastapi-0.1.0 → modern_di_fastapi-0.1.1}/tests/test_fastapi_di.py

@@ -7,7 +7,7 @@ import httpx
 import modern_di
 import pytest
 from asgi_lifespan import LifespanManager
-from modern_di import Scope, resolvers
+from modern_di import Scope, providers
 from starlette import status
 from starlette.requests import Request
 
@@ -41,9 +41,9 @@ def context_adapter_function(*, request: Request, **_: object) -> str:
     return request.method
 
 
-app_factory = resolvers.Factory(Scope.APP, SimpleCreator, dep1="original")
-request_factory = resolvers.Factory(Scope.REQUEST, DependentCreator, dep1=app_factory.cast)
-context_adapter = resolvers.ContextAdapter(Scope.REQUEST, context_adapter_function)
+app_factory = providers.Factory(Scope.APP, SimpleCreator, dep1="original")
+request_factory = providers.Factory(Scope.REQUEST, DependentCreator, dep1=app_factory.cast)
+context_adapter = providers.ContextAdapter(Scope.REQUEST, context_adapter_function)
 
 
 @app.get("/")