python-injection 0.19.1__py3-none-any.whl → 0.19.3__py3-none-any.whl

injection/_core/asfunction.py

@@ -2,20 +2,21 @@ from abc import abstractmethod
 from collections.abc import Callable
 from functools import wraps
 from inspect import iscoroutinefunction
+from types import MethodType
 from typing import Any, Protocol, runtime_checkable
 
 from injection._core.common.asynchronous import Caller
 from injection._core.module import Module, mod
 
-type AsFunctionWrappedType[**P, T] = type[_Callable[P, T]]
+type AsFunctionWrappedType[**P, T] = type[AsFunctionCallable[P, T]]
 
 
 @runtime_checkable
-class _Callable[**P, T](Protocol):
+class AsFunctionCallable[**P, T](Protocol):
     __slots__ = ()
 
     @abstractmethod
-    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> T:
+    def call(self, *args: P.args, **kwargs: P.kwargs) -> T:
         raise NotImplementedError
 
 
@@ -29,28 +30,27 @@ def asfunction[**P, T](
     module = module or mod()
 
     def decorator(wp: AsFunctionWrappedType[P, T]) -> Callable[P, T]:
-        get_method = wp.__call__.__get__
-        method = get_method(NotImplemented)
-        factory: Caller[..., Callable[P, T]] = module.make_injected_function(
+        fake_method = MethodType(wp.call, NotImplemented)
+        factory: Caller[..., AsFunctionCallable[P, T]] = module.make_injected_function(
             wp,
             threadsafe=threadsafe,
         ).__inject_metadata__
 
         wrapper: Callable[P, T]
 
-        if iscoroutinefunction(method):
+        if iscoroutinefunction(fake_method):
 
-            @wraps(method)
+            @wraps(fake_method)
             async def wrapper(*args: P.args, **kwargs: P.kwargs) -> Any:
                 self = await factory.acall()
-                return await get_method(self)(*args, **kwargs)
+                return await self.call(*args, **kwargs)  # type: ignore[misc]
 
         else:
 
-            @wraps(method)
+            @wraps(fake_method)
             def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
                 self = factory.call()
-                return get_method(self)(*args, **kwargs)
+                return self.call(*args, **kwargs)
 
         wrapper.__name__ = wp.__name__
         wrapper.__qualname__ = wp.__qualname__

injection/_core/common/type.py

@@ -89,8 +89,16 @@ def standardize_types(
         else:
             yield tp
 
-            if with_origin and origin is not None:
-                yield origin
+            if with_origin:
+                if origin is not None:
+                    yield origin
+
+                for alias in (tp, origin):
+                    if isinstance(alias, TypeAliasType):
+                        yield from standardize_types(
+                            alias.__value__,
+                            with_origin=with_origin,
+                        )
 
             continue
 

injection/_core/module.py

@@ -347,8 +347,8 @@ class Locator(Broker):
     @staticmethod
     def __standardize_inputs[T](
         classes: Iterable[InputType[T]],
-    ) -> Iterable[InputType[T]]:
-        return tuple(standardize_types(*classes, with_origin=True))
+    ) -> Iterator[InputType[T]]:
+        return standardize_types(*classes, with_origin=True)
 
     @staticmethod
     def __update_preprocessing[T](updater: Updater[T]) -> Updater[T]:

{python_injection-0.19.1.dist-info → python_injection-0.19.3.dist-info}/METADATA

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

{python_injection-0.19.1.dist-info → python_injection-0.19.3.dist-info}/RECORD

@@ -5,10 +5,10 @@ injection/exceptions.py,sha256=v57yMujiq6H_zwwn30A8UYEZX9R9k-bY8FnsdaimPM4,1025
 injection/loaders.py,sha256=gKlJfe9nXCuB8r6j0RF9_2FHC6YplM8GQYsgRqyxYw8,7257
 injection/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-injection/_core/asfunction.py,sha256=oVDJcM8buR1OnKJPDOfQ61bbrKVEPzfgtE_H74O1HN4,1718
+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=T9zvSOjMaPZiC_DCV7BIKOqCrmAHcYcleqgNro0MBgU,32624
+injection/_core/module.py,sha256=yK3-WKi5vJoTSw6ESDQkJzp4uQeP8GdVRoO5BV6hXcM,32617
 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=L7C2dB5UBI--W5Kkvntp_jypYhudY3SHqs8rM6jxxsk,965
 injection/_core/common/threading.py,sha256=kwRXNa9ocndIqeZA9kMHjEa8SBpHFcJARj1bgrWCpxE,225
-injection/_core/common/type.py,sha256=SCDtmBv9qFvEf5o5tTgCuwMDfuo1fgjSW0bUqA8ACis,2251
+injection/_core/common/type.py,sha256=hlhzpWHgvdMKMVaGBSwFhgEur0Sruzj67Md-yV-1cNw,2550
 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.1.dist-info/METADATA,sha256=5skunJb1mk9ovTHiGRielQzeImyZOTRDcd4HLg6EaO0,4301
-python_injection-0.19.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_injection-0.19.1.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
-python_injection-0.19.1.dist-info/RECORD,,
+python_injection-0.19.3.dist-info/METADATA,sha256=Ybbbf_GEZF9uEOexRMieKVXKh2by7czCpD7MTJQkECk,4301
+python_injection-0.19.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_injection-0.19.3.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
+python_injection-0.19.3.dist-info/RECORD,,