python-injection 0.9.1__tar.gz → 0.9.3__tar.gz

{python_injection-0.9.1 → python_injection-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-injection
-Version: 0.9.1
+Version: 0.9.3
 Summary: Fast and easy dependency injection framework.
 Home-page: https://github.com/100nm/python-injection
 License: MIT

{python_injection-0.9.1 → python_injection-0.9.3}/injection/__init__.pyi

@@ -2,6 +2,7 @@ from abc import abstractmethod
 from collections.abc import Callable
 from contextlib import ContextDecorator
 from enum import StrEnum
+from logging import Logger
 from types import UnionType
 from typing import (
     Any,
@@ -179,6 +180,7 @@ class Module:
         Function to unlock the module by deleting cached instances of singletons.
         """
 
+    def add_logger(self, logger: Logger) -> Self: ...
     @classmethod
     def from_name(cls, name: str) -> Self:
         """

{python_injection-0.9.1 → python_injection-0.9.3}/injection/common/invertible.py

@@ -15,7 +15,7 @@ class Invertible[T](Protocol):
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)
 class SimpleInvertible[T](Invertible[T]):
-    callable: Callable[[], T]
+    callable: Callable[..., T]
 
     def __invert__(self) -> T:
         return self.callable()

{python_injection-0.9.1 → python_injection-0.9.3}/injection/common/lazy.py

@@ -9,7 +9,7 @@ __all__ = ("Lazy", "LazyMapping")
 class Lazy[T](Invertible[T]):
     __slots__ = ("__cache", "__is_set")
 
-    def __init__(self, factory: Callable[[], T]):
+    def __init__(self, factory: Callable[..., T]):
         self.__setup_cache(factory)
 
     def __invert__(self) -> T:
@@ -19,7 +19,7 @@ class Lazy[T](Invertible[T]):
     def is_set(self) -> bool:
         return self.__is_set
 
-    def __setup_cache(self, factory: Callable[[], T]):
+    def __setup_cache(self, factory: Callable[..., T]):
         def cache_generator() -> Iterator[T]:
             nonlocal factory
             cached = factory()

{python_injection-0.9.1 → python_injection-0.9.3}/injection/core/module.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import inspect
-import logging
 from abc import ABC, abstractmethod
 from collections import OrderedDict
 from collections.abc import (
@@ -17,7 +16,8 @@ from dataclasses import dataclass, field
 from enum import StrEnum
 from functools import partialmethod, singledispatchmethod, update_wrapper
 from inspect import Signature, isclass
-from queue import Queue
+from logging import Logger, getLogger
+from queue import Empty, Queue
 from types import MethodType, UnionType
 from typing import (
     Any,
@@ -59,8 +59,6 @@ __all__ = (
     "PriorityStr",
 )
 
-_logger = logging.getLogger(__name__)
-
 """
 Events
 """
@@ -161,7 +159,7 @@ class Injectable[T](Protocol):
 
 @dataclass(repr=False, frozen=True, slots=True)
 class BaseInjectable[T](Injectable[T], ABC):
-    factory: Callable[[], T]
+    factory: Callable[..., T]
 
 
 class NewInjectable[T](BaseInjectable[T]):
@@ -386,6 +384,11 @@ class Module(EventListener, Broker):
         init=False,
         repr=False,
     )
+    __loggers: list[Logger] = field(
+        default_factory=lambda: [getLogger(__name__)],
+        init=False,
+        repr=False,
+    )
 
     __instances: ClassVar[dict[str, Module]] = {}
 
@@ -476,7 +479,7 @@ class Module(EventListener, Broker):
 
             function = InjectedFunction(wp)
 
-            @function.on_setup(block=False)
+            @function.on_setup
             def listen():
                 function.update(self)
                 self.add_listener(function)
@@ -585,6 +588,10 @@ class Module(EventListener, Broker):
 
         return self
 
+    def add_logger(self, logger: Logger) -> Self:
+        self.__loggers.append(logger)
+        return self
+
     def add_listener(self, listener: EventListener) -> Self:
         self.__channel.add_listener(listener)
         return self
@@ -603,7 +610,7 @@ class Module(EventListener, Broker):
 
         with self.__channel.dispatch(event):
             yield
-            _logger.debug(event)
+            self.__send_debug(event)
 
     def __check_locking(self):
         if self.is_locked:
@@ -619,13 +626,19 @@ class Module(EventListener, Broker):
                 f"`{module}` can't be found in the modules used by `{self}`."
             ) from exc
 
+    def __send_debug(self, message: object):
+        for logger in self.__loggers:
+            logger.debug(message)
+
     @classmethod
     def from_name(cls, name: str) -> Self:
         with suppress(KeyError):
             return cls.__instances[name]
 
-        instance = cls(name)
-        cls.__instances[name] = instance
+        with synchronized():
+            instance = cls(name)
+            cls.__instances[name] = instance
+
         return instance
 
     @classmethod
@@ -723,10 +736,8 @@ class InjectedFunction(EventListener):
         update_wrapper(self, wrapped, updated=())
         self.__dependencies = Dependencies.empty()
         self.__owner = None
-
-        queue = Queue[Callable[[], Any]]()
-        queue.put_nowait(self.__set_signature)
-        self.__setup_queue = queue
+        self.__setup_queue = Queue[Callable[..., Any]](maxsize=2)
+        self.on_setup(self.__set_signature)
 
     def __repr__(self) -> str:  # pragma: no cover
         return repr(self.wrapped)
@@ -735,13 +746,7 @@ class InjectedFunction(EventListener):
         return str(self.wrapped)
 
     def __call__(self, /, *args, **kwargs) -> Any:
-        queue = self.__setup_queue
-
-        while not queue.empty():
-            setup = queue.get()
-            setup()
-            queue.task_done()
-
+        self.__setup()
         arguments = self.bind(args, kwargs)
         return self.wrapped(*arguments.args, **arguments.kwargs)
 
@@ -796,15 +801,15 @@ class InjectedFunction(EventListener):
         self.__dependencies = Dependencies.resolve(self.signature, module, self.__owner)
         return self
 
-    def on_setup(self, wrapped: Callable[[], Any] = None, /, *, block: bool = True):
+    def on_setup(self, wrapped: Callable[..., Any] = None, /):
         def decorator(wp):
-            self.__setup_queue.put(wp, block=block)
+            self.__setup_queue.put_nowait(wp)
             return wp
 
         return decorator(wrapped) if wrapped else decorator
 
     @singledispatchmethod
-    def on_event(self, event: Event, /) -> None:  # type: ignore
+    def on_event(self, event: Event, /) -> ContextManager | None:  # type: ignore
         return None
 
     @on_event.register
@@ -813,6 +818,20 @@ class InjectedFunction(EventListener):
         yield
         self.update(event.on_module)
 
+    def __setup(self):
+        queue = self.__setup_queue
+
+        while True:
+            try:
+                task = queue.get_nowait()
+            except Empty:
+                break
+
+            task()
+            queue.task_done()
+
+        queue.join()
+
     def __set_signature(self) -> Self:
         self.__signature__ = inspect.signature(self.wrapped, eval_str=True)
         return self

{python_injection-0.9.1 → python_injection-0.9.3}/injection/testing/__init__.py

@@ -33,6 +33,8 @@ def use_test_injectables(*, on: Module = None, test_module: Module = None):
     for module in (on, test_module):
         module.unlock()
 
+    del module
+
     with on.use_temporarily(test_module, priority=ModulePriority.HIGH):
         yield
         on.unlock()

{python_injection-0.9.1 → python_injection-0.9.3}/injection/utils.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from importlib import import_module
 from pkgutil import walk_packages
 from types import ModuleType
@@ -5,9 +6,10 @@ from types import ModuleType
 __all__ = ("load_package",)
 
 
-def load_package(package: ModuleType | str):
+def load_package(package: ModuleType | str, predicate: Callable[[str], bool] = None):
     """
     Function for importing all modules in a Python package.
+    Pass the `predicate` parameter if you want to filter the modules to be imported.
     """
 
     if isinstance(package, str):
@@ -20,8 +22,15 @@ def load_package(package: ModuleType | str):
             "Package has no `__path__` attribute, as it's probably a module."
         ) from exc
 
+    if predicate is None:
+
+        def predicate(_: str) -> bool:
+            return True
+
     for info in walk_packages(path=path, prefix=f"{package.__name__}."):
-        if info.ispkg:
+        name = info.name
+
+        if info.ispkg or not predicate(name):
             continue
 
-        import_module(info.name)
+        import_module(name)

{python_injection-0.9.1 → python_injection-0.9.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-injection"
-version = "0.9.1"
+version = "0.9.3"
 description = "Fast and easy dependency injection framework."
 authors = ["remimd"]
 keywords = ["dependencies", "inject", "injection"]