python-injection 0.8.2__py3-none-any.whl → 0.8.3__py3-none-any.whl

injection/__init__.py

@@ -1,8 +1,10 @@
-from .core import Injectable, Module
+from .core import Injectable, InjectableMode, Module, ModulePriority
 
 __all__ = (
     "Injectable",
+    "InjectableMode",
     "Module",
+    "ModulePriority",
     "default_module",
     "get_instance",
     "get_lazy_instance",

injection/__init__.pyi

@@ -1,6 +1,7 @@
 from abc import abstractmethod
 from collections.abc import Callable, Iterable
 from contextlib import ContextDecorator
+from enum import Enum
 from types import UnionType
 from typing import (
     Any,
@@ -54,7 +55,7 @@ class Module:
         cls: type[Injectable] = ...,
         inject: bool = ...,
         on: type | Iterable[type] | UnionType = ...,
-        mode: Literal["fallback", "normal", "override"] = ...,
+        mode: InjectableMode | Literal["fallback", "normal", "override"] = ...,
     ):
         """
         Decorator applicable to a class or function. It is used to indicate how the
@@ -69,7 +70,7 @@ class Module:
         *,
         inject: bool = ...,
         on: type | Iterable[type] | UnionType = ...,
-        mode: Literal["fallback", "normal", "override"] = ...,
+        mode: InjectableMode | Literal["fallback", "normal", "override"] = ...,
     ):
         """
         Decorator applicable to a class or function. It is used to indicate how the
@@ -89,7 +90,7 @@ class Module:
         instance: _T,
         on: type | Iterable[type] | UnionType = ...,
         *,
-        mode: Literal["fallback", "normal", "override"] = ...,
+        mode: InjectableMode | Literal["fallback", "normal", "override"] = ...,
     ) -> _T:
         """
         Function for registering a specific instance to be injected. This is useful for
@@ -119,7 +120,12 @@ class Module:
         Example: instance = ~lazy_instance
         """
 
-    def use(self, module: Module, *, priority: Literal["low", "high"] = ...):
+    def use(
+        self,
+        module: Module,
+        *,
+        priority: ModulePriority | Literal["low", "high"] = ...,
+    ):
         """
         Function for using another module. Using another module replaces the module's
         dependencies with those of the module used. If the dependency is not found, it
@@ -135,13 +141,17 @@ class Module:
         self,
         module: Module,
         *,
-        priority: Literal["low", "high"] = ...,
+        priority: ModulePriority | Literal["low", "high"] = ...,
     ) -> ContextManager | ContextDecorator:
         """
         Context manager or decorator for temporary use of a module.
         """
 
-    def change_priority(self, module: Module, priority: Literal["low", "high"]):
+    def change_priority(
+        self,
+        module: Module,
+        priority: ModulePriority | Literal["low", "high"],
+    ):
         """
         Function for changing the priority of a module in use.
         There are two priority values:
@@ -155,6 +165,11 @@ class Module:
         Function to unlock the module by deleting cached instances of singletons.
         """
 
+@final
+class ModulePriority(str, Enum):
+    LOW = ...
+    HIGH = ...
+
 @runtime_checkable
 class Injectable(Protocol[_T]):
     def __init__(self, factory: Callable[[], _T] = ..., /): ...
@@ -163,3 +178,9 @@ class Injectable(Protocol[_T]):
     def unlock(self): ...
     @abstractmethod
     def get_instance(self) -> _T: ...
+
+@final
+class InjectableMode(str, Enum):
+    FALLBACK = ...
+    NORMAL = ...
+    OVERRIDE = ...

injection/core/module.py

@@ -14,6 +14,7 @@ from collections.abc import (
 )
 from contextlib import ContextDecorator, contextmanager, suppress
 from dataclasses import dataclass, field
+from enum import Enum
 from functools import partialmethod, singledispatchmethod, update_wrapper
 from inspect import Signature, isclass
 from types import MethodType, UnionType
@@ -27,7 +28,6 @@ from typing import (
     Protocol,
     TypeVar,
     cast,
-    get_args,
     runtime_checkable,
 )
 
@@ -45,7 +45,7 @@ from injection.exceptions import (
     NoInjectable,
 )
 
-__all__ = ("Injectable", "Module")
+__all__ = ("Injectable", "InjectableMode", "Module", "ModulePriority")
 
 _logger = logging.getLogger(__name__)
 
@@ -53,15 +53,6 @@ _T = TypeVar("_T")
 _Types = Iterable[type] | UnionType
 
 
-"""
-Literal types
-"""
-
-
-_Mode = Literal["fallback", "normal", "override"]
-_Priority = Literal["low", "high"]
-
-
 """
 Events
 """
@@ -75,7 +66,7 @@ class ContainerEvent(Event, ABC):
 @dataclass(frozen=True, slots=True)
 class ContainerDependenciesUpdated(ContainerEvent):
     classes: Collection[type]
-    mode: _Mode
+    mode: InjectableMode
 
     def __str__(self) -> str:
         length = len(self.classes)
@@ -113,6 +104,7 @@ class ModuleEventProxy(ModuleEvent):
 @dataclass(frozen=True, slots=True)
 class ModuleAdded(ModuleEvent):
     module_added: Module
+    priority: ModulePriority
 
     def __str__(self) -> str:
         return f"`{self.on_module}` now uses `{self.module_added}`."
@@ -129,7 +121,7 @@ class ModuleRemoved(ModuleEvent):
 @dataclass(frozen=True, slots=True)
 class ModulePriorityUpdated(ModuleEvent):
     module_updated: Module
-    priority: _Priority
+    priority: ModulePriority
 
     def __str__(self) -> str:
         return (
@@ -241,20 +233,37 @@ Container
 """
 
 
+class InjectableMode(str, Enum):
+    FALLBACK = "fallback"
+    NORMAL = "normal"
+    OVERRIDE = "override"
+
+    @property
+    def rank(self) -> int:
+        return tuple(type(self)).index(self)
+
+    @classmethod
+    def get_default(cls):
+        return cls.NORMAL
+
+
+_Mode = InjectableMode | Literal["fallback", "normal", "override"]
+
+
 class Record(NamedTuple):
     injectable: Injectable
-    mode: _Mode
+    mode: InjectableMode
 
 
 @dataclass(repr=False, frozen=True, slots=True)
 class Container(Broker):
-    __data: dict[type, Record] = field(default_factory=dict, init=False)
+    __records: dict[type, Record] = field(default_factory=dict, init=False)
     __channel: EventChannel = field(default_factory=EventChannel, init=False)
 
     def __getitem__(self, cls: type[_T] | UnionType, /) -> Injectable[_T]:
         for cls in get_origins(cls):
             try:
-                injectable, _ = self.__data[cls]
+                injectable, _ = self.__records[cls]
             except KeyError:
                 continue
 
@@ -263,7 +272,7 @@ class Container(Broker):
         raise NoInjectable(cls)
 
     def __contains__(self, cls: type | UnionType, /) -> bool:
-        return any(cls in self.__data for cls in get_origins(cls))
+        return any(cls in self.__records for cls in get_origins(cls))
 
     @property
     def is_locked(self) -> bool:
@@ -271,10 +280,11 @@ class Container(Broker):
 
     @property
     def __injectables(self) -> frozenset[Injectable]:
-        return frozenset(injectable for injectable, _ in self.__data.values())
+        return frozenset(injectable for injectable, _ in self.__records.values())
 
     @synchronized()
     def update(self, classes: Iterable[type], injectable: Injectable, mode: _Mode):
+        mode = InjectableMode(mode)
         records = {
             cls: Record(injectable, mode)
             for cls in self.__filter_classes(classes, mode)
@@ -284,7 +294,7 @@ class Container(Broker):
             event = ContainerDependenciesUpdated(self, records.keys(), mode)
 
             with self.notify(event):
-                self.__data.update(records)
+                self.__records.update(records)
 
         return self
 
@@ -302,13 +312,16 @@ class Container(Broker):
     def notify(self, event: Event) -> ContextManager | ContextDecorator:
         return self.__channel.dispatch(event)
 
-    def __filter_classes(self, classes: Iterable[type], mode: _Mode) -> Iterator[type]:
-        modes = get_args(_Mode)
-        rank = modes.index(mode)
+    def __filter_classes(
+        self,
+        classes: Iterable[type],
+        mode: InjectableMode,
+    ) -> Iterator[type]:
+        rank = mode.rank
 
         for cls in frozenset(get_origins(*classes)):
             try:
-                _, current_mode = self.__data[cls]
+                _, current_mode = self.__records[cls]
 
             except KeyError:
                 pass
@@ -319,7 +332,7 @@ class Container(Broker):
                         f"An injectable already exists for the class `{format_type(cls)}`."
                     )
 
-                elif rank < modes.index(current_mode):
+                elif rank < current_mode.rank:
                     continue
 
             yield cls
@@ -330,6 +343,18 @@ Module
 """
 
 
+class ModulePriority(str, Enum):
+    LOW = "low"
+    HIGH = "high"
+
+    @classmethod
+    def get_default(cls):
+        return cls.LOW
+
+
+_Priority = ModulePriority | Literal["low", "high"]
+
+
 @dataclass(repr=False, eq=False, frozen=True, slots=True)
 class Module(EventListener, Broker):
     name: str = field(default=None)
@@ -376,7 +401,7 @@ class Module(EventListener, Broker):
         cls: type[Injectable] = NewInjectable,
         inject: bool = True,
         on: type | _Types = None,
-        mode: _Mode = "normal",
+        mode: _Mode = InjectableMode.get_default(),
     ):
         def decorator(wp):
             factory = self.inject(wp, return_factory=True) if inject else wp
@@ -394,7 +419,7 @@ class Module(EventListener, Broker):
             self.update(
                 (wp,),
                 ShouldBeInjectable(wp),
-                mode="fallback",
+                mode=InjectableMode.FALLBACK,
             )
             return wp
 
@@ -405,7 +430,7 @@ class Module(EventListener, Broker):
         instance: _T,
         on: type | _Types = None,
         *,
-        mode: _Mode = "normal",
+        mode: _Mode = InjectableMode.get_default(),
     ) -> _T:
         cls = type(instance)
         self.injectable(
@@ -468,19 +493,25 @@ class Module(EventListener, Broker):
         self,
         classes: Iterable[type],
         injectable: Injectable,
-        mode: _Mode = "normal",
+        mode: _Mode = InjectableMode.get_default(),
     ):
         self.__container.update(classes, injectable, mode)
         return self
 
-    def use(self, module: Module, *, priority: _Priority = "low"):
+    def use(
+        self,
+        module: Module,
+        *,
+        priority: _Priority = ModulePriority.get_default(),
+    ):
         if module is self:
             raise ModuleError("Module can't be used by itself.")
 
         if module in self.__modules:
             raise ModuleError(f"`{self}` already uses `{module}`.")
 
-        event = ModuleAdded(self, module)
+        priority = ModulePriority(priority)
+        event = ModuleAdded(self, module, priority)
 
         with self.notify(event):
             self.__modules[module] = None
@@ -504,13 +535,14 @@ class Module(EventListener, Broker):
         self,
         module: Module,
         *,
-        priority: _Priority = "low",
+        priority: _Priority = ModulePriority.get_default(),
     ) -> ContextManager | ContextDecorator:
         self.use(module, priority=priority)
         yield
         self.stop_using(module)
 
     def change_priority(self, module: Module, priority: _Priority):
+        priority = ModulePriority(priority)
         event = ModulePriorityUpdated(self, module, priority)
 
         with self.notify(event):
@@ -549,8 +581,8 @@ class Module(EventListener, Broker):
         if self.is_locked:
             raise ModuleLockError(f"`{self}` is locked.")
 
-    def __move_module(self, module: Module, priority: _Priority):
-        last = priority != "high"
+    def __move_module(self, module: Module, priority: ModulePriority):
+        last = priority != ModulePriority.HIGH
 
         try:
             self.__modules.move_to_end(module, last=last)
@@ -646,14 +678,7 @@ class InjectedFunction(EventListener):
     )
 
     def __init__(self, wrapped: Callable[..., Any], /):
-        try:
-            variables = vars(wrapped)
-        except TypeError:
-            pass
-        else:
-            self.__update_vars(variables)
-            del variables
-
+        self.__update_vars_from(wrapped)
         update_wrapper(self, wrapped, updated=())
         self.__dependencies = Dependencies.empty()
         self.__owner = None
@@ -745,7 +770,15 @@ class InjectedFunction(EventListener):
         self.__signature__ = inspect.signature(self.wrapped, eval_str=True)
         return self
 
-    def __update_vars(self, variables: Mapping[str, Any], /):
+    def __update_vars_from(self, obj: Any):
+        try:
+            variables = vars(obj)
+        except TypeError:
+            pass
+        else:
+            self.__update_vars(variables)
+
+    def __update_vars(self, variables: Mapping[str, Any]):
         def is_dunder(var: str) -> bool:
             return var.startswith("__") and var.endswith("__")
 

{python_injection-0.8.2.dist-info → python_injection-0.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-injection
-Version: 0.8.2
+Version: 0.8.3
 Summary: Fast and easy dependency injection framework.
 Home-page: https://github.com/100nm/python-injection
 License: MIT
@@ -136,7 +136,7 @@ class ConcreteServiceOverload(ConcreteService):
     ...
 ```
 
-If a class is registered in a package and you want to override it, there is the `mode` parameter:
+If a class is registered in a package, and you want to override it, there is the `mode` parameter:
 
 ```python
 @injectable

{python_injection-0.8.2.dist-info → python_injection-0.8.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
-injection/__init__.py,sha256=QyzDT1tjjIvXQmwFjBJL_veQkEHYrn1OvATiGYFbzHo,609
-injection/__init__.pyi,sha256=XarvsM5fn9uMI0vNI4o1hrQAcHFL6Gaz2qSlL5hh4GQ,5395
+injection/__init__.py,sha256=6Z4-h68LLXJ6FlrLqEMeJjw_RG7jyl0b-GQwKC2vIEY,685
+injection/__init__.pyi,sha256=DrMtI3q4JYqPT2nwEoSmY3gVO62TwOUOJToEv9rtPVk,5755
 injection/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/common/event.py,sha256=uFoGRnxxkohH53JEStn4tN2Pn79HlgGExh7VkXdBwVQ,1316
 injection/common/invertible.py,sha256=CyGp57Ik1pSQ2G7bRvnFWkY0kJkZDD5_19OjMYNvQes,558
@@ -9,11 +9,11 @@ injection/common/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 injection/common/tools/threading.py,sha256=02mBkIir2kQaXt47ewMJnOvhCldXCmPI2V-BW_l_6V8,271
 injection/common/tools/type.py,sha256=-zL0dtoVZme71Mscvav7iEWxY2-JltzNTekbWOCPSFo,1276
 injection/core/__init__.py,sha256=zuf0ubI2dHnbjn1059eduhS-ACIkkROa6-dhp10krh0,22
-injection/core/module.py,sha256=F6UEi0KEdz9CutM0IzRLYJUCAnCk8XAmHUBPmxHgMjE,19663
+injection/core/module.py,sha256=mO8vHhbbvYTMFEucmpjFbGrJTeBrtlPiERmQDCxBGao,20545
 injection/exceptions.py,sha256=nE56jW00ZB1T-Z-dvfPczPShs3CwIc7tIvdYlOXlaXA,653
 injection/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/integrations/blacksheep.py,sha256=vcLil1IccS7JtXpuVu7s2LqN5Zravfe_7xpAt5cTIU0,723
 injection/utils.py,sha256=_79aiciimZpuoUTz5lojKySUMMzpkU-e7SotiHIFTI8,676
-python_injection-0.8.2.dist-info/METADATA,sha256=CSKZD9lBsSbRQO3XZYFVa6ofP5L6Gi_dsDhVke_mS1U,3671
-python_injection-0.8.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_injection-0.8.2.dist-info/RECORD,,
+python_injection-0.8.3.dist-info/METADATA,sha256=148AKRb_jDQah38kKBXqLv185AoQeq8NTgg_9JMZDY4,3672
+python_injection-0.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_injection-0.8.3.dist-info/RECORD,,