python-injection 0.9.5__tar.gz → 0.9.6__tar.gz

{python_injection-0.9.5 → python_injection-0.9.6}/PKG-INFO

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

{python_injection-0.9.5 → python_injection-0.9.6}/injection/__init__.py

@@ -1,6 +1,6 @@
-from .core import Injectable, Module
-from .core import Mode as InjectableMode
-from .core import Priority as ModulePriority
+from ._core import Injectable, Module
+from ._core import Mode as InjectableMode
+from ._core import Priority as ModulePriority
 
 __all__ = (
     "Injectable",

{python_injection-0.9.5 → python_injection-0.9.6}/injection/__init__.pyi

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from collections.abc import Callable
 from contextlib import ContextDecorator
-from enum import StrEnum
+from enum import Enum
 from logging import Logger
 from types import UnionType
 from typing import (
@@ -13,11 +13,11 @@ from typing import (
     runtime_checkable,
 )
 
-from .common.invertible import Invertible
-from .common.tools.type import TypeInfo
-from .core import InjectableFactory
-from .core import ModeStr as InjectableModeStr
-from .core import PriorityStr as ModulePriorityStr
+from ._core import InjectableFactory as _InjectableFactory
+from ._core import ModeStr as InjectableModeStr
+from ._core import PriorityStr as ModulePriorityStr
+from ._core.common.invertible import Invertible as _Invertible
+from ._core.common.type import TypeInfo as _TypeInfo
 
 _: Module = ...
 
@@ -62,9 +62,9 @@ class Module:
         wrapped: Callable[..., T] = ...,
         /,
         *,
-        cls: InjectableFactory[T] = ...,
+        cls: _InjectableFactory[T] = ...,
         inject: bool = ...,
-        on: TypeInfo[T] = ...,
+        on: _TypeInfo[T] = ...,
         mode: InjectableMode | InjectableModeStr = ...,
     ):
         """
@@ -79,7 +79,7 @@ class Module:
         /,
         *,
         inject: bool = ...,
-        on: TypeInfo[T] = ...,
+        on: _TypeInfo[T] = ...,
         mode: InjectableMode | InjectableModeStr = ...,
     ):
         """
@@ -98,7 +98,7 @@ class Module:
     def set_constant[T](
         self,
         instance: T,
-        on: TypeInfo[T] = ...,
+        on: _TypeInfo[T] = ...,
         *,
         mode: InjectableMode | InjectableModeStr = ...,
     ) -> Self:
@@ -125,7 +125,7 @@ class Module:
         cls: type[T],
         *,
         cache: bool = ...,
-    ) -> Invertible[T | None]:
+    ) -> _Invertible[T | None]:
         """
         Function used to retrieve an instance associated with the type passed in
         parameter or `None`. Return a `Invertible` object. To access the instance
@@ -199,7 +199,7 @@ class Module:
         """
 
 @final
-class ModulePriority(StrEnum):
+class ModulePriority(Enum):
     LOW = ...
     HIGH = ...
 
@@ -212,7 +212,7 @@ class Injectable[T](Protocol):
     def get_instance(self) -> T: ...
 
 @final
-class InjectableMode(StrEnum):
+class InjectableMode(Enum):
     FALLBACK = ...
     NORMAL = ...
     OVERRIDE = ...

{python_injection-0.9.5/injection → python_injection-0.9.6/injection/_core}/common/lazy.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable, Iterator, Mapping
 from types import MappingProxyType
 
-from injection.common.invertible import Invertible
+from injection._core.common.invertible import Invertible
 
 __all__ = ("Lazy", "LazyMapping")
 

{python_injection-0.9.5/injection/common/tools → python_injection-0.9.6/injection/_core/common}/threading.py

@@ -1,3 +1,4 @@
+from collections.abc import Iterator
 from contextlib import contextmanager
 from threading import RLock
 
@@ -5,7 +6,7 @@ __all__ = ("synchronized",)
 
 
 @contextmanager
-def synchronized():
+def synchronized() -> Iterator[RLock]:
     lock = RLock()
 
     with lock:

{python_injection-0.9.5/injection/core → python_injection-0.9.6/injection/_core}/module.py

@@ -30,12 +30,13 @@ from typing import (
     Self,
     runtime_checkable,
 )
+from uuid import uuid4
 
-from injection.common.event import Event, EventChannel, EventListener
-from injection.common.invertible import Invertible, SimpleInvertible
-from injection.common.lazy import Lazy, LazyMapping
-from injection.common.tools.threading import synchronized
-from injection.common.tools.type import (
+from injection._core.common.event import Event, EventChannel, EventListener
+from injection._core.common.invertible import Invertible, SimpleInvertible
+from injection._core.common.lazy import Lazy, LazyMapping
+from injection._core.common.threading import synchronized
+from injection._core.common.type import (
     TypeInfo,
     TypeReport,
     analyze_types,
@@ -65,12 +66,12 @@ Events
 
 
 @dataclass(frozen=True, slots=True)
-class ContainerEvent(Event, ABC):
-    container: Container
+class LocatorEvent(Event, ABC):
+    locator: Locator
 
 
 @dataclass(frozen=True, slots=True)
-class ContainerDependenciesUpdated(ContainerEvent):
+class LocatorDependenciesUpdated(LocatorEvent):
     reports: Collection[TypeReport]
     mode: Mode
 
@@ -78,8 +79,8 @@ class ContainerDependenciesUpdated(ContainerEvent):
         length = len(self.reports)
         formatted_types = ", ".join(f"`{report.type}`" for report in self.reports)
         return (
-            f"{length} container dependenc{'ies' if length > 1 else 'y'} have "
-            f"been updated{f': {formatted_types}' if formatted_types else ''}."
+            f"{length} dependenc{"ies" if length > 1 else "y"} have been "
+            f"updated{f": {formatted_types}" if formatted_types else ""}."
         )
 
 
@@ -232,7 +233,7 @@ class Broker(Protocol):
 
 
 """
-Container
+Locator
 """
 
 
@@ -259,7 +260,7 @@ class Record[T](NamedTuple):
 
 
 @dataclass(repr=False, frozen=True, slots=True)
-class Container(Broker):
+class Locator(Broker):
     __records: dict[TypeReport, Record] = field(default_factory=dict, init=False)
     __channel: EventChannel = field(default_factory=EventChannel, init=False)
 
@@ -294,13 +295,14 @@ class Container(Broker):
         mode: Mode | ModeStr,
     ) -> Self:
         mode = Mode(mode)
+        record = Record(injectable, mode)
         records = {
-            report: Record(injectable, mode)
+            report: record
             for report in self.__prepare_reports_for_updating(classes, mode)
         }
 
         if records:
-            event = ContainerDependenciesUpdated(self, records.keys(), mode)
+            event = LocatorDependenciesUpdated(self, records.keys(), mode)
 
             with self.dispatch(event):
                 self.__records.update(records)
@@ -367,25 +369,25 @@ type InjectableFactory[T] = Callable[[Callable[..., T]], Injectable[T]]
 
 
 @dataclass(eq=False, frozen=True, slots=True)
-class Module(EventListener, Broker):
-    name: str | None = field(default=None)
+class Module(Broker, EventListener):
+    name: str = field(default_factory=lambda: f"anonymous@{uuid4().hex[:7]}")
     __channel: EventChannel = field(
         default_factory=EventChannel,
         init=False,
         repr=False,
     )
-    __container: Container = field(
-        default_factory=Container,
+    __locator: Locator = field(
+        default_factory=Locator,
         init=False,
         repr=False,
     )
-    __modules: OrderedDict[Module, None] = field(
-        default_factory=OrderedDict,
+    __loggers: list[Logger] = field(
+        default_factory=lambda: [getLogger(__name__)],
         init=False,
         repr=False,
     )
-    __loggers: list[Logger] = field(
-        default_factory=lambda: [getLogger(__name__)],
+    __modules: OrderedDict[Module, None] = field(
+        default_factory=OrderedDict,
         init=False,
         repr=False,
     )
@@ -393,7 +395,7 @@ class Module(EventListener, Broker):
     __instances: ClassVar[dict[str, Module]] = {}
 
     def __post_init__(self):
-        self.__container.add_listener(self)
+        self.__locator.add_listener(self)
 
     def __getitem__[T](self, cls: type[T] | UnionType, /) -> Injectable[T]:
         for broker in self.__brokers:
@@ -402,9 +404,6 @@ class Module(EventListener, Broker):
 
         raise NoInjectable(cls)
 
-    def __setitem__[T](self, cls: type[T] | UnionType, injectable: Injectable[T], /):
-        self.update((cls,), injectable)
-
     def __contains__(self, cls: type | UnionType, /) -> bool:
         return any(cls in broker for broker in self.__brokers)
 
@@ -415,7 +414,7 @@ class Module(EventListener, Broker):
     @property
     def __brokers(self) -> Iterator[Broker]:
         yield from tuple(self.__modules)
-        yield self.__container
+        yield self.__locator
 
     def injectable[T](
         self,
@@ -517,7 +516,7 @@ class Module(EventListener, Broker):
         injectable: Injectable[T],
         mode: Mode | ModeStr = Mode.get_default(),
     ) -> Self:
-        self.__container.update(classes, injectable, mode)
+        self.__locator.update(classes, injectable, mode)
         return self
 
     def init_modules(self, *modules: Module) -> Self:

{python_injection-0.9.5 → python_injection-0.9.6}/injection/utils.py

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

{python_injection-0.9.5 → python_injection-0.9.6}/pyproject.toml

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