modern-di 0.4.3__tar.gz → 0.5.1__tar.gz

{modern_di-0.4.3 → modern_di-0.5.1}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.3
 Name: modern-di
-Version: 0.4.3
+Version: 0.5.1
 Summary: Dependency Injection framework with IOC-container and scopes
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io
 Author-email: Artur Shiriev <me@shiriev.ru>
 License-Expression: MIT
-License-File: LICENSE
-Keywords: dependency injector,di,ioc-container,mocks,python
+Keywords: DI,dependency injector,ioc-container,mocks,python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{modern_di-0.4.3 → modern_di-0.5.1}/modern_di/container.py

@@ -23,10 +23,6 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
         parent_container: typing.Optional["Container"] = None,
         context: dict[str, typing.Any] | None = None,
     ) -> None:
-        if scope.value != 1 and parent_container is None:
-            msg = "Only first scope can be used without parent_container"
-            raise RuntimeError(msg)
-
         self.scope = scope
         self.parent_container = parent_container
         self.context: dict[str, typing.Any] = context or {}
@@ -45,16 +41,22 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
             msg = "Enter the context first"
             raise RuntimeError(msg)
 
-    def build_child_container(self, context: dict[str, typing.Any] | None = None) -> "typing_extensions.Self":
+    def build_child_container(
+        self, context: dict[str, typing.Any] | None = None, scope: enum.IntEnum | None = None
+    ) -> "typing_extensions.Self":
         self._check_entered()
+        if scope and scope <= self.scope:
+            msg = "Scope of child container must be more than current scope"
+            raise RuntimeError(msg)
 
-        try:
-            new_scope = self.scope.__class__(self.scope.value + 1)
-        except ValueError as exc:
-            msg = f"Max scope is reached, {self.scope.name}"
-            raise RuntimeError(msg) from exc
+        if not scope:
+            try:
+                scope = self.scope.__class__(self.scope.value + 1)
+            except ValueError as exc:
+                msg = f"Max scope is reached, {self.scope.name}"
+                raise RuntimeError(msg) from exc
 
-        return self.__class__(scope=new_scope, parent_container=self, context=context)
+        return self.__class__(scope=scope, parent_container=self, context=context)
 
     def find_container(self, scope: enum.IntEnum) -> "typing_extensions.Self":
         container = self
@@ -64,6 +66,11 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
 
         while container.scope > scope and container.parent_container:
             container = typing.cast("typing_extensions.Self", container.parent_container)
+
+        if container.scope != scope:
+            msg = f"Scope {scope.name} is skipped"
+            raise RuntimeError(msg)
+
         return container
 
     def fetch_provider_state(

modern_di-0.5.1/modern_di/scope.py

@@ -0,0 +1,9 @@
+import enum
+
+
+class Scope(enum.IntEnum):
+    APP = 1
+    SESSION = 2
+    REQUEST = 3
+    ACTION = 4
+    STEP = 5

modern_di-0.5.1/pyproject.toml

@@ -0,0 +1,45 @@
+[project]
+name = "modern-di"
+description = "Dependency Injection framework with IOC-container and scopes"
+authors = [{ name = "Artur Shiriev", email = "me@shiriev.ru" }]
+requires-python = ">=3.10,<4"
+license = "MIT"
+keywords = ["DI", "dependency injector", "ioc-container", "mocks", "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",
+]
+dynamic = ["version", "readme"]
+
+[project.urls]
+repository = "https://github.com/modern-python/modern-di"
+docs = "https://modern-di.readthedocs.io"
+
+[build-system]
+requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
+raw-options.root = "../.."
+fallback-version = "0"
+
+[tool.hatch.build]
+include = ["modern_di"]
+
+[tool.hatch.metadata.hooks.fancy-pypi-readme]
+content-type = "text/markdown"
+
+[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+path = "../../README.md"
+
+[tool.pytest.ini_options]
+addopts = "--cov=. --cov-report term-missing"
+asyncio_mode = "auto"
+
+[tool.coverage.report]
+exclude_also = ["if typing.TYPE_CHECKING:"]

modern_di-0.4.3/.github/workflows/core-ci.yml

@@ -1,52 +0,0 @@
-name: core ci
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'modern_di/**'
-      - 'tests/**'
-      - '.github/workflows/core-ci.yml'
-  pull_request:
-    paths:
-      - 'modern_di/**'
-      - 'tests/**'
-      - '.github/workflows/core-ci.yml'
-
-concurrency:
-  group: ${{ github.head_ref || github.run_id }} core
-  cancel-in-progress: true
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: extractions/setup-just@v2
-      - uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: true
-          cache-dependency-glob: "pyproject.toml"
-      - run: uv python install 3.10
-      - run: just install lint-ci
-
-  pytest:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: extractions/setup-just@v2
-      - uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: true
-          cache-dependency-glob: "pyproject.toml"
-      - run: uv python install ${{ matrix.python-version }}
-      - run: just install test . --cov=. --cov-report xml

modern_di-0.4.3/.github/workflows/fastapi-ci.yml

@@ -1,54 +0,0 @@
-name: fastapi ci
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'integrations/fastapi/**'
-      - '.github/workflows/fastapi-ci.yml'
-  pull_request:
-    paths:
-      - 'integrations/fastapi/**'
-      - '.github/workflows/fastapi-ci.yml'
-
-defaults:
-  run:
-    working-directory: integrations/fastapi
-
-concurrency:
-  group: ${{ github.head_ref || github.run_id }} fastapi
-  cancel-in-progress: false
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: extractions/setup-just@v2
-      - uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: true
-          cache-dependency-glob: "pyproject.toml"
-      - run: uv python install 3.10
-      - run: just install lint-ci
-
-  pytest:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: extractions/setup-just@v2
-      - uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: true
-          cache-dependency-glob: "pyproject.toml"
-      - run: uv python install ${{ matrix.python-version }}
-      - run: just install test . --cov=. --cov-report xml

modern_di-0.4.3/.github/workflows/publish.yml

@@ -1,30 +0,0 @@
-name: Publish Package
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: extractions/setup-just@v2
-      - uses: astral-sh/setup-uv@v3
-        with:
-          enable-cache: true
-          cache-dependency-glob: "pyproject.toml"
-
-      - if: startsWith(github.ref_name, 'core')
-        run: just publish modern-di
-        env:
-          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-
-      - if: startsWith(github.ref_name, 'fastapi')
-        run: |
-          export SETUPTOOLS_SCM_PRETEND_VERSION=$(echo "${{ github.ref_name }}" | sed 's/^fastapi-//; s/-.*$//')
-          echo "SETUPTOOLS_SCM_PRETEND_VERSION=$SETUPTOOLS_SCM_PRETEND_VERSION"
-          just publish modern-di-fastapi
-        env:
-          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

modern_di-0.4.3/.readthedocs.yaml

@@ -1,13 +0,0 @@
-version: 2
-
-build:
-  os: "ubuntu-22.04"
-  tools:
-    python: "3.10"
-
-python:
-  install:
-    - requirements: docs/requirements.txt
-
-sphinx:
-  configuration: docs/conf.py

modern_di-0.4.3/Justfile

@@ -1,23 +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 tests {{ args }}
-
-publish package:
-    rm -rf dist
-    uv build --package {{package}}
-    uv publish --token $PYPI_TOKEN

modern_di-0.4.3/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 modern-python
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

modern_di-0.4.3/README.md

@@ -1,20 +0,0 @@
-"Modern-DI"
-==
-
-| Project           | Badges                                                                                                                                                                                                                                                                                          |
-|-------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| common            | [![MyPy Strict](https://img.shields.io/badge/mypy-strict-blue)](https://mypy.readthedocs.io/en/stable/getting_started.html#strict-mode-and-configuration) [![GitHub stars](https://img.shields.io/github/stars/modern-python/modern-di)](https://github.com/modern-python/modern-di/stargazers) |
-| modern-di         | [![Supported versions](https://img.shields.io/pypi/pyversions/modern-di.svg)](https://pypi.python.org/pypi/modern-di ) [![downloads](https://img.shields.io/pypi/dm/modern-di.svg)](https://pypistats.org/packages/modern-di)                                                                   |
-| modern-di-fastapi | [![Supported versions](https://img.shields.io/pypi/pyversions/modern-di-fastapi.svg)](https://pypi.python.org/pypi/modern-di-fastapi) [![downloads](https://img.shields.io/pypi/dm/modern-di-fastapi.svg)](https://pypistats.org/packages/modern-di-fastapi)                                    |
-
-Dependency injection framework for Python inspired by `dependency-injector` and `dishka`.
-
-It is in early development state and gives you the following:
-- DI framework with IOC-container and scopes.
-- Async and sync resolving.
-- Python 3.10-3.13 support.
-- Full coverage by types annotations (mypy in strict mode).
-- Overriding dependencies for tests.
-- Package with zero dependencies.
-
-📚 [Documentation](https://modern-di.readthedocs.io)

modern_di-0.4.3/docs/conf.py

@@ -1,34 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-
-# -- Project information
-project = "modern-di"
-copyright = "2024, Modern Python"
-author = "Modern Python Community"
-
-release = ""
-version = ""
-
-# -- General configuration
-extensions = [
-    "sphinx_copybutton",
-    "sphinx.ext.duration",
-    "sphinx.ext.doctest",
-    "sphinx.ext.autodoc",
-    "sphinx.ext.autosummary",
-    "sphinx.ext.intersphinx",
-    "myst_parser",
-]
-
-intersphinx_mapping = {
-    "python": ("https://docs.python.org/3/", None),
-    "sphinx": ("https://www.sphinx-doc.org/en/master/", None),
-}
-intersphinx_disabled_domains = ["std"]
-
-templates_path = ["_templates"]
-
-# -- Options for HTML output
-html_theme = "sphinx_rtd_theme"
-
-# -- Options for EPUB output
-epub_show_urls = "footnote"

modern_di-0.4.3/docs/dev/contributing.md

@@ -1,19 +0,0 @@
-# Contributing
-This is an opensource project, and we are opened to new contributors.
-
-## Getting started
-1. Make sure that you have [uv](https://docs.astral.sh/uv/) and [just](https://just.systems/) installed.
-2. Clone project:
-```
-git@github.com:modern-python/modern-di.git
-cd modern-di
-```
-3. Install dependencies running `just install`
-
-## Running linters
-`Ruff` and `mypy` are used for static analysis.
-
-Run all checks by command `just lint`
-
-## Running tests
-Run all tests by command `just test`

modern_di-0.4.3/docs/dev/development-notes.md

@@ -1,25 +0,0 @@
-# Development Notes
-## Base parts
-### Scope
-- any int enum, starting from 1 with step 1
-
-### Container
-- all states live in containers:
-  - resolved dependencies
-  - context stacks for resources
-  - overrides
-
-### Providers
-- completely stateless
-- if dependency is already saved or overridden in `Container`, returns it
-- otherwise build dependency and save it to `Container`
-- can have dependencies only the same or lower scope, check in init
-
-### Graph
-- Cannot be instantiated
-- Contains graph of `Providers`
-- Can initialize its resources and factories to container
-
-### Questions
-1. Thread-safety
-2. Configuration without global object

modern_di-0.4.3/docs/index.md

@@ -1,11 +0,0 @@
-```{include} ../README.md
-```
-
-```{eval-rst}
-.. toctree::
-    :maxdepth: 1
-    :caption: For developers
-
-    dev/development-notes
-    dev/contributing
-```

modern_di-0.4.3/docs/requirements.txt

@@ -1,4 +0,0 @@
-sphinx==7.*
-sphinx-rtd-theme==2.*
-myst-parser
-sphinx-copybutton

modern_di-0.4.3/integrations/fastapi/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-0.4.3/integrations/fastapi/README.md

@@ -1,6 +0,0 @@
-"Modern-DI-FastAPI"
-==
-
-Integration of [Modern-DI](https://github.com/modern-python/modern-di) to FastAPI
-
-📚 [Documentation](https://modern-di.readthedocs.io)

modern_di-0.4.3/integrations/fastapi/modern_di_fastapi/__init__.py

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

modern_di-0.4.3/integrations/fastapi/modern_di_fastapi/main.py

@@ -1,38 +0,0 @@
-import dataclasses
-import enum
-import typing
-
-import fastapi
-from modern_di import Container, Scope, providers
-
-
-T_co = typing.TypeVar("T_co", covariant=True)
-
-
-def setup_di(app: fastapi.FastAPI, scope: enum.IntEnum = Scope.APP) -> Container:
-    app.state.di_container = Container(scope=scope)
-    return app.state.di_container
-
-
-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:
-        yield request_container
-
-
-@dataclasses.dataclass(slots=True, frozen=True)
-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)]
-    ) -> 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
-    return typing.cast(T_co, fastapi.Depends(dependency=Dependency(dependency), use_cache=use_cache))

modern_di-0.4.3/integrations/fastapi/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-0.4.3/integrations/fastapi/tests/conftest.py

@@ -1,28 +0,0 @@
-import contextlib
-import typing
-
-import fastapi
-import httpx
-import pytest
-from asgi_lifespan import LifespanManager
-
-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) -> httpx.AsyncClient:
-    return httpx.AsyncClient(transport=httpx.ASGITransport(app=app), base_url="http://test")

modern_di-0.4.3/integrations/fastapi/tests/dependencies.py

@@ -1,17 +0,0 @@
-import dataclasses
-
-import fastapi
-
-
-@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: fastapi.Request, **_: object) -> str:
-    return request.method