anydi 0.70.0__py3-none-any.whl → 0.70.2__py3-none-any.whl

anydi/_container.py

@@ -17,7 +17,7 @@ from typing import Any, Literal, TypeVar, get_args, get_origin, overload
 from typing_extensions import ParamSpec, Self, type_repr
 
 from ._context import InstanceContext
-from ._decorators import get_alias_list, is_provided
+from ._decorators import is_provided
 from ._graph import Graph
 from ._injector import Injector
 from ._marker import Marker
@@ -25,7 +25,15 @@ from ._module import ModuleDef, ModuleRegistrar
 from ._provider import Provider, ProviderDef, ProviderKind, ProviderParameter
 from ._resolver import Resolver
 from ._scanner import PackageOrIterable, Scanner
-from ._types import NOT_SET, Event, Scope, is_event_type, is_iterator_type, is_none_type
+from ._types import (
+    NOT_SET,
+    Event,
+    Scope,
+    is_event_type,
+    is_iterator_type,
+    is_none_type,
+    to_list,
+)
 
 T = TypeVar("T", bound=Any)
 P = ParamSpec("P")
@@ -75,13 +83,13 @@ class Container:
         # Register providers
         providers = providers or []
         for provider in providers:
-            self._register_provider(
+            self.register(
                 provider.dependency_type,
                 provider.factory,
-                provider.scope,
-                provider.from_context,
-                False,
-                None,
+                scope=provider.scope,
+                from_context=provider.from_context,
+                alias=provider.alias,
+                override=False,
             )
 
         # Register modules
@@ -345,6 +353,7 @@ class Container:
         scope: Scope = "singleton",
         from_context: bool = False,
         override: bool = False,
+        alias: Any = NOT_SET,
         interface: Any = NOT_SET,
         call: Callable[..., Any] = NOT_SET,
     ) -> Provider:
@@ -372,10 +381,16 @@ class Container:
             dependency_type = interface
         if factory is NOT_SET:
             factory = call if call is not NOT_SET else dependency_type
-        return self._register_provider(
+        provider = self._register_provider(
             dependency_type, factory, scope, from_context, override, None
         )
 
+        # Register aliases if specified
+        for alias_type in to_list(alias):
+            self.alias(alias_type, provider.dependency_type)
+
+        return provider
+
     def alias(self, alias_type: Any, canonical_type: Any, /) -> None:
         """Register an alias for a dependency type."""
         if self.ready:
@@ -427,12 +442,19 @@ class Container:
         self._delete_provider(provider)
 
     def provider(
-        self, *, scope: Scope, override: bool = False
+        self, *, scope: Scope, override: bool = False, alias: Any = NOT_SET
     ) -> Callable[[Callable[P, T]], Callable[P, T]]:
         """Decorator to register a provider function with the specified scope."""
 
         def decorator(call: Callable[P, T]) -> Callable[P, T]:
-            self._register_provider(NOT_SET, call, scope, False, override, None)
+            provider = self._register_provider(
+                NOT_SET, call, scope, False, override, None
+            )
+
+            # Register aliases if specified
+            for alias_type in to_list(alias):
+                self.alias(alias_type, provider.dependency_type)
+
             return call
 
         return decorator
@@ -627,7 +649,8 @@ class Container:
                 )
                 # Register aliases if specified
                 if not self.ready:
-                    for alias_type in get_alias_list(dependency_type.__provided__):
+                    aliases = to_list(dependency_type.__provided__.get("alias"))
+                    for alias_type in aliases:
                         self.alias(alias_type, dependency_type)
                 registered = True
             else:
@@ -710,7 +733,8 @@ class Container:
                         None,
                     )
                     # Register aliases if specified
-                    for alias_type in get_alias_list(dependency_type.__provided__):
+                    aliases = to_list(dependency_type.__provided__.get("alias"))
+                    for alias_type in aliases:
                         self._aliases[alias_type] = dependency_type
                     # Recursively ensure the @provided class is resolved
                     dep_provider = self._ensure_provider_resolved(
@@ -1013,9 +1037,8 @@ class Container:
                             None,
                         )
                         # Register aliases if specified
-                        for alias_type in get_alias_list(
-                            param_dependency_type.__provided__
-                        ):
+                        provided_meta = param_dependency_type.__provided__
+                        for alias_type in to_list(provided_meta.get("alias")):
                             self._aliases[alias_type] = param_dependency_type
                     elif param.has_default:
                         # Has default, can be missing

anydi/_decorators.py

@@ -34,16 +34,6 @@ class ProvidedMetadata(TypedDict):
     from_context: NotRequired[bool]
 
 
-def get_alias_list(provided: ProvidedMetadata) -> list[Any]:
-    """Get alias list from __provided__ metadata, normalizing single to list."""
-    alias = provided.get("alias")
-    if alias is None:
-        return []
-    if isinstance(alias, list | tuple):
-        return list(alias)  # type: ignore
-    return [alias]
-
-
 def provided(
     *, scope: Scope, alias: Any = NOT_SET, from_context: bool = False
 ) -> Callable[[ClassT], ClassT]:
@@ -162,10 +152,11 @@ def is_provided(cls: Any) -> TypeGuard[type[Provided]]:
 class ProviderMetadata(TypedDict):
     scope: Scope
     override: bool
+    alias: NotRequired[Any]
 
 
 def provider(
-    *, scope: Scope, override: bool = False
+    *, scope: Scope, override: bool = False, alias: Any = NOT_SET
 ) -> Callable[
     [Callable[Concatenate[ModuleT, P], T]], Callable[Concatenate[ModuleT, P], T]
 ]:
@@ -174,7 +165,10 @@ def provider(
     def decorator(
         target: Callable[Concatenate[ModuleT, P], T],
     ) -> Callable[Concatenate[ModuleT, P], T]:
-        target.__provider__ = ProviderMetadata(scope=scope, override=override)  # type: ignore
+        metadata: ProviderMetadata = {"scope": scope, "override": override}
+        if alias is not NOT_SET:
+            metadata["alias"] = alias
+        target.__provider__ = metadata  # type: ignore
         return target
 
     return decorator

anydi/_provider.py

@@ -77,6 +77,7 @@ class ProviderDef:
     _: KW_ONLY
     from_context: bool = False
     scope: Scope = "singleton"
+    alias: Any = NOT_SET
     interface: Any = NOT_SET
     call: Callable[..., Any] = NOT_SET
 

anydi/_scanner.py

@@ -8,7 +8,8 @@ from dataclasses import dataclass
 from types import ModuleType
 from typing import TYPE_CHECKING, Any
 
-from ._decorators import Provided, get_alias_list, is_injectable, is_provided
+from ._decorators import Provided, is_injectable, is_provided
+from ._types import to_list
 
 if TYPE_CHECKING:
     from ._container import Container
@@ -65,7 +66,7 @@ class Scanner:
                     cls, cls, scope=scope, from_context=from_context
                 )
             # Create aliases if specified (alias → cls)
-            for alias_type in get_alias_list(cls.__provided__):
+            for alias_type in to_list(cls.__provided__.get("alias")):
                 self._container.alias(alias_type, cls)
 
         # Second: inject @injectable functions

anydi/_types.py

@@ -43,3 +43,12 @@ def is_none_type(tp: Any) -> bool:
 def is_iterator_type(tp: Any) -> bool:
     """Check if the given object is an iterator type."""
     return tp in (Iterator, AsyncIterator)
+
+
+def to_list(value: Any) -> list[Any]:
+    """Convert a value to a list, handling None and sequences."""
+    if value is None or value is NOT_SET:
+        return []
+    if isinstance(value, list | tuple):
+        return list(value)  # type: ignore[arg-type]
+    return [value]

{anydi-0.70.0.dist-info → anydi-0.70.2.dist-info}/METADATA

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

{anydi-0.70.0.dist-info → anydi-0.70.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
 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=6dqMUlqvBEI0bghytOSqHK74EN9tfiEoQbJdNPbjLeE,48660
+anydi/_container.py,sha256=0Mhper1g4O4cmAaGOeXAkcfMeJhoJqcYTowhNKPQhhs,49237
 anydi/_context.py,sha256=ZQWxtBXWkrMsCk_L7K_A7-e09v5Mv9HApPH3LZ6ZF9k,3648
-anydi/_decorators.py,sha256=04M1xN7oHVskAnoEJdvJr3hXrrzruUp4mzlLOCuuZv0,5598
+anydi/_decorators.py,sha256=27AQBzp_P_ajO_bRk1ybgwuxTy9PMWGMJmfBvjriJ-8,5435
 anydi/_graph.py,sha256=WN_N1nNNPp74YU1mqxM-dJlf0rWF9ooGNTIv87DJpKI,8619
 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/_provider.py,sha256=1hUah9xmAVEVfE1AOFraodJiyfgRhO05egWq1aeRZCA,2923
 anydi/_resolver.py,sha256=xpBgFhUTMdHeNjqmUfOZMU5J8PviVkc5q_ckgwrdAhs,33603
-anydi/_scanner.py,sha256=bCd1mBYXYBANBVoVEf2gHyw3Mr1DbTX5kV1b80-RljM,5898
-anydi/_types.py,sha256=lsShY_-_CM2EFajeknAYXvLl-rHfopBT8udnK5_BtS4,1161
+anydi/_scanner.py,sha256=gLs6Gdv12VVgT-J1vfCVOQ515drGtZQ4QNI8Bs0fqE0,5916
+anydi/_types.py,sha256=QQY_WG6-e2VuqH2AqrStiM1bg2ACQMHaPtdOQVsDimU,1439
 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
@@ -23,7 +23,7 @@ anydi/ext/starlette/middleware.py,sha256=n_JJ7BcG2Mg2M5HwM_SBboxZ-mnnD6WWJn4khq7
 anydi/ext/typer.py,sha256=c7HapXQfKhnLJQcHNncJAGd8jZ3crX5it6-MRCJjyPM,6268
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/testing.py,sha256=cHg3mMScZbEep9smRqSNQ81BZMQOkyugHe8TvKdPnEg,1347
-anydi-0.70.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-anydi-0.70.0.dist-info/entry_points.txt,sha256=oDl_yEX12KlWcDzsZBTg85GG1Jl1rpiYOG4C7EJvebs,87
-anydi-0.70.0.dist-info/METADATA,sha256=w2CzRSLiozxgqMa3gaGhpR1LdcAyGA7yVsJrCruZeEI,8061
-anydi-0.70.0.dist-info/RECORD,,
+anydi-0.70.2.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+anydi-0.70.2.dist-info/entry_points.txt,sha256=oDl_yEX12KlWcDzsZBTg85GG1Jl1rpiYOG4C7EJvebs,87
+anydi-0.70.2.dist-info/METADATA,sha256=kDJCV_O9IcrhLR-X4gWYTHM0h5AvO8H_q53p9VBe1Ew,8061
+anydi-0.70.2.dist-info/RECORD,,