refactoring: ♻️ Default parameter added to Inject and LazyInstance

Author: remimd

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 @@ def scoped[**P, T](
         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 @@ def decorator(
                 | 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 @@ def decorator(
                 on=hints,
                 mode=mode,
             )
-            return wp
+            return wrapped
 
         return decorator
 

injection/_core/scope.py

@@ -3,14 +3,7 @@
 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 @@
     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 @@ def enter[T](self, context_manager: ContextManager[T]) -> T:
         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 @@ def __exit__(
     ) -> 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 @@
 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)

pyproject.toml

@@ -61,6 +61,15 @@ exclude_lines = [
 [tool.coverage.run]
 omit = ["bench.py"]
 
+[tool.hatch.build]
+skip-excluded-dirs = true
+
+[tool.hatch.build.targets.sdist]
+include = ["injection"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["injection"]
+
 [tool.mypy]
 check_untyped_defs = true
 disallow_any_generics = true
@@ -77,15 +86,6 @@ plugins = ["pydantic.mypy"]
 warn_redundant_casts = true
 warn_unused_ignores = true
 
-[tool.hatch.build]
-skip-excluded-dirs = true
-
-[tool.hatch.build.targets.sdist]
-include = ["injection"]
-
-[tool.hatch.build.targets.wheel]
-packages = ["injection"]
-
 [tool.pydantic-mypy]
 init_forbid_extra = true
 init_typed = true