python-injection 0.20.0__py3-none-any.whl → 0.21.1__py3-none-any.whl

injection/_core/asfunction.py

@@ -1,22 +1,12 @@
-from abc import abstractmethod
 from collections.abc import Callable
 from functools import wraps
 from inspect import iscoroutinefunction
-from typing import Any, Protocol, runtime_checkable
+from typing import Any
 
 from injection._core.common.asynchronous import Caller
 from injection._core.module import Module, mod
 
-type AsFunctionWrappedType[**P, T] = type[AsFunctionCallable[P, T]]
-
-
-@runtime_checkable
-class AsFunctionCallable[**P, T](Protocol):
-    __slots__ = ()
-
-    @abstractmethod
-    def call(self, *args: P.args, **kwargs: P.kwargs) -> T:
-        raise NotImplementedError
+type AsFunctionWrappedType[**P, T] = type[Callable[P, T]]
 
 
 def asfunction[**P, T](
@@ -29,8 +19,8 @@ def asfunction[**P, T](
     module = module or mod()
 
     def decorator(wp: AsFunctionWrappedType[P, T]) -> Callable[P, T]:
-        fake_method = wp.call.__get__(NotImplemented)
-        factory: Caller[..., AsFunctionCallable[P, T]] = module.make_injected_function(
+        fake_method = wp.__call__.__get__(NotImplemented, wp)
+        factory: Caller[..., Callable[P, T]] = module.make_injected_function(
             wp,
             threadsafe=threadsafe,
         ).__inject_metadata__
@@ -42,14 +32,14 @@ def asfunction[**P, T](
             @wraps(fake_method)
             async def wrapper(*args: P.args, **kwargs: P.kwargs) -> Any:
                 self = await factory.acall()
-                return await self.call(*args, **kwargs)  # type: ignore[misc]
+                return await self(*args, **kwargs)  # type: ignore[misc]
 
         else:
 
             @wraps(fake_method)
             def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
                 self = factory.call()
-                return self.call(*args, **kwargs)
+                return self(*args, **kwargs)
 
         wrapper.__name__ = wp.__name__
         wrapper.__qualname__ = wp.__qualname__

injection/_core/common/type.py

@@ -9,7 +9,7 @@ from collections.abc import (
     Iterable,
     Iterator,
 )
-from inspect import isfunction
+from inspect import isclass, isfunction
 from types import GenericAlias, UnionType
 from typing import (
     Annotated,
@@ -33,7 +33,7 @@ type TypeInfo[T] = (
 
 def get_return_types(*args: TypeInfo[Any]) -> Iterator[InputType[Any]]:
     for arg in args:
-        if isinstance(arg, Collection):
+        if isinstance(arg, Collection) and not isclass(arg):
             inner_args = arg
 
         elif isfunction(arg) and (return_type := get_return_hint(arg)):

{python_injection-0.20.0.dist-info → python_injection-0.21.1.dist-info}/METADATA

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

{python_injection-0.20.0.dist-info → python_injection-0.21.1.dist-info}/RECORD

@@ -5,7 +5,7 @@ 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=Fb-05PAi0XOV0w2Hg5OGWuAVDNBBFL_WnpH7tteuaKI,1734
+injection/_core/asfunction.py,sha256=BIMLoz5iLNbTcdbvWdipA9nupjYI1y2EL2amT8s8FLs,1453
 injection/_core/descriptors.py,sha256=1OX6JnM8Ux14vW1JSW3FzPgKc2VMTKqJUYBGT3Ypafg,800
 injection/_core/injectables.py,sha256=fxhiGv7qTCbUunhhd6a3ahosFmgznUFsEvqlwxi4gS4,6098
 injection/_core/module.py,sha256=kUOzW7CYf3oGgVBhwJT1-05UI-HLH2N_E4o17Fyw1g4,32721
@@ -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=LR5_wiwZ9_YrcOOKg0qtwbe1YqYdYP57-PAFIe4bknM,415
-injection/_core/common/type.py,sha256=w8nH8_OilxR9r9zGNXqIxzMJbrw0uUUMBnpw9NTnkaY,2476
+injection/_core/common/type.py,sha256=NjbMoYDOzhKYWKNXrwWqajFyx7mcVFF4yIP9cVPKknQ,2506
 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.20.0.dist-info/METADATA,sha256=JcFR3ULIZ-cIJ-JfsJ8_gV7xMFIkLVj9UHz-0m_bSRk,4667
-python_injection-0.20.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_injection-0.20.0.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
-python_injection-0.20.0.dist-info/RECORD,,
+python_injection-0.21.1.dist-info/METADATA,sha256=gLTl40ZZWeBzp1XdXhgCL1aAxSfbRK940p7Id2fC21c,4667
+python_injection-0.21.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_injection-0.21.1.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
+python_injection-0.21.1.dist-info/RECORD,,