python-injection 0.9.4.post0__tar.gz → 0.9.5__tar.gz

{python_injection-0.9.4.post0 → python_injection-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-injection
-Version: 0.9.4.post0
+Version: 0.9.5
 Summary: Fast and easy dependency injection framework.
 Home-page: https://github.com/100nm/python-injection
 License: MIT
@@ -59,7 +59,8 @@ from injection import set_constant
 class ServiceC:
     """ class implementation """
 
-service_c = set_constant(ServiceC())
+service_c = ServiceC()
+set_constant(service_c)
 ```
 
 ## Inject an instance

{python_injection-0.9.4.post0 → python_injection-0.9.5}/documentation/basic-usage.md

@@ -33,7 +33,8 @@ from injection import set_constant
 class ServiceC:
     """ class implementation """
 
-service_c = set_constant(ServiceC())
+service_c = ServiceC()
+set_constant(service_c)
 ```
 
 ## Inject an instance

{python_injection-0.9.4.post0 → python_injection-0.9.5}/injection/__init__.pyi

@@ -101,7 +101,7 @@ class Module:
         on: TypeInfo[T] = ...,
         *,
         mode: InjectableMode | InjectableModeStr = ...,
-    ) -> T:
+    ) -> Self:
         """
         Function for registering a specific instance to be injected. This is useful for
         registering global variables. The difference with the singleton decorator is

{python_injection-0.9.4.post0 → python_injection-0.9.5}/injection/common/tools/type.py

@@ -59,9 +59,9 @@ def analyze_types(*types: type | Any) -> Iterator[TypeReport[Any]]:
 
 def get_return_types(*args: TypeInfo[Any]) -> Iterator[type | UnionType]:
     for arg in args:
-        origin = get_origin(arg) or arg
-
-        if isinstance(origin, Iterable) and not isinstance(origin, type | str):
+        if isinstance(arg, Iterable) and not (
+            isinstance(arg, type | str) or isinstance(get_origin(arg), type)
+        ):
             inner_args = arg
 
         elif isfunction(arg):

{python_injection-0.9.4.post0 → python_injection-0.9.5}/injection/core/module.py

@@ -66,7 +66,7 @@ Events
 
 @dataclass(frozen=True, slots=True)
 class ContainerEvent(Event, ABC):
-    on_container: Container
+    container: Container
 
 
 @dataclass(frozen=True, slots=True)
@@ -85,7 +85,7 @@ class ContainerDependenciesUpdated(ContainerEvent):
 
 @dataclass(frozen=True, slots=True)
 class ModuleEvent(Event, ABC):
-    on_module: Module
+    module: Module
 
 
 @dataclass(frozen=True, slots=True)
@@ -93,7 +93,7 @@ class ModuleEventProxy(ModuleEvent):
     event: Event
 
     def __str__(self) -> str:
-        return f"`{self.on_module}` has propagated an event: {self.origin}"
+        return f"`{self.module}` has propagated an event: {self.origin}"
 
     @property
     def history(self) -> Iterator[Event]:
@@ -113,7 +113,7 @@ class ModuleAdded(ModuleEvent):
     priority: Priority
 
     def __str__(self) -> str:
-        return f"`{self.on_module}` now uses `{self.module_added}`."
+        return f"`{self.module}` now uses `{self.module_added}`."
 
 
 @dataclass(frozen=True, slots=True)
@@ -121,7 +121,7 @@ class ModuleRemoved(ModuleEvent):
     module_removed: Module
 
     def __str__(self) -> str:
-        return f"`{self.on_module}` no longer uses `{self.module_removed}`."
+        return f"`{self.module}` no longer uses `{self.module_removed}`."
 
 
 @dataclass(frozen=True, slots=True)
@@ -131,7 +131,7 @@ class ModulePriorityUpdated(ModuleEvent):
 
     def __str__(self) -> str:
         return (
-            f"In `{self.on_module}`, the priority `{self.priority}` "
+            f"In `{self.module}`, the priority `{self.priority}` "
             f"has been applied to `{self.module_updated}`."
         )
 
@@ -265,7 +265,7 @@ class Container(Broker):
 
     def __getitem__[T](self, cls: type[T] | UnionType, /) -> Injectable[T]:
         for report in analyze_types(cls):
-            for scoped_report in dict.fromkeys((report, report.no_args)):
+            for scoped_report in OrderedDict.fromkeys((report, report.no_args)):
                 try:
                     injectable, _ = self.__records[scoped_report]
                 except KeyError:
@@ -302,7 +302,7 @@ class Container(Broker):
         if records:
             event = ContainerDependenciesUpdated(self, records.keys(), mode)
 
-            with self.notify(event):
+            with self.dispatch(event):
                 self.__records.update(records)
 
         return self
@@ -318,7 +318,7 @@ class Container(Broker):
         self.__channel.add_listener(listener)
         return self
 
-    def notify(self, event: Event) -> ContextManager:
+    def dispatch(self, event: Event) -> ContextManager:
         return self.__channel.dispatch(event)
 
     def __prepare_reports_for_updating(
@@ -455,7 +455,7 @@ class Module(EventListener, Broker):
         on: TypeInfo[T] = (),
         *,
         mode: Mode | ModeStr = Mode.get_default(),
-    ) -> T:
+    ) -> Self:
         cls = type(instance)
         self.injectable(
             lambda: instance,
@@ -463,7 +463,7 @@ class Module(EventListener, Broker):
             on=(cls, on),
             mode=mode,
         )
-        return instance
+        return self
 
     def inject(
         self,
@@ -544,7 +544,7 @@ class Module(EventListener, Broker):
         priority = Priority(priority)
         event = ModuleAdded(self, module, priority)
 
-        with self.notify(event):
+        with self.dispatch(event):
             self.__modules[module] = None
             self.__move_module(module, priority)
             module.add_listener(self)
@@ -555,7 +555,7 @@ class Module(EventListener, Broker):
         event = ModuleRemoved(self, module)
 
         with suppress(KeyError):
-            with self.notify(event):
+            with self.dispatch(event):
                 self.__modules.pop(module)
                 module.remove_listener(self)
 
@@ -576,7 +576,7 @@ class Module(EventListener, Broker):
         priority = Priority(priority)
         event = ModulePriorityUpdated(self, module, priority)
 
-        with self.notify(event):
+        with self.dispatch(event):
             self.__move_module(module, priority)
 
         return self
@@ -602,15 +602,20 @@ class Module(EventListener, Broker):
 
     def on_event(self, event: Event, /) -> ContextManager:
         self_event = ModuleEventProxy(self, event)
-        return self.notify(self_event)
+        return self.dispatch(self_event)
 
     @contextmanager
-    def notify(self, event: Event):
+    def dispatch(self, event: Event):
         self.__check_locking()
 
         with self.__channel.dispatch(event):
             yield
-            self.__send_debug(event)
+            message = str(event)
+            self.__debug(message)
+
+    def __debug(self, message: object):
+        for logger in tuple(self.__loggers):
+            logger.debug(message)
 
     def __check_locking(self):
         if self.is_locked:
@@ -626,10 +631,6 @@ 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 tuple(self.__loggers):
-            logger.debug(message)
-
     @classmethod
     def from_name(cls, name: str) -> Self:
         with suppress(KeyError):
@@ -816,7 +817,7 @@ class InjectedFunction(EventListener):
     @contextmanager
     def _(self, event: ModuleEvent, /):
         yield
-        self.update(event.on_module)
+        self.update(event.module)
 
     def __setup(self):
         queue = self.__setup_queue

{python_injection-0.9.4.post0 → python_injection-0.9.5}/injection/integrations/blacksheep.py

@@ -22,7 +22,6 @@ class InjectionServices(ContainerProtocol):
 
     def register(self, obj_type: type | Any, *args, **kwargs):
         self.__module.injectable(obj_type)
-        return self
 
     def resolve[T](self, obj_type: type[T] | Any, *args, **kwargs) -> T:
         return self.__module.find_instance(obj_type)

python_injection-0.9.5/injection/testing/__init__.py

@@ -0,0 +1,35 @@
+from contextlib import contextmanager
+from functools import partial
+
+from injection import Module, ModulePriority, mod
+
+__all__ = (
+    "set_test_constant",
+    "should_be_test_injectable",
+    "test_injectable",
+    "test_singleton",
+    "use_test_injectables",
+)
+
+
+tmod = partial(mod, "testing")
+
+set_test_constant = tmod().set_constant
+should_be_test_injectable = tmod().should_be_injectable
+test_injectable = tmod().injectable
+test_singleton = tmod().singleton
+
+
+@contextmanager
+def use_test_injectables(*, module: Module = None, test_module: Module = None):
+    module = module or mod()
+    test_module = test_module or tmod()
+
+    for m in (module, test_module):
+        m.unlock()
+
+    del m
+
+    with module.use_temporarily(test_module, priority=ModulePriority.HIGH):
+        yield
+        module.unlock()

{python_injection-0.9.4.post0 → python_injection-0.9.5}/injection/testing/__init__.pyi

@@ -11,7 +11,7 @@ test_singleton = _.singleton
 
 def use_test_injectables(
     *,
-    on: Module = ...,
+    module: Module = ...,
     test_module: Module = ...,
 ) -> ContextManager | ContextDecorator:
     """

{python_injection-0.9.4.post0 → python_injection-0.9.5}/injection/utils.py

@@ -1,4 +1,4 @@
-from collections.abc import Callable
+from collections.abc import Callable, Iterator
 from importlib import import_module
 from pkgutil import walk_packages
 from types import ModuleType
@@ -6,7 +6,10 @@ from types import ModuleType
 __all__ = ("load_package",)
 
 
-def load_package(package: ModuleType | str, predicate: Callable[[str], bool] = None):
+def load_package(
+    package: ModuleType | str,
+    predicate: Callable[[str], bool] = lambda module_name: True,
+) -> tuple[ModuleType, ...]:
     """
     Function for importing all modules in a Python package.
     Pass the `predicate` parameter if you want to filter the modules to be imported.
@@ -15,6 +18,13 @@ def load_package(package: ModuleType | str, predicate: Callable[[str], bool] = N
     if isinstance(package, str):
         package = import_module(package)
 
+    return tuple(__iter_modules(package, predicate))
+
+
+def __iter_modules(
+    package: ModuleType,
+    predicate: Callable[[str], bool],
+) -> Iterator[ModuleType]:
     try:
         path = package.__path__
     except AttributeError as exc:
@@ -22,15 +32,10 @@ def load_package(package: ModuleType | str, predicate: Callable[[str], bool] = N
             "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__}."):
         name = info.name
 
         if info.ispkg or not predicate(name):
             continue
 
-        import_module(name)
+        yield import_module(name)

{python_injection-0.9.4.post0 → python_injection-0.9.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-injection"
-version = "0.9.4.post0"
+version = "0.9.5"
 description = "Fast and easy dependency injection framework."
 license = "MIT"
 authors = ["remimd"]

python_injection-0.9.4.post0/injection/testing/__init__.py

@@ -1,35 +0,0 @@
-from contextlib import contextmanager
-from functools import partial
-
-from injection import Module, ModulePriority, mod
-
-__all__ = (
-    "set_test_constant",
-    "should_be_test_injectable",
-    "test_injectable",
-    "test_singleton",
-    "use_test_injectables",
-)
-
-
-testing_mod = partial(mod, "testing")
-
-set_test_constant = testing_mod().set_constant
-should_be_test_injectable = testing_mod().should_be_injectable
-test_injectable = testing_mod().injectable
-test_singleton = testing_mod().singleton
-
-
-@contextmanager
-def use_test_injectables(*, on: Module = None, test_module: Module = None):
-    on = on or mod()
-    test_module = test_module or testing_mod()
-
-    for module in (on, test_module):
-        module.unlock()
-
-    del module
-
-    with on.use_temporarily(test_module, priority=ModulePriority.HIGH):
-        yield
-        on.unlock()