Refactor Resource provider state management

Author: ZipFile

src/dependency_injector/_cwiring.pyx

@@ -5,7 +5,7 @@ from collections.abc import Awaitable
 from inspect import CO_ITERABLE_COROUTINE
 from types import CoroutineType, GeneratorType
 
-from .providers cimport Provider, Resource
+from .providers cimport Provider, BaseResource
 from .wiring import _Marker
 
 
@@ -54,15 +54,15 @@ cdef class DependencyResolver:
         cdef Provider provider
 
         for name, provider in self.closings.items():
-            if _is_injectable(self.kwargs, name) and isinstance(provider, Resource):
+            if _is_injectable(self.kwargs, name) and isinstance(provider, BaseResource):
                 provider.shutdown()
 
     cdef list _handle_closings_async(self):
         cdef list to_await = []
         cdef Provider provider
 
         for name, provider in self.closings.items():
-            if _is_injectable(self.kwargs, name) and isinstance(provider, Resource):
+            if _is_injectable(self.kwargs, name) and isinstance(provider, BaseResource):
                 if _isawaitable(shutdown := provider.shutdown()):
                     to_await.append(shutdown)
 

src/dependency_injector/containers.pyi

@@ -22,7 +22,7 @@ try:
 except ImportError:
     from typing_extensions import Self as _Self
 
-from .providers import Provider, Resource, Self, ProviderParent
+from .providers import Provider, BaseResource, Self, ProviderParent
 
 C_Base = TypeVar("C_Base", bound="Container")
 C = TypeVar("C", bound="DeclarativeContainer")
@@ -77,8 +77,8 @@ class Container:
         warn_unresolved: bool = False,
     ) -> None: ...
     def unwire(self) -> None: ...
-    def init_resources(self, resource_type: Type[Resource[Any]] = Resource) -> Optional[Awaitable[None]]: ...
-    def shutdown_resources(self, resource_type: Type[Resource[Any]] = Resource) -> Optional[Awaitable[None]]: ...
+    def init_resources(self, resource_type: Type[BaseResource[Any]] = BaseResource) -> Optional[Awaitable[None]]: ...
+    def shutdown_resources(self, resource_type: Type[BaseResource[Any]] = BaseResource) -> Optional[Awaitable[None]]: ...
     def load_config(self) -> None: ...
     def apply_container_providers_overridings(self) -> None: ...
     def reset_singletons(self) -> SingletonResetContext[C_Base]: ...

src/dependency_injector/containers.pyx

@@ -339,10 +339,10 @@ class DynamicContainer(Container):
         self.wired_to_modules.clear()
         self.wired_to_packages.clear()
 
-    def init_resources(self, resource_type=providers.Resource):
+    def init_resources(self, resource_type=providers.BaseResource):
         """Initialize all container resources."""
 
-        if not issubclass(resource_type, providers.Resource):
+        if not issubclass(resource_type, providers.BaseResource):
             raise TypeError("resource_type must be a subclass of Resource provider")
 
         futures = []
@@ -356,10 +356,10 @@ class DynamicContainer(Container):
         if futures:
             return asyncio.gather(*futures)
 
-    def shutdown_resources(self, resource_type=providers.Resource):
+    def shutdown_resources(self, resource_type=providers.BaseResource):
         """Shutdown all container resources."""
 
-        if not issubclass(resource_type, providers.Resource):
+        if not issubclass(resource_type, providers.BaseResource):
             raise TypeError("resource_type must be a subclass of Resource provider")
 
         def _independent_resources(resources):

src/dependency_injector/providers.pxd

@@ -224,11 +224,19 @@ cdef class Dict(Provider):
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
-cdef class Resource(Provider):
+cdef class ResourceState:
+    cdef object resource
+    cdef object shutdowner
+    cdef bint is_async
+    cdef bint async_done
+
+    cdef void from_coro(self, coro, error_callback)
+    cdef void from_async_context_manager(self, acm, error_callback)
+    cdef object from_context_manager(self, cm, error_callback)
+
+
+cdef class BaseResource(Provider):
     cdef object _provides
-    cdef bint __initialized
-    cdef object __shutdowner
-    cdef object __resource
 
     cdef tuple _args
     cdef int _args_len
@@ -237,12 +245,16 @@ cdef class Resource(Provider):
     cdef int _kwargs_len
 
     cpdef object _provide(self, tuple args, dict kwargs)
+    cdef void set_state(self, ResourceState state)
+    cdef ResourceState get_state(self)
+
+
+cdef class Resource(BaseResource):
+    cdef ResourceState _state
 
 
-cdef class ContextLocalResource(Resource):
-    cdef object _resource_context_var
-    cdef object _initialized_context_var
-    cdef object _shutdowner_context_var
+cdef class ContextLocalResource(BaseResource):
+    cdef object _cvar
 
 
 cdef class Container(Provider):

src/dependency_injector/providers.pyi

@@ -449,7 +449,7 @@ class Dict(Provider[_Dict]):
     ) -> _Self: ...
     def clear_kwargs(self) -> _Self: ...
 
-class Resource(Provider[T]):
+class BaseResource(Provider[T]):
     @overload
     def __init__(
         self,
@@ -524,7 +524,8 @@ class Resource(Provider[T]):
     def init(self) -> Optional[Awaitable[T]]: ...
     def shutdown(self) -> Optional[Awaitable]: ...
 
-class ContextLocalResource(Resource[T]):...
+class Resource(BaseResource[T]): ...
+class ContextLocalResource(BaseResource[T]):...
 
 class Container(Provider[T]):
     def __init__(