python-injection 0.10.8.post0__tar.gz → 0.10.10__tar.gz

{python_injection-0.10.8.post0 → python_injection-0.10.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-injection
-Version: 0.10.8.post0
+Version: 0.10.10
 Summary: Fast and easy dependency injection framework.
 Home-page: https://github.com/100nm/python-injection
 License: MIT
@@ -15,6 +15,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks

{python_injection-0.10.8.post0 → python_injection-0.10.10}/injection/__init__.pyi

@@ -136,18 +136,23 @@ class Module:
         parameter or an exception will be raised.
         """
 
-    def get_instance[T](self, cls: _InputType[T]) -> T | None:
+    def get_instance[T, Default](
+        self,
+        cls: _InputType[T],
+        default: Default | None = ...,
+    ) -> T | Default | None:
         """
         Function used to retrieve an instance associated with the type passed in
         parameter or return `None`.
         """
 
-    def get_lazy_instance[T](
+    def get_lazy_instance[T, Default](
         self,
         cls: _InputType[T],
+        default: Default | None = ...,
         *,
         cache: bool = ...,
-    ) -> _Invertible[T | None]:
+    ) -> _Invertible[T | Default | None]:
         """
         Function used to retrieve an instance associated with the type passed in
         parameter or `None`. Return a `Invertible` object. To access the instance

{python_injection-0.10.8.post0 → python_injection-0.10.10}/injection/_core/hook.py

@@ -34,7 +34,7 @@ class Hook[**P, T]:
         return iter(self.__functions)
 
     def add(self, *functions: HookFunction[P, T]) -> Self:
-        self.__functions.extend(functions)
+        self.__functions.extend(reversed(functions))
         return self
 
     @classmethod

{python_injection-0.10.8.post0 → python_injection-0.10.10}/injection/_core/module.py

@@ -572,22 +572,27 @@ class Module(Broker, EventListener):
         injectable = self[cls]
         return injectable.get_instance()
 
-    def get_instance[T](self, cls: InputType[T]) -> T | None:
+    def get_instance[T, Default](
+        self,
+        cls: InputType[T],
+        default: Default | None = None,
+    ) -> T | Default | None:
         try:
             return self.find_instance(cls)
         except KeyError:
-            return None
+            return default
 
-    def get_lazy_instance[T](
+    def get_lazy_instance[T, Default](
         self,
         cls: InputType[T],
+        default: Default | None = None,
         *,
         cache: bool = False,
-    ) -> Invertible[T | None]:
+    ) -> Invertible[T | Default | None]:
         if cache:
-            return Lazy(lambda: self.get_instance(cls))
+            return Lazy(lambda: self.get_instance(cls, default))
 
-        function = self.inject(lambda instance=None: instance)
+        function = self.inject(lambda instance=default: instance)
         function.__injected__.set_owner(cls)
         return SimpleInvertible(function)
 

{python_injection-0.10.8.post0 → python_injection-0.10.10}/injection/integrations/fastapi.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
 from types import GenericAlias
-from typing import Any, TypeAliasType
+from typing import Any, ClassVar, Self, TypeAliasType
 
 from injection import Module, mod
 from injection.exceptions import InjectionError
@@ -28,27 +28,37 @@ def Inject[T](  # noqa: N802
 
 
 class InjectionDependency[T]:
-    __slots__ = ("__call__", "__class")
+    __slots__ = ("__call__", "__class", "__module")
 
     __call__: Callable[[], T]
     __class: type[T] | TypeAliasType | GenericAlias
+    __module: Module
+
+    __sentinel: ClassVar[object] = object()
 
     def __init__(self, cls: type[T] | TypeAliasType | GenericAlias, module: Module):
-        lazy_instance = module.get_lazy_instance(cls)
+        lazy_instance = module.get_lazy_instance(cls, default=self.__sentinel)
         self.__call__ = lambda: self.__ensure(~lazy_instance)
         self.__class = cls
+        self.__module = module
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, type(self)):
-            return hash(self) == hash(other)
+            return self.__key == other.__key
 
         return NotImplemented
 
     def __hash__(self) -> int:
-        return hash((self.__class,))
+        return hash(self.__key)
+
+    @property
+    def __key(
+        self,
+    ) -> tuple[type[Self], type[T] | TypeAliasType | GenericAlias, Module]:
+        return type(self), self.__class, self.__module
 
-    def __ensure(self, instance: T | None) -> T:
-        if instance is None:
+    def __ensure(self, instance: T | Any) -> T:
+        if instance is self.__sentinel:
             raise InjectionError(f"`{self.__class}` is an unknown dependency.")
 
         return instance

{python_injection-0.10.8.post0 → python_injection-0.10.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-injection"
-version = "0.10.8.post0"
+version = "0.10.10"
 description = "Fast and easy dependency injection framework."
 license = "MIT"
 authors = ["remimd"]
@@ -31,7 +31,7 @@ mypy = "*"
 ruff = "*"
 
 [tool.poetry.group.test.dependencies]
-blacksheep = "*"
+blacksheep = { version = "*", optional = true }
 fastapi = "*"
 httpx = "*"
 pydantic = "*"
@@ -54,6 +54,7 @@ exclude_lines = [
     "pass",
     "pragma: no cover",
     "raise NotImplementedError",
+    "return NotImplemented",
 ]
 
 [tool.coverage.run]
@@ -64,12 +65,12 @@ check_untyped_defs = true
 disallow_any_generics = true
 disallow_subclassing_any = true
 disallow_untyped_defs = true
-enable_incomplete_feature = ["NewGenericSyntax"]
 exclude = [
     "documentation/example/",
     "tests/",
     "bench.py",
     "conftest.py",
+    "injection/integrations/blacksheep.py",
 ]
 follow_imports = "silent"
 no_implicit_reexport = true
@@ -84,7 +85,7 @@ warn_required_dynamic_aliases = true
 
 [tool.pytest.ini_options]
 python_files = "test_*.py"
-addopts = "--tb short --cov ./ --cov-report term-missing:skip-covered"
+addopts = "--tb short --cov ./ --cov-report term-missing:skip-covered --ignore tests/integrations/test_blacksheep.py"
 asyncio_default_fixture_loop_scope = "session"
 asyncio_mode = "auto"
 testpaths = "**/tests/"