python-injection 0.10.3__tar.gz → 0.10.5__tar.gz

{python_injection-0.10.3 → python_injection-0.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-injection
-Version: 0.10.3
+Version: 0.10.5
 Summary: Fast and easy dependency injection framework.
 Home-page: https://github.com/100nm/python-injection
 License: MIT
@@ -63,7 +63,6 @@ class Printer:
         self.history.append(message)
         print(message)
 
-
 @injectable
 class Service:
     def __init__(self, printer: Printer):
@@ -72,12 +71,10 @@ class Service:
     def hello(self):
         self.printer.print("Hello world!")
 
-
 @inject
 def main(service: Service):
     service.hello()
 
-
 if __name__ == "__main__":
     main()
 ```

{python_injection-0.10.3 → python_injection-0.10.5}/README.md

@@ -37,7 +37,6 @@ class Printer:
         self.history.append(message)
         print(message)
 
-
 @injectable
 class Service:
     def __init__(self, printer: Printer):
@@ -46,12 +45,10 @@ class Service:
     def hello(self):
         self.printer.print("Hello world!")
 
-
 @inject
 def main(service: Service):
     service.hello()
 
-
 if __name__ == "__main__":
     main()
 ```

{python_injection-0.10.3 → python_injection-0.10.5}/injection/_core/common/type.py

@@ -1,9 +1,17 @@
 from collections.abc import Awaitable, Callable, Iterable, Iterator
 from inspect import iscoroutinefunction, isfunction
 from types import GenericAlias, UnionType
-from typing import Annotated, Any, Union, get_args, get_origin, get_type_hints
-
-type TypeDef[T] = type[T] | GenericAlias
+from typing import (
+    Annotated,
+    Any,
+    TypeAliasType,
+    Union,
+    get_args,
+    get_origin,
+    get_type_hints,
+)
+
+type TypeDef[T] = type[T] | TypeAliasType | GenericAlias
 type InputType[T] = TypeDef[T] | UnionType
 type TypeInfo[T] = InputType[T] | Callable[..., T] | Iterable[TypeInfo[T]]
 

{python_injection-0.10.3 → python_injection-0.10.5}/injection/_core/hook.py

@@ -2,7 +2,7 @@ import itertools
 from collections.abc import Callable, Generator, Iterator
 from dataclasses import dataclass, field
 from inspect import isclass, isgeneratorfunction
-from typing import Self
+from typing import Any, Self
 
 from injection.exceptions import HookError
 
@@ -48,11 +48,11 @@ class Hook[**P, T]:
         handler: Callable[P, T],
         function: HookFunction[P, T],
     ) -> Callable[P, T]:
-        if not isgeneratorfunction(function):
+        if not cls.__is_generator_function(function):
             return function  # type: ignore[return-value]
 
         def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
-            hook = function(*args, **kwargs)
+            hook: HookGenerator[T] = function(*args, **kwargs)  # type: ignore[assignment]
 
             try:
                 next(hook)
@@ -87,6 +87,14 @@ class Hook[**P, T]:
 
         return handler
 
+    @staticmethod
+    def __is_generator_function(obj: Any) -> bool:
+        for o in obj, getattr(obj, "__call__", None):
+            if isgeneratorfunction(o):
+                return True
+
+        return False
+
 
 def apply_hooks[**P, T](
     handler: Callable[P, T],

python_injection-0.10.5/injection/integrations/__init__.py

@@ -0,0 +1,11 @@
+from importlib.util import find_spec
+from typing import Literal
+
+__all__ = ("_is_installed",)
+
+
+def _is_installed(package: str, needed_for: object, /) -> Literal[True]:
+    if find_spec(package) is None:
+        raise RuntimeError(f"To use `{needed_for}`, {package} must be installed.")
+
+    return True

{python_injection-0.10.3 → python_injection-0.10.5}/injection/integrations/blacksheep.py

@@ -1,15 +1,11 @@
 from typing import Any, override
 
 from injection import Module, mod
+from injection.integrations import _is_installed
 
 __all__ = ("InjectionServices",)
 
-
-try:
-    import blacksheep  # noqa: F401
-except ImportError as exc:  # pragma: no cover
-    raise ImportError(f"To use `{__name__}`, blacksheep must be installed.") from exc
-else:
+if _is_installed("blacksheep", __name__):
     from rodi import ContainerProtocol
 
 

python_injection-0.10.5/injection/integrations/fastapi.py

@@ -0,0 +1,37 @@
+from collections.abc import Callable
+from typing import Any
+
+from injection import Module, mod
+from injection.exceptions import InjectionError
+from injection.integrations import _is_installed
+
+__all__ = ("Inject",)
+
+if _is_installed("fastapi", __name__):
+    from fastapi import Depends
+
+
+def Inject[T](cls: type[T] | Any, /, module: Module | None = None) -> Any:  # noqa: N802
+    """
+    Declare a FastAPI dependency with `python-injection`.
+    """
+
+    dependency: InjectionDependency[T] = InjectionDependency(cls, module or mod())
+    return Depends(dependency)
+
+
+class InjectionDependency[T]:
+    __slots__ = ("__call__",)
+
+    __call__: Callable[[], T]
+
+    def __init__(self, cls: type[T] | Any, module: Module):
+        lazy_instance = module.get_lazy_instance(cls)
+        self.__call__ = lambda: self.__ensure(~lazy_instance, cls)
+
+    @staticmethod
+    def __ensure[_T](instance: _T | None, cls: type[_T] | Any) -> _T:
+        if instance is None:
+            raise InjectionError(f"`{cls}` is an unknown dependency.")
+
+        return instance

{python_injection-0.10.3 → python_injection-0.10.5}/injection/testing/__init__.py

@@ -1,4 +1,3 @@
-from contextlib import ContextDecorator
 from typing import ContextManager, Final
 
 from injection import mod
@@ -22,7 +21,5 @@ test_injectable = mod(_TEST_PROFILE_NAME).injectable
 test_singleton = mod(_TEST_PROFILE_NAME).singleton
 
 
-def load_test_profile(
-    *other_profile_names: str,
-) -> ContextManager[None] | ContextDecorator:
+def load_test_profile(*other_profile_names: str) -> ContextManager[None]:
     return load_profile(_TEST_PROFILE_NAME, *other_profile_names)

{python_injection-0.10.3 → python_injection-0.10.5}/injection/testing/__init__.pyi

@@ -1,4 +1,3 @@
-from contextlib import ContextDecorator
 from typing import ContextManager
 
 import injection as _
@@ -9,9 +8,7 @@ test_constant = _.constant
 test_injectable = _.injectable
 test_singleton = _.singleton
 
-def load_test_profile(
-    *additional_names: str,
-) -> ContextManager[None] | ContextDecorator:
+def load_test_profile(*other_profile_names: str) -> ContextManager[None]:
     """
     Context manager or decorator for temporary use test module.
     """

{python_injection-0.10.3 → python_injection-0.10.5}/injection/utils.py

@@ -1,5 +1,5 @@
 from collections.abc import Callable, Iterator
-from contextlib import ContextDecorator, contextmanager
+from contextlib import contextmanager
 from importlib import import_module
 from pkgutil import walk_packages
 from types import ModuleType as PythonModule
@@ -10,11 +10,7 @@ from injection import mod
 __all__ = ("load_packages", "load_profile")
 
 
-def load_profile(
-    name: str,
-    /,
-    *other_profile_names: str,
-) -> ContextManager[None] | ContextDecorator:
+def load_profile(name: str, /, *other_profile_names: str) -> ContextManager[None]:
     """
     Injection module initialization function based on profile name.
     A profile name is equivalent to an injection module name.
@@ -27,12 +23,14 @@ def load_profile(
 
     target = mod().unlock().init_modules(*modules)
 
+    del module, modules
+
     @contextmanager
-    def teardown() -> Iterator[None]:
+    def cleaner() -> Iterator[None]:
         yield
         target.unlock().init_modules()
 
-    return teardown()
+    return cleaner()
 
 
 def load_packages(

{python_injection-0.10.3 → python_injection-0.10.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-injection"
-version = "0.10.3"
+version = "0.10.5"
 description = "Fast and easy dependency injection framework."
 license = "MIT"
 authors = ["remimd"]
@@ -32,6 +32,8 @@ ruff = "*"
 
 [tool.poetry.group.test.dependencies]
 blacksheep = "*"
+fastapi = "*"
+httpx = "*"
 pydantic = "*"
 pytest = "*"
 pytest-asyncio = "*"
@@ -83,6 +85,7 @@ warn_required_dynamic_aliases = true
 [tool.pytest.ini_options]
 python_files = "test_*.py"
 addopts = "-p no:warnings --tb=short --cov=./ --cov-report term-missing:skip-covered"
+asyncio_default_fixture_loop_scope = "session"
 asyncio_mode = "auto"
 testpaths = "**/tests/"