python-injection 0.20.0__tar.gz → 0.21.1__tar.gz

{python_injection-0.20.0 → python_injection-0.21.1}/PKG-INFO

@@ -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 → python_injection-0.21.1}/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__

{python_injection-0.20.0 → python_injection-0.21.1}/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 → python_injection-0.21.1}/pyproject.toml

@@ -30,7 +30,7 @@ test = [
 
 [project]
 name = "python-injection"
-version = "0.20.0"
+version = "0.21.1"
 description = "Fast and easy dependency injection framework."
 license = "MIT"
 license-files = ["LICENSE"]