modern-di-fastapi 0.6.0__tar.gz → 1.0.0__tar.gz

{modern_di_fastapi-0.6.0 → modern_di_fastapi-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-fastapi
-Version: 0.6.0
+Version: 1.0.0
 Summary: Modern-DI integration for FastAPI
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io
@@ -11,11 +11,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Typing :: Typed
 Requires-Python: <4,>=3.10
 Requires-Dist: fastapi>=0.100
-Requires-Dist: modern-di
+Requires-Dist: modern-di>=1.0.0alpha
 Description-Content-Type: text/markdown
 
 "Modern-DI-FastAPI"

{modern_di_fastapi-0.6.0 → modern_di_fastapi-1.0.0}/modern_di_fastapi/main.py

@@ -1,19 +1,18 @@
 import contextlib
 import dataclasses
-import enum
 import typing
 
 import fastapi
 from fastapi.routing import _merge_lifespan_context
-from modern_di import Container, Scope, providers
+from modern_di import AsyncContainer, Scope, providers
 from starlette.requests import HTTPConnection
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
-def fetch_di_container(app_: fastapi.FastAPI) -> Container:
-    return typing.cast(Container, app_.state.di_container)
+def fetch_di_container(app_: fastapi.FastAPI) -> AsyncContainer:
+    return typing.cast(AsyncContainer, app_.state.di_container)
 
 
 @contextlib.asynccontextmanager
@@ -22,9 +21,7 @@ async def _lifespan_manager(app_: fastapi.FastAPI) -> typing.AsyncIterator[None]
         yield
 
 
-def setup_di(app: fastapi.FastAPI, scope: enum.IntEnum = Scope.APP, container: Container | None = None) -> Container:
-    if not container:
-        container = Container(scope=scope)
+def setup_di(app: fastapi.FastAPI, container: AsyncContainer) -> AsyncContainer:
     app.state.di_container = container
     old_lifespan_manager = app.router.lifespan_context
     app.router.lifespan_context = _merge_lifespan_context(
@@ -34,29 +31,31 @@ def setup_di(app: fastapi.FastAPI, scope: enum.IntEnum = Scope.APP, container: C
     return container
 
 
-async def build_di_container(connection: HTTPConnection) -> typing.AsyncIterator[Container]:
-    context: dict[str, typing.Any] = {}
+async def build_di_container(connection: HTTPConnection) -> typing.AsyncIterator[AsyncContainer]:
+    context: dict[type[typing.Any], typing.Any] = {}
     scope: Scope | None = None
     if isinstance(connection, fastapi.Request):
         scope = Scope.REQUEST
-        context["request"] = connection
+        context[fastapi.Request] = connection
     elif isinstance(connection, fastapi.WebSocket):
-        context["websocket"] = connection
+        context[fastapi.WebSocket] = connection
         scope = Scope.SESSION
-    container: Container = fetch_di_container(connection.app)
+    container: AsyncContainer = fetch_di_container(connection.app)
     async with container.build_child_container(context=context, scope=scope) as request_container:
         yield request_container
 
 
 @dataclasses.dataclass(slots=True, frozen=True)
 class Dependency(typing.Generic[T_co]):
-    dependency: providers.AbstractProvider[T_co]
+    dependency: providers.AbstractProvider[T_co] | type[T_co]
 
     async def __call__(
-        self, request_container: typing.Annotated[Container, fastapi.Depends(build_di_container)]
+        self, request_container: typing.Annotated[AsyncContainer, fastapi.Depends(build_di_container)]
     ) -> T_co:
-        return await self.dependency.async_resolve(request_container)
+        if isinstance(self.dependency, providers.AbstractProvider):
+            return await request_container.resolve_provider(self.dependency)
+        return await request_container.resolve(dependency_type=self.dependency)
 
 
-def FromDI(dependency: providers.AbstractProvider[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802
+def FromDI(dependency: providers.AbstractProvider[T_co] | type[T_co], *, use_cache: bool = True) -> T_co:  # noqa: N802
     return typing.cast(T_co, fastapi.Depends(dependency=Dependency(dependency), use_cache=use_cache))

{modern_di_fastapi-0.6.0 → modern_di_fastapi-1.0.0}/pyproject.toml

@@ -11,11 +11,12 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Typing :: Typed",
     "Topic :: Software Development :: Libraries",
 ]
-dependencies = ["fastapi>=0.100", "modern-di"]
-dynamic = ["version"]
+dependencies = ["fastapi>=0.100", "modern-di>=1.0.0alpha"]
+version = "1.0.0"
 
 [project.urls]
 repository = "https://github.com/modern-python/modern-di"
@@ -33,14 +34,9 @@ dev = [
 ]
 
 [build-system]
-requires = ["hatchling", "hatch-vcs"]
+requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.hatch.version]
-source = "vcs"
-raw-options.root = "../.."
-fallback-version = "0"
-
 [tool.hatch.build]
 include = ["modern_di_fastapi"]