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

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

@@ -0,0 +1,26 @@
+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"
+      - run: just publish modern-di
+        if: startsWith(github.ref_name, 'core')
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+
+      - run: just publish modern-di-fastapi
+        if: startsWith(github.ref_name, 'fastapi')
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

{modern_di-0.4.0 → modern_di-0.4.2}/Justfile

@@ -17,7 +17,7 @@ lint-ci:
 test *args:
     uv run pytest tests {{ args }}
 
-publish:
+publish package:
     rm -rf dist
-    uv build
+    uv build --package {{package}}
     uv publish --token $PYPI_TOKEN

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: modern-di
-Version: 0.4.0
+Version: 0.4.2
 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

{modern_di-0.4.0 → modern_di-0.4.2}/integrations/fastapi/pyproject.toml

@@ -41,9 +41,6 @@ dev = [
     "asgi-lifespan",
 ]
 
-[tool.uv.sources]
-modern-di = { path = "../../" }
-
 [build-system]
 requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
@@ -52,6 +49,9 @@ build-backend = "hatchling.build"
 source = "vcs"
 fallback-version = "0"
 
+[tool.hatch.build.targets.wheel]
+packages = ["integrations/fastapi"]
+
 [tool.mypy]
 python_version = "3.10"
 strict = true

{modern_di-0.4.0 → modern_di-0.4.2}/modern_di/providers/__init__.py

@@ -1,3 +1,5 @@
+from modern_di.providers.abstract import AbstractProvider
+from modern_di.providers.context_adapter import ContextAdapter
 from modern_di.providers.dict import Dict
 from modern_di.providers.factory import Factory
 from modern_di.providers.list import List
@@ -7,6 +9,8 @@ from modern_di.providers.singleton import Singleton
 
 
 __all__ = [
+    "AbstractProvider",
+    "ContextAdapter",
     "Factory",
     "Dict",
     "List",

modern_di-0.4.2/modern_di/providers/context_adapter.py

@@ -0,0 +1,27 @@
+import enum
+import typing
+
+from modern_di import Container
+from modern_di.providers import AbstractProvider
+
+
+T_co = typing.TypeVar("T_co", covariant=True)
+P = typing.ParamSpec("P")
+
+
+class ContextAdapter(AbstractProvider[T_co]):
+    __slots__ = [*AbstractProvider.BASE_SLOTS, "_function"]
+
+    def __init__(
+        self,
+        scope: enum.IntEnum,
+        function: typing.Callable[..., T_co],
+    ) -> None:
+        super().__init__(scope)
+        self._function = function
+
+    async def async_resolve(self, container: Container) -> T_co:
+        return self._function(**container.find_container(self.scope).context)
+
+    def sync_resolve(self, container: Container) -> T_co:
+        return self._function(**container.find_container(self.scope).context)

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

@@ -35,6 +35,12 @@ dev = [
     "typing-extensions",
 ]
 
+[tool.uv.workspace]
+members = ["integrations/*"]
+
+[tool.uv.sources]
+modern-di = { workspace = true }
+
 [build-system]
 requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"

modern_di-0.4.2/tests/providers/test_context_adapter.py

@@ -0,0 +1,30 @@
+import datetime
+
+from modern_di import Container, Scope, providers
+
+
+def context_adapter_function(*, now: datetime.datetime, **_: object) -> datetime.datetime:
+    return now
+
+
+context_adapter = providers.ContextAdapter(Scope.APP, context_adapter_function)
+request_context_adapter = providers.ContextAdapter(Scope.REQUEST, context_adapter_function)
+
+
+async def test_context_adapter() -> None:
+    now = datetime.datetime.now(tz=datetime.timezone.utc)
+    async with Container(scope=Scope.APP, context={"now": now}) as app_container:
+        instance1 = await context_adapter.async_resolve(app_container)
+        instance2 = context_adapter.sync_resolve(app_container)
+        assert instance1 is instance2 is now
+
+
+async def test_context_adapter_in_request_scope() -> None:
+    now = datetime.datetime.now(tz=datetime.timezone.utc)
+    async with (
+        Container(scope=Scope.APP) as app_container,
+        app_container.build_child_container(context={"now": now}) as request_container,
+    ):
+        instance1 = await request_context_adapter.async_resolve(request_container)
+        instance2 = request_context_adapter.sync_resolve(request_container)
+        assert instance1 is instance2 is now

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

@@ -1,41 +0,0 @@
-name: Publish Package
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  publish-core:
-    if: startsWith(github.ref_name, 'core')
-    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: just publish
-        env:
-          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-
-  publish-fastapi:
-    if: startsWith(github.ref_name, 'fastapi')
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: integrations/fastapi
-    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: |
-          export SETUPTOOLS_SCM_PRETEND_VERSION=$(echo "${{ github.ref_name }}" | sed 's/^fastapi-//; s/-.*$//')
-          echo "SETUPTOOLS_SCM_PRETEND_VERSION=$SETUPTOOLS_SCM_PRETEND_VERSION"
-          just publish
-        env:
-          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

modern_di-0.4.0/integrations/fastapi/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 {{ args }}
-
-publish:
-    rm -rf dist
-    uv build
-    uv publish --token $PYPI_TOKEN