python-injection 0.17.0__py3-none-any.whl → 0.17.2__py3-none-any.whl

injection/_core/descriptors.py

@@ -17,8 +17,7 @@ class LazyInstance[T]:
         default: T = NotImplemented,
         module: Module | None = None,
     ) -> None:
-        module = module or mod()
-        self.__value = module.get_lazy_instance(cls, default)
+        self.__value = (module or mod()).get_lazy_instance(cls, default)
 
     def __get__(
         self,

injection/_core/injectables.py

@@ -48,7 +48,7 @@ class Injectable[T](Protocol):
 
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)
-class SimpleInjectable[T](Injectable[T]):
+class TransientInjectable[T](Injectable[T]):
     factory: Caller[..., T]
 
     async def aget_instance(self) -> T:

injection/_core/module.py

@@ -66,9 +66,9 @@ from injection._core.injectables import (
     ScopedInjectable,
     ScopedSlotInjectable,
     ShouldBeInjectable,
-    SimpleInjectable,
     SimpleScopedInjectable,
     SingletonInjectable,
+    TransientInjectable,
 )
 from injection._core.slots import SlotKey
 from injection.exceptions import (
@@ -430,7 +430,7 @@ class Module(Broker, EventListener):
         wrapped: Recipe[P, T] | None = None,
         /,
         *,
-        cls: InjectableFactory[T] = SimpleInjectable,
+        cls: InjectableFactory[T] = TransientInjectable,
         ignore_type_hint: bool = False,
         inject: bool = True,
         on: TypeInfo[T] = (),
@@ -583,7 +583,12 @@ class Module(Broker, EventListener):
         threadsafe: bool = ...,
     ) -> AsyncInjectedFunction[P, T]: ...
 
-    def make_injected_function(self, wrapped, /, threadsafe=False):  # type: ignore[no-untyped-def]
+    def make_injected_function[**P, T](
+        self,
+        wrapped: Callable[P, T],
+        /,
+        threadsafe: bool = False,
+    ) -> InjectedFunction[P, T]:
         metadata = InjectMetadata(wrapped, threadsafe)
 
         @metadata.task
@@ -592,7 +597,7 @@ class Module(Broker, EventListener):
             self.add_listener(metadata)
 
         if iscoroutinefunction(wrapped):
-            return AsyncInjectedFunction(metadata)
+            return AsyncInjectedFunction(metadata)  # type: ignore[arg-type, return-value]
 
         return SyncInjectedFunction(metadata)
 
@@ -630,7 +635,11 @@ class Module(Broker, EventListener):
         default: None = ...,
     ) -> T | None: ...
 
-    async def aget_instance(self, cls, default=None):  # type: ignore[no-untyped-def]
+    async def aget_instance[T, Default](
+        self,
+        cls: InputType[T],
+        default: Default | None = None,
+    ) -> T | Default | None:
         try:
             return await self.afind_instance(cls)
         except (KeyError, SkipInjectable):
@@ -650,7 +659,11 @@ class Module(Broker, EventListener):
         default: None = ...,
     ) -> T | None: ...
 
-    def get_instance(self, cls, default=None):  # type: ignore[no-untyped-def]
+    def get_instance[T, Default](
+        self,
+        cls: InputType[T],
+        default: Default | None = None,
+    ) -> T | Default | None:
         try:
             return self.find_instance(cls)
         except (KeyError, SkipInjectable):
@@ -674,7 +687,13 @@ class Module(Broker, EventListener):
         cache: bool = ...,
     ) -> Awaitable[T | None]: ...
 
-    def aget_lazy_instance(self, cls, default=None, *, cache=False):  # type: ignore[no-untyped-def]
+    def aget_lazy_instance[T, Default](
+        self,
+        cls: InputType[T],
+        default: Default | None = None,
+        *,
+        cache: bool = False,
+    ) -> Awaitable[T | Default | None]:
         if cache:
             return alazy(lambda: self.aget_instance(cls, default))
 
@@ -700,7 +719,13 @@ class Module(Broker, EventListener):
         cache: bool = ...,
     ) -> Invertible[T | None]: ...
 
-    def get_lazy_instance(self, cls, default=None, *, cache=False):  # type: ignore[no-untyped-def]
+    def get_lazy_instance[T, Default](
+        self,
+        cls: InputType[T],
+        default: Default | None = None,
+        *,
+        cache: bool = False,
+    ) -> Invertible[T | Default | None]:
         if cache:
             return lazy(lambda: self.get_instance(cls, default))
 
@@ -790,8 +815,6 @@ class Module(Broker, EventListener):
 
         self.unlock().init_modules(*modules)
 
-        del module, modules
-
         @contextmanager
         def cleaner() -> Iterator[Self]:
             yield self

injection/_core/scope.py

@@ -163,7 +163,7 @@ def get_scope(name: str, default: EllipsisType = ...) -> Scope: ...
 def get_scope[T](name: str, default: T) -> Scope | T: ...
 
 
-def get_scope(name, default=...):  # type: ignore[no-untyped-def]
+def get_scope[T](name: str, default: T | EllipsisType = ...) -> Scope | T:
     for states in (__CONTEXTUAL_SCOPES, __SHARED_SCOPES):
         state = states.get(name)
         if state and (scope := state.get_scope()):

injection/ext/fastapi.py

@@ -1,5 +1,5 @@
 from types import GenericAlias
-from typing import Any, TypeAliasType
+from typing import TYPE_CHECKING, Annotated, Any, TypeAliasType
 
 from fastapi import Depends
 
@@ -8,20 +8,35 @@ from injection import Module, mod
 __all__ = ("Inject",)
 
 
-def Inject[T](  # noqa: N802
-    cls: type[T] | TypeAliasType | GenericAlias,
-    /,
-    default: T = NotImplemented,
-    module: Module | None = None,
-) -> Any:
-    """
-    Declare a FastAPI dependency with `python-injection`.
-    """
+class FastAPIInject:
+    __slots__ = ()
 
-    module = module or mod()
-    lazy_instance = module.aget_lazy_instance(cls, default)
+    def __call__[T](
+        self,
+        cls: type[T] | TypeAliasType | GenericAlias,
+        /,
+        default: T = NotImplemented,
+        module: Module | None = None,
+    ) -> Any:
+        ainstance = (module or mod()).aget_lazy_instance(cls, default)
 
-    async def getter() -> T:
-        return await lazy_instance
+        async def dependency() -> T:
+            return await ainstance
 
-    return Depends(getter, use_cache=False)
+        class_name = getattr(cls, "__name__", str(cls))
+        dependency.__name__ = f"inject({class_name})"
+        return Depends(dependency, use_cache=False)
+
+    def __getitem__(self, params: Any, /) -> Any:
+        iter_params = iter(params if isinstance(params, tuple) else (params,))
+        cls = next(iter_params)
+        return Annotated[cls, self(cls), *iter_params]
+
+
+if TYPE_CHECKING:
+    type Inject[T, *Metadata] = Annotated[T, Depends(...), *Metadata]
+
+else:
+    Inject = FastAPIInject()
+
+del FastAPIInject

{python_injection-0.17.0.dist-info → python_injection-0.17.2.dist-info}/METADATA

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

{python_injection-0.17.0.dist-info → python_injection-0.17.2.dist-info}/RECORD

@@ -4,10 +4,10 @@ injection/exceptions.py,sha256=v57yMujiq6H_zwwn30A8UYEZX9R9k-bY8FnsdaimPM4,1025
 injection/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/utils.py,sha256=bLIVA_3N3mTEQ3kGV4YzrWEnokHxUGqWYNKPggOOnpg,4065
 injection/_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-injection/_core/descriptors.py,sha256=7fSHlgAqmgR_Uta8KocBapOt1Xyj2dI7RY9ZdoStTzw,726
-injection/_core/injectables.py,sha256=yeW_AHCZSsxyiN1oT_E9MLc1DcYA37XlmQGAkUc4eR8,6189
-injection/_core/module.py,sha256=GNDnYbD7oXVCS_CH_w7Io-rbWZxMConoOMNy1XJKotY,31575
-injection/_core/scope.py,sha256=J6O0fgaz7IstYDx1hjRPaZUNIzIS_cHc29fp-qIrUA0,8291
+injection/_core/descriptors.py,sha256=jH0pyIlPurMmU4yXr-HKS_7BJ-9d0XUvEx4pQre3QeI,704
+injection/_core/injectables.py,sha256=Rg1nxDkbcpeX4ELohrNVMguPhN36SNQuD0JKfyfL6bI,6192
+injection/_core/module.py,sha256=7jTp3dHHQqJ_b95iHHMp9TKRF794Msgla7UfBsLysV8,31988
+injection/_core/scope.py,sha256=OBzVY1mUApryqIZKQtwHz7wiuY13MfouyaHp50DpWeQ,8300
 injection/_core/slots.py,sha256=g9TG6CbqRzCsjg01iPyfRtTTUCJnnJOwcj9mJabH0dc,37
 injection/_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/common/asynchronous.py,sha256=QeS2Lc4gEBFvTA_snOWfme5mTL4BFZWqZ8EzJwOdVos,1816
@@ -17,9 +17,9 @@ injection/_core/common/key.py,sha256=ghkZD-Y8Moz6SEPNgMh3xgsZUjDVq-XYAmXaCu5VuCA
 injection/_core/common/lazy.py,sha256=6xh5h0lmaNvl32V0WoX4VCTsNJ3zUJdWVqpLJ_YeIIU,1363
 injection/_core/common/type.py,sha256=SCDtmBv9qFvEf5o5tTgCuwMDfuo1fgjSW0bUqA8ACis,2251
 injection/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-injection/ext/fastapi.py,sha256=YHSs85_3m6TUVtOwUcV157b3UZJQIw_aXWAg199a-YE,594
+injection/ext/fastapi.py,sha256=Kl-gei0zjFL_oeoOqAOnj7St3Z_5MZlxcKSmuR4g1is,1082
 injection/testing/__init__.py,sha256=SiImXDd0-DO1a8S5nbUQRtgDX8iaU_nHcp8DdqwtD2M,896
 injection/testing/__init__.pyi,sha256=iOii0i9F5n7znltGeGQYI2KXC_if9SAogLh1h03yx-0,540
-python_injection-0.17.0.dist-info/METADATA,sha256=I1L9Clj5aiursJyGnauGg8HmLfFg6ybWnnLU5FZ3ssE,3199
-python_injection-0.17.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_injection-0.17.0.dist-info/RECORD,,
+python_injection-0.17.2.dist-info/METADATA,sha256=lJqNL0UMAVNRNxj6CodPgVZuCGVoU3VjZThGAGHn6c0,3199
+python_injection-0.17.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_injection-0.17.2.dist-info/RECORD,,