anydi 0.60.0__tar.gz → 0.60.2__tar.gz

{anydi-0.60.0 → anydi-0.60.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.60.0
+Version: 0.60.2
 Summary: Dependency Injection library
 Keywords: dependency injection,dependencies,di,async,asyncio,application
 Author: Anton Ruhlov

{anydi-0.60.0 → anydi-0.60.2}/anydi/_container.py

@@ -257,31 +257,52 @@ class Container:
         # Register the scope
         self._scopes[scope] = tuple({scope, "singleton"} | set(parents))
 
-    def get_ordered_scopes(self, scopes: set[Scope]) -> list[str]:
-        """Get ordered list of scopes to enter."""
-        # Expand scopes to include all parent scopes
-        expanded_scopes: set[str] = set()
-        for scope in scopes:
+    def get_context_scopes(self, scopes: set[Scope] | None = None) -> list[str]:  # noqa: C901
+        """Return scopes that require context management in dependency order."""
+        # Build execution order: singleton -> request -> custom (by depth)
+        ordered = ["singleton"]
+        custom_scopes: list[tuple[int, str]] = []
+        has_request = False
+
+        for scope, parents in self._scopes.items():
+            if scope == "singleton":
+                continue
+            if scope == "request":
+                has_request = True
+                continue
             if scope == "transient":
                 continue
-            elif scope == "singleton":
-                expanded_scopes.add("singleton")
-            else:
-                # Add the scope and all its parents from container._scopes
-                expanded_scopes.update(self._scopes[scope])
+            custom_scopes.append((len(parents), scope))
 
-        # Separate singleton from other scopes
-        has_singleton = "singleton" in expanded_scopes
-        other_scopes = expanded_scopes - {"singleton"}
+        if has_request:
+            ordered.append("request")
 
-        # Sort other scopes by dependency depth (parents before children)
-        # Scopes with fewer parents come first
-        ordered_scopes = sorted(
-            other_scopes, key=lambda scope: len(self._scopes[scope])
-        )
+        custom_scopes.sort(key=lambda item: item[0])
+        ordered.extend(scope for _, scope in custom_scopes)
+
+        # If no filter, return all scopes with contexts (transient excluded)
+        if scopes is None:
+            return ordered
+
+        # Helper to add scope with its parents to needed set
+        def add_scope_tree(needed: set[str], scope: str) -> None:
+            if scope == "singleton":
+                needed.add("singleton")
+            elif scope != "transient":
+                needed.update(self._scopes[scope])
+
+        needed_scopes: set[str] = set()
+
+        # Add injected scopes and their parents
+        for scope in scopes:
+            add_scope_tree(needed_scopes, scope)
+
+        # Add scopes with resource providers and their parents
+        for scope in ordered:
+            if self._resources.get(scope):
+                add_scope_tree(needed_scopes, scope)
 
-        # Return with singleton first if needed
-        return ["singleton", *ordered_scopes] if has_singleton else ordered_scopes
+        return [scope for scope in ordered if scope in needed_scopes]
 
     # == Provider Registry ==
 

{anydi-0.60.0 → anydi-0.60.2}/anydi/ext/typer.py

@@ -12,6 +12,7 @@ import anyio
 from typer import Typer
 
 from anydi import Container, Scope
+from anydi._decorators import is_provided
 
 __all__ = ["install"]
 
@@ -38,11 +39,12 @@ def _wrap_async_callback_with_injection(
     @functools.wraps(callback)
     def async_wrapper(*args: Any, **kwargs: Any) -> Any:
         async def _run() -> Any:
-            ordered_scopes = container.get_ordered_scopes(scopes)
+            # Get scopes for execution (injected OR have resources)
+            needed_scopes = container.get_context_scopes(scopes)
 
             async with contextlib.AsyncExitStack() as stack:
                 # Start scoped contexts in dependency order
-                for scope in ordered_scopes:
+                for scope in needed_scopes:
                     if scope == "singleton":
                         await stack.enter_async_context(container)
                     else:
@@ -60,7 +62,7 @@ def _wrap_async_callback_with_injection(
     return async_wrapper
 
 
-def _process_callback(callback: Callable[..., Any], container: Container) -> Any:
+def _process_callback(callback: Callable[..., Any], container: Container) -> Any:  # noqa: C901
     """Validate and wrap a callback for dependency injection."""
     sig = inspect.signature(callback, eval_str=True)
     injected_param_names: set[str] = set()
@@ -74,7 +76,11 @@ def _process_callback(callback: Callable[..., Any], container: Container) -> Any
         )
         if should_inject:
             injected_param_names.add(parameter.name)
-            scopes.add(container.providers[interface].scope)
+            try:
+                scopes.add(container.providers[interface].scope)
+            except KeyError:
+                if inspect.isclass(interface) and is_provided(interface):
+                    scopes.add(interface.__provided__["scope"])
         else:
             non_injected_params.add(parameter)
 
@@ -94,11 +100,12 @@ def _process_callback(callback: Callable[..., Any], container: Container) -> Any
 
     @functools.wraps(callback)
     def wrapper(*args: Any, **kwargs: Any) -> Any:
-        ordered_scopes = container.get_ordered_scopes(scopes)
+        # Get scopes for execution (injected OR have resources)
+        needed_scopes = container.get_context_scopes(scopes)
 
         with contextlib.ExitStack() as stack:
             # Start scoped contexts in dependency order
-            for scope in ordered_scopes:
+            for scope in needed_scopes:
                 if scope == "singleton":
                     stack.enter_context(container)
                 else:

{anydi-0.60.0 → anydi-0.60.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "anydi"
-version = "0.60.0"
+version = "0.60.2"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
 requires-python = ">=3.10.0, <3.15"