python-injection 0.14.0.post0__py3-none-any.whl → 0.14.2__py3-none-any.whl

injection/__init__.pyi

@@ -10,6 +10,7 @@ from ._core.common.type import InputType as _InputType
 from ._core.common.type import TypeInfo as _TypeInfo
 from ._core.module import InjectableFactory as _InjectableFactory
 from ._core.module import ModeStr, PriorityStr
+from ._core.module import Recipe as _Recipe
 
 __MODULE: Final[Module] = ...
 
@@ -91,7 +92,7 @@ class Module:
 
     def injectable[**P, T](
         self,
-        wrapped: Callable[P, T] | Callable[P, Awaitable[T]] = ...,
+        wrapped: _Recipe[P, T] = ...,
         /,
         *,
         cls: _InjectableFactory[T] = ...,
@@ -107,7 +108,7 @@ class Module:
 
     def singleton[**P, T](
         self,
-        wrapped: Callable[P, T] | Callable[P, Awaitable[T]] = ...,
+        wrapped: _Recipe[P, T] = ...,
         /,
         *,
         inject: bool = ...,
@@ -176,6 +177,12 @@ class Module:
         /,
         threadsafe: bool = ...,
     ) -> Callable[P, T]: ...
+    def make_async_factory[T](
+        self,
+        wrapped: type[T],
+        /,
+        threadsafe: bool = ...,
+    ) -> Callable[..., Awaitable[T]]: ...
     async def afind_instance[T](self, cls: _InputType[T]) -> T: ...
     def find_instance[T](self, cls: _InputType[T]) -> T:
         """

injection/_core/hook.py

@@ -1,5 +1,4 @@
 import itertools
-from collections import deque
 from collections.abc import Callable, Generator, Iterator
 from dataclasses import dataclass, field
 from inspect import isclass, isgeneratorfunction
@@ -14,8 +13,8 @@ type HookFunction[**P, T] = Callable[P, T] | HookGeneratorFunction[P, T]
 
 @dataclass(eq=False, frozen=True, slots=True)
 class Hook[**P, T]:
-    __functions: deque[HookFunction[P, T]] = field(
-        default_factory=deque,
+    __functions: list[HookFunction[P, T]] = field(
+        default_factory=list,
         init=False,
         repr=False,
     )
@@ -36,7 +35,7 @@ class Hook[**P, T]:
         return iter(self.__functions)
 
     def add(self, *functions: HookFunction[P, T]) -> Self:
-        self.__functions.extendleft(functions)
+        self.__functions.extend(reversed(functions))
         return self
 
     @classmethod
@@ -65,7 +64,6 @@ class Hook[**P, T]:
                     hook.throw(exc)
                 else:
                     hook.send(value)
-                    return value
 
             except StopIteration as stop:
                 return stop.value

injection/_core/module.py

@@ -3,10 +3,12 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from collections import OrderedDict, deque
 from collections.abc import (
+    AsyncGenerator,
     AsyncIterator,
     Awaitable,
     Callable,
     Collection,
+    Generator,
     Iterable,
     Iterator,
     Mapping,
@@ -71,6 +73,7 @@ from injection.exceptions import (
     ModuleLockError,
     ModuleNotUsedError,
     NoInjectable,
+    SkipInjectable,
 )
 
 """
@@ -360,6 +363,14 @@ class Priority(StrEnum):
 
 type PriorityStr = Literal["low", "high"]
 
+type ContextManagerLikeRecipe[**P, T] = (
+    Callable[P, ContextManager[T]] | Callable[P, AsyncContextManager[T]]
+)
+type GeneratorRecipe[**P, T] = (
+    Callable[P, Generator[T, Any, Any]] | Callable[P, AsyncGenerator[T, Any]]
+)
+type Recipe[**P, T] = Callable[P, T] | Callable[P, Awaitable[T]]
+
 
 @dataclass(eq=False, frozen=True, slots=True)
 class Module(Broker, EventListener):
@@ -411,7 +422,7 @@ class Module(Broker, EventListener):
 
     def injectable[**P, T](
         self,
-        wrapped: Callable[P, T] | Callable[P, Awaitable[T]] | None = None,
+        wrapped: Recipe[P, T] | None = None,
         /,
         *,
         cls: InjectableFactory[T] = SimpleInjectable,
@@ -420,9 +431,7 @@ class Module(Broker, EventListener):
         on: TypeInfo[T] = (),
         mode: Mode | ModeStr = Mode.get_default(),
     ) -> Any:
-        def decorator(
-            wp: Callable[P, T] | Callable[P, Awaitable[T]],
-        ) -> Callable[P, T] | Callable[P, Awaitable[T]]:
+        def decorator(wp: Recipe[P, T]) -> Recipe[P, T]:
             factory = extract_caller(self.make_injected_function(wp) if inject else wp)
             hints = on if ignore_type_hint else (wp, on)
             updater = Updater(
@@ -447,23 +456,10 @@ class Module(Broker, EventListener):
         mode: Mode | ModeStr = Mode.get_default(),
     ) -> Any:
         def decorator(
-            wrapped: Callable[P, T]
-            | Callable[P, Awaitable[T]]
-            | Callable[P, Iterator[T]]
-            | Callable[P, AsyncIterator[T]],
-        ) -> (
-            Callable[P, T]
-            | Callable[P, Awaitable[T]]
-            | Callable[P, Iterator[T]]
-            | Callable[P, AsyncIterator[T]]
-        ):
+            wrapped: Recipe[P, T] | GeneratorRecipe[P, T],
+        ) -> Recipe[P, T] | GeneratorRecipe[P, T]:
             injectable_class: Callable[[Caller[P, Any], str], Injectable[T]]
-            wrapper: (
-                Callable[P, T]
-                | Callable[P, Awaitable[T]]
-                | Callable[P, ContextManager[T]]
-                | Callable[P, AsyncContextManager[T]]
-            )
+            wrapper: Recipe[P, T] | ContextManagerLikeRecipe[P, T]
 
             if isasyncgenfunction(wrapped):
                 hint = get_yield_hint(wrapped)
@@ -588,6 +584,18 @@ class Module(Broker, EventListener):
 
         return SyncInjectedFunction(metadata)
 
+    def make_async_factory[T](
+        self,
+        wrapped: type[T],
+        /,
+        threadsafe: bool = False,
+    ) -> Callable[..., Awaitable[T]]:
+        factory: InjectedFunction[..., T] = self.make_injected_function(
+            wrapped,
+            threadsafe,
+        )
+        return factory.__inject_metadata__.acall
+
     async def afind_instance[T](self, cls: InputType[T]) -> T:
         injectable = self[cls]
         return await injectable.aget_instance()
@@ -613,7 +621,7 @@ class Module(Broker, EventListener):
     async def aget_instance(self, cls, default=None):  # type: ignore[no-untyped-def]
         try:
             return await self.afind_instance(cls)
-        except KeyError:
+        except (KeyError, SkipInjectable):
             return default
 
     @overload
@@ -633,7 +641,7 @@ class Module(Broker, EventListener):
     def get_instance(self, cls, default=None):  # type: ignore[no-untyped-def]
         try:
             return self.find_instance(cls)
-        except KeyError:
+        except (KeyError, SkipInjectable):
             return default
 
     @overload
@@ -859,29 +867,28 @@ class Dependencies:
     lazy_mapping: Lazy[Mapping[str, Injectable[Any]]]
 
     def __iter__(self) -> Iterator[tuple[str, Any]]:
-        for name, injectable in self.mapping.items():
-            instance = injectable.get_instance()
-            yield name, instance
+        for name, injectable in self.items():
+            with suppress(SkipInjectable):
+                yield name, injectable.get_instance()
 
     async def __aiter__(self) -> AsyncIterator[tuple[str, Any]]:
-        for name, injectable in self.mapping.items():
-            instance = await injectable.aget_instance()
-            yield name, instance
+        for name, injectable in self.items():
+            with suppress(SkipInjectable):
+                yield name, await injectable.aget_instance()
 
     @property
     def are_resolved(self) -> bool:
         return self.lazy_mapping.is_set
 
-    @property
-    def mapping(self) -> Mapping[str, Injectable[Any]]:
-        return ~self.lazy_mapping
-
     async def aget_arguments(self) -> dict[str, Any]:
         return {key: value async for key, value in self}
 
     def get_arguments(self) -> dict[str, Any]:
         return dict(self)
 
+    def items(self) -> Iterator[tuple[str, Injectable[Any]]]:
+        return iter((~self.lazy_mapping).items())
+
     @classmethod
     def from_iterable(cls, iterable: Iterable[tuple[str, Injectable[Any]]]) -> Self:
         lazy_mapping = Lazy(lambda: dict(iterable))

injection/exceptions.py

@@ -10,6 +10,7 @@ __all__ = (
     "ScopeAlreadyDefinedError",
     "ScopeError",
     "ScopeUndefinedError",
+    "SkipInjectable",
 )
 
 
@@ -30,6 +31,9 @@ class NoInjectable[T](KeyError, InjectionError):
         return self.__class
 
 
+class SkipInjectable(InjectionError): ...
+
+
 class ModuleError(InjectionError): ...
 
 
@@ -42,7 +46,7 @@ class ModuleNotUsedError(KeyError, ModuleError): ...
 class ScopeError(InjectionError): ...
 
 
-class ScopeUndefinedError(LookupError, ScopeError): ...
+class ScopeUndefinedError(LookupError, SkipInjectable, ScopeError): ...
 
 
 class ScopeAlreadyDefinedError(ScopeError): ...

{python_injection-0.14.0.post0.dist-info → python_injection-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-injection
-Version: 0.14.0.post0
+Version: 0.14.2
 Summary: Fast and easy dependency injection framework.
 Project-URL: Repository, https://github.com/100nm/python-injection
 Author: remimd

{python_injection-0.14.0.post0.dist-info → python_injection-0.14.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 injection/__init__.py,sha256=X0vIAoN4MDlhR7YIkup1qHgqbOkwZ3PWgdSi7h-udaM,1049
-injection/__init__.pyi,sha256=T95sTJol0Tmzlajb5rqJd020CBMYrHXvFDPUmbazD8I,9916
-injection/exceptions.py,sha256=T__732aXxWWUz0sKc39ySteyolCS5tpqQC0oCnzUF2E,917
+injection/__init__.pyi,sha256=6B5GdRNaAJ15Q-QAL8nNpTBVIKEUPJAwWIlCSjOkkJ8,10058
+injection/exceptions.py,sha256=dp9XYpWHh8R76wbWDJdjmpTHGQp8KuCeveTqarXY_6Y,999
 injection/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/utils.py,sha256=Lr0qHaq3_1AkUoAaw2XmMNie_alwYTeTrRlO22FeCnk,2762
 injection/_core/__init__.py,sha256=XERocCxCZBxPGIaOR37yeiQOZyvjHQ6a4rgRmlkUSuU,1367
 injection/_core/descriptors.py,sha256=7fSHlgAqmgR_Uta8KocBapOt1Xyj2dI7RY9ZdoStTzw,726
-injection/_core/hook.py,sha256=bXTMd3NiltV2yEweSJWOjNybKQwX_L7N4oE1v24BQK8,3156
+injection/_core/hook.py,sha256=rJyaSwFAHM8qizWANPUSt5KzWdjxc5oJ2U8hcGeZjU8,3097
 injection/_core/injectables.py,sha256=GIumNp0TXf8Voxe1sCPhcqq2gyw4E_hl7I45IJ_tyHE,4512
-injection/_core/module.py,sha256=xd55CGCpDjNc9ZW_iwVLpejgKIAJaRTVK860ZqmIPGY,30978
+injection/_core/module.py,sha256=1eGb4IHVCJByHUnAG83-oPgp8VbZty8x1YZ6OFT0zEU,31232
 injection/_core/scope.py,sha256=pwOqVKOUM_ZteNScgp-hLqyOHg5Ew75jWlfWLLD2PU8,5437
 injection/_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/common/asynchronous.py,sha256=9bQDVRE6eqo9K0d5H9RzyFalf0WGoGP7cDrKDGbvZPI,1500
@@ -20,6 +20,6 @@ injection/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 injection/integrations/fastapi.py,sha256=YHSs85_3m6TUVtOwUcV157b3UZJQIw_aXWAg199a-YE,594
 injection/testing/__init__.py,sha256=Bh3JqEXw62-JnUnspOXr2jpjGXZJ_K_K9CgfD7dPZeQ,793
 injection/testing/__init__.pyi,sha256=1h9zNGghxlo4D1jAx5s8EHk54mn7o-qO7WgJa6hwX6U,484
-python_injection-0.14.0.post0.dist-info/METADATA,sha256=AfarVqsSo7GAgTtjjhEUG2xFoincSsfvLOfGDwf9ZDs,3205
-python_injection-0.14.0.post0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_injection-0.14.0.post0.dist-info/RECORD,,
+python_injection-0.14.2.dist-info/METADATA,sha256=9IhlCQv8o9QERwHq1RZwXB83mmrz4stiLxnoKKhX6sI,3199
+python_injection-0.14.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_injection-0.14.2.dist-info/RECORD,,