New implementation of scopes #186

example/custom/general/src/general/application.py

@@ -9,7 +9,8 @@ from cpl.core.environment import Environment
 from cpl.core.log import LoggerABC
 from cpl.core.pipes import IPAddressPipe
 from cpl.mail import EMail, EMailClientABC
-from cpl.query.extension.list import List
+from cpl.query import List
+from general.scoped_service import ScopedService
 from test_service import TestService
 from test_settings import TestSettings
 
@@ -38,7 +39,7 @@ class Application(ApplicationABC):
     def main(self):
         self._logger.debug(f"Host: {Environment.get_host_name()}")
         self._logger.debug(f"Environment: {Environment.get_environment()}")
-        Console.write_line(List(int, range(0, 10)).select(lambda x: f"x={x}").to_list())
+        Console.write_line(List(range(0, 10)).select(lambda x: f"x={x}").to_list())
         Console.spinner("Test", self._wait, 2, spinner_foreground_color="red")
         test: TestService = self._services.get_service(TestService)
         ip_pipe: IPAddressPipe = self._services.get_service(IPAddressPipe)
@@ -48,10 +49,21 @@ class Application(ApplicationABC):
         Console.write_line(f"DI working: {test == test2 and ip_pipe != ip_pipe2}")
         Console.write_line(self._services.get_service(LoggerABC))
 
-        scope = self._services.create_scope()
-        Console.write_line("scope", scope)
-        with self._services.create_scope() as s:
-            Console.write_line("with scope", s)
+        root_scoped_service = self._services.get_service(ScopedService)
+        with self._services.create_scope() as scope:
+            s_srvc1 = scope.get_service(ScopedService)
+            s_srvc2 = scope.get_service(ScopedService)
+
+            Console.write_line(root_scoped_service)
+            Console.write_line(s_srvc1)
+            Console.write_line(s_srvc2)
+            if root_scoped_service == s_srvc1 or s_srvc1 != s_srvc2:
+                raise Exception("Root scoped service should not be equal to scoped service")
+
+        root_scoped_service2 = self._services.get_service(ScopedService)
+        Console.write_line(root_scoped_service2)
+        if root_scoped_service != root_scoped_service2:
+            raise Exception("Root scoped service should be equal to root scoped service 2")
 
         test_settings = Configuration.get(TestSettings)
         Console.write_line(test_settings.value)

example/custom/general/src/general/scoped_service.py

@@ -0,0 +1,10 @@
+from cpl.core.console import Console
+
+
+class ScopedService:
+    def __init__(self):
+        self.value = "I am a scoped service"
+        Console.write_line(self.value, self)
+
+    def get_value(self):
+        return self.value

example/custom/general/src/general/startup.py

@@ -4,6 +4,7 @@ from cpl.core.configuration import Configuration
 from cpl.core.environment import Environment
 from cpl.core.pipes import IPAddressPipe
 from cpl.dependency import ServiceCollection
+from general.scoped_service import ScopedService
 from test_service import TestService
 
 
@@ -21,3 +22,4 @@ class Startup(StartupABC):
         services.add_module(mail)
         services.add_transient(IPAddressPipe)
         services.add_singleton(TestService)
+        services.add_scoped(ScopedService)