modern-di-fastapi 0.3.0__tar.gz → 0.4.1__tar.gz

{modern_di_fastapi-0.3.0 → modern_di_fastapi-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: modern-di-fastapi
-Version: 0.3.0
+Version: 0.4.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.4.1/modern_di_fastapi/__init__.py

@@ -0,0 +1,9 @@
+from modern_di_fastapi.main import Provide, build_di_container, fetch_di_container, setup_di
+
+
+__all__ = [
+    "Provide",
+    "build_di_container",
+    "fetch_di_container",
+    "setup_di",
+]

{modern_di_fastapi-0.3.0 → modern_di_fastapi-0.4.1}/modern_di_fastapi/main.py

@@ -1,15 +1,17 @@
 import dataclasses
+import enum
 import typing
 
 import fastapi
 from modern_di import Container, Scope, providers
+from starlette.requests import HTTPConnection
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
-def setup_di(app: fastapi.FastAPI) -> Container:
-    app.state.di_container = Container(scope=Scope.APP)
+def setup_di(app: fastapi.FastAPI, scope: enum.IntEnum = Scope.APP) -> Container:
+    app.state.di_container = Container(scope=scope)
     return app.state.di_container
 
 
@@ -17,9 +19,17 @@ def fetch_di_container(app: fastapi.FastAPI) -> Container:
     return typing.cast(Container, app.state.di_container)
 
 
-async def _build_request_container(request: fastapi.Request) -> typing.AsyncIterator[Container]:
-    container: Container = fetch_di_container(request.app)
-    async with container.build_child_container(context={"request": request}) as request_container:
+async def build_di_container(connection: HTTPConnection) -> typing.AsyncIterator[Container]:
+    context: dict[str, typing.Any] = {}
+    scope: Scope | None = None
+    if isinstance(connection, fastapi.Request):
+        scope = Scope.REQUEST
+        context["request"] = connection
+    elif isinstance(connection, fastapi.WebSocket):
+        context["websocket"] = connection
+        scope = Scope.SESSION
+    container: Container = fetch_di_container(connection.app)
+    async with container.build_child_container(context=context, scope=scope) as request_container:
         yield request_container
 
 
@@ -28,7 +38,7 @@ class Dependency(typing.Generic[T_co]):
     dependency: providers.AbstractProvider[T_co]
 
     async def __call__(
-        self, request_container: typing.Annotated[Container, fastapi.Depends(_build_request_container)]
+        self, request_container: typing.Annotated[Container, fastapi.Depends(build_di_container)]
     ) -> T_co:
         return await self.dependency.async_resolve(request_container)
 

modern_di_fastapi-0.4.1/pyproject.toml

@@ -0,0 +1,44 @@
+[project]
+name = "modern-di-fastapi"
+description = "Modern-DI integration for FastAPI"
+authors = [{ name = "Artur Shiriev", email = "me@shiriev.ru" }]
+requires-python = ">=3.10,<4"
+license = "MIT"
+readme = "README.md"
+keywords = ["DI", "dependency injector", "ioc-container", "FastAPI", "python"]
+classifiers = [
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Typing :: Typed",
+    "Topic :: Software Development :: Libraries",
+]
+dependencies = ["fastapi>=0.100", "modern-di"]
+dynamic = ["version"]
+
+[project.urls]
+repository = "https://github.com/modern-python/modern-di"
+docs = "https://modern-di.readthedocs.io"
+
+[dependency-groups]
+dev = ["httpx", "asgi-lifespan"]
+
+[build-system]
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
+raw-options.root = "../.."
+fallback-version = "0"
+
+[tool.hatch.build]
+include = ["modern_di_fastapi"]
+
+[tool.pytest.ini_options]
+addopts = "--cov=. --cov-report term-missing"
+asyncio_mode = "auto"
+
+[tool.coverage.report]
+exclude_also = ["if typing.TYPE_CHECKING:"]

modern_di_fastapi-0.3.0/Justfile

@@ -1,18 +0,0 @@
-default: install lint test
-
-install:
-    uv lock --upgrade
-    uv sync --all-extras --frozen
-
-lint:
-    uv run ruff format .
-    uv run ruff check . --fix
-    uv run mypy .
-
-lint-ci:
-    uv run ruff format . --check
-    uv run ruff check . --no-fix
-    uv run mypy .
-
-test *args:
-    uv run pytest {{ args }}

modern_di_fastapi-0.3.0/modern_di_fastapi/__init__.py

@@ -1,8 +0,0 @@
-from modern_di_fastapi.main import Provide, fetch_di_container, setup_di
-
-
-__all__ = [
-    "Provide",
-    "fetch_di_container",
-    "setup_di",
-]

modern_di_fastapi-0.3.0/pyproject.toml

@@ -1,87 +0,0 @@
-[project]
-name = "modern-di-fastapi"
-description = "Modern-DI integration for FastAPI"
-authors = [
-    { name = "Artur Shiriev", email = "me@shiriev.ru" },
-]
-readme = "README.md"
-requires-python = ">=3.10,<4"
-license = "MIT"
-keywords = ["DI", "dependency injector", "ioc-container", "FastAPI", "python"]
-classifiers = [
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Typing :: Typed",
-    "Topic :: Software Development :: Libraries",
-]
-packages = [
-    { include = "modern_di_fastapi" },
-]
-dynamic = ["version"]
-dependencies = [
-    "fastapi>=0.100",
-    "modern-di",
-]
-
-[project.urls]
-repository = "https://github.com/modern-python/modern-di"
-docs = "https://modern-di.readthedocs.io"
-
-[dependency-groups]
-dev = [
-    "httpx",
-    "pytest",
-    "pytest-cov",
-    "pytest-asyncio",
-    "ruff",
-    "mypy",
-    "typing-extensions",
-    "asgi-lifespan",
-]
-
-[build-system]
-requires = ["hatchling", "hatch-vcs"]
-build-backend = "hatchling.build"
-
-[tool.hatch.version]
-source = "vcs"
-fallback-version = "0"
-
-[tool.mypy]
-python_version = "3.10"
-strict = true
-
-[tool.ruff]
-fix = true
-unsafe-fixes = true
-line-length = 120
-target-version = "py310"
-extend-exclude = [
-    "docs",
-]
-
-[tool.ruff.lint]
-select = ["ALL"]
-ignore = [
-    "D1", # allow missing docstrings
-    "S101", # allow asserts
-    "TCH", # ignore flake8-type-checking
-    "FBT", # allow boolean args
-    "ANN101", # missing-type-self
-    "ANN102", # missing-type-cls
-    "D203", # "one-blank-line-before-class" conflicting with D211
-    "D213", # "multi-line-summary-second-line" conflicting with D212
-    "COM812", # flake8-commas "Trailing comma missing"
-    "ISC001", # flake8-implicit-str-concat
-]
-isort.lines-after-imports = 2
-isort.no-lines-before = ["standard-library", "local-folder"]
-
-[tool.pytest.ini_options]
-addopts = "--cov=. --cov-report term-missing"
-asyncio_mode = "auto"
-
-[tool.coverage.report]
-exclude_also = ["if typing.TYPE_CHECKING:"]

modern_di_fastapi-0.3.0/tests/test_fastapi_di.py

@@ -1,65 +0,0 @@
-import contextlib
-import dataclasses
-import typing
-
-import fastapi
-import httpx
-import pytest
-from asgi_lifespan import LifespanManager
-from modern_di import Scope, providers
-from starlette import status
-from starlette.requests import Request
-
-from modern_di_fastapi import Provide, setup_di
-
-
-@contextlib.asynccontextmanager
-async def lifespan(app_: fastapi.FastAPI) -> typing.AsyncIterator[None]:
-    container = setup_di(app_)
-    async with container:
-        yield
-
-
-app = fastapi.FastAPI(lifespan=lifespan)
-
-
-@dataclasses.dataclass(kw_only=True, slots=True)
-class SimpleCreator:
-    dep1: str
-
-
-@dataclasses.dataclass(kw_only=True, slots=True)
-class DependentCreator:
-    dep1: SimpleCreator
-
-
-def context_adapter_function(*, request: Request, **_: object) -> str:
-    return request.method
-
-
-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("/")
-async def read_root(
-    app_factory_instance: typing.Annotated[SimpleCreator, Provide(app_factory)],
-    request_factory_instance: typing.Annotated[DependentCreator, Provide(request_factory)],
-    method: typing.Annotated[str, Provide(context_adapter)],
-) -> str:
-    assert isinstance(app_factory_instance, SimpleCreator)
-    assert isinstance(request_factory_instance, DependentCreator)
-    return method
-
-
-@pytest.fixture(scope="session")
-async def client() -> typing.AsyncIterator[httpx.AsyncClient]:
-    async with LifespanManager(app):
-        yield httpx.AsyncClient(transport=httpx.ASGITransport(app=app), base_url="http://test")
-
-
-async def test_read_main(client: httpx.AsyncClient) -> None:
-    response = await client.get("/")
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() == "GET"