anydi 0.67.1__py3-none-any.whl → 0.68.0__py3-none-any.whl

anydi/_scanner.py

@@ -33,18 +33,24 @@ class Scanner:
         self._container = container
 
     def scan(
-        self, /, packages: PackageOrIterable, *, tags: Iterable[str] | None = None
+        self,
+        /,
+        packages: PackageOrIterable,
+        *,
+        tags: Iterable[str] | None = None,
+        ignore: PackageOrIterable | None = None,
     ) -> None:
         """Scan packages or modules for decorated members and inject dependencies."""
         if isinstance(packages, (ModuleType, str)):
             packages = [packages]
 
         tags_list = list(tags) if tags else []
+        ignore_prefixes = self._normalize_ignore(ignore)
         provided_classes: list[type[Provided]] = []
         injectable_dependencies: list[ScannedDependency] = []
 
         # Single pass: collect both @provided classes and @injectable functions
-        for module in self._iter_modules(packages):
+        for module in self._iter_modules(packages, ignore_prefixes=ignore_prefixes):
             provided_classes.extend(self._scan_module_for_provided(module))
             injectable_dependencies.extend(
                 self._scan_module_for_injectable(module, tags=tags_list)
@@ -52,16 +58,47 @@ class Scanner:
 
         # First: register @provided classes
         for cls in provided_classes:
-            if not self._container.is_registered(cls):
+            dependency_type = cls.__provided__.get("dependency_type", cls)
+            if not self._container.is_registered(dependency_type):
                 scope = cls.__provided__["scope"]
-                self._container.register(cls, scope=scope)
+                from_context = cls.__provided__.get("from_context", False)
+                self._container.register(
+                    dependency_type, cls, scope=scope, from_context=from_context
+                )
 
         # Second: inject @injectable functions
         for dependency in injectable_dependencies:
             decorated = self._container.inject()(dependency.member)
             setattr(dependency.module, dependency.member.__name__, decorated)
 
-    def _iter_modules(self, packages: Iterable[Package]) -> Iterator[ModuleType]:
+    def _normalize_ignore(self, ignore: PackageOrIterable | None) -> list[str]:
+        """Normalize ignore parameter to a list of module name prefixes."""
+        if ignore is None:
+            return []
+
+        if isinstance(ignore, (ModuleType, str)):
+            ignore = [ignore]
+
+        prefixes: list[str] = []
+        for item in ignore:
+            if isinstance(item, ModuleType):
+                prefixes.append(item.__name__)
+            else:
+                prefixes.append(item)
+        return prefixes
+
+    def _should_ignore_module(
+        self, module_name: str, ignore_prefixes: list[str]
+    ) -> bool:
+        """Check if a module should be ignored based on ignore prefixes."""
+        for prefix in ignore_prefixes:
+            if module_name == prefix or module_name.startswith(prefix + "."):
+                return True
+        return False
+
+    def _iter_modules(
+        self, packages: Iterable[Package], *, ignore_prefixes: list[str]
+    ) -> Iterator[ModuleType]:
         """Iterate over all modules in the given packages."""
         for package in packages:
             if isinstance(package, str):
@@ -69,14 +106,16 @@ class Scanner:
 
             # Single module (not a package)
             if not hasattr(package, "__path__"):
-                yield package
+                if not self._should_ignore_module(package.__name__, ignore_prefixes):
+                    yield package
                 continue
 
             # Package - walk all submodules
             for module_info in pkgutil.walk_packages(
                 package.__path__, prefix=package.__name__ + "."
             ):
-                yield importlib.import_module(module_info.name)
+                if not self._should_ignore_module(module_info.name, ignore_prefixes):
+                    yield importlib.import_module(module_info.name)
 
     def _scan_module_for_provided(self, module: ModuleType) -> list[type[Provided]]:
         """Scan a module for @provided classes."""

anydi/ext/fastapi.py

@@ -35,7 +35,7 @@ class FastAPIMarker(params.Depends, Marker):
     async def _fastapi_dependency(
         self, container: Annotated[Container, Depends(get_container)]
     ) -> Any:
-        return await container.aresolve(self.interface)
+        return await container.aresolve(self.dependency_type)
 
 
 # Configure Inject() and Provide[T] to use FastAPI-specific marker at import time

anydi/ext/faststream.py

@@ -62,7 +62,7 @@ class FastStreamMarker(Dependant, Marker):
 
     async def _faststream_dependency(self, context: ContextRepo) -> Any:
         container = get_container_from_context(context)
-        return await container.aresolve(self.interface)
+        return await container.aresolve(self.dependency_type)
 
 
 # Configure Inject() and Provide[T] to use FastStream-specific marker

anydi/ext/pydantic_settings.py

@@ -26,14 +26,14 @@ def install(
         all_fields = {**settings_cls.model_fields, **settings_cls.model_computed_fields}
         for setting_name, field_info in all_fields.items():
             if isinstance(field_info, ComputedFieldInfo):
-                interface = field_info.return_type
+                origin = field_info.return_type
             elif isinstance(field_info, FieldInfo):
-                interface = field_info.annotation
+                origin = field_info.annotation
             else:
                 continue
 
             container.register(
-                Annotated[interface, f"{prefix}{setting_name}"],
+                Annotated[origin, f"{prefix}{setting_name}"],
                 _get_setting_value(getattr(_settings, setting_name)),
                 scope="singleton",
             )

anydi/ext/pytest_plugin.py

@@ -183,8 +183,10 @@ def pytest_fixture_setup(  # noqa: C901
 
 @pytest.fixture(scope="session")
 def container(request: pytest.FixtureRequest) -> Container:
-    """Container fixture."""
-    return _find_container(request)
+    """Container fixture with testing mode enabled."""
+    container = _find_container(request)
+    container.enable_test_mode()
+    return container
 
 
 @pytest.fixture
@@ -441,6 +443,7 @@ def _resolve_dependencies_sync(
     *,
     target: str,
 ) -> dict[str, Any]:
+    container.enable_test_mode()
     resolved: dict[str, Any] = {}
     for param_name, annotation in parameters:
         try:
@@ -462,6 +465,7 @@ async def _resolve_dependencies_async(
     *,
     target: str,
 ) -> dict[str, Any]:
+    container.enable_test_mode()
     resolved: dict[str, Any] = {}
     for param_name, annotation in parameters:
         try:

anydi/ext/typer.py

@@ -42,7 +42,7 @@ def _wrap_async_callback_with_injection(
     callback: Callable[..., Awaitable[Any]],
     container: Container,
     sig: inspect.Signature,
-    non_injected_params: set[inspect.Parameter],
+    non_injected_params: list[inspect.Parameter],
     scopes: set[Scope],
 ) -> Any:
     """Wrap async callback with injection in anyio.run()."""
@@ -86,24 +86,24 @@ def _process_callback(callback: Callable[..., Any], container: Container) -> Any
     """Validate and wrap a callback for dependency injection."""
     sig = inspect.signature(callback, eval_str=True)
     injected_param_names: set[str] = set()
-    non_injected_params: set[inspect.Parameter] = set()
+    non_injected_params: list[inspect.Parameter] = []
     scopes: set[Scope] = set()
 
     # Validate parameters and collect which ones need injection
     for parameter in sig.parameters.values():
-        interface, should_inject, _ = container.validate_injected_parameter(
+        dependency_type, should_inject, _ = container.validate_injected_parameter(
             parameter, call=callback
         )
         processed_parameter = container._injector.unwrap_parameter(parameter)
         if should_inject:
             injected_param_names.add(parameter.name)
             try:
-                scopes.add(container.providers[interface].scope)
+                scopes.add(container.providers[dependency_type].scope)
             except KeyError:
-                if inspect.isclass(interface) and is_provided(interface):
-                    scopes.add(interface.__provided__["scope"])
+                if inspect.isclass(dependency_type) and is_provided(dependency_type):
+                    scopes.add(dependency_type.__provided__["scope"])
         else:
-            non_injected_params.add(processed_parameter)
+            non_injected_params.append(processed_parameter)
 
     # If no parameters need injection and callback is not async, return original
     if not injected_param_names and not inspect.iscoroutinefunction(callback):

{anydi-0.67.1.dist-info → anydi-0.68.0.dist-info}/METADATA

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

anydi-0.68.0.dist-info/RECORD

@@ -0,0 +1,29 @@
+anydi/__init__.py,sha256=KFX8OthKXwBuYDPCV61t-044DpJ88tAOzIxeUWRC5OA,633
+anydi/_async_lock.py,sha256=3dwZr0KthXFYha0XKMyXf8jMmGb1lYoNC0O5w29V9ic,1104
+anydi/_cli.py,sha256=0BhNvWPyuIGzUkDELIBm_nsEMWk7MtLi3oTvgXj5oko,2072
+anydi/_container.py,sha256=lxUkRYU35qSiwTZYXfydElD28n2imzS81qRAAIhiHZU,46677
+anydi/_context.py,sha256=ZQWxtBXWkrMsCk_L7K_A7-e09v5Mv9HApPH3LZ6ZF9k,3648
+anydi/_decorators.py,sha256=7FvgmBDruv1w_iVqwloPzZwQQgyzQCklM6r9f6UVn-E,5728
+anydi/_graph.py,sha256=X7AYsTMcGZtnIUJD5CVc1t8-t54fSI8CY_xh6ijODWk,7945
+anydi/_injector.py,sha256=RvnPEYOgkg-WOIW1ItvVsoAZaSC9wmCnWQrfXad_86A,4507
+anydi/_marker.py,sha256=yXSPbIVU-X-jMSawtCHWFMKke5VpWMiBRZlEH8PlUqE,3373
+anydi/_module.py,sha256=2kN5uEXLd2Dsc58gz5IWK43wJewr_QgIVGSO3iWp798,2609
+anydi/_provider.py,sha256=5pMXyiGwBo2j6OHaoOktLQfiX2rkCf5aYXFlFi65JlQ,2898
+anydi/_resolver.py,sha256=CTYCjYkUXX35o2VMwvVwXyF8Kqp7h2tXituCNq6oydM,32746
+anydi/_scanner.py,sha256=rCPbpW_5OV9MwYQdwTfceV_MlwSMPfpTTKuxdcMmV98,5804
+anydi/_types.py,sha256=lsShY_-_CM2EFajeknAYXvLl-rHfopBT8udnK5_BtS4,1161
+anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anydi/ext/django/__init__.py,sha256=Ve8lncLU9dPY_Vjt4zihPgsSxwAtFHACn0XvBM5JG8k,367
+anydi/ext/fastapi.py,sha256=NowHc-z_Sw069YDv9vP98Mehum5vHsIIcqvDkRmicmc,2964
+anydi/ext/faststream.py,sha256=_3FZ8vlgl1GVizVv_6ippvwSWu_Zor4qm6HaiAp24o4,2744
+anydi/ext/pydantic_settings.py,sha256=y6uz0MiLtqPvRO186bIdRZVQfezLvRUfT3KvvB5fCWk,1524
+anydi/ext/pytest_plugin.py,sha256=XoMy5nLY8jM-KyK7VuwDuF_3rE3ouxaR3jZ0S6A6mdw,16322
+anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anydi/ext/starlette/middleware.py,sha256=n_JJ7BcG2Mg2M5HwM_SBboxZ-mnnD6WWJn4khq7Bgbs,1860
+anydi/ext/typer.py,sha256=c7HapXQfKhnLJQcHNncJAGd8jZ3crX5it6-MRCJjyPM,6268
+anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anydi/testing.py,sha256=cHg3mMScZbEep9smRqSNQ81BZMQOkyugHe8TvKdPnEg,1347
+anydi-0.68.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+anydi-0.68.0.dist-info/entry_points.txt,sha256=oDl_yEX12KlWcDzsZBTg85GG1Jl1rpiYOG4C7EJvebs,87
+anydi-0.68.0.dist-info/METADATA,sha256=3gYwUfTF6a368Qhb8H-_-85cIze1H_054Wlt-ExFLz0,8061
+anydi-0.68.0.dist-info/RECORD,,

{anydi-0.67.1.dist-info → anydi-0.68.0.dist-info}/entry_points.txt

@@ -1,3 +1,6 @@
+[console_scripts]
+anydi = anydi._cli:main
+
 [pytest11]
 anydi = anydi.ext.pytest_plugin
 

anydi-0.67.1.dist-info/RECORD

@@ -1,27 +0,0 @@
-anydi/__init__.py,sha256=KFX8OthKXwBuYDPCV61t-044DpJ88tAOzIxeUWRC5OA,633
-anydi/_async_lock.py,sha256=3dwZr0KthXFYha0XKMyXf8jMmGb1lYoNC0O5w29V9ic,1104
-anydi/_container.py,sha256=4bv3_fiDw6aPZ-bKjU5jmqeT66CvRnteHbosqMk5R0U,29408
-anydi/_context.py,sha256=-9QqeMWo9OpZVXZxZCQgIsswggl3Ch7lgx1KiFX_ezc,3752
-anydi/_decorators.py,sha256=J3W261ZAG7q4XKm4tbAv1wsWr9ysx9_5MUbUvSJB_MQ,2809
-anydi/_injector.py,sha256=1Ux71DhGxu3dLwPJP8gU73olI0pcZ3_tVaVzwKH7100,4411
-anydi/_marker.py,sha256=xVydjGdkxd_DqqwttnJZRkQbhpCTE9OnrhFmFJMlgvI,3415
-anydi/_module.py,sha256=2kN5uEXLd2Dsc58gz5IWK43wJewr_QgIVGSO3iWp798,2609
-anydi/_provider.py,sha256=OV1WFHTYv7W2U0XDk_Kql1r551Vhq8o-pUV5ep1HQcU,1574
-anydi/_resolver.py,sha256=6pJS-9F0epCj7goVbc7GeGdpqe0woI3Blu-3dA3jeNs,31464
-anydi/_scanner.py,sha256=rbRkHzyd2zMu7AFLffN6_tZJcMaW9gy7E-lVdHLHYrs,4294
-anydi/_types.py,sha256=lsShY_-_CM2EFajeknAYXvLl-rHfopBT8udnK5_BtS4,1161
-anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/ext/django/__init__.py,sha256=Ve8lncLU9dPY_Vjt4zihPgsSxwAtFHACn0XvBM5JG8k,367
-anydi/ext/fastapi.py,sha256=px6gdRVIE8-thDy93Zcsd_xJF3H09n1nn7FKKemdiig,2958
-anydi/ext/faststream.py,sha256=yszUfSbo3vJ2tr9PNC2GR-uX1XgRSXGH2lvLNoAXkc4,2738
-anydi/ext/pydantic_settings.py,sha256=jVJZ1wPaPpsxdNPlJj9yq282ebqLZ9tckWpZ0eIwWLg,1533
-anydi/ext/pytest_plugin.py,sha256=M54DkA-KxD9GqLnXdoCyn-Qur2c44MB6d0AgJuYCZ5w,16171
-anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/ext/starlette/middleware.py,sha256=n_JJ7BcG2Mg2M5HwM_SBboxZ-mnnD6WWJn4khq7Bgbs,1860
-anydi/ext/typer.py,sha256=z-sDd3jZMPTE2CyEuJ0f9uIJB43FjoLWbjpnkOvqSKA,6236
-anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/testing.py,sha256=cHg3mMScZbEep9smRqSNQ81BZMQOkyugHe8TvKdPnEg,1347
-anydi-0.67.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-anydi-0.67.1.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
-anydi-0.67.1.dist-info/METADATA,sha256=lqtZFxSRc7ohAAkAAdjcgxQDy7q5FTNP2MtBPZo3c4o,8061
-anydi-0.67.1.dist-info/RECORD,,