python-injection 0.9.3.post0__tar.gz → 0.9.4.post0__tar.gz

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

@@ -1,15 +1,26 @@
 Metadata-Version: 2.1
 Name: python-injection
-Version: 0.9.3.post0
+Version: 0.9.4.post0
 Summary: Fast and easy dependency injection framework.
 Home-page: https://github.com/100nm/python-injection
 License: MIT
-Keywords: dependencies,inject,injection
+Keywords: dependencies,dependency,inject,injection
 Author: remimd
 Requires-Python: >=3.12,<4
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Testing
+Classifier: Typing :: Typed
 Project-URL: Repository, https://github.com/100nm/python-injection
 Description-Content-Type: text/markdown
 

python_injection-0.9.4.post0/injection/__init__.py

@@ -0,0 +1,36 @@
+from .core import Injectable, Module
+from .core import Mode as InjectableMode
+from .core import Priority as ModulePriority
+
+__all__ = (
+    "Injectable",
+    "InjectableMode",
+    "Module",
+    "ModulePriority",
+    "find_instance",
+    "get_instance",
+    "get_lazy_instance",
+    "inject",
+    "injectable",
+    "mod",
+    "set_constant",
+    "should_be_injectable",
+    "singleton",
+)
+
+
+def mod(name: str = None, /) -> Module:
+    if name is None:
+        return Module.default()
+
+    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

{python_injection-0.9.3.post0 → python_injection-0.9.4.post0}/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.

{python_injection-0.9.3.post0 → python_injection-0.9.4.post0}/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):

{python_injection-0.9.3.post0 → python_injection-0.9.4.post0}/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
 

{python_injection-0.9.3.post0 → python_injection-0.9.4.post0}/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)

{python_injection-0.9.3.post0 → python_injection-0.9.4.post0}/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()

{python_injection-0.9.3.post0 → python_injection-0.9.4.post0}/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.post0 → python_injection-0.9.4.post0}/pyproject.toml

@@ -1,13 +1,27 @@
 [tool.poetry]
 name = "python-injection"
-version = "0.9.3.post0"
+version = "0.9.4.post0"
 description = "Fast and easy dependency injection framework."
-authors = ["remimd"]
-keywords = ["dependencies", "inject", "injection"]
 license = "MIT"
-packages = [{ include = "injection" }]
+authors = ["remimd"]
 readme = "documentation/basic-usage.md"
 repository = "https://github.com/100nm/python-injection"
+keywords = ["dependencies", "dependency", "inject", "injection"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Software Development :: Testing",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Operating System :: OS Independent",
+    "Intended Audience :: Developers",
+    "Natural Language :: English",
+    "Typing :: Typed",
+]
+packages = [{ include = "injection" }]
 
 [tool.poetry.dependencies]
 python = ">=3.12, <4"

python_injection-0.9.3.post0/injection/__init__.py

@@ -1,29 +0,0 @@
-from .core import Injectable, Module
-from .core import Mode as InjectableMode
-from .core import Priority as ModulePriority
-
-__all__ = (
-    "Injectable",
-    "InjectableMode",
-    "Module",
-    "ModulePriority",
-    "get_instance",
-    "get_lazy_instance",
-    "inject",
-    "injectable",
-    "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
-
-del _module