anydi 0.43.0__tar.gz → 0.44.1__tar.gz

{anydi-0.43.0 → anydi-0.44.1}/PKG-INFO

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

{anydi-0.43.0 → anydi-0.44.1}/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-0.43.0 → anydi-0.44.1}/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-0.43.0 → anydi-0.44.1}/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-0.43.0 → anydi-0.44.1}/anydi/ext/django/_utils.py

@@ -62,15 +62,16 @@ def register_components(container: Container) -> None:
 def inject_urlpatterns(container: Container, *, urlconf: str) -> None:
     """Auto-inject the container into views."""
     resolver = get_resolver(urlconf)
+    injected_urlpatterns = []
     for pattern in iter_urlpatterns(resolver.url_patterns):
         # Skip already injected views
-        if hasattr(pattern.callback, "_injected"):
+        if pattern.lookup_str in injected_urlpatterns:
             continue
         # Skip django-ninja views
         if pattern.lookup_str.startswith("ninja."):
             continue  # pragma: no cover
         pattern.callback = container.inject(pattern.callback)
-        pattern.callback._injected = True  # type: ignore
+        injected_urlpatterns.append(pattern.lookup_str)
 
 
 def iter_urlpatterns(

{anydi-0.43.0 → anydi-0.44.1}/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-0.43.0 → anydi-0.44.1}/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-0.43.0 → anydi-0.44.1}/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 → anydi-0.44.1}/docs/extensions/django.md

@@ -59,7 +59,6 @@ The `HelloService` will be automatically injected into the hello view through th
 `ANYDI` supports the following settings:
 
 * `CONTAINER_FACTORY: str | None` - Specifies the factory function used to create the container. If not provided, the default container factory will be utilized.
-* `STRICT_MODE: bool` - Determines the container's behavior when a dependency cannot be resolved. If set to `True`, the container will raise an exception. If `False`, it will attempt to automatically create the dependency.
 * `REGISTER_SETTINGS: bool` - If `True`, the container will register the Django settings within it.
 * `REGISTER_COMPONENTS: bool` - If `True`, the container will register Django components such as the database and cache.
 * `INJECT_URLCONF: str | Sequence[str] | None` - Specifies the URL configuration where dependencies should be injected.
@@ -148,7 +147,7 @@ from anydi import Container
 
 
 def get_container() -> Container:
-    container = Container(strict=True)
+    container = Container()
     # Add custom container configuration here
     return container
 ```

{anydi-0.43.0 → anydi-0.44.1}/docs/usage.md

@@ -145,10 +145,11 @@ assert not container.is_resolved(int)
 
     This pattern can be used while writing unit tests to ensure that each test case has a clean dependency graph.
 
-## Strict Mode
+## Auto-Registration
 
 
-`AnyDI` operates in non-strict mode by default, meaning it doesn't require explicit registration for every type. It can dynamically resolve or auto-register dependencies, simplifying setups where manual registration for each type is impractical.
+`AnyDI` doesn't require explicit registration for every type. It can dynamically resolve and auto-register dependencies,
+simplifying setups where manual registration for each type is impractical.
 
 Consider a scenario with class dependencies:
 
@@ -177,7 +178,7 @@ from typing import Iterator
 
 from anydi import Container
 
-container = Container()  # Non-strict mode
+container = Container()
 
 @container.provider(scope="singleton")
 def db() -> Iterator[Database]:
@@ -194,19 +195,6 @@ assert container.is_resolved(Repository)
 assert container.is_resolved(Database)
 ```
 
-### Enabling Strict Mode
-
-For strict checking, enable strict mode by setting `strict=True` when creating the `Container`. In strict mode, all types must be explicitly registered or have a definable provider before instantiation.
-
-```python
-container = Container(strict=True)
-
-# Raises LookupError if `Service` or dependencies aren't registered.
-_ = container.resolve(Service)
-```
-
-Here's an improved version of the documentation with some enhancements for clarity, completeness, and formatting:
-
 ### Automatic Resource Management
 
 When your class dependencies implement the context manager protocol by defining the `__enter__/__aenter__` and `__exit__/__aexit__` methods, these resources are automatically managed by the container for `singleton` and `request` scoped providers.
@@ -229,7 +217,7 @@ class Connection:
         self.disconnected = True
 
 
-container = Container(strict=False)
+container = Container()
 connection = container.resolve(Connection)
 
 assert container.is_resolved(Connection)

{anydi-0.43.0 → anydi-0.44.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "anydi"
-version = "0.43.0"
+version = "0.44.1"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
 requires-python = "~=3.9"
@@ -137,7 +137,7 @@ omit = [
 ]
 
 [tool.bumpversion]
-current_version = "0.43.0"
+current_version = "0.44.1"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.

{anydi-0.43.0 → anydi-0.44.1}/tests/ext/fastapi/app.py

@@ -10,7 +10,7 @@ from anydi.testing import TestContainer
 
 from tests.ext.fixtures import Mail, MailService, User, UserService
 
-container = TestContainer(strict=True)
+container = TestContainer()
 
 
 @container.provider(scope="singleton")

{anydi-0.43.0 → anydi-0.44.1}/tests/ext/fastapi/test_ext.py

@@ -15,7 +15,7 @@ def test_inject_param_missing_interface() -> None:
 
 
 def test_install_without_annotation() -> None:
-    container = Container(strict=True)
+    container = Container()
 
     @container.provider(scope="singleton")
     def message() -> str:
@@ -34,7 +34,7 @@ def test_install_without_annotation() -> None:
 
 
 def test_install_unknown_annotation() -> None:
-    container = Container(strict=True)
+    container = Container()
 
     app = FastAPI()
 

{anydi-0.43.0 → anydi-0.44.1}/tests/ext/faststream/test_ext.py

@@ -15,7 +15,7 @@ def test_inject_param_missing_interface() -> None:
 
 
 def test_install_without_annotation() -> None:
-    container = Container(strict=True)
+    container = Container()
 
     @container.provider(scope="singleton")
     def message() -> str:
@@ -34,7 +34,7 @@ def test_install_without_annotation() -> None:
 
 
 def test_install_unknown_annotation() -> None:
-    container = Container(strict=True)
+    container = Container()
 
     broker = RedisBroker()
 

{anydi-0.43.0 → anydi-0.44.1}/tests/ext/faststream/test_subscribers.py

@@ -18,7 +18,7 @@ class UserMessage(BaseModel):
 
 @pytest.fixture(scope="session")
 def container() -> Container:
-    container = Container(strict=True)
+    container = Container()
 
     @container.provider(scope="singleton")
     def provide_user_service() -> UserService:

{anydi-0.43.0 → anydi-0.44.1}/tests/ext/test_pytest_plugin.py

@@ -14,7 +14,7 @@ class UnknownService:
 
 @pytest.fixture(scope="module")
 def container() -> Container:
-    container = Container(strict=True)
+    container = Container()
     container.register(Service, lambda: Service(), scope="singleton")
     return container
 

{anydi-0.43.0 → anydi-0.44.1}/tests/test_container.py

@@ -1,5 +1,4 @@
 import asyncio
-import logging
 import sys
 import threading
 import uuid
@@ -35,12 +34,6 @@ def container() -> Container:
 
 
 class TestContainer:
-    def test_default_properties(self) -> None:
-        container = Container()
-
-        assert not container.strict
-        assert container.default_scope == "transient"
-
     def test_register_provider(self, container: Container) -> None:
         def provider_call() -> str:
             return "test"
@@ -1319,7 +1312,7 @@ class TestContainer:
             def __init__(self, name: str) -> None:
                 self.name = name
 
-        container = Container(strict=False)
+        container = Container()
 
         instance = container.create(Component, name="test")
 
@@ -1331,7 +1324,7 @@ class TestContainer:
             def __init__(self, name: str) -> None:
                 self.name = name
 
-        container = Container(strict=False)
+        container = Container()
 
         instance = container.create(Component, name="test")
 
@@ -1343,7 +1336,7 @@ class TestContainer:
             def __init__(self, name: str) -> None:
                 self.name = name
 
-        container = Container(strict=False)
+        container = Container()
 
         with container.request_context():
             instance = container.create(Component, name="test")
@@ -1355,7 +1348,7 @@ class TestContainer:
         class Component:
             pass
 
-        container = Container(strict=False)
+        container = Container()
 
         with pytest.raises(TypeError, match="takes no arguments"):
             container.create(Component, param="test")
@@ -1366,7 +1359,7 @@ class TestContainer:
             def __init__(self, name: str) -> None:
                 self.name = name
 
-        container = Container(strict=False)
+        container = Container()
 
         instance = await container.acreate(Component, name="test")
 
@@ -1378,7 +1371,7 @@ class TestContainer:
             def __init__(self, name: str) -> None:
                 self.name = name
 
-        container = Container(strict=False)
+        container = Container()
 
         instance = await container.acreate(Component, name="test")
 
@@ -1390,7 +1383,7 @@ class TestContainer:
             def __init__(self, name: str) -> None:
                 self.name = name
 
-        container = Container(strict=False)
+        container = Container()
 
         with container.request_context():
             instance = await container.acreate(Component, name="test")
@@ -1402,7 +1395,7 @@ class TestContainer:
         class Component:
             pass
 
-        container = Container(strict=False)
+        container = Container()
 
         with pytest.raises(TypeError, match="takes no arguments"):
             await container.acreate(Component, param="test")
@@ -1426,22 +1419,6 @@ class TestContainerInjector:
 
         assert result == "service ident = 1000"
 
-    def test_inject_auto_registered_log_message(
-        self, container: Container, caplog: pytest.LogCaptureFixture
-    ) -> None:
-        with caplog.at_level(logging.DEBUG, logger="anydi"):
-
-            @container.inject
-            def handler(service: Service = auto) -> None:
-                pass
-
-            assert caplog.messages == [
-                "Cannot validate the `tests.test_container.TestContainerInjector"
-                ".test_inject_auto_registered_log_message.<locals>.handler` parameter "
-                "`service` with an annotation of `tests.fixtures.Service due to "
-                "being in non-strict mode. It will be validated at the first call."
-            ]
-
     def test_inject_missing_annotation(self, container: Container) -> None:
         def handler(name=auto) -> str:  # type: ignore[no-untyped-def]
             return name  # type: ignore[no-any-return]
@@ -1452,7 +1429,7 @@ class TestContainerInjector:
             container.inject(handler)
 
     def test_inject_unknown_dependency_using_strict_mode(self) -> None:
-        container = Container(strict=True)
+        container = Container()
 
         def handler(message: str = auto) -> None:
             pass

{anydi-0.43.0 → anydi-0.44.1}/tests/test_testing.py

@@ -20,7 +20,6 @@ class TestTestContainer:
         test_container = TestContainer.from_container(container)
 
         assert test_container.providers == container.providers
-        assert test_container.strict == container.strict
         assert test_container.default_scope == container.default_scope
 
         assert test_container.resolve(str) == "Hello, world!"
@@ -41,7 +40,7 @@ class TestTestContainer:
         assert container.resolve(str) == origin_name
 
     def test_override_instance_provider_not_registered_using_strict_mode(self) -> None:
-        container = TestContainer(strict=True)
+        container = TestContainer()
 
         with pytest.raises(
             LookupError, match="The provider interface `str` not registered."
@@ -92,7 +91,7 @@ class TestTestContainer:
             assert (await container.aresolve(str)) == overridden
 
     def test_override_registered_instance(self) -> None:
-        container = TestContainer(strict=False)
+        container = TestContainer()
         container.register(Annotated[str, "param"], lambda: "param", scope="singleton")
 
         class UserRepo:
@@ -126,7 +125,7 @@ class TestTestContainer:
             }
 
     async def test_override_instance_async_resolved(self) -> None:
-        container = TestContainer(strict=False)
+        container = TestContainer()
         container.register(Annotated[str, "param"], lambda: "param", scope="singleton")
 
         @singleton
@@ -147,7 +146,7 @@ class TestTestContainer:
             }
 
     def test_override_instance_in_strict_mode(self) -> None:
-        container = TestContainer(strict=True)
+        container = TestContainer()
 
         class Settings:
             def __init__(self, name: str) -> None:
@@ -166,7 +165,7 @@ class TestTestContainer:
         assert service.ident == "test"
 
     def test_override_instance_first(self) -> None:
-        container = TestContainer(strict=True)
+        container = TestContainer()
 
         @dataclass
         class Item:

{anydi-0.43.0 → anydi-0.44.1}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "anydi"
-version = "0.43.0"
+version = "0.44.1"
 source = { editable = "." }
 dependencies = [
     { name = "anyio" },

anydi-0.43.0/tests/ext/fastapi/test_auto_register.py

@@ -1,34 +0,0 @@
-import logging
-from typing import Any
-
-import pytest
-from fastapi import FastAPI
-
-import anydi.ext.fastapi
-from anydi import Container
-from anydi.ext.fastapi import Inject
-
-from tests.ext.fixtures import Mail, MailService
-
-
-def test_auto_register(caplog: pytest.LogCaptureFixture) -> None:
-    container = Container(strict=False)
-
-    app = FastAPI()
-
-    @app.post("/send-mail", response_model=Mail)
-    async def send_email(
-        mail_service: MailService = Inject(),
-    ) -> Any:
-        return await mail_service.send_mail(email="test@mail.com", message="test")
-
-    with caplog.at_level(logging.DEBUG, logger="anydi"):
-        anydi.ext.fastapi.install(app, container)
-
-        assert caplog.messages == [
-            "Callable `tests.ext.fastapi.test_auto_register.test_auto_register.<locals>"
-            ".send_email` injected parameter `mail_service` with an annotation of "
-            "`tests.ext.fixtures.MailService` is not registered. It will be "
-            "registered at runtime with the first call because it is running in "
-            "non-strict mode."
-        ]