Bugfix: Add enter_scope in BaseContainer.inject()

Author: xelandernt

tests/test_injection.py

@@ -1040,6 +1040,36 @@ async def _injected(val: float = Provide()) -> float:
         await _injected()
 
 
+def test_inject_with_enter_scope_enters_scope_using_container_sync() -> None:
+    def _sync_creator() -> typing.Iterator[float]:
+        yield random.random()
+
+    class _Container(BaseContainer):
+        resource = providers.ContextResource(_sync_creator).with_config(scope=ContextScopes.INJECT)
+
+    @_Container.inject(enter_scope=True)
+    def _injected(val: float = Provide[_Container.resource]) -> float:
+        assert get_current_scope() is ContextScopes.INJECT
+        return val
+
+    assert isinstance(_injected(), float)
+
+
+async def test_inject_with_enter_scope_enters_scope_using_container_async() -> None:
+    async def _async_creator() -> typing.AsyncIterator[float]:
+        yield random.random()
+
+    class _Container(BaseContainer):
+        resource = providers.ContextResource(_async_creator).with_config(scope=ContextScopes.INJECT)
+
+    @_Container.inject(enter_scope=True)
+    async def _injected(val: float = Provide[_Container.resource]) -> float:
+        assert get_current_scope() is ContextScopes.INJECT
+        return val
+
+    assert isinstance(await _injected(), float)
+
+
 def test_inject_with_enter_scope_enters_scope_sync() -> None:
     def _sync_creator() -> typing.Iterator[float]:
         yield random.random()

that_depends/meta.py

@@ -195,17 +195,21 @@ def inject(
         cls,
         *,
         scope: ContextScope | None = ContextScopes.INJECT,
+        enter_scope: bool = False,
     ) -> typing.Callable[[typing.Callable[P, T]], typing.Callable[P, T]]: ...
 
     def inject(
-        cls, func: typing.Callable[P, T] | None = None, scope: ContextScope | None = ContextScopes.INJECT
+        cls,
+        func: typing.Callable[P, T] | None = None,
+        scope: ContextScope | None = ContextScopes.INJECT,
+        enter_scope: bool = False,
     ) -> typing.Callable[P, T] | typing.Callable[[typing.Callable[P, T]], typing.Callable[P, T]]:
-        """Inject dependencies into a function.
+        """Inject dependencies from this container into a function.
 
         If your function does not use `Provide()` for dependency markers, consider using `@inject` instead.
         """
         return (
-            that_depends.inject(scope=scope, container=cls)
+            that_depends.inject(scope=scope, container=cls, enter_scope=enter_scope)
             if func is None
-            else that_depends.inject(scope=scope, container=cls)(func)
+            else that_depends.inject(scope=scope, container=cls, enter_scope=enter_scope)(func)
         )