Remove unused _resolve_unresolved_provider method

aioinject/_store.py

@@ -11,8 +11,8 @@
 from types import TracebackType
 from typing import TYPE_CHECKING, Any, Literal, TypeVar
 
+from aioinject._utils import enter_context_maybe, enter_sync_context_maybe
 from aioinject.providers import DependencyLifetime
-from aioinject.utils import enter_context_maybe, enter_sync_context_maybe
 
 
 if TYPE_CHECKING:

aioinject/containers.py

@@ -21,30 +21,18 @@ def __init__(self) -> None:
         self._unresolved_providers: list[Provider[Any]] = []
         self.type_context: dict[str, type[Any]] = {}
 
-    def _resolve_unresolved_provider(self) -> None:
-        for provider in self._unresolved_providers:
-            with contextlib.suppress(NameError):
-                self._register_impl(provider)
-                self._unresolved_providers.remove(provider)
-
-    def _register_impl(self, provider: Provider[Any]) -> None:
+    def register(
+        self,
+        provider: Provider[Any],
+    ) -> None:
         provider_type = provider.resolve_type(self.type_context)
         if provider_type in self.providers:
             msg = f"Provider for type {provider_type} is already registered"
             raise ValueError(msg)
-        self.providers[provider_type] = provider
-        if klass_name := getattr(provider_type, "__name__", None):
-            self.type_context[klass_name] = provider_type
 
-    def register(
-        self,
-        provider: Provider[Any],
-    ) -> None:
-        try:
-            self._register_impl(provider)
-        except NameError:
-            self._unresolved_providers.append(provider)
-        self._resolve_unresolved_provider()
+        self.providers[provider_type] = provider
+        if class_name := getattr(provider_type, "__name__", None):
+            self.type_context[class_name] = provider_type
 
     def get_provider(self, type_: type[_T]) -> Provider[_T]:
         try:

aioinject/ext/fastapi.py

@@ -3,7 +3,7 @@
 from collections.abc import Callable
 from typing import TYPE_CHECKING, ParamSpec, TypeVar
 
-from aioinject import decorators, utils
+from aioinject import _utils, decorators
 
 
 if TYPE_CHECKING:
@@ -20,7 +20,7 @@ def inject(function: Callable[_P, _T]) -> Callable[_P, _T]:
         function,
         inject_method=decorators.InjectMethod.context,
     )
-    return utils.clear_wrapper(wrapper)
+    return _utils.clear_wrapper(wrapper)
 
 
 class AioInjectMiddleware:

aioinject/ext/litestar.py

@@ -10,7 +10,7 @@
 from litestar.plugins import InitPluginProtocol
 from litestar.types import ASGIApp, Receive, Scope, Send
 
-from aioinject import decorators, utils
+from aioinject import _utils, decorators
 
 
 if TYPE_CHECKING:
@@ -27,7 +27,7 @@ def inject(function: Callable[_P, _T]) -> Callable[_P, _T]:
         function,
         inject_method=decorators.InjectMethod.context,
     )
-    return utils.clear_wrapper(wrapper)
+    return _utils.clear_wrapper(wrapper)
 
 
 class AioInjectMiddleware(MiddlewareProtocol):

aioinject/ext/strawberry.py

@@ -5,7 +5,7 @@
 
 from strawberry.extensions import SchemaExtension
 
-from aioinject import decorators, utils
+from aioinject import _utils, decorators
 from aioinject.context import container_var
 
 
@@ -21,7 +21,7 @@ def inject(function: Callable[_P, _T]) -> Callable[_P, _T]:
         function,
         inject_method=decorators.InjectMethod.container,
     )
-    return utils.clear_wrapper(wrapper)
+    return _utils.clear_wrapper(wrapper)
 
 
 class AioInjectExtension(SchemaExtension):

aioinject/providers.py

@@ -21,12 +21,12 @@
 
 import typing_extensions
 
-from aioinject.markers import Inject
-from aioinject.utils import (
+from aioinject._utils import (
     _get_type_hints,
     is_context_manager_function,
     remove_annotation,
 )
+from aioinject.markers import Inject
 
 
 _T = TypeVar("_T")
@@ -169,7 +169,7 @@ class Provider(Protocol[_T]):
     impl: Any
     lifetime: DependencyLifetime
     _cached_dependencies: tuple[Dependency[object], ...]
-    _cached_type: type[_T]  # TODO: I think it is redundant.
+    _cached_type: type[_T]
 
     async def provide(self, kwargs: Mapping[str, Any]) -> _T:
         ...
@@ -190,13 +190,6 @@ def resolve_type(self, context: dict[str, Any] | None = None) -> type[_T]:
             self._cached_type = self._resolve_type_impl(context)
             return self._cached_type
 
-    def type_hints(self, context: dict[str, Any] | None) -> dict[str, Any]:
-        ...
-
-    @property
-    def is_async(self) -> bool:
-        ...
-
     def resolve_dependencies(
         self,
         context: dict[str, Any] | None = None,
@@ -209,6 +202,13 @@ def resolve_dependencies(
             )
             return self._cached_dependencies
 
+    def type_hints(self, context: dict[str, Any] | None) -> dict[str, Any]:
+        ...
+
+    @property
+    def is_async(self) -> bool:
+        ...
+
     @functools.cached_property
     def is_generator(self) -> bool:
         return is_context_manager_function(self.impl)

tests/test_utils.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from aioinject.utils import enter_context_maybe, enter_sync_context_maybe
+from aioinject._utils import enter_context_maybe, enter_sync_context_maybe
 
 
 pytestmark = pytest.mark.anyio

tests/utils/test_utils.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
 from aioinject import Inject
-from aioinject.utils import get_inject_annotations
+from aioinject._utils import get_inject_annotations
 
 
 def test_inject_annotations_returns_all_inject_markers() -> None: