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

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

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

{modern_di-0.4.0 → modern_di-0.4.1}/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"

{modern_di-0.4.0 → modern_di-0.4.1}/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.1/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.1}/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.1/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