python-injection 0.13.0__tar.gz → 0.13.2__tar.gz

{python_injection-0.13.0 → python_injection-0.13.2}/PKG-INFO

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

{python_injection-0.13.0 → python_injection-0.13.2}/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

{python_injection-0.13.0 → python_injection-0.13.2}/injection/_core/common/asynchronous.py

@@ -1,17 +1,7 @@
-import asyncio
 from abc import abstractmethod
-from collections.abc import Awaitable, Callable, Coroutine, Generator
+from collections.abc import Awaitable, Callable, Generator
 from dataclasses import dataclass
-from typing import Any, Protocol, runtime_checkable
-
-
-def run_sync[T](coroutine: Coroutine[Any, Any, T]) -> T:
-    loop = asyncio.get_event_loop()
-
-    try:
-        return loop.run_until_complete(coroutine)
-    finally:
-        coroutine.close()
+from typing import Any, NoReturn, Protocol, runtime_checkable
 
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)
@@ -37,13 +27,13 @@ class Caller[**P, T](Protocol):
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)
 class AsyncCaller[**P, T](Caller[P, T]):
-    callable: Callable[P, Coroutine[Any, Any, T]]
+    callable: Callable[P, Awaitable[T]]
 
     async def acall(self, /, *args: P.args, **kwargs: P.kwargs) -> T:
         return await self.callable(*args, **kwargs)
 
-    def call(self, /, *args: P.args, **kwargs: P.kwargs) -> T:
-        return run_sync(self.callable(*args, **kwargs))
+    def call(self, /, *args: P.args, **kwargs: P.kwargs) -> NoReturn:
+        raise RuntimeError("Can't call async callable synchronously.")
 
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)

python_injection-0.13.2/injection/_core/common/lazy.py

@@ -0,0 +1,55 @@
+from collections.abc import AsyncIterator, Awaitable, Callable, Iterator
+from functools import partial
+
+from injection._core.common.asynchronous import SimpleAwaitable
+from injection._core.common.invertible import Invertible, SimpleInvertible
+
+
+def lazy[T](factory: Callable[..., T]) -> Invertible[T]:
+    def cache() -> Iterator[T]:
+        nonlocal factory
+        value = factory()
+        del factory
+
+        while True:
+            yield value
+
+    getter = partial(next, cache())
+    return SimpleInvertible(getter)
+
+
+def alazy[T](factory: Callable[..., Awaitable[T]]) -> Awaitable[T]:
+    async def cache() -> AsyncIterator[T]:
+        nonlocal factory
+        value = await factory()
+        del factory
+
+        while True:
+            yield value
+
+    getter = partial(anext, cache())
+    return SimpleAwaitable(getter)
+
+
+class Lazy[T](Invertible[T]):
+    __slots__ = ("__invertible", "__is_set")
+
+    __invertible: Invertible[T]
+    __is_set: bool
+
+    def __init__(self, factory: Callable[..., T]) -> None:
+        @lazy
+        def invertible() -> T:
+            value = factory()
+            self.__is_set = True
+            return value
+
+        self.__invertible = invertible
+        self.__is_set = False
+
+    def __invert__(self) -> T:
+        return ~self.__invertible
+
+    @property
+    def is_set(self) -> bool:
+        return self.__is_set

{python_injection-0.13.0 → python_injection-0.13.2}/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,

{python_injection-0.13.0 → python_injection-0.13.2}/injection/_core/injectables.py

@@ -12,7 +12,7 @@ from typing import (
     runtime_checkable,
 )
 
-from injection._core.common.asynchronous import Caller, run_sync
+from injection._core.common.asynchronous import Caller
 from injection._core.scope import Scope, get_active_scopes, get_scope
 from injection.exceptions import InjectionError
 
@@ -138,8 +138,8 @@ class AsyncCMScopedInjectable[T](ScopedInjectable[AsyncContextManager[T], T]):
         cm = await self.factory.acall()
         return await scope.aenter(cm)
 
-    def build(self, scope: Scope) -> T:
-        return run_sync(self.abuild(scope))
+    def build(self, scope: Scope) -> NoReturn:
+        raise RuntimeError("Can't use async context manager synchronously.")
 
 
 class CMScopedInjectable[T](ScopedInjectable[ContextManager[T], T]):

{python_injection-0.13.0 → python_injection-0.13.2}/injection/_core/module.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-import asyncio
 from abc import ABC, abstractmethod
-from collections import OrderedDict
+from collections import OrderedDict, deque
 from collections.abc import (
     AsyncIterator,
     Awaitable,
@@ -26,7 +25,6 @@ from inspect import (
 )
 from inspect import signature as inspect_signature
 from logging import Logger, getLogger
-from queue import Empty, Queue
 from types import MethodType
 from typing import (
     Any,
@@ -50,7 +48,7 @@ from injection._core.common.asynchronous import (
 from injection._core.common.event import Event, EventChannel, EventListener
 from injection._core.common.invertible import Invertible, SimpleInvertible
 from injection._core.common.key import new_short_key
-from injection._core.common.lazy import Lazy, LazyMapping
+from injection._core.common.lazy import Lazy, alazy, lazy
 from injection._core.common.type import (
     InputType,
     TypeInfo,
@@ -296,6 +294,9 @@ class Locator(Broker):
 
     async def all_ready(self) -> None:
         for injectable in self.__injectables:
+            if injectable.is_locked:
+                continue
+
             await injectable.aget_instance()
 
     def add_listener(self, listener: EventListener) -> Self:
@@ -445,7 +446,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 +464,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 +487,7 @@ class Module(Broker, EventListener):
                 on=hints,
                 mode=mode,
             )
-            return wp
+            return wrapped
 
         return decorator
 
@@ -511,7 +512,7 @@ class Module(Broker, EventListener):
         mode: Mode | ModeStr = Mode.get_default(),
     ) -> Any:
         def decorator(wp: type[T]) -> type[T]:
-            lazy_instance = Lazy(wp)
+            lazy_instance = lazy(wp)
             self.injectable(
                 lambda: ~lazy_instance,
                 ignore_type_hint=True,
@@ -568,7 +569,7 @@ class Module(Broker, EventListener):
     def make_injected_function(self, wrapped, /):  # type: ignore[no-untyped-def]
         metadata = InjectMetadata(wrapped)
 
-        @metadata.on_setup
+        @metadata.task
         def listen() -> None:
             metadata.update(self)
             self.add_listener(metadata)
@@ -646,12 +647,10 @@ class Module(Broker, EventListener):
 
     def aget_lazy_instance(self, cls, default=None, *, cache=False):  # type: ignore[no-untyped-def]
         if cache:
-            coroutine = self.aget_instance(cls, default)
-            return asyncio.ensure_future(coroutine)
+            return alazy(lambda: self.aget_instance(cls, default))
 
         function = self.make_injected_function(lambda instance=default: instance)
-        metadata = function.__inject_metadata__
-        metadata.set_owner(cls)
+        metadata = function.__inject_metadata__.set_owner(cls)
         return SimpleAwaitable(metadata.acall)
 
     @overload
@@ -674,11 +673,10 @@ class Module(Broker, EventListener):
 
     def get_lazy_instance(self, cls, default=None, *, cache=False):  # type: ignore[no-untyped-def]
         if cache:
-            return Lazy(lambda: self.get_instance(cls, default))
+            return lazy(lambda: self.get_instance(cls, default))
 
         function = self.make_injected_function(lambda instance=default: instance)
-        metadata = function.__inject_metadata__
-        metadata.set_owner(cls)
+        metadata = function.__inject_metadata__.set_owner(cls)
         return SimpleInvertible(metadata.call)
 
     def update[T](self, updater: Updater[T]) -> Self:
@@ -832,10 +830,7 @@ InjectedFunction
 
 @dataclass(repr=False, frozen=True, slots=True)
 class Dependencies:
-    mapping: Mapping[str, Injectable[Any]]
-
-    def __bool__(self) -> bool:
-        return bool(self.mapping)
+    lazy_mapping: Lazy[Mapping[str, Injectable[Any]]]
 
     def __iter__(self) -> Iterator[tuple[str, Any]]:
         for name, injectable in self.mapping.items():
@@ -849,10 +844,11 @@ class Dependencies:
 
     @property
     def are_resolved(self) -> bool:
-        if isinstance(self.mapping, LazyMapping) and not self.mapping.is_set:
-            return False
+        return self.lazy_mapping.is_set
 
-        return bool(self)
+    @property
+    def mapping(self) -> Mapping[str, Injectable[Any]]:
+        return ~self.lazy_mapping
 
     async def aget_arguments(self) -> dict[str, Any]:
         return {key: value async for key, value in self}
@@ -861,12 +857,13 @@ class Dependencies:
         return dict(self)
 
     @classmethod
-    def from_mapping(cls, mapping: Mapping[str, Injectable[Any]]) -> Self:
-        return cls(mapping)
+    def from_iterable(cls, iterable: Iterable[tuple[str, Injectable[Any]]]) -> Self:
+        lazy_mapping = Lazy(lambda: dict(iterable))
+        return cls(lazy_mapping)
 
     @classmethod
     def empty(cls) -> Self:
-        return cls.from_mapping({})
+        return cls.from_iterable(())
 
     @classmethod
     def resolve(
@@ -875,8 +872,8 @@ class Dependencies:
         module: Module,
         owner: type | None = None,
     ) -> Self:
-        dependencies = LazyMapping(cls.__resolver(signature, module, owner))
-        return cls.from_mapping(dependencies)
+        iterable = cls.__resolver(signature, module, owner)
+        return cls.from_iterable(iterable)
 
     @classmethod
     def __resolver(
@@ -917,21 +914,21 @@ class InjectMetadata[**P, T](Caller[P, T], EventListener):
     __slots__ = (
         "__dependencies",
         "__owner",
-        "__setup_queue",
         "__signature",
+        "__tasks",
         "__wrapped",
     )
 
     __dependencies: Dependencies
     __owner: type | None
-    __setup_queue: Queue[Callable[..., Any]] | None
     __signature: Signature
+    __tasks: deque[Callable[..., Any]]
     __wrapped: Callable[P, T]
 
     def __init__(self, wrapped: Callable[P, T], /) -> None:
         self.__dependencies = Dependencies.empty()
         self.__owner = None
-        self.__setup_queue = Queue()
+        self.__tasks = deque()
         self.__wrapped = wrapped
 
     @property
@@ -964,12 +961,12 @@ class InjectMetadata[**P, T](Caller[P, T], EventListener):
         return self.__bind(args, kwargs, additional_arguments)
 
     async def acall(self, /, *args: P.args, **kwargs: P.kwargs) -> T:
-        self.__setup()
+        self.__run_tasks()
         arguments = await self.abind(args, kwargs)
         return self.wrapped(*arguments.args, **arguments.kwargs)
 
     def call(self, /, *args: P.args, **kwargs: P.kwargs) -> T:
-        self.__setup()
+        self.__run_tasks()
         arguments = self.bind(args, kwargs)
         return self.wrapped(*arguments.args, **arguments.kwargs)
 
@@ -989,14 +986,9 @@ class InjectMetadata[**P, T](Caller[P, T], EventListener):
         self.__dependencies = Dependencies.resolve(self.signature, module, self.__owner)
         return self
 
-    def on_setup[**_P, _T](self, wrapped: Callable[_P, _T] | None = None, /) -> Any:
+    def task[**_P, _T](self, wrapped: Callable[_P, _T] | None = None, /) -> Any:
         def decorator(wp: Callable[_P, _T]) -> Callable[_P, _T]:
-            queue = self.__setup_queue
-
-            if queue is None:
-                raise RuntimeError(f"`{self}` is already up.")
-
-            queue.put_nowait(wp)
+            self.__tasks.append(wp)
             return wp
 
         return decorator(wrapped) if wrapped else decorator
@@ -1027,24 +1019,10 @@ class InjectMetadata[**P, T](Caller[P, T], EventListener):
         bound.arguments = bound.arguments | additional_arguments | bound.arguments
         return Arguments(bound.args, bound.kwargs)
 
-    def __close_setup_queue(self) -> None:
-        self.__setup_queue = None
-
-    def __setup(self) -> None:
-        if (queue := self.__setup_queue) is None:
-            return
-
-        while True:
-            try:
-                task = queue.get_nowait()
-            except Empty:
-                break
-
+    def __run_tasks(self) -> None:
+        while tasks := self.__tasks:
+            task = tasks.popleft()
             task()
-            queue.task_done()
-
-        queue.join()
-        self.__close_setup_queue()
 
 
 class InjectedFunction[**P, T](ABC):

{python_injection-0.13.0 → python_injection-0.13.2}/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,10 +200,8 @@ 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:
-        raise ScopeError(
-            "Synchronous scope doesn't support asynchronous context manager."
-        )
+    async def aenter[T](self, context_manager: AsyncContextManager[T]) -> NoReturn:
+        raise ScopeError("Synchronous scope doesn't support async context manager.")
 
     def enter[T](self, context_manager: ContextManager[T]) -> T:
         return self.delegate.enter_context(context_manager)

python_injection-0.13.2/injection/integrations/fastapi.py

@@ -0,0 +1,27 @@
+from types import GenericAlias
+from typing import Any, TypeAliasType
+
+from fastapi import Depends
+
+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`.
+    """
+
+    module = module or mod()
+    lazy_instance = module.aget_lazy_instance(cls, default)
+
+    async def getter() -> T:
+        return await lazy_instance
+
+    return Depends(getter, use_cache=False)

{python_injection-0.13.0 → python_injection-0.13.2}/pyproject.toml

@@ -24,7 +24,7 @@ test = [
 
 [project]
 name = "python-injection"
-version = "0.13.0"
+version = "0.13.2"
 description = "Fast and easy dependency injection framework."
 license = { text = "MIT" }
 readme = "README.md"
@@ -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

python_injection-0.13.0/injection/_core/common/lazy.py

@@ -1,56 +0,0 @@
-from collections.abc import Callable, Iterator, Mapping
-from types import MappingProxyType
-
-from injection._core.common.invertible import Invertible
-
-
-class Lazy[T](Invertible[T]):
-    __slots__ = ("__iterator", "__is_set")
-
-    __iterator: Iterator[T]
-    __is_set: bool
-
-    def __init__(self, factory: Callable[..., T]) -> None:
-        self.__setup_cache(factory)
-
-    def __invert__(self) -> T:
-        return next(self.__iterator)
-
-    @property
-    def is_set(self) -> bool:
-        return self.__is_set
-
-    def __setup_cache(self, factory: Callable[..., T]) -> None:
-        def infinite_yield() -> Iterator[T]:
-            nonlocal factory
-            cached = factory()
-            self.__is_set = True
-            del factory
-
-            while True:
-                yield cached
-
-        self.__iterator = infinite_yield()
-        self.__is_set = False
-
-
-class LazyMapping[K, V](Mapping[K, V]):
-    __slots__ = ("__lazy",)
-
-    __lazy: Lazy[Mapping[K, V]]
-
-    def __init__(self, iterator: Iterator[tuple[K, V]]) -> None:
-        self.__lazy = Lazy(lambda: MappingProxyType(dict(iterator)))
-
-    def __getitem__(self, key: K, /) -> V:
-        return (~self.__lazy)[key]
-
-    def __iter__(self) -> Iterator[K]:
-        yield from ~self.__lazy
-
-    def __len__(self) -> int:
-        return len(~self.__lazy)
-
-    @property
-    def is_set(self) -> bool:
-        return self.__lazy.is_set

python_injection-0.13.0/injection/integrations/fastapi.py

@@ -1,38 +0,0 @@
-from collections.abc import Awaitable
-from types import GenericAlias
-from typing import Any, TypeAliasType
-
-from fastapi import Depends
-
-from injection import Module, mod
-
-__all__ = ("Inject",)
-
-
-def Inject[T](  # noqa: N802
-    cls: type[T] | TypeAliasType | GenericAlias,
-    /,
-    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)
-
-
-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