dependency-injection-pattern 0.0.0__tar.gz → 0.0.1__tar.gz

{dependency_injection_pattern-0.0.0/src/dependency_injection_pattern.egg-info → dependency_injection_pattern-0.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dependency-injection-pattern
-Version: 0.0.0
+Version: 0.0.1
 Summary: Python implementation of the Dependency Injection pattern.
 Author-email: Anders Madsen <anders.madsen@alphavue.com>
 License: MIT
@@ -25,7 +25,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing-utilities==0.0.2
+Requires-Dist: typing-utilities<0.1,>=0.0.3
 Provides-Extra: test
 Requires-Dist: pytest>=8.3; extra == "test"
 Requires-Dist: pytest-cov>=6.1; extra == "test"
@@ -99,6 +99,6 @@ app = provider.provide(Application)
 value = app.get_value() # => "Service2 returned: Service1 returned: Some value"
 ```
 
-## API
+## Full documentation
 
-[Go to API documentation](https://github.com/apmadsen/dependency-injection-pattern/blob/main/docs/api.md)
+[Go to documentation](https://github.com/apmadsen/dependency-injection-pattern/blob/main/docs/documentation.md)

{dependency_injection_pattern-0.0.0 → dependency_injection_pattern-0.0.1}/README.md

@@ -66,6 +66,6 @@ app = provider.provide(Application)
 value = app.get_value() # => "Service2 returned: Service1 returned: Some value"
 ```
 
-## API
+## Full documentation
 
-[Go to API documentation](https://github.com/apmadsen/dependency-injection-pattern/blob/main/docs/api.md)
+[Go to documentation](https://github.com/apmadsen/dependency-injection-pattern/blob/main/docs/documentation.md)

{dependency_injection_pattern-0.0.0 → dependency_injection_pattern-0.0.1}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
     "Typing :: Typed"
 ]
 dependencies = [
-    "typing-utilities==0.0.2"
+    "typing-utilities >= 0.0.3, < 0.1"
 ]
 requires-python = ">=3.10"
 

{dependency_injection_pattern-0.0.0 → dependency_injection_pattern-0.0.1/src/dependency_injection_pattern.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dependency-injection-pattern
-Version: 0.0.0
+Version: 0.0.1
 Summary: Python implementation of the Dependency Injection pattern.
 Author-email: Anders Madsen <anders.madsen@alphavue.com>
 License: MIT
@@ -25,7 +25,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing-utilities==0.0.2
+Requires-Dist: typing-utilities<0.1,>=0.0.3
 Provides-Extra: test
 Requires-Dist: pytest>=8.3; extra == "test"
 Requires-Dist: pytest-cov>=6.1; extra == "test"
@@ -99,6 +99,6 @@ app = provider.provide(Application)
 value = app.get_value() # => "Service2 returned: Service1 returned: Some value"
 ```
 
-## API
+## Full documentation
 
-[Go to API documentation](https://github.com/apmadsen/dependency-injection-pattern/blob/main/docs/api.md)
+[Go to documentation](https://github.com/apmadsen/dependency-injection-pattern/blob/main/docs/documentation.md)

{dependency_injection_pattern-0.0.0 → dependency_injection_pattern-0.0.1}/src/dependency_injection_pattern.egg-info/requires.txt

@@ -1,4 +1,4 @@
-typing-utilities==0.0.2
+typing-utilities<0.1,>=0.0.3
 
 [test]
 pytest>=8.3

{dependency_injection_pattern-0.0.0 → dependency_injection_pattern-0.0.1}/src/di/core/container.py

@@ -2,6 +2,7 @@ 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 types import FunctionType
+from weakref import ref
 
 from di.core.log import LOG
 from di.core.reflection import reflect_function
@@ -34,12 +35,12 @@ class Container:
         provider = container.provider() # container is sealed, and no more services can be added beyound this point
         provider.provide(Service) # => Service
     """
-    __slots__ = ["__factories", "__named_factories", "__list_factories", "__default_scope", "__provider"]
+    __slots__ = ["__factories", "__named_factories", "__list_factories", "__default_scope", "__provider", "__weakref__"]
 
     def __init__(self):
         self.__factories: dict[type[Any], Factory[Any]] = {}
         self.__named_factories: dict[str, tuple[type[Any], Factory[Any]]] = {}
-        self.__provider: Provider | None = None
+        self.__provider: ref[Provider] | None = None
         self.__default_scope = DefaultScope()
 
     @property
@@ -185,10 +186,11 @@ class Container:
         Returns:
             Provider -- The Provider instance
         """
+        from di.core.provider import Provider
         if self.__provider is None:
-            from di.core.provider import Provider
-            self.__provider = Provider(self)
-            self.__add_factory(SingletonFactory, Provider, self.__provider)
+            provider = Provider(self)
+            self.__provider = ref(provider)
+            self.__add_factory(SingletonFactory, Provider, self.provider)
 
             factories = { **self.__factories, **{ service: factory for service, factory in self.__named_factories.values() } }
             for service, factory in factories.items():
@@ -204,7 +206,13 @@ class Container:
                         elif isinstance(factories[dep.service], TransientFactory):
                             raise SealException(f"Singleton service '{get_service_name(service)}' depends on transient service {get_service_name(dep.service)}' which is not permitted.")
 
-        return self.__provider
+            return provider
+        elif provider :=self.__provider():
+            return provider
+        else:
+            provider = Provider(self)
+            self.__provider = ref(provider)
+            return provider
 
     def __add_factory_pre(self, factory_type: type[Factory[T]], *args: Any) -> tuple[str, type[Any]]:
         if self.__provider != None:

{dependency_injection_pattern-0.0.0 → dependency_injection_pattern-0.0.1}/src/di/core/provider.py

@@ -14,7 +14,7 @@ class Provider:
     """
     The Provider is connected to the Container and provides the services defined.
     """
-    __slots__ = ["__container"]
+    __slots__ = ["__container", "__weakref__"]
 
     def __init__(self, container: Container):
         self.__container = container

{dependency_injection_pattern-0.0.0 → dependency_injection_pattern-0.0.1}/tests/test_container.py

@@ -3,11 +3,13 @@
 from typing import cast, Sequence
 from pytest import raises as assert_raises
 from threading import Thread
+from weakref import ref
+from gc import get_referrers, collect
 
-from di import Container, Provider
+from di import Container, Provider, Factory
 from di.exceptions import ImplementationException, AddException, SealException, ProvideException, ContainerSealedError
 
-from tests.classes import Service, Options1, DependentService, DependentServiceFail1, IService, Service2
+from tests.classes import Service, Options1, DependentService, DependentServiceFail1, IService, Service2, Service5, DependentService5, Application
 
 
 
@@ -93,3 +95,65 @@ def test_collections():
     with assert_raises(ImplementationException):
         container.add_singleton(Sequence[IService], [ Service, Service2 ])
 
+def test_lifetime():
+
+    container = Container()
+    container.add_transient(Service5)
+
+    provider = container.provider()
+    provider_id = id(provider)
+    svc = provider.provide(Service5)
+    provider = ref(provider)
+
+    collect()
+
+    assert not provider() # provider should have been collected
+
+    provider = container.provider()
+    assert id(provider) != provider_id # this provider be a new instance
+
+    provider = ref(provider)
+    container = ref(container)
+
+    collect()
+
+    # provider and container should have been collected
+    assert not provider()
+    assert not container()
+
+    ### cleanup
+    del container
+    del provider
+    del svc
+    collect()
+    ###
+
+    container = Container()
+    container.add_transient(Application)
+    container.add_transient(Service5)
+    container.add_transient(DependentService5)
+    provider = container.provider()
+
+    app = provider.provide(Application)
+    svc = app.service_factory()
+
+    container = ref(container)
+    provider = ref(provider)
+
+    collect()
+
+    # app has a live reference to Factory[Service5],
+    # so neither container or provider should be collected
+    assert container()
+    assert provider()
+
+    app = ref(app)
+
+    collect()
+
+    # app has been collected thus any references to container and provider
+    # has been removed and container and provider has therefore
+    # also been collected
+    assert not app()
+    assert not provider()
+    assert not container()

{dependency_injection_pattern-0.0.0 → dependency_injection_pattern-0.0.1}/tests/test_examples.py

@@ -175,4 +175,52 @@ def test_example_7():
     service1, service2 = app.services # => Service1, Service2
 
     assert isinstance(service1, Service1)
-    assert isinstance(service2, Service2)
+    assert isinstance(service2, Service2)
+
+
+def test_example_8():
+    from di import Container, DefaultScope, Scope, Provider
+    from random import Random
+    from threading import Thread
+
+    class RandGen:
+        rnd: Random | None
+
+        def generate(self) -> int:
+            if self.rnd:
+                return self.rnd.randint(0, 100)
+            else:
+                return -1
+
+        def __enter__(self):
+            self.rnd = Random()
+            return self
+
+        def __exit__(self):
+            del self.rnd
+
+    container = Container()
+    container.add_scoped(RandGen)
+
+    scope = DefaultScope()
+    provider = container.provider()
+
+    generators: set[int] = set()
+    ints: list[int] = []
+
+    def fn(provider: Provider, scope: Scope):
+        for i in range(3):
+            gen = provider.provide(RandGen, scope)
+            generators.add(id(gen))
+            ints.append(gen.generate())
+
+    thread1 = Thread(target = fn, args = (provider, scope))
+    thread1.start()
+    thread2 = Thread(target = fn, args = (provider, scope))
+    thread2.start()
+    thread1.join()
+    thread2.join()
+
+    assert len(generators) == 2
+    assert len(ints) == 6
+