dependency-injection-pattern 0.0.3__tar.gz → 0.0.5__tar.gz

{dependency_injection_pattern-0.0.3/src/dependency_injection_pattern.egg-info → dependency_injection_pattern-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dependency-injection-pattern
-Version: 0.0.3
+Version: 0.0.5
 Summary: Python implementation of the Dependency Injection pattern.
 Author-email: Anders Madsen <anders.madsen@alphavue.com>
 License-Expression: MIT
@@ -25,8 +25,8 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing-utilities<0.1,>=0.0.3
-Requires-Dist: runtime-reflection-lite<0.2,>=0.1.0
+Requires-Dist: typing-utilities<0.2,>=0.1.0
+Requires-Dist: runtime-reflection-lite<0.2,>=0.1.2
 Provides-Extra: test
 Requires-Dist: pytest>=8.3; extra == "test"
 Requires-Dist: pytest-cov>=6.1; extra == "test"

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/pyproject.toml

@@ -28,8 +28,8 @@ classifiers = [
     "Typing :: Typed"
 ]
 dependencies = [
-    "typing-utilities >= 0.0.3, < 0.1",
-    "runtime-reflection-lite >= 0.1.0, < 0.2"
+    "typing-utilities >= 0.1.0, < 0.2",
+    "runtime-reflection-lite >= 0.1.2, < 0.2"
 ]
 requires-python = ">=3.10"
 

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5/src/dependency_injection_pattern.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dependency-injection-pattern
-Version: 0.0.3
+Version: 0.0.5
 Summary: Python implementation of the Dependency Injection pattern.
 Author-email: Anders Madsen <anders.madsen@alphavue.com>
 License-Expression: MIT
@@ -25,8 +25,8 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing-utilities<0.1,>=0.0.3
-Requires-Dist: runtime-reflection-lite<0.2,>=0.1.0
+Requires-Dist: typing-utilities<0.2,>=0.1.0
+Requires-Dist: runtime-reflection-lite<0.2,>=0.1.2
 Provides-Extra: test
 Requires-Dist: pytest>=8.3; extra == "test"
 Requires-Dist: pytest-cov>=6.1; extra == "test"

dependency_injection_pattern-0.0.5/src/dependency_injection_pattern.egg-info/requires.txt

@@ -0,0 +1,6 @@
+typing-utilities<0.2,>=0.1.0
+runtime-reflection-lite<0.2,>=0.1.2
+
+[test]
+pytest>=8.3
+pytest-cov>=6.1

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/src/di/core/container.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 from typing import TypeVar, Callable, Any, cast, overload, TYPE_CHECKING
-from typingutils import is_type, isinstance_typing, get_optional_type, AnyFunction
+from typingutils import is_type, isinstance_typing, get_optional_type
 from types import FunctionType
 from weakref import ref
-from runtime.reflection.lite import reflect_function
+from runtime.reflection.lite import get_signature
 
 from di.core.log import LOG
 from di.core.scope import Scope
@@ -48,19 +48,19 @@ class Container:
         return self.__default_scope
 
     @overload
-    def add_singleton(self, service: type, /) -> None:
+    def add_singleton(self, service: type[Any], /) -> None:
         """Adds a singleton service to provider, which will result in same instance every time it's provided.
 
         Args:
-            service (type): The service interface
+            service (type[Any]): The service interface
         """
         ...
     @overload
-    def add_singleton(self, implementation: AnyFunction, /) -> None:
+    def add_singleton(self, implementation: Callable[..., T], /) -> None:
         """Adds a singleton service to provider, which will result in same instance every time it's provided.
 
         Args:
-            implementation (AnyFunction) The service implementation
+            implementation (Callable[..., T]) The service implementation
         """
         ...
     @overload
@@ -87,20 +87,20 @@ class Container:
         self.__add_factory_pre(SingletonFactory, *args)
 
     @overload
-    def add_transient(self, service: type, /) -> None:
+    def add_transient(self, service: type[Any], /) -> None:
         """Adds a transient service to provider, which will result in a new instance every time it's provided.
 
         Args:
-            service (type) The service interface
+            service (type[Any]) The service interface
 
         """
         ...
     @overload
-    def add_transient(self, implementation: AnyFunction, /) -> None:
+    def add_transient(self, implementation: Callable[..., T], /) -> None:
         """Adds a transient service to provider, which will result in a new instance every time it's provided.
 
         Args:
-            implementation (AnyFunction) The service implementation
+            implementation (Callable[..., T]) The service implementation
         """
         ...
     @overload
@@ -127,25 +127,25 @@ class Container:
         self.__add_factory_pre(TransientFactory, *args)
 
     @overload
-    def add_scoped(self, service: type, /) -> None:
+    def add_scoped(self, service: type[Any], /) -> None:
         """Adds a scoped service to provider, which will result in one instance every time it's provided in the same scope.
         The default scope is thread-based, and bound to the lifetime of the thread in which a given service is provided.
 
         Note: Scoped services should implement the ContextManager pattern.
 
         Args:
-            service (type) The service interface
+            service (type[Any]) The service interface
         """
         ...
     @overload
-    def add_scoped(self, implementation: AnyFunction, /) -> None:
+    def add_scoped(self, implementation: Callable[..., T], /) -> None:
         """Adds a scoped service to provider, which will result in one instance every time it's provided in the same scope.
         The default scope is thread-based, and bound to the lifetime of the thread in which a given service is provided.
 
         Note: Scoped services should implement the ContextManager pattern.
 
         Args:
-            implementation (AnyFunction) The service implementation
+            implementation (Callable[..., T]) The service implementation
         """
         ...
     @overload
@@ -195,7 +195,7 @@ class Container:
             factories = { **self.__factories, **{ service: factory for service, factory in self.__named_factories.values() } }
             for service, factory in factories.items():
                 for dep in factory.dependencies.values():
-                    if not dep.service in factories:
+                    if dep.service not in factories:
                         if not dep.is_optional and not dep.has_default:
                             raise SealException(f"Service '{get_service_name(service)}' depends on service '{get_service_name(dep.service)}' which is not defined in container.")
                         else:
@@ -207,7 +207,7 @@ class Container:
                             raise SealException(f"Singleton service '{get_service_name(service)}' depends on transient service {get_service_name(dep.service)}' which is not permitted.")
 
             return provider
-        elif provider :=self.__provider():
+        elif provider := self.__provider():
             return provider
         else:
             provider = Provider(self)
@@ -215,7 +215,7 @@ class Container:
             return provider
 
     def __add_factory_pre(self, factory_type: type[Factory[T]], *args: Any) -> tuple[str, type[Any]]:
-        if self.__provider != None:
+        if self.__provider is not None:
             raise ContainerSealedError
 
         if len(args) == 2:
@@ -231,7 +231,7 @@ class Container:
             if not isinstance(args[0], FunctionType):
                 raise AddException("Implementation must be a function or a type when no service is specified.")
             implementation = cast(Callable[..., Any], args[0])
-            signature = reflect_function(implementation)
+            signature = get_signature(implementation)
             service, _ = get_optional_type(cast(type, signature.return_type))
 
         return get_service_name(service), self.__add_factory(factory_type, cast(str | type[Any], service), implementation)
@@ -248,7 +248,7 @@ class Container:
             if is_type(implementation):
                 svc_type = cast(type[T], implementation)
             elif callable(implementation):
-                signature = reflect_function(implementation)
+                signature = get_signature(implementation)
                 svc_type = cast(type[T], signature.return_type)
             else:
                 svc_type = cast(type[T], type(implementation))
@@ -335,7 +335,7 @@ class Container:
 
         if factory:
             return factory
-        elif default != None:
+        elif default is not None:
             return default
         elif not is_optional:
             if isinstance(service, ServiceRequest):

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/src/di/core/default_scope.py

@@ -9,7 +9,6 @@ from di.core.helpers import is_context, get_service_name
 
 T = TypeVar('T')
 
-
 class DefaultScope(Scope):
     """
     DefaultScope is as the name implies the default scope. This scope is thread-based, meaning it will supply
@@ -56,7 +55,7 @@ class DefaultScope(Scope):
                 self.__local.finalizer = Thread(target = finalize, args = [ current_thread(), dict ])
                 self.__local.finalizer.start()
 
-        if not service in self.__local.dict:
+        if service not in self.__local.dict:
             impl = factory()
             if current_thread() != main_thread() and is_context(service):
                 # finalizer is only implemented when thread is not main thread, otherwise object would never be exited (eg. finalized)

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/src/di/core/factories/factory.py

@@ -1,6 +1,6 @@
 from typing import TypeVar, Callable, Generic, Any, cast
 from typingutils import get_optional_type, issubclass_typing, isinstance_typing
-from runtime.reflection.lite import Undefined, ParameterKind, reflect_function, get_constructor
+from runtime.reflection.lite import Undefined, ParameterKind, get_signature, get_constructor
 
 from di.core.scope import Scope
 from di.core.named_service import NamedService
@@ -25,19 +25,19 @@ class Factory(Generic[T]):
 
         if not implementation:
             if hasattr(service, "__origin__"):
-                sig = reflect_function(getattr(service, "__call__"), service)
+                sig = get_signature(getattr(service, "__call__"), service)
             else:
                 sig = get_constructor(service)
         elif isinstance(implementation, type):
             sig = get_constructor(cast(type, implementation))
-            if not service is NamedService and not issubclass_typing(implementation, service):
+            if service is not NamedService and not issubclass_typing(implementation, service):
                 raise ImplementationException(service, implementation, "Implementation class is not derived from service")
             elif implementation is service:
                 raise ImplementationException(service, implementation, "Implementation equals service")
         elif isinstance_typing(implementation, service, recursive=True):
             sig = None
         elif callable(implementation):
-            sig = reflect_function(implementation)
+            sig = get_signature(implementation)
             if sig.return_type:
                 implementation_type, _ = get_optional_type(sig.return_type)
             else:
@@ -54,7 +54,7 @@ class Factory(Generic[T]):
         else:
             raise ImplementationException(service, implementation, "Implementation does not resolve into a class derived from service")
 
-        if sig != None:
+        if sig is not None:
             parameters = [ p for p in sig.parameters if p.kind == ParameterKind.POSITIONAL_OR_KEYWORD ]
             missing_annotations = [ p.name for p in parameters if not p.parameter_type ]
             self.__dependencies = { p.name: Dependency(p.name, p.parameter_type, p.default) for p in parameters }

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/src/di/core/helpers.py

@@ -1,5 +1,4 @@
 from typing import MutableMapping, Protocol, TypeVar, cast, runtime_checkable
-from di.core.factory import Factory
 from types import TracebackType
 from typingutils import AnyType, issubclass_typing, get_type_name
 
@@ -35,7 +34,7 @@ def get_provided_service_from_annotation(annotation: AnyType) -> tuple[AnyType,
 __CONTEXT_SERVICES__: MutableMapping[type, bool] = {}
 
 def is_context(cls: type) -> bool:
-    if not cls in __CONTEXT_SERVICES__:
+    if cls not in __CONTEXT_SERVICES__:
         # reflection = reflect_class(cls)
 
         # if "__enter__" in reflection.functions and "__exit__" in reflection.functions:

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/src/di/core/provider.py

@@ -68,7 +68,7 @@ class Provider:
         else:
             result = self.__container._get(cast(type[T], service)) # pyright: ignore[reportPrivateUsage]
 
-            if result == None:
+            if result is None:
                 # optional requirements may return None
                 if is_optional:
                     return None # pyright: ignore[reportReturnType]

dependency_injection_pattern-0.0.5/src/di/core/scope.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+from abc import ABC, abstractmethod
+from typing import Callable, TypeVar
+
+T = TypeVar('T')
+
+class Scope(ABC):
+    """
+    Scope is the base class from which scopes are derived, and its superclasses handle provision of
+    scoped services.
+    """
+
+    @abstractmethod
+    def provide(self, service: type[T], factory: Callable[[], T]) -> T:
+        """This function function is used by the `ScopedFactory` factory to provide and cleanup services.
+
+        Args:
+            service (type[T]): The service type.
+            factory (Callable[[], T]): The factory function.
+
+        Returns:
+            T: Returns an object.
+        """
+        ...

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/tests/test_container.py

@@ -1,5 +1,5 @@
 # pyright: basic
-# from __future__ import annotations
+# ruff: noqa
 from typing import cast, Sequence
 from pytest import raises as assert_raises
 from threading import Thread

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/tests/test_examples.py

@@ -1,4 +1,5 @@
 # pyright: basic
+# ruff: noqa
 
 def test_example_1():
     from logging import Logger

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/tests/test_factory.py

@@ -1,4 +1,5 @@
 # pyright: basic
+# ruff: noqa
 from __future__ import annotations
 from time import sleep
 from threading import Thread

{dependency_injection_pattern-0.0.3 → dependency_injection_pattern-0.0.5}/tests/test_provider.py

@@ -1,4 +1,5 @@
 # pyright: basic
+# ruff: noqa
 from typing import cast, Sequence, MutableSequence, Generic, TypeVar, Any, ClassVar
 from pytest import raises as assert_raises
 

dependency_injection_pattern-0.0.3/src/dependency_injection_pattern.egg-info/requires.txt

@@ -1,6 +0,0 @@
-typing-utilities<0.1,>=0.0.3
-runtime-reflection-lite<0.2,>=0.1.0
-
-[test]
-pytest>=8.3
-pytest-cov>=6.1

dependency_injection_pattern-0.0.3/src/di/core/scope.py

@@ -1,15 +0,0 @@
-from __future__ import annotations
-from abc import ABC, abstractmethod
-from typing import Callable, TypeVar
-
-T = TypeVar('T')
-
-class Scope(ABC):
-    """
-    Scope is the base class from which scopes are derived, and its superclasses handle provision of
-    scoped services.
-    """
-
-    @abstractmethod
-    def provide(self, service: type[T], factory: Callable[..., T]) -> T:
-        ...