python-injection 0.9.3__py3-none-any.whl → 0.9.4__py3-none-any.whl

injection/__init__.py

@@ -7,23 +7,30 @@ __all__ = (
     "InjectableMode",
     "Module",
     "ModulePriority",
+    "find_instance",
     "get_instance",
     "get_lazy_instance",
     "inject",
     "injectable",
+    "mod",
     "set_constant",
     "should_be_injectable",
     "singleton",
 )
 
-_module = Module.default()
 
-get_instance = _module.get_instance
-get_lazy_instance = _module.get_lazy_instance
-inject = _module.inject
-injectable = _module.injectable
-set_constant = _module.set_constant
-should_be_injectable = _module.should_be_injectable
-singleton = _module.singleton
+def mod(name: str = None, /) -> Module:
+    if name is None:
+        return Module.default()
 
-del _module
+    return Module.from_name(name)
+
+
+find_instance = mod().find_instance
+get_instance = mod().get_instance
+get_lazy_instance = mod().get_lazy_instance
+inject = mod().inject
+injectable = mod().injectable
+set_constant = mod().set_constant
+should_be_injectable = mod().should_be_injectable
+singleton = mod().singleton

injection/__init__.pyi

@@ -19,18 +19,23 @@ from .core import InjectableFactory
 from .core import ModeStr as InjectableModeStr
 from .core import PriorityStr as ModulePriorityStr
 
-_module: Module = ...
+_: Module = ...
 
-get_instance = _module.get_instance
-get_lazy_instance = _module.get_lazy_instance
-inject = _module.inject
-injectable = _module.injectable
-set_constant = _module.set_constant
-should_be_injectable = _module.should_be_injectable
-singleton = _module.singleton
+find_instance = _.find_instance
+get_instance = _.get_instance
+get_lazy_instance = _.get_lazy_instance
+inject = _.inject
+injectable = _.injectable
+set_constant = _.set_constant
+should_be_injectable = _.should_be_injectable
+singleton = _.singleton
 
-del _module
+del _
 
+def mod(name: str = ..., /) -> Module:
+    """
+    Short syntax for `Module.from_name`.
+    """
 @final
 class Module:
     """
@@ -103,7 +108,7 @@ class Module:
         that no dependencies are resolved, so the module doesn't need to be locked.
         """
 
-    def resolve[T](self, cls: type[T]) -> T:
+    def find_instance[T](self, cls: type[T]) -> T:
         """
         Function used to retrieve an instance associated with the type passed in
         parameter or an exception will be raised.

injection/common/tools/type.py

@@ -59,10 +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:
-        if isinstance(arg, Iterable) and not isinstance(
-            get_origin(arg) or arg,
-            type | str,
-        ):
+        origin = get_origin(arg) or arg
+
+        if isinstance(origin, Iterable) and not isinstance(origin, type | str):
             inner_args = arg
 
         elif isfunction(arg):

injection/core/module.py

@@ -488,13 +488,13 @@ class Module(EventListener, Broker):
 
         return decorator(wrapped) if wrapped else decorator
 
-    def resolve[T](self, cls: type[T]) -> T:
+    def find_instance[T](self, cls: type[T]) -> T:
         injectable = self[cls]
         return injectable.get_instance()
 
     def get_instance[T](self, cls: type[T]) -> T | None:
         try:
-            return self.resolve(cls)
+            return self.find_instance(cls)
         except KeyError:
             return None
 
@@ -627,7 +627,7 @@ class Module(EventListener, Broker):
             ) from exc
 
     def __send_debug(self, message: object):
-        for logger in self.__loggers:
+        for logger in tuple(self.__loggers):
             logger.debug(message)
 
     @classmethod

injection/integrations/blacksheep.py

@@ -2,7 +2,7 @@ from typing import Any
 
 from rodi import ContainerProtocol
 
-from injection import Module
+from injection import Module, mod
 
 __all__ = ("InjectionServices",)
 
@@ -15,7 +15,7 @@ class InjectionServices(ContainerProtocol):
     __slots__ = ("__module",)
 
     def __init__(self, module: Module = None):
-        self.__module = module or Module.default()
+        self.__module = module or mod()
 
     def __contains__(self, item: Any) -> bool:
         return item in self.__module
@@ -25,4 +25,4 @@ class InjectionServices(ContainerProtocol):
         return self
 
     def resolve[T](self, obj_type: type[T] | Any, *args, **kwargs) -> T:
-        return self.__module.resolve(obj_type)
+        return self.__module.find_instance(obj_type)

injection/testing/__init__.py

@@ -1,6 +1,7 @@
 from contextlib import contextmanager
+from functools import partial
 
-from injection import Module, ModulePriority
+from injection import Module, ModulePriority, mod
 
 __all__ = (
     "set_test_constant",
@@ -11,24 +12,18 @@ __all__ = (
 )
 
 
-def get_test_module() -> Module:
-    return Module.from_name("testing")
+testing_mod = partial(mod, "testing")
 
-
-_module = get_test_module()
-
-set_test_constant = _module.set_constant
-should_be_test_injectable = _module.should_be_injectable
-test_injectable = _module.injectable
-test_singleton = _module.singleton
-
-del _module
+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 Module.default()
-    test_module = test_module or get_test_module()
+    on = on or mod()
+    test_module = test_module or testing_mod()
 
     for module in (on, test_module):
         module.unlock()

injection/testing/__init__.pyi

@@ -1,16 +1,13 @@
 from contextlib import ContextDecorator
 from typing import ContextManager
 
+import injection as _
 from injection import Module
 
-_module: Module = ...
-
-set_test_constant = _module.set_constant
-should_be_test_injectable = _module.should_be_injectable
-test_injectable = _module.injectable
-test_singleton = _module.singleton
-
-del _module
+set_test_constant = _.set_constant
+should_be_test_injectable = _.should_be_injectable
+test_injectable = _.injectable
+test_singleton = _.singleton
 
 def use_test_injectables(
     *,

{python_injection-0.9.3.dist-info → python_injection-0.9.4.dist-info}/METADATA

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

{python_injection-0.9.3.dist-info → python_injection-0.9.4.dist-info}/RECORD

@@ -1,21 +1,21 @@
-injection/__init__.py,sha256=LhfwYFMBw6tJ7XA_C353w61OPt4IuQQgs3zIjrwMIz8,654
-injection/__init__.pyi,sha256=mpb4pqneX3DLyMfWNmU706FOtNs9MZIy_MXk-ljMY4g,6316
+injection/__init__.py,sha256=4kwoQN5V-fcasIbZ3G3_zCbmnvGCqTilJ92Lwu62wXc,798
+injection/__init__.pyi,sha256=BQ8Fd7EDGBO8YMq95JxNWZACIo75EKW28-dr6zK8S90,6396
 injection/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/common/event.py,sha256=5Rdb2m3vAMCic8cQAVkStJDbrDrW_lk6kav8wYwmexM,1283
 injection/common/invertible.py,sha256=a-fht4TxMnki-oFFaZrDz52X_LWx0NU60KQlw72pzs4,528
 injection/common/lazy.py,sha256=SpQhlGBpMpeD9R5R-CdIInSVDv1XZWvnkERp1J6wsus,1315
 injection/common/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/common/tools/threading.py,sha256=HlvP6k_-eZaK8JbB2b9PP171IZVe_0W2oMYsw3ebdKA,187
-injection/common/tools/type.py,sha256=ThM3Z1_gHmsdT4Jp7PlZgJY0lsufc4InPO65485Ugsg,1739
+injection/common/tools/type.py,sha256=DP8_XG0iaqr6CwKqgBVHQfAO5FcgJjyzcFGAAhuyNZk,1732
 injection/core/__init__.py,sha256=zuf0ubI2dHnbjn1059eduhS-ACIkkROa6-dhp10krh0,22
-injection/core/module.py,sha256=LlKfQQHBUzlwJzabvmeJOSz0QxjLDZHKXKSk_CYxqlg,22114
+injection/core/module.py,sha256=M7fKNnqMhMcZavWnIfcV0Nx9Fl-R375scCcO4IS3QtI,22133
 injection/exceptions.py,sha256=RsWWiWwKSMU0vxXQqQSn6CKHLMrGu4SSzYUAy9OJRXk,626
 injection/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-injection/integrations/blacksheep.py,sha256=82P_owhF3FKIJxxalnSic3AJnoOr1mkojkWMefpO6QI,731
+injection/integrations/blacksheep.py,sha256=XtDIrU5fQGEyBlxwXG2o7X04k2tCmq2OcCC-h2IYZbE,731
 injection/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-injection/testing/__init__.py,sha256=cr4e3VnoKbWzkc6uyC03sffT59deKgLN-SKiZjhzooI,880
-injection/testing/__init__.pyi,sha256=_u95cJVHBkt69HUvnu2bbfYWmi7GOH_1qyFyvC1PxBk,518
+injection/testing/__init__.py,sha256=buILjhmjPEo8Ma2i1py6ZXtJVziAK2FUa4kQqKftzOo,847
+injection/testing/__init__.pyi,sha256=ier9Sgi2_OTv7ecHusl0worKCKQ5ri3LjJks1qjLeNQ,480
 injection/utils.py,sha256=a_H6RC6cNWbG1NQ-zvtrlgwnfS5Jfu0X6VJwIUIHlSU,974
-python_injection-0.9.3.dist-info/METADATA,sha256=f2aBg9u9o0X-2ssaejGkj4w6wXIozn5aEmYLWj00aPE,3572
-python_injection-0.9.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_injection-0.9.3.dist-info/RECORD,,
+python_injection-0.9.4.dist-info/METADATA,sha256=8FdPq1Yi8lB_P9t2QFloHqyGYdgAnbVUelgNOACPqPs,3572
+python_injection-0.9.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_injection-0.9.4.dist-info/RECORD,,