modern-di-fastapi 0.4.0__tar.gz → 0.4.2__tar.gz

{modern_di_fastapi-0.4.0 → modern_di_fastapi-0.4.2}/PKG-INFO

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

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

{modern_di_fastapi-0.4.0 → modern_di_fastapi-0.4.2}/modern_di_fastapi/main.py

@@ -43,5 +43,5 @@ class Dependency(typing.Generic[T_co]):
         return await self.dependency.async_resolve(request_container)
 
 
-def Provide(dependency: providers.AbstractProvider[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))

{modern_di_fastapi-0.4.0 → modern_di_fastapi-0.4.2}/pyproject.toml

@@ -1,12 +1,10 @@
 [project]
 name = "modern-di-fastapi"
 description = "Modern-DI integration for FastAPI"
-authors = [
-    { name = "Artur Shiriev", email = "me@shiriev.ru" },
-]
-readme = "README.md"
+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",
@@ -16,14 +14,8 @@ classifiers = [
     "Typing :: Typed",
     "Topic :: Software Development :: Libraries",
 ]
-packages = [
-    { include = "modern_di_fastapi" },
-]
+dependencies = ["fastapi>=0.100", "modern-di"]
 dynamic = ["version"]
-dependencies = [
-    "fastapi>=0.100",
-    "modern-di",
-]
 
 [project.urls]
 repository = "https://github.com/modern-python/modern-di"
@@ -31,13 +23,13 @@ docs = "https://modern-di.readthedocs.io"
 
 [dependency-groups]
 dev = [
-    "httpx",
     "pytest",
     "pytest-cov",
     "pytest-asyncio",
     "ruff",
     "mypy",
     "typing-extensions",
+    "httpx",
     "asgi-lifespan",
 ]
 
@@ -47,41 +39,16 @@ build-backend = "hatchling.build"
 
 [tool.hatch.version]
 source = "vcs"
+raw-options.root = "../.."
 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.hatch.build]
+include = ["modern_di_fastapi"]
 
 [tool.pytest.ini_options]
 addopts = "--cov=. --cov-report term-missing"
 asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.coverage.report]
 exclude_also = ["if typing.TYPE_CHECKING:"]

modern_di_fastapi-0.4.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.4.0/modern_di_fastapi/__init__.py

@@ -1,9 +0,0 @@
-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.4.0/tests/conftest.py

@@ -1,28 +0,0 @@
-import contextlib
-import typing
-
-import fastapi
-import pytest
-from asgi_lifespan import LifespanManager
-from starlette.testclient import TestClient
-
-from modern_di_fastapi import setup_di
-
-
-@contextlib.asynccontextmanager
-async def lifespan(app_: fastapi.FastAPI) -> typing.AsyncIterator[None]:
-    container = setup_di(app_)
-    async with container:
-        yield
-
-
-@pytest.fixture
-async def app() -> typing.AsyncIterator[fastapi.FastAPI]:
-    app_ = fastapi.FastAPI(lifespan=lifespan)
-    async with LifespanManager(app_):
-        yield app_
-
-
-@pytest.fixture
-def client(app: fastapi.FastAPI) -> TestClient:
-    return TestClient(app=app)

modern_di_fastapi-0.4.0/tests/dependencies.py

@@ -1,11 +0,0 @@
-import dataclasses
-
-
-@dataclasses.dataclass(kw_only=True, slots=True)
-class SimpleCreator:
-    dep1: str
-
-
-@dataclasses.dataclass(kw_only=True, slots=True)
-class DependentCreator:
-    dep1: SimpleCreator

modern_di_fastapi-0.4.0/tests/test_routes.py

@@ -1,61 +0,0 @@
-import typing
-
-import fastapi
-import modern_di
-from modern_di import Scope, providers
-from starlette import status
-from starlette.testclient import TestClient
-
-from modern_di_fastapi import Provide, build_di_container
-from tests.dependencies import DependentCreator, SimpleCreator
-
-
-def context_adapter_function(*, request: fastapi.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)
-action_factory = providers.Factory(Scope.ACTION, DependentCreator, dep1=app_factory.cast)
-context_adapter = providers.ContextAdapter(Scope.REQUEST, context_adapter_function)
-
-
-def test_factories(client: TestClient, app: fastapi.FastAPI) -> None:
-    @app.get("/")
-    async def read_root(
-        app_factory_instance: typing.Annotated[SimpleCreator, Provide(app_factory)],
-        request_factory_instance: typing.Annotated[DependentCreator, Provide(request_factory)],
-    ) -> None:
-        assert isinstance(app_factory_instance, SimpleCreator)
-        assert isinstance(request_factory_instance, DependentCreator)
-        assert request_factory_instance.dep1 is not app_factory_instance
-
-    response = client.get("/")
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() is None
-
-
-def test_context_adapter(client: TestClient, app: fastapi.FastAPI) -> None:
-    @app.get("/")
-    async def read_root(
-        method: typing.Annotated[str, Provide(context_adapter)],
-    ) -> None:
-        assert method == "GET"
-
-    response = client.get("/")
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() is None
-
-
-def test_factories_action_scope(client: TestClient, app: fastapi.FastAPI) -> None:
-    @app.get("/")
-    async def read_root(
-        request_container: typing.Annotated[modern_di.Container, fastapi.Depends(build_di_container)],
-    ) -> None:
-        with request_container.build_child_container() as action_container:
-            action_factory_instance = action_factory.sync_resolve(action_container)
-            assert isinstance(action_factory_instance, DependentCreator)
-
-    response = client.get("/")
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() is None

modern_di_fastapi-0.4.0/tests/test_websockets.py

@@ -1,75 +0,0 @@
-import typing
-
-import fastapi
-import modern_di
-from modern_di import Scope, providers
-from starlette.testclient import TestClient
-
-from modern_di_fastapi import Provide, build_di_container
-from tests.dependencies import DependentCreator, SimpleCreator
-
-
-def context_adapter_function(*, websocket: fastapi.WebSocket, **_: object) -> str:
-    return str(websocket.scope["path"])
-
-
-app_factory = providers.Factory(Scope.APP, SimpleCreator, dep1="original")
-session_factory = providers.Factory(Scope.SESSION, DependentCreator, dep1=app_factory.cast)
-request_factory = providers.Factory(Scope.REQUEST, DependentCreator, dep1=app_factory.cast)
-context_adapter = providers.ContextAdapter(Scope.SESSION, context_adapter_function)
-
-
-async def test_factories(client: TestClient, app: fastapi.FastAPI) -> None:
-    @app.websocket("/ws")
-    async def websocket_endpoint(
-        websocket: fastapi.WebSocket,
-        app_factory_instance: typing.Annotated[SimpleCreator, Provide(app_factory)],
-        session_factory_instance: typing.Annotated[DependentCreator, Provide(session_factory)],
-    ) -> None:
-        assert isinstance(app_factory_instance, SimpleCreator)
-        assert isinstance(session_factory_instance, DependentCreator)
-        assert session_factory_instance.dep1 is not app_factory_instance
-
-        await websocket.accept()
-        await websocket.send_text("test")
-        await websocket.close()
-
-    with client.websocket_connect("/ws") as websocket:
-        data = websocket.receive_text()
-        assert data == "test"
-
-
-async def test_factories_request_scope(client: TestClient, app: fastapi.FastAPI) -> None:
-    @app.websocket("/ws")
-    async def websocket_endpoint(
-        websocket: fastapi.WebSocket,
-        session_container: typing.Annotated[modern_di.Container, fastapi.Depends(build_di_container)],
-    ) -> None:
-        with session_container.build_child_container() as request_container:
-            request_factory_instance = request_factory.sync_resolve(request_container)
-            assert isinstance(request_factory_instance, DependentCreator)
-
-        await websocket.accept()
-        await websocket.send_text("test")
-        await websocket.close()
-
-    with client.websocket_connect("/ws") as websocket:
-        data = websocket.receive_text()
-        assert data == "test"
-
-
-async def test_context_adapter(client: TestClient, app: fastapi.FastAPI) -> None:
-    @app.websocket("/ws")
-    async def websocket_endpoint(
-        websocket: fastapi.WebSocket,
-        path: typing.Annotated[str, Provide(context_adapter)],
-    ) -> None:
-        assert path == "/ws"
-
-        await websocket.accept()
-        await websocket.send_text("test")
-        await websocket.close()
-
-    with client.websocket_connect("/ws") as websocket:
-        data = websocket.receive_text()
-        assert data == "test"