anydi 0.55.0__tar.gz → 0.55.1__tar.gz

{anydi-0.55.0 → anydi-0.55.1}/PKG-INFO

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

{anydi-0.55.0 → anydi-0.55.1}/anydi/_container.py

@@ -339,6 +339,7 @@ class Container:
                     default=default,
                     has_default=has_default,
                     provider=sub_provider,
+                    shared_scope=sub_provider.scope == scope and scope != "transient",
                 )
             )
 
@@ -389,10 +390,10 @@ class Container:
     @staticmethod
     def _validate_provider_scope(scope: Scope, name: str, is_resource: bool) -> None:
         """Validate the provider scope."""
-        if scope not in (allowed_scopes := get_args(Scope)):
+        if scope not in ALLOWED_SCOPES:
             raise ValueError(
                 f"The provider `{name}` scope is invalid. Only the following "
-                f"scopes are supported: {', '.join(allowed_scopes)}. "
+                f"scopes are supported: {', '.join(ALLOWED_SCOPES)}. "
                 "Please use one of the supported scopes when registering a provider."
             )
         if scope == "transient" and is_resource:

{anydi-0.55.0 → anydi-0.55.1}/anydi/_provider.py

@@ -40,6 +40,7 @@ class ProviderParameter:
     default: Any
     has_default: bool
     provider: Provider | None = None
+    shared_scope: bool = False
 
 
 @dataclass(frozen=True, slots=True)

{anydi-0.55.0 → anydi-0.55.1}/anydi/_resolver.py

@@ -81,6 +81,7 @@ class Resolver:
         param_defaults: list[Any] = [None] * num_params
         param_has_default: list[bool] = [False] * num_params
         param_names: list[str] = [""] * num_params
+        param_shared_scopes: list[bool] = [False] * num_params
         unresolved_messages: list[str] = [""] * num_params
 
         cache = self._async_cache if is_async else self._cache
@@ -90,6 +91,7 @@ class Resolver:
             param_defaults[idx] = p.default
             param_has_default[idx] = p.has_default
             param_names[idx] = p.name
+            param_shared_scopes[idx] = p.shared_scope
 
             if p.provider is not None:
                 compiled = cache.get(p.provider.interface)
@@ -191,7 +193,8 @@ class Resolver:
                     )
                     create_lines.append(
                         f"                    arg_{idx} = "
-                        f"await compiled[0](container, context)"
+                        f"await compiled[0](container, "
+                        f"context if _param_shared_scopes[{idx}] else None)"
                     )
                 else:
                     create_lines.append(
@@ -212,7 +215,8 @@ class Resolver:
                     )
                     create_lines.append(
                         f"                    arg_{idx} = "
-                        f"compiled[0](container, context)"
+                        f"compiled[0](container, "
+                        f"context if _param_shared_scopes[{idx}] else None)"
                     )
                 create_lines.append("                except LookupError:")
                 create_lines.append(
@@ -227,11 +231,14 @@ class Resolver:
                 if is_async:
                     create_lines.append(
                         f"                arg_{idx} = await resolver("
-                        f"container, context)"
+                        f"container, "
+                        f"context if _param_shared_scopes[{idx}] else None)"
                     )
                 else:
                     create_lines.append(
-                        f"                arg_{idx} = resolver(container, context)"
+                        f"                arg_{idx} = resolver("
+                        f"container, "
+                        f"context if _param_shared_scopes[{idx}] else None)"
                     )
                 create_lines.append("        else:")
                 create_lines.append(f"            arg_{idx} = cached")
@@ -539,6 +546,7 @@ class Resolver:
             "_param_defaults": param_defaults,
             "_param_has_default": param_has_default,
             "_param_resolvers": param_resolvers,
+            "_param_shared_scopes": param_shared_scopes,
             "_unresolved_messages": unresolved_messages,
             "_unresolved_interfaces": self._unresolved_interfaces,
             "_NOT_SET": NOT_SET,

{anydi-0.55.0 → anydi-0.55.1}/pyproject.toml

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