python-injection 0.13.0__py3-none-any.whl → 0.13.1__py3-none-any.whl

injection/__init__.pyi

@@ -46,7 +46,13 @@ class Injectable[T](Protocol):
     def get_instance(self) -> T: ...
 
 class LazyInstance[T]:
-    def __init__(self, cls: _InputType[T], module: Module = ...) -> None: ...
+    def __init__(
+        self,
+        cls: _InputType[T],
+        /,
+        default: T = ...,
+        module: Module = ...,
+    ) -> None: ...
     @overload
     def __get__(self, instance: object, owner: type | None = ...) -> T: ...
     @overload

injection/_core/descriptors.py

@@ -10,9 +10,15 @@ class LazyInstance[T]:
 
     __value: Invertible[T]
 
-    def __init__(self, cls: InputType[T], module: Module | None = None) -> None:
+    def __init__(
+        self,
+        cls: InputType[T],
+        /,
+        default: T = NotImplemented,
+        module: Module | None = None,
+    ) -> None:
         module = module or mod()
-        self.__value = module.get_lazy_instance(cls, default=NotImplemented)
+        self.__value = module.get_lazy_instance(cls, default)
 
     def __get__(
         self,

injection/_core/module.py

@@ -445,7 +445,7 @@ class Module(Broker, EventListener):
         mode: Mode | ModeStr = Mode.get_default(),
     ) -> Any:
         def decorator(
-            wp: Callable[P, T]
+            wrapped: Callable[P, T]
             | Callable[P, Awaitable[T]]
             | Callable[P, Iterator[T]]
             | Callable[P, AsyncIterator[T]],
@@ -463,19 +463,19 @@ class Module(Broker, EventListener):
                 | Callable[P, AsyncContextManager[T]]
             )
 
-            if isasyncgenfunction(wp):
-                hint = get_yield_hint(wp)
+            if isasyncgenfunction(wrapped):
+                hint = get_yield_hint(wrapped)
                 injectable_class = AsyncCMScopedInjectable
-                wrapper = asynccontextmanager(wp)
+                wrapper = asynccontextmanager(wrapped)
 
-            elif isgeneratorfunction(wp):
-                hint = get_yield_hint(wp)
+            elif isgeneratorfunction(wrapped):
+                hint = get_yield_hint(wrapped)
                 injectable_class = CMScopedInjectable
-                wrapper = contextmanager(wp)
+                wrapper = contextmanager(wrapped)
 
             else:
                 injectable_class = SimpleScopedInjectable
-                hint = wrapper = wp  # type: ignore[assignment]
+                hint = wrapper = wrapped  # type: ignore[assignment]
 
             hints = on if hint is None else (hint, on)
             self.injectable(
@@ -486,7 +486,7 @@ class Module(Broker, EventListener):
                 on=hints,
                 mode=mode,
             )
-            return wp
+            return wrapped
 
         return decorator
 

injection/_core/scope.py

@@ -3,14 +3,7 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from collections import defaultdict
 from collections.abc import AsyncIterator, Iterator, MutableMapping
-from contextlib import (
-    AsyncContextDecorator,
-    AsyncExitStack,
-    ContextDecorator,
-    ExitStack,
-    asynccontextmanager,
-    contextmanager,
-)
+from contextlib import AsyncExitStack, ExitStack, asynccontextmanager, contextmanager
 from contextvars import ContextVar
 from dataclasses import dataclass, field
 from types import TracebackType
@@ -19,6 +12,7 @@ from typing import (
     AsyncContextManager,
     ContextManager,
     Final,
+    NoReturn,
     Protocol,
     Self,
     runtime_checkable,
@@ -163,7 +157,7 @@ class BaseScope[T](Scope, ABC):
     )
 
 
-class AsyncScope(AsyncContextDecorator, BaseScope[AsyncExitStack]):
+class AsyncScope(BaseScope[AsyncExitStack]):
     __slots__ = ()
 
     def __init__(self) -> None:
@@ -188,7 +182,7 @@ class AsyncScope(AsyncContextDecorator, BaseScope[AsyncExitStack]):
         return self.delegate.enter_context(context_manager)
 
 
-class SyncScope(ContextDecorator, BaseScope[ExitStack]):
+class SyncScope(BaseScope[ExitStack]):
     __slots__ = ()
 
     def __init__(self) -> None:
@@ -206,7 +200,7 @@ class SyncScope(ContextDecorator, BaseScope[ExitStack]):
     ) -> Any:
         return self.delegate.__exit__(exc_type, exc_value, traceback)
 
-    async def aenter[T](self, context_manager: AsyncContextManager[T]) -> T:
+    async def aenter[T](self, context_manager: AsyncContextManager[T]) -> NoReturn:
         raise ScopeError(
             "Synchronous scope doesn't support asynchronous context manager."
         )

injection/integrations/fastapi.py

@@ -1,4 +1,3 @@
-from collections.abc import Awaitable
 from types import GenericAlias
 from typing import Any, TypeAliasType
 
@@ -12,27 +11,17 @@ __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`.
     """
 
-    dependency: InjectionDependency[T] = InjectionDependency(cls, module or mod())
-    return Depends(dependency, use_cache=False)
+    module = module or mod()
+    lazy_instance = module.aget_lazy_instance(cls, default)
 
+    async def getter() -> T:
+        return await lazy_instance
 
-class InjectionDependency[T]:
-    __slots__ = ("__awaitable",)
-
-    __awaitable: Awaitable[T]
-
-    def __init__(
-        self,
-        cls: type[T] | TypeAliasType | GenericAlias,
-        module: Module,
-    ) -> None:
-        self.__awaitable = module.aget_lazy_instance(cls, default=NotImplemented)
-
-    async def __call__(self) -> T:
-        return await self.__awaitable
+    return Depends(getter, use_cache=False)

{python_injection-0.13.0.dist-info → python_injection-0.13.1.dist-info}/METADATA

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

{python_injection-0.13.0.dist-info → python_injection-0.13.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 injection/__init__.py,sha256=X0vIAoN4MDlhR7YIkup1qHgqbOkwZ3PWgdSi7h-udaM,1049
-injection/__init__.pyi,sha256=XlDjgy-gLz9LKBER0478b_9UMatwdQ4p0zKpaPAaF9M,9572
+injection/__init__.pyi,sha256=LXBL7_ihiw6NyU94xWGdXkWwxvzRBoLYBSOv88PV2WM,9640
 injection/exceptions.py,sha256=T__732aXxWWUz0sKc39ySteyolCS5tpqQC0oCnzUF2E,917
 injection/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/utils.py,sha256=SZBzmVAwRL-kilS2eRt9MCeNAL4zeaj_7Rm_2NLBzg0,3175
 injection/_core/__init__.py,sha256=XERocCxCZBxPGIaOR37yeiQOZyvjHQ6a4rgRmlkUSuU,1367
-injection/_core/descriptors.py,sha256=y1rFTQdCDIMLVQfuQE8ZkTPlVZKgzvwZ2Y20Si05DwM,662
+injection/_core/descriptors.py,sha256=7fSHlgAqmgR_Uta8KocBapOt1Xyj2dI7RY9ZdoStTzw,726
 injection/_core/hook.py,sha256=Qv505pr3kjOE6UitftlLh9JKX9OCNqZBRtHbFha1gqM,3130
 injection/_core/injectables.py,sha256=SApYnP6vG3b1qi_KJx6hkJyPoyTmZfooxqPpOsxWSVI,4482
-injection/_core/module.py,sha256=MvXxy5Yrb3tOTgD5qCWwZVgMBzHGVlqtcceYA51dLNk,30550
-injection/_core/scope.py,sha256=e6SYiiWZuQluGWxEAT2T-2M6Y67r-89FgGG0rM4HP-s,5673
+injection/_core/module.py,sha256=wOoHW_bImPSwoxi3i8_rFXP_HWFJ_S78UuY_5EIilFQ,30595
+injection/_core/scope.py,sha256=TKOoxCmi2FIoXis0irReVNayDTte4KjLrTq8ZDcrOSk,5583
 injection/_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/common/asynchronous.py,sha256=LlYMde_55osS3r8Sc3Fh5lgPp5UWmIfvyBzUeIDmMiM,1698
 injection/_core/common/event.py,sha256=XjzV8gxtGlGvzZs_ykvoC60qmdpd3RN08Eiqz5QUwes,1236
@@ -17,9 +17,9 @@ injection/_core/common/key.py,sha256=ghkZD-Y8Moz6SEPNgMh3xgsZUjDVq-XYAmXaCu5VuCA
 injection/_core/common/lazy.py,sha256=ZKx2O9CCFsF9F0SLM4zb7jSLksJUv-FBLCPlWltMN5k,1398
 injection/_core/common/type.py,sha256=QbBBhJp7i1p6gLzWX0TgofvfG7yDH-gHfEQcssVZeHo,2186
 injection/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-injection/integrations/fastapi.py,sha256=EYjaQ2RpdPFMj6CDQWg3YYk9Y9wujbdZkm63VRhpTt4,908
+injection/integrations/fastapi.py,sha256=YHSs85_3m6TUVtOwUcV157b3UZJQIw_aXWAg199a-YE,594
 injection/testing/__init__.py,sha256=ALcKuDYNdslmpgqotZzSWrXAW0kNNFUs9nzfO1ZgIGc,783
 injection/testing/__init__.pyi,sha256=6rv5NOYHEaiKMd82E1IIc8lFlLV9ttY57DLiMqGTXt8,482
-python_injection-0.13.0.dist-info/METADATA,sha256=P_YxmXOtCUAkg8V0pnjikcl9B702McvBakiBjv6AGik,2996
-python_injection-0.13.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_injection-0.13.0.dist-info/RECORD,,
+python_injection-0.13.1.dist-info/METADATA,sha256=y4ls59BE2tC-G8V8chV5dMl4um6zcLtYOejDr03Z3jQ,2996
+python_injection-0.13.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_injection-0.13.1.dist-info/RECORD,,