anydi 0.43.0__py3-none-any.whl → 0.44.0__py3-none-any.whl

anydi/_container.py

@@ -19,11 +19,7 @@ from ._async import run_sync
 from ._context import InstanceContext
 from ._decorators import is_provided
 from ._module import ModuleDef, ModuleRegistrar
-from ._provider import (
-    Provider,
-    ProviderDef,
-    ProviderKind,
-)
+from ._provider import Provider, ProviderDef, ProviderKind
 from ._scan import PackageOrIterable, Scanner
 from ._scope import ALLOWED_SCOPES, Scope
 from ._typing import (
@@ -53,12 +49,10 @@ class Container:
         *,
         providers: Iterable[ProviderDef] | None = None,
         modules: Iterable[ModuleDef] | None = None,
-        strict: bool = False,
         default_scope: Scope = "transient",
         logger: logging.Logger | None = None,
     ) -> None:
         self._providers: dict[Any, Provider] = {}
-        self._strict = strict
         self._default_scope: Scope = default_scope
         self._logger = logger or logging.getLogger(__name__)
         self._resources: dict[str, list[Any]] = defaultdict(list)
@@ -91,11 +85,6 @@ class Container:
     # Properties
     ############################
 
-    @property
-    def strict(self) -> bool:
-        """Check if strict mode is enabled."""
-        return self._strict
-
     @property
     def default_scope(self) -> Scope:
         """Get the default scope."""
@@ -231,6 +220,10 @@ class Container:
         """Check if a provider is registered for the specified interface."""
         return interface in self._providers
 
+    def has_provider_for(self, interface: Any) -> bool:
+        """Check if a provider exists for the specified interface."""
+        return self.is_registered(interface) or is_provided(interface)
+
     def unregister(self, interface: Any) -> None:
         """Unregister a provider by interface."""
         if not self.is_registered(interface):
@@ -440,7 +433,7 @@ class Container:
         try:
             return self._get_provider(interface)
         except LookupError:
-            if self.strict or interface is inspect.Parameter.empty:
+            if interface is inspect.Parameter.empty:
                 raise
             if inspect.isclass(interface) and not is_builtin_type(interface):
                 # Try to get defined scope
@@ -464,14 +457,13 @@ class Container:
         if provider.is_resource:
             self._resources[provider.scope].remove(provider.interface)
 
+    @staticmethod
     def _parameter_has_default(
-        self, parameter: inspect.Parameter, /, **defaults: Any
+        parameter: inspect.Parameter, /, **defaults: Any
     ) -> bool:
         has_default_in_kwargs = parameter.name in defaults if defaults else False
-        has_non_strict_default = not self.strict and (
-            parameter.default is not inspect.Parameter.empty
-        )
-        return has_default_in_kwargs or has_non_strict_default
+        has_default = parameter.default is not inspect.Parameter.empty
+        return has_default_in_kwargs or has_default
 
     ############################
     # Instance Methods
@@ -822,18 +814,7 @@ class Container:
         for parameter in get_typed_parameters(call):
             if not is_marker(parameter.default):
                 continue
-            try:
-                self._validate_injected_parameter(call, parameter)
-            except LookupError as exc:
-                if not self.strict:
-                    self.logger.debug(
-                        f"Cannot validate the `{type_repr(call)}` parameter "
-                        f"`{parameter.name}` with an annotation of "
-                        f"`{type_repr(parameter.annotation)} due to being "
-                        "in non-strict mode. It will be validated at the first call."
-                    )
-                else:
-                    raise exc
+            self._validate_injected_parameter(call, parameter)
             injected_params[parameter.name] = parameter.annotation
         return injected_params
 
@@ -846,7 +827,7 @@ class Container:
                 f"Missing `{type_repr(call)}` parameter `{parameter.name}` annotation."
             )
 
-        if not self.is_registered(parameter.annotation):
+        if not self.has_provider_for(parameter.annotation):
             raise LookupError(
                 f"`{type_repr(call)}` has an unknown dependency parameter "
                 f"`{parameter.name}` with an annotation of "

anydi/ext/_utils.py

@@ -9,7 +9,6 @@ from typing import Annotated, Any, Callable
 from typing_extensions import get_args, get_origin
 
 from anydi._container import Container
-from anydi._typing import type_repr
 
 logger = logging.getLogger(__name__)
 
@@ -69,15 +68,6 @@ def patch_call_parameter(
     if not isinstance(parameter.default, HasInterface):
         return None
 
-    if not container.strict and not container.is_registered(parameter.annotation):
-        logger.debug(
-            f"Callable `{type_repr(call)}` injected parameter "
-            f"`{parameter.name}` with an annotation of "
-            f"`{type_repr(parameter.annotation)}` "
-            "is not registered. It will be registered at runtime with the "
-            "first call because it is running in non-strict mode."
-        )
-    else:
-        container._validate_injected_parameter(call, parameter)  # noqa
+    container._validate_injected_parameter(call, parameter)  # noqa
 
     parameter.default.interface = parameter.annotation

anydi/ext/django/_settings.py

@@ -8,7 +8,6 @@ from typing_extensions import TypedDict
 
 class Settings(TypedDict):
     CONTAINER_FACTORY: str | None
-    STRICT_MODE: bool
     REGISTER_SETTINGS: bool
     REGISTER_COMPONENTS: bool
     INJECT_URLCONF: str | Sequence[str] | None
@@ -19,7 +18,6 @@ class Settings(TypedDict):
 
 DEFAULTS = Settings(
     CONTAINER_FACTORY=None,
-    STRICT_MODE=False,
     REGISTER_SETTINGS=False,
     REGISTER_COMPONENTS=False,
     MODULES=[],

anydi/ext/django/apps.py

@@ -34,9 +34,7 @@ class ContainerConfig(AppConfig):
                 ) from exc
             self.container = container_factory()
         else:
-            self.container = anydi.Container(
-                strict=self.settings["STRICT_MODE"],
-            )
+            self.container = anydi.Container()
 
     def ready(self) -> None:  # noqa: C901
         # Register Django settings

anydi/ext/pytest_plugin.py

@@ -88,8 +88,8 @@ def _anydi_inject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
-        # Skip if the interface is not registered
-        if container.strict and not container.is_registered(interface):
+        # Skip if the interface has no provider
+        if not container.has_provider_for(interface):
             continue
 
         try:
@@ -128,8 +128,8 @@ def _anydi_ainject(
         container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
         for argname, interface in _anydi_injected_parameter_iterator():
-            # Skip if the interface is not registered
-            if container.strict and not container.is_registered(interface):
+            # Skip if the interface has no provider
+            if not container.has_provider_for(interface):
                 continue
 
             try:

anydi/testing.py

@@ -23,14 +23,12 @@ class TestContainer(Container):
         *,
         providers: Sequence[ProviderDef] | None = None,
         modules: Iterable[ModuleDef] | None = None,
-        strict: bool = False,
         default_scope: Scope = "transient",
         logger: logging.Logger | None = None,
     ) -> None:
         super().__init__(
             providers=providers,
             modules=modules,
-            strict=strict,
             default_scope=default_scope,
             logger=logger,
         )
@@ -47,7 +45,6 @@ class TestContainer(Container):
                 )
                 for provider in container.providers.values()
             ],
-            strict=container.strict,
             default_scope=container.default_scope,
             logger=container.logger,
         )
@@ -57,7 +54,7 @@ class TestContainer(Container):
         """
         Override the provider for the specified interface with a specific instance.
         """
-        if not self.is_registered(interface) and self.strict:
+        if not self.has_provider_for(interface):
             raise LookupError(
                 f"The provider interface `{type_repr(interface)}` not registered."
             )

{anydi-0.43.0.dist-info → anydi-0.44.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.43.0
+Version: 0.44.0
 Summary: Dependency Injection library
 Project-URL: Repository, https://github.com/antonrh/anydi
 Author-email: Anton Ruhlov <antonruhlov@gmail.com>

{anydi-0.43.0.dist-info → anydi-0.44.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 anydi/__init__.py,sha256=UH3N0LIw4ysoV0_EFgtDNioxEQxOmeytYbJnS8MXIXM,532
 anydi/_async.py,sha256=KhRd3RmZFcwNDzrMm8ctA1gwrg-6m_7laECTYsZdF5k,1445
-anydi/_container.py,sha256=sftWiHUTJBMQelglSbThn-Y0IeYw15vZnmC7sFqDpxQ,31529
+anydi/_container.py,sha256=lc4sT0kMgPUgJOxKEaJcNCuVZ8Lc4tS-6POOTumrCmM,30946
 anydi/_context.py,sha256=_Xy8cTpRskb4cxTd-Fe-5NnIZyBe1DnovkofhdeUfmw,3020
 anydi/_decorators.py,sha256=F3yBeGQSz1EsulZaEvYn3cd6FEjJRMoyA6u1QCbEwcs,2813
 anydi/_module.py,sha256=QPvP27JndZkwl-FYUZWscJm6yfkNzjwoFGURyDhb6Pc,2582
@@ -9,26 +9,26 @@ anydi/_scan.py,sha256=WOdsPaoRZPYw4kBzoBXyWhkiwuxY8_UjHfa0c9QFyLc,3639
 anydi/_scope.py,sha256=PFHjPb2-n0vhRo9mvD_craTFfoJBzR3y-N3_0apL5Q0,258
 anydi/_typing.py,sha256=m7KnVenDE1E420IeYz2Ocw6dhddmSFbuBBgkOXtl9pA,3709
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/testing.py,sha256=O6d6s5s7RET4CDit0ubvnV0TRuC37Z26-FV9cssZkC4,5963
+anydi/testing.py,sha256=J7W5m4nRxi8XW99pi5gqHLXfwCC0AqAtemIA1Li3x8c,5856
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/ext/_utils.py,sha256=FULK0KKLzWBQTYaUML_UCOpdCWSK5imMzzHHlOrGqjk,2554
+anydi/ext/_utils.py,sha256=QthoO0Nxv_nI-yQ9kGSi9jLLT5N71BxOgFNXwLQ5DQ0,2073
 anydi/ext/fastapi.py,sha256=q7q1hF5v4dpV3YM4L1CVuD20bXC7f5S7e1apAfekkG0,2448
 anydi/ext/faststream.py,sha256=DLZTfiGeZJCiwfmZTvVecaTlX84_jqClh6cgY2qMPJg,1910
 anydi/ext/pydantic_settings.py,sha256=8IXXLuG_OvKbvKlBkBRQUHcXgbTpgQUxeWyoMcRIUQM,1488
-anydi/ext/pytest_plugin.py,sha256=57Y1G4MOpwV43Fib88JGeRI8jACcj5Jy8R-7ZT0SZJs,4772
+anydi/ext/pytest_plugin.py,sha256=IoP6XKuGLGLd2Xlpfttc3mI4pxCm2WQLE7x_a7asbv4,4732
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
-anydi/ext/django/_settings.py,sha256=Z0RlAuXoO73oahWeMkK10w8c-4uCBde-DBpeKTV5USY,853
+anydi/ext/django/_settings.py,sha256=NsYbFBeslqw_tcXCn2b2gKnSp7eb64DM4dRc4tn_eiw,808
 anydi/ext/django/_utils.py,sha256=N1DZlY5RHxbb7TUWH-BWWC78GzUX_a1oYEZ8hT8WgaE,2663
-anydi/ext/django/apps.py,sha256=mfOLUQ1i-B4e3f5NPitbRVuVUlm4QoFzuJVXsI8zGWA,2791
+anydi/ext/django/apps.py,sha256=YLL1uU6dSQ3uf3GB0VHzPW_eLuB1j9h6pv8EdAutMqo,2725
 anydi/ext/django/middleware.py,sha256=5OUdp0OWRozyW338Sq04BDhacaFlyUTTOduS_7EwCTA,854
 anydi/ext/django/ninja/__init__.py,sha256=4J0zoHPK9itbTVrjjvLX6Ftrsb2ND8bITqNDIJzEhks,520
 anydi/ext/django/ninja/_operation.py,sha256=wk5EOjLY3KVIHk9jMCGsFsja9-dQmMOpLpHXciqxQdk,2680
 anydi/ext/django/ninja/_signature.py,sha256=UVLmKpYvH1fNb9C7ffP50KCmh0BE6unHegfss5dvpVU,2261
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=MxnzshAs-CMvjJp0r457k52MzBL8O4KAuClnF6exBdU,803
-anydi-0.43.0.dist-info/METADATA,sha256=QwACa2m9ugixipKP81nR-jASIqmk9c2W_Y3LNPYvW58,4957
-anydi-0.43.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-anydi-0.43.0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
-anydi-0.43.0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.43.0.dist-info/RECORD,,
+anydi-0.44.0.dist-info/METADATA,sha256=c5w1BMcgZzQpKFh2pQlRYq602OKr56x1kMt9gy5m31U,4957
+anydi-0.44.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+anydi-0.44.0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
+anydi-0.44.0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.44.0.dist-info/RECORD,,