python-injection 0.19.4__py3-none-any.whl → 0.19.5.post0__py3-none-any.whl

injection/__init__.pyi

@@ -136,6 +136,7 @@ class Module:
 
         With `threadsafe=True`, the injection logic is wrapped in a `threading.RLock`.
         """
+
     @overload
     def inject[T](
         self,
@@ -145,13 +146,13 @@ class Module:
         threadsafe: bool | None = ...,
     ) -> type[T]: ...
     @overload
-    def inject[**P, T](
+    def inject(
         self,
         wrapped: None = ...,
         /,
         *,
         threadsafe: bool | None = ...,
-    ) -> _Decorator[Callable[P, T]] | _Decorator[type[T]]: ...
+    ) -> _Decorator[Callable[..., Any] | type]: ...
     @overload
     def injectable[**P, T](
         self,
@@ -192,20 +193,27 @@ class Module:
         mode: Mode | ModeStr = ...,
     ) -> type[T]: ...
     @overload
-    def injectable[**P, T](
+    def injectable[T](
         self,
         wrapped: None = ...,
         /,
         *,
         cls: _InjectableFactory[T] = ...,
         inject: bool = ...,
-        on: _TypeInfo[T] = ...,
+        on: _TypeInfo[T],
+        mode: Mode | ModeStr = ...,
+    ) -> _Decorator[Callable[..., T] | Callable[..., Awaitable[T]] | type[T]]: ...
+    @overload
+    def injectable(
+        self,
+        wrapped: None = ...,
+        /,
+        *,
+        cls: _InjectableFactory[Any] = ...,
+        inject: bool = ...,
+        on: tuple[()] = ...,
         mode: Mode | ModeStr = ...,
-    ) -> (
-        _Decorator[Callable[P, T]]
-        | _Decorator[Callable[P, Awaitable[T]]]
-        | _Decorator[type[T]]
-    ): ...
+    ) -> _Decorator[Callable[..., Any] | type]: ...
     @overload
     def singleton[**P, T](
         self,
@@ -243,40 +251,57 @@ class Module:
         mode: Mode | ModeStr = ...,
     ) -> type[T]: ...
     @overload
-    def singleton[**P, T](
+    def singleton[T](
         self,
         wrapped: None = ...,
         /,
         *,
         inject: bool = ...,
-        on: _TypeInfo[T] = ...,
+        on: _TypeInfo[T],
         mode: Mode | ModeStr = ...,
-    ) -> (
-        _Decorator[Callable[P, T]]
-        | _Decorator[Callable[P, Awaitable[T]]]
-        | _Decorator[type[T]]
-    ): ...
-    def scoped[**P, T](
+    ) -> _Decorator[Callable[..., T] | Callable[..., Awaitable[T]] | type[T]]: ...
+    @overload
+    def singleton(
+        self,
+        wrapped: None = ...,
+        /,
+        *,
+        inject: bool = ...,
+        on: tuple[()] = ...,
+        mode: Mode | ModeStr = ...,
+    ) -> _Decorator[Callable[..., Any] | type]: ...
+    @overload
+    def scoped[T](
         self,
         scope_name: str,
         /,
         *,
         inject: bool = ...,
-        on: _TypeInfo[T] = (),
+        on: _TypeInfo[T],
         mode: Mode | ModeStr = ...,
-    ) -> (
-        _Decorator[Callable[P, T]]
-        | _Decorator[Callable[P, Awaitable[T]]]
-        | _Decorator[Callable[P, AsyncIterator[T]]]
-        | _Decorator[Callable[P, Iterator[T]]]
-        | _Decorator[type[T]]
-    ):
+    ) -> _Decorator[
+        Callable[..., T]
+        | Callable[..., Awaitable[T]]
+        | Callable[..., AsyncIterator[T]]
+        | Callable[..., Iterator[T]]
+        | type[T]
+    ]:
         """
         Decorator applicable to a class or function or generator function. It is used
         to indicate how the scoped instance will be constructed. At injection time, the
         injected instance is retrieved from the scope.
         """
 
+    @overload
+    def scoped(
+        self,
+        scope_name: str,
+        /,
+        *,
+        inject: bool = ...,
+        on: tuple[()] = ...,
+        mode: Mode | ModeStr = ...,
+    ) -> _Decorator[Callable[..., Any] | type]: ...
     @overload
     def should_be_injectable[T](self, wrapped: type[T], /) -> type[T]:
         """
@@ -286,11 +311,11 @@ class Module:
         """
 
     @overload
-    def should_be_injectable[T](
+    def should_be_injectable(
         self,
         wrapped: None = ...,
         /,
-    ) -> _Decorator[type[T]]: ...
+    ) -> _Decorator[type]: ...
     @overload
     def constant[**P, T](
         self,
@@ -325,18 +350,23 @@ class Module:
         mode: Mode | ModeStr = ...,
     ) -> type[T]: ...
     @overload
-    def constant[**P, T](
+    def constant[T](
         self,
         wrapped: None = ...,
         /,
         *,
-        on: _TypeInfo[T] = ...,
+        on: _TypeInfo[T],
+        mode: Mode | ModeStr = ...,
+    ) -> _Decorator[Callable[..., T] | Callable[..., Awaitable[T]] | type[T]]: ...
+    @overload
+    def constant(
+        self,
+        wrapped: None = ...,
+        /,
+        *,
+        on: tuple[()] = ...,
         mode: Mode | ModeStr = ...,
-    ) -> (
-        _Decorator[Callable[P, T]]
-        | _Decorator[Callable[P, Awaitable[T]]]
-        | _Decorator[type[T]]
-    ): ...
+    ) -> _Decorator[Callable[..., Any] | type]: ...
     def set_constant[T](
         self,
         instance: T,

injection/_core/common/type.py

@@ -54,10 +54,10 @@ def get_return_hint[T](function: Callable[..., T]) -> InputType[T] | None:
 
 def get_yield_hint[T](
     function: Callable[..., Iterator[T]] | Callable[..., AsyncIterator[T]],
-) -> InputType[T] | None:
+) -> tuple[InputType[T]] | tuple[()]:
     return_type = get_return_hint(function)
 
-    if get_origin(return_type) not in {
+    if get_origin(return_type) in {
         AsyncGenerator,
         AsyncIterable,
         AsyncIterator,
@@ -65,10 +65,10 @@ def get_yield_hint[T](
         Iterable,
         Iterator,
     }:
-        return None
+        for arg in get_args(return_type):
+            return (arg,)
 
-    args = get_args(return_type)
-    return next(iter(args), None)
+    return ()
 
 
 def standardize_types(

injection/_core/module.py

@@ -337,12 +337,14 @@ class Locator(Broker):
         cls: InputType[T],
     ) -> bool:
         new_mode, existing_mode = new.mode, existing.mode
-        is_override = new_mode == Mode.OVERRIDE
 
-        if new_mode == existing_mode and not is_override:
+        if new_mode == Mode.OVERRIDE:
+            return True
+
+        elif new_mode == existing_mode:
             raise RuntimeError(f"An injectable already exists for the class `{cls}`.")
 
-        return is_override or new_mode.rank > existing_mode.rank
+        return new_mode.rank > existing_mode.rank
 
     @staticmethod
     def __standardize_inputs[T](
@@ -478,16 +480,16 @@ class Module(Broker, EventListener):
                 wrapper = contextmanager(wrapped)
 
             else:
+                hint = (wrapped,)  # type: ignore[assignment]
                 injectable_class = SimpleScopedInjectable
-                hint = wrapper = wrapped  # type: ignore[assignment]
+                wrapper = wrapped  # type: ignore[assignment]
 
-            hints = on if hint is None else (hint, on)
             self.injectable(
                 wrapper,
                 cls=partial(injectable_class, scope_name=scope_name),
                 ignore_type_hint=True,
                 inject=inject,
-                on=hints,
+                on=(*hint, on),
                 mode=mode,
             )
             return wrapped

{python_injection-0.19.4.dist-info → python_injection-0.19.5.post0.dist-info}/METADATA

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

{python_injection-0.19.4.dist-info → python_injection-0.19.5.post0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 injection/__init__.py,sha256=iJm0BbyGZw-Qr5e8d2C3n8-7FiVD-sy4LU_i_n3AgHY,1318
-injection/__init__.pyi,sha256=VCuJkbE1S2XppeTkwiDAbOsVBmlmCpFFXe5ztTUb_-Q,14942
+injection/__init__.pyi,sha256=8uWRfGfkVCfWBx4X4XsRyo1l7vKym6-vmcMklPyVMqg,15672
 injection/entrypoint.py,sha256=1JtooUCE9nIvHGAps5ypRb9ZEbgLdLwydkGF-kXMXDY,4953
 injection/exceptions.py,sha256=v57yMujiq6H_zwwn30A8UYEZX9R9k-bY8FnsdaimPM4,1025
 injection/loaders.py,sha256=gKlJfe9nXCuB8r6j0RF9_2FHC6YplM8GQYsgRqyxYw8,7257
@@ -8,7 +8,7 @@ injection/_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/asfunction.py,sha256=fTgAAWsDWUz89kYsoSVDXdqYKIuh6HtUW5MohGp3ov4,1767
 injection/_core/descriptors.py,sha256=1OX6JnM8Ux14vW1JSW3FzPgKc2VMTKqJUYBGT3Ypafg,800
 injection/_core/injectables.py,sha256=fxhiGv7qTCbUunhhd6a3ahosFmgznUFsEvqlwxi4gS4,6098
-injection/_core/module.py,sha256=IrNpWIO75kO3REQX6RdQdtZDjc-S17B8Y2KdM_NGacA,32684
+injection/_core/module.py,sha256=Nd7IVFX0Cgw2FDyH0fuOLozXloSaTXcm-pQ-QK6Pf-c,32672
 injection/_core/scope.py,sha256=r094k1Vjvwm0hTf7AQGYrxxvqQgb7_CDVUKaHQ8wyeM,8772
 injection/_core/slots.py,sha256=g9TG6CbqRzCsjg01iPyfRtTTUCJnnJOwcj9mJabH0dc,37
 injection/_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,13 +18,13 @@ injection/_core/common/invertible.py,sha256=gA_vw5nBjgp_w9MrDK5jMO8lhuOQWON8BbPp
 injection/_core/common/key.py,sha256=ghkZD-Y8Moz6SEPNgMh3xgsZUjDVq-XYAmXaCu5VuCA,80
 injection/_core/common/lazy.py,sha256=hZvz9LhlYxVkD_D8VBAvQmy7YuVaaw075jq0XM0w9_Y,1193
 injection/_core/common/threading.py,sha256=kwRXNa9ocndIqeZA9kMHjEa8SBpHFcJARj1bgrWCpxE,225
-injection/_core/common/type.py,sha256=mmDMaR68pQpwGnOLLkOmy9slCvgjLVYuEhoYVyANRlk,2564
+injection/_core/common/type.py,sha256=U7PtuH-FuMgw75LB7xy-arJRJXojxsJDQbhnTqA4P-o,2567
 injection/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/ext/fastapi.py,sha256=fiy3-mZIIwGcql3Y5ekFX8_7hALzqXP5u40qbtNE73o,1441
 injection/ext/fastapi.pyi,sha256=HLs7mfruIEFRrN_Xf8oCvSa4qwHWfwm6HHU_KMedXkE,185
 injection/testing/__init__.py,sha256=bJ7WXBXrw4rHc91AFVFnOwFLWOlpvX9Oh2SnRQ_NESo,919
 injection/testing/__init__.pyi,sha256=raGsGlxwbz3jkzJwA_5oCIE1emWINjT2UuwzbnqRb-0,577
-python_injection-0.19.4.dist-info/METADATA,sha256=xtDdgHy2s2fYA8jwKObxTd--xD2gC6yPVkDNKSwgr8c,4301
-python_injection-0.19.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_injection-0.19.4.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
-python_injection-0.19.4.dist-info/RECORD,,
+python_injection-0.19.5.post0.dist-info/METADATA,sha256=vaFb1wrfK4K1AGaoimYkxPtzCgHJX37dngLeIELmMBw,4307
+python_injection-0.19.5.post0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_injection-0.19.5.post0.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
+python_injection-0.19.5.post0.dist-info/RECORD,,