scripts/upload.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 
 if [ $1 == "-prod" ]; then
-  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
+  twine upload -r pip.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip.sh-edraft.de dist/sh_cpl-query/publish/setup/*
 elif [ $1 == "-prod" ]; then
-  twine upload -r pip-exp.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip-exp.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip-.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
+  twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip-exp.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip-.sh-edraft.de dist/sh_cpl-query/publish/setup/*
 
 else
-  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-cli/publish/setup/*
-  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-core/publish/setup/*
-  twine upload -r pip-dev.sh-edraft.de ../dist/sh_cpl-query/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-cli/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-core/publish/setup/*
+  twine upload -r pip-dev.sh-edraft.de dist/sh_cpl-query/publish/setup/*
 fi

src/cpl_cli/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/build/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.build'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/generate/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.generate'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/console/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/console/source/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/console/source/name/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/console/source/name/application.py

@@ -5,11 +5,33 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class ApplicationTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         self._name = 'application.py'
         self._path = path
+        self._use_async = use_async
+        
+        if self._use_async:
+            self._value = textwrap.dedent("""\
+                from cpl_core.application import ApplicationABC
+                from cpl_core.configuration import ConfigurationABC
+                from cpl_core.console import Console
+                from cpl_core.dependency_injection import ServiceProviderABC
+                    
+                    
+                class Application(ApplicationABC):
+                
+                    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
+                        ApplicationABC.__init__(self, config, services)
+                
+                    async def configure(self):
+                        pass
+                
+                    async def main(self):
+                        Console.write_line('Hello World')
+            """)
+        else:
             self._value = textwrap.dedent("""\
                 from cpl_core.application import ApplicationABC
                 from cpl_core.configuration import ConfigurationABC

src/cpl_cli/_templates/new/console/source/name/main.py

@@ -6,7 +6,7 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         name = String.convert_to_snake_case(name)
@@ -15,6 +15,28 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
         import_pkg = f'{name}.'
 
+        if use_async:
+            self._value = textwrap.dedent(f"""\
+                import asyncio
+                
+                from cpl_core.application import ApplicationBuilder
+                
+                from {import_pkg}application import Application
+                from {import_pkg}startup import Startup
+                
+                
+                async def main():
+                    app_builder = ApplicationBuilder(Application)
+                    app_builder.use_startup(Startup)
+                    app: Application = await app_builder.build_async()
+                    await app.run_async()
+                
+                
+                if __name__ == '__main__':
+                    ml = asyncio.get_event_loop()
+                    ml.run_until_complete(main())
+            """)
+        else:
             self._value = textwrap.dedent(f"""\
                 from cpl_core.application import ApplicationBuilder
                 
@@ -47,7 +69,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
 class MainWithApplicationBaseTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         name = String.convert_to_snake_case(name)
@@ -56,6 +78,26 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
 
         import_pkg = f'{name}.'
 
+        if use_async:
+            self._value = textwrap.dedent(f"""\
+                import asyncio
+                
+                from cpl_core.application import ApplicationBuilder
+                
+                from {import_pkg}application import Application
+                
+                
+                async def main():
+                    app_builder = ApplicationBuilder(Application)
+                    app: Application = await app_builder.build_async()
+                    await app.run_async()
+                
+                
+                if __name__ == '__main__':
+                    ml = asyncio.get_event_loop()
+                    ml.run_until_complete(main())
+            """)
+        else:
             self._value = textwrap.dedent(f"""\
                 from cpl_core.application import ApplicationBuilder
                 
@@ -86,7 +128,7 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
 
 class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         name = String.convert_to_snake_case(name)
@@ -95,6 +137,22 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
         import_pkg = f'{name}.'
 
+        if use_async:
+            self._value = textwrap.dedent("""\
+                import asyncio
+                
+                from cpl_core.console import Console
+                
+                
+                async def main():
+                    Console.write_line('Hello World')
+                
+                
+                if __name__ == '__main__':
+                    ml = asyncio.get_event_loop()
+                    ml.run_until_complete(main())
+            """)
+        else:
             self._value = textwrap.dedent("""\
                 from cpl_core.console import Console
                 
@@ -122,7 +180,7 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
 class MainWithDependencyInjection(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         name = String.convert_to_snake_case(name)
@@ -131,6 +189,36 @@ class MainWithDependencyInjection(TemplateFileABC):
 
         import_pkg = f'{name}.'
 
+        if use_async:
+            self._value = textwrap.dedent("""\
+                import asyncio
+                
+                from cpl_core.configuration import Configuration, ConfigurationABC
+                from cpl_core.console import Console
+                from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
+                
+                
+                async def configure_configuration() -> ConfigurationABC:
+                    config = Configuration()
+                    return config
+                
+                
+                async def configure_services(config: ConfigurationABC) -> ServiceProviderABC:
+                    services = ServiceCollection(config)
+                    return services.build_service_provider()
+                
+                
+                async def main():
+                    config = await configure_configuration()
+                    provider = await configure_services(config)
+                    Console.write_line('Hello World')
+                
+                
+                if __name__ == '__main__':
+                    ml = asyncio.get_event_loop()
+                    ml.run_until_complete(main())
+            """)
+        else:
             self._value = textwrap.dedent("""\
                 from cpl_core.configuration import Configuration, ConfigurationABC
                 from cpl_core.console import Console

src/cpl_cli/_templates/new/console/source/name/startup.py

@@ -5,11 +5,33 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class StartupTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         self._name = 'startup.py'
         self._path = path
+        self._use_async = use_async
+        
+        if self._use_async:
+            self._value = textwrap.dedent("""\
+                from cpl_core.application import StartupABC
+                from cpl_core.configuration import ConfigurationABC
+                from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+                from cpl_core.environment import ApplicationEnvironment
+                
+                
+                class Startup(StartupABC):
+                
+                    def __init__(self):
+                        StartupABC.__init__(self)
+                
+                    async def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+                        return configuration
+                
+                    async def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
+                        return services.build_service_provider()
+            """)
+        else:
             self._value = textwrap.dedent("""\
                 from cpl_core.application import StartupABC
                 from cpl_core.configuration import ConfigurationABC

src/cpl_cli/_templates/new/console/source/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/library/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/library/source/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/library/source/name/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/new/library/source/name/application.py

@@ -5,11 +5,32 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class ApplicationTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         self._name = 'application.py'
         self._path = path
+        
+        if use_async:
+            self._value = textwrap.dedent("""\
+                from cpl_core.application import ApplicationABC
+                from cpl_core.configuration import ConfigurationABC
+                from cpl_core.console import Console
+                from cpl_core.dependency_injection import ServiceProviderABC
+                    
+                    
+                class Application(ApplicationABC):
+                
+                    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
+                        ApplicationABC.__init__(self, config, services)
+                
+                    async def configure(self):
+                        pass
+                
+                    async def main(self):
+                        Console.write_line('Hello World')
+            """)
+        else:
             self._value = textwrap.dedent("""\
                 from cpl_core.application import ApplicationABC
                 from cpl_core.configuration import ConfigurationABC

src/cpl_cli/_templates/new/library/source/name/main.py

@@ -5,7 +5,7 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
@@ -15,6 +15,28 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
         if name == '':
             import_pkg = ''
 
+        if use_async:
+            self._value = textwrap.dedent(f"""\
+                import asyncio
+                
+                from cpl_core.application import ApplicationBuilder
+                
+                from {import_pkg}application import Application
+                from {import_pkg}startup import Startup
+                
+                
+                async def main():
+                    app_builder = ApplicationBuilder(Application)
+                    app_builder.use_startup(Startup)
+                    app: Application = await app_builder.build_async()
+                    await app.run_async()
+                
+                
+                if __name__ == '__main__':
+                    ml = asyncio.get_event_loop()
+                    ml.run_until_complete(main())
+            """)
+        else:
             self._value = textwrap.dedent(f"""\
                 from cpl_core.application import ApplicationBuilder
                 
@@ -47,7 +69,7 @@ class MainWithApplicationHostAndStartupTemplate(TemplateFileABC):
 
 class MainWithApplicationBaseTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
@@ -57,6 +79,26 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
         if name == '':
             import_pkg = ''
 
+        if use_async:
+            self._value = textwrap.dedent(f"""\
+                import asyncio
+                
+                from cpl_core.application import ApplicationBuilder
+                
+                from {import_pkg}application import Application
+                
+                
+                async def main():
+                    app_builder = ApplicationBuilder(Application)
+                    app: Application = await app_builder.build_async()
+                    await app.run_async()
+                
+                
+                if __name__ == '__main__':
+                    ml = asyncio.get_event_loop()
+                    ml.run_until_complete(main())
+            """)
+        else:
             self._value = textwrap.dedent(f"""\
                 from cpl_core.application import ApplicationBuilder
                 
@@ -87,12 +129,28 @@ class MainWithApplicationBaseTemplate(TemplateFileABC):
 
 class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
         self._path = path
 
+        if use_async:
+            self._value = textwrap.dedent("""\
+                import asyncio
+                
+                from cpl_core.console import Console
+                
+                
+                async def main():
+                    Console.write_line('Hello World')
+                
+                
+                if __name__ == '__main__':
+                    ml = asyncio.get_event_loop()
+                    ml.run_until_complete(main())
+            """)
+        else:
             self._value = textwrap.dedent("""\
                 from cpl_core.console import Console
                 
@@ -120,12 +178,42 @@ class MainWithoutApplicationBaseTemplate(TemplateFileABC):
 
 class MainWithDependencyInjection(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         self._name = 'main.py'
         self._path = path
         
+        if use_async:
+            self._value = textwrap.dedent("""\
+                import asyncio
+                
+                from cpl_core.configuration import Configuration, ConfigurationABC
+                from cpl_core.console import Console
+                from cpl_core.dependency_injection import ServiceCollection, ServiceProviderABC
+                
+                
+                async def configure_configuration() -> ConfigurationABC:
+                    config = Configuration()
+                    return config
+                
+                
+                async def configure_services(config: ConfigurationABC) -> ServiceProviderABC:
+                    services = ServiceCollection(config)
+                    return services.build_service_provider()
+                
+                
+                async def main():
+                    config = await configure_configuration()
+                    provider = await configure_services(config)
+                    Console.write_line('Hello World')
+                
+                
+                if __name__ == '__main__':
+                    ml = asyncio.get_event_loop()
+                    ml.run_until_complete(main())
+            """)
+        else:
             self._value = textwrap.dedent("""\
                 from cpl_core.configuration import Configuration, ConfigurationABC
                 from cpl_core.console import Console

src/cpl_cli/_templates/new/library/source/name/startup.py

@@ -5,11 +5,32 @@ from cpl_cli._templates.template_file_abc import TemplateFileABC
 
 class StartupTemplate(TemplateFileABC):
 
-    def __init__(self, name: str, path: str):
+    def __init__(self, name: str, path: str, use_async: bool):
         TemplateFileABC.__init__(self)
 
         self._name = 'startup.py'
         self._path = path
+        
+        if use_async:
+            self._value = textwrap.dedent("""\
+                from cpl_core.application import StartupABC
+                from cpl_core.configuration import ConfigurationABC
+                from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+                from cpl_core.environment import ApplicationEnvironment
+                
+                
+                class Startup(StartupABC):
+                
+                    def __init__(self):
+                        StartupABC.__init__(self)
+                
+                    async def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+                        return configuration
+                
+                    async def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
+                        return services.build_service_provider()
+            """)
+        else:
             self._value = textwrap.dedent("""\
                 from cpl_core.application import StartupABC
                 from cpl_core.configuration import ConfigurationABC

src/cpl_cli/_templates/new/library/source/tests/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/_templates/publish/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .publish_service import PublishService
 from .version_service import VersionService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/command/new_service.py

@@ -46,6 +46,7 @@ class NewService(CommandABC):
         self._use_application_api: bool = False
         self._use_startup: bool = False
         self._use_service_providing: bool = False
+        self._use_async: bool = False
 
     @property
     def help_message(self) -> str:
@@ -178,6 +179,10 @@ class NewService(CommandABC):
             if result.lower() == 'y':
                 self._use_service_providing = True
                 
+        result = Console.read('Do you want to use async? (y/n) ')
+        if result.lower() == 'y':
+            self._use_async = True
+
         Console.set_foreground_color(ForegroundColorEnum.default)
 
     def _console(self, args: list[str]):
@@ -202,6 +207,7 @@ class NewService(CommandABC):
                 self._use_application_api,
                 self._use_startup,
                 self._use_service_providing,
+                self._use_async,
                 self._project.name,
                 self._project_json,
                 self._workspace
@@ -231,6 +237,7 @@ class NewService(CommandABC):
                 self._use_application_api,
                 self._use_startup,
                 self._use_service_providing,
+                self._use_async,
                 self._project.name,
                 self._project_json,
                 self._workspace

src/cpl_cli/command/version_service.py

@@ -52,7 +52,11 @@ class VersionService(CommandABC):
         ]
         packages = []
         for modname in cpl_packages:
-            module = pkgutil.find_loader(modname).load_module(modname)
+            module = pkgutil.find_loader(modname)
+            if module is None:
+                break
+            
+            module = module.load_module(modname)
             if '__version__' in dir(module):
                 packages.append([f'{modname}', module.__version__])
 

src/cpl_cli/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/cpl_cli.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "0.post2"
+      "Micro": "3"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "sh_cpl-core>=2021.10.0.post1"
+      "sh_cpl-core>=2021.10.2"
     ],
     "PythonVersion": ">=3.8",
     "PythonPath": {},

src/cpl_cli/live_server/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.live_server'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/publish/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .publisher_abc import PublisherABC
 from .publisher_service import PublisherService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/source_creator/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.source_creator'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.3'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='3')

src/cpl_cli/source_creator/console_builder.py

@@ -59,13 +59,14 @@ class ConsoleBuilder:
 
     @classmethod
     def build(cls, project_path: str, use_application_api: bool, use_startup: bool, use_service_providing: bool,
-              project_name: str, project_settings: dict, workspace: Optional[WorkspaceSettings]):
+              use_async: bool, project_name: str, project_settings: dict, workspace: Optional[WorkspaceSettings]):
         """
         Builds the console project files
         :param project_path:
         :param use_application_api:
         :param use_startup:
         :param use_service_providing:
+        :param use_async:
         :param project_name:
         :param project_settings:
         :param workspace:
@@ -79,7 +80,8 @@ class ConsoleBuilder:
                 ReadmeTemplate(),
                 TestsInitTemplate(),
                 AppsettingsTemplate(),
-                MainInitTemplate(project_name, os.path.join('src/', project_name_snake))
+                MainInitTemplate(project_name, os.path.join(
+                    'src/', project_name_snake))
             ]
         else:
             project_path = os.path.join(
@@ -103,18 +105,22 @@ class ConsoleBuilder:
             src_rel_path = os.path.join('src/', src_name)
 
         if use_application_api:
-            templates.append(ApplicationTemplate(src_name, src_rel_path))
+            templates.append(ApplicationTemplate(src_name, src_rel_path, use_async))
 
             if use_startup:
-                templates.append(StartupTemplate(src_name, src_rel_path))
-                templates.append(MainWithApplicationHostAndStartupTemplate(src_name, src_rel_path))
+                templates.append(StartupTemplate(src_name, src_rel_path, use_async))
+                templates.append(MainWithApplicationHostAndStartupTemplate(
+                    src_name, src_rel_path, use_async))
             else:
-                templates.append(MainWithApplicationBaseTemplate(src_name, src_rel_path))
+                templates.append(MainWithApplicationBaseTemplate(
+                    src_name, src_rel_path, use_async))
         else:
             if use_service_providing:
-                templates.append(MainWithDependencyInjection(src_name, src_rel_path))
+                templates.append(MainWithDependencyInjection(
+                    src_name, src_rel_path, use_async))
             else:
-                templates.append(MainWithoutApplicationBaseTemplate(src_name, src_rel_path))
+                templates.append(MainWithoutApplicationBaseTemplate(
+                    src_name, src_rel_path, use_async))
 
         proj_name = project_name
         if workspace is not None:
@@ -132,7 +138,8 @@ class ConsoleBuilder:
 
         else:
             workspace.projects[project_name] = f'src/{project_file_path}'
-            cls._create_workspace('cpl-workspace.json', workspace.default_project, workspace.projects)
+            cls._create_workspace('cpl-workspace.json',
+                                  workspace.default_project, workspace.projects)
 
         Console.spinner(
             f'Creating {project_file_path}',

src/cpl_cli/source_creator/library_builder.py

@@ -59,7 +59,7 @@ class LibraryBuilder:
 
     @classmethod
     def build(cls, project_path: str, use_application_api: bool, use_startup: bool,
-              use_service_providing: bool, project_name: str, project_settings: dict,
+              use_async: bool, use_service_providing: bool, project_name: str, project_settings: dict,
               workspace: Optional[WorkspaceSettings]):
         """
         Builds the library project files
@@ -67,6 +67,7 @@ class LibraryBuilder:
         :param use_application_api:
         :param use_startup:
         :param use_service_providing:
+        :param use_async:
         :param project_name:
         :param project_settings:
         :param workspace:
@@ -79,7 +80,8 @@ class LibraryBuilder:
                 LicenseTemplate(),
                 ReadmeTemplate(),
                 TestsInitTemplate(),
-                NameInitTemplate(project_name, os.path.join('src/', project_name_snake)),
+                NameInitTemplate(project_name, os.path.join(
+                    'src/', project_name_snake)),
                 AppsettingsTemplate()
             ]
         else:
@@ -108,14 +110,18 @@ class LibraryBuilder:
 
             if use_startup:
                 templates.append(StartupTemplate(src_name, src_rel_path))
-                templates.append(MainWithApplicationHostAndStartupTemplate(src_name, src_rel_path))
+                templates.append(MainWithApplicationHostAndStartupTemplate(
+                    src_name, src_rel_path))
             else:
-                templates.append(MainWithApplicationBaseTemplate(src_name, src_rel_path))
+                templates.append(MainWithApplicationBaseTemplate(
+                    src_name, src_rel_path))
         else:
             if use_service_providing:
-                templates.append(MainWithDependencyInjection(src_name, src_rel_path))
+                templates.append(MainWithDependencyInjection(
+                    src_name, src_rel_path))
             else:
-                templates.append(MainWithoutApplicationBaseTemplate(src_name, src_rel_path))
+                templates.append(MainWithoutApplicationBaseTemplate(
+                    src_name, src_rel_path))
 
         proj_name = project_name
         if workspace is not None:
@@ -133,7 +139,8 @@ class LibraryBuilder:
 
         else:
             workspace.projects[project_name] = f'src/{project_file_path}'
-            cls._create_workspace('cpl-workspace.json', workspace.default_project, workspace.projects)
+            cls._create_workspace('cpl-workspace.json',
+                                  workspace.default_project, workspace.projects)
 
         Console.spinner(
             f'Creating {project_file_path}',

src/cpl_core/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .application_builder_abc import ApplicationBuilderABC
 from .startup_abc import StartupABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/application/application_abc.py

@@ -35,6 +35,17 @@ class ApplicationABC(ABC):
         except KeyboardInterrupt:
             Console.close()
     
+    async def run_async(self):
+        r"""Entry point
+
+        Called by custom Application.main
+        """
+        try:
+            await self.configure()
+            await self.main()
+        except KeyboardInterrupt:
+            Console.close()
+
     @abstractmethod
     def configure(self):
         r"""Configure the application

src/cpl_core/application/application_builder.py

@@ -1,4 +1,3 @@
-import types
 from typing import Type, Optional, Callable
 
 from cpl_core.application.application_abc import ApplicationABC
@@ -6,7 +5,6 @@ from cpl_core.application.application_builder_abc import ApplicationBuilderABC
 from cpl_core.application.application_extension_abc import ApplicationExtensionABC
 from cpl_core.application.startup_abc import StartupABC
 from cpl_core.configuration.configuration import Configuration
-from cpl_core.console import Console
 from cpl_core.dependency_injection.service_collection import ServiceCollection
 
 
@@ -50,3 +48,17 @@ class ApplicationBuilder(ApplicationBuilderABC):
             extension.run(config, services)
 
         return self._app(config, services)
+
+    async def build_async(self) -> ApplicationABC:
+        if self._startup is not None:
+            await self._startup.configure_configuration(self._configuration, self._environment)
+            await self._startup.configure_services(self._services, self._environment)
+
+        config = self._configuration
+        services = self._services.build_service_provider()
+
+        for ex in self._extensions:
+            extension = ex()
+            await extension.run(config, services)
+
+        return self._app(config, services)

src/cpl_core/application/application_builder_abc.py

@@ -23,6 +23,17 @@ class ApplicationBuilderABC(ABC):
         """
         pass
 
+    @abstractmethod
+    async def use_startup(self, startup: Type[StartupABC]):
+        r"""Sets the custom startup class to use async
+
+        Parameter
+        ---------
+            startup: Type[:class:`cpl_core.application.startup_abc.StartupABC`]
+                Startup class to use
+        """
+        pass
+
     @abstractmethod
     def build(self) -> ApplicationABC:
         r"""Creates custom application object
@@ -32,3 +43,13 @@ class ApplicationBuilderABC(ABC):
             Object of :class:`cpl_core.application.application_abc.ApplicationABC`
         """
         pass
+
+    @abstractmethod
+    async def build_async(self) -> ApplicationABC:
+        r"""Creates custom application object async
+
+        Returns
+        -------
+            Object of :class:`cpl_core.application.application_abc.ApplicationABC`
+        """
+        pass

src/cpl_core/application/application_extension_abc.py

@@ -11,3 +11,6 @@ class ApplicationExtensionABC(ABC):
 
     @abstractmethod
     def run(self, config: ConfigurationABC, services: ServiceProviderABC): pass
+    
+    @abstractmethod
+    async def run(self, config: ConfigurationABC, services: ServiceProviderABC): pass

src/cpl_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .configuration_variable_name_enum import ConfigurationVariableNameEnum
 from .console_argument import ConsoleArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/console/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/cpl_core.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "0.post1"
+      "Micro": "2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_core/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_settings import DatabaseSettings
 from .database_settings_name_enum import DatabaseSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/database/connection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/database/context/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/dependency_injection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/dependency_injection/scope.py

@@ -0,0 +1,18 @@
+
+from cpl_core.console.console import Console
+from cpl_core.dependency_injection.scope_abc import ScopeABC
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
+
+
+class Scope(ScopeABC):
+
+    def __init__(self, service_provider: ServiceProviderABC):
+        self._service_provider = service_provider
+        self._service_provider.set_scope(self)
+
+    @property
+    def service_provider(self) -> ServiceProviderABC:
+        return self._service_provider
+    
+    def dispose(self):
+        self._service_provider = None

src/cpl_core/dependency_injection/scope_abc.py

@@ -0,0 +1,24 @@
+from abc import ABC, abstractmethod
+
+class ScopeABC(ABC):
+    r"""ABC for the class :class:`cpl_core.dependency_injection.scope.Scope`"""
+    
+    def __init__(self):
+        pass
+    
+    @property
+    @abstractmethod
+    def service_provider(self):
+        r"""Returns to service provider of scope
+
+        Returns
+        -------
+            Object of type :class:`cpl_core.dependency_injection.service_provider_abc.ServiceProviderABC`
+        """
+        pass
+    
+    @abstractmethod
+    def dispose():
+        r"""Sets service_provider to None
+        """
+        pass

src/cpl_core/dependency_injection/scope_builder.py

@@ -0,0 +1,19 @@
+from cpl_core.dependency_injection.scope import Scope
+from cpl_core.dependency_injection.scope_abc import ScopeABC
+from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
+
+
+class ScopeBuilder:
+    r"""Class to build :class:`cpl_core.dependency_injection.scope.Scope`"""
+    
+    def __init__(self, service_provider: ServiceProviderABC) -> None:
+        self._service_provider = service_provider
+    
+    def build(self) -> ScopeABC:
+        r"""Returns scope
+
+        Returns
+        -------
+            Object of type :class:`cpl_core.dependency_injection.scope.Scope`
+        """
+        return Scope(self._service_provider)

src/cpl_core/dependency_injection/service_collection.py

@@ -59,9 +59,13 @@ class ServiceCollection(ServiceCollectionABC):
             self._add_descriptor(impl, ServiceLifetimeEnum.singleton)
 
     def add_scoped(self, service_type: Type, service: Callable = None):
-        raise Exception('Not implemented')
+        if service is not None:
+            self._add_descriptor(service, ServiceLifetimeEnum.scoped)
+        else:
+            self._add_descriptor(service_type, ServiceLifetimeEnum.scoped)
         
-    def add_transient(self, service_type: Union[type], service: Union[type] = None):
+
+    def add_transient(self, service_type: type, service: type = None):
         if service is not None:
             self._add_descriptor(service, ServiceLifetimeEnum.transient)
         else:

src/cpl_core/dependency_injection/service_lifetime_enum.py

@@ -4,5 +4,5 @@ from enum import Enum
 class ServiceLifetimeEnum(Enum):
 
     singleton = 0
-    scoped = 1  # not supported yet
+    scoped = 1
     transient = 2

src/cpl_core/dependency_injection/service_provider.py

@@ -1,10 +1,13 @@
 from collections import Callable
+import copy
 from inspect import signature, Parameter
 from typing import Optional
 
 from cpl_core.configuration.configuration_abc import ConfigurationABC
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl_core.database.context.database_context_abc import DatabaseContextABC
+from cpl_core.dependency_injection.scope_abc import ScopeABC
+from cpl_core.dependency_injection.scope_builder import ScopeBuilder
 from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
 from cpl_core.dependency_injection.service_descriptor import ServiceDescriptor
 from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum
@@ -30,8 +33,9 @@ class ServiceProvider(ServiceProviderABC):
         self._service_descriptors: list[ServiceDescriptor] = service_descriptors
         self._configuration: ConfigurationABC = config
         self._database_context = db_context
+        self._scope: Optional[ScopeABC] = None
 
-    def _find_service(self, service_type: type) -> [ServiceDescriptor]:
+    def _find_service(self, service_type: type) -> ServiceDescriptor:
         for descriptor in self._service_descriptors:
             if descriptor.service_type == service_type or issubclass(descriptor.service_type, service_type):
                 return descriptor
@@ -85,6 +89,13 @@ class ServiceProvider(ServiceProviderABC):
 
         return service_type(*params)
     
+    def set_scope(self, scope: ScopeABC):
+        self._scope = scope
+    
+    def create_scope(self) -> ScopeABC:
+        sb = ScopeBuilder(ServiceProvider(copy.deepcopy(self._service_descriptors), self._configuration, self._database_context))
+        return sb.build()
+
     def get_service(self, service_type: type) -> Optional[Callable[object]]:
         result = self._find_service(service_type)
 
@@ -95,7 +106,7 @@ class ServiceProvider(ServiceProviderABC):
             return result.implementation
 
         implementation = self.build_service(service_type)
-        if result.lifetime == ServiceLifetimeEnum.singleton:
+        if result.lifetime == ServiceLifetimeEnum.singleton or result.lifetime == ServiceLifetimeEnum.scoped and self._scope is not None:
             result.implementation = implementation
 
         return implementation

src/cpl_core/dependency_injection/service_provider_abc.py

@@ -2,6 +2,8 @@ from abc import abstractmethod, ABC
 from collections import Callable
 from typing import Type, Optional
 
+from cpl_core.dependency_injection.scope_abc import ScopeABC
+
 
 class ServiceProviderABC(ABC):
     r"""ABC for the class :class:`cpl_core.dependency_injection.service_provider.ServiceProvider`"""
@@ -25,6 +27,27 @@ class ServiceProviderABC(ABC):
         """
         pass
     
+    @abstractmethod
+    def set_scope(self, scope: ScopeABC):
+        r"""Sets the scope of service provider
+
+        Parameter
+        ---------
+            scope :class:`cpl_core.dependency_injection.scope.Scope`
+                Service scope
+        """
+        pass
+    
+    @abstractmethod
+    def create_scope(self) -> ScopeABC:
+        r"""Creates a service scope
+
+        Returns
+        -------
+            Object of type :class:`cpl_core.dependency_injection.scope.Scope`
+        """
+        pass
+
     @abstractmethod
     def get_service(self, instance_type: Type) -> Optional[Callable[object]]:
         r"""Returns instance of given type

src/cpl_core/environment/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/mailing/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/time/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_core/utils/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post1'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_query/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_query/_query/__init__.py

@@ -15,11 +15,11 @@ __title__ = 'cpl_query._query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/cpl_query/cpl_query.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "0.post2"
+      "Micro": "2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_query/extension/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_query.extension'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0.post2'
+__version__ = '2021.10.2'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .ordered_iterable_abc import OrderedIterableABC
 from .ordered_iterable import OrderedIterable
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0.post2')
+version_info = VersionInfo(major='2021', minor='10', micro='2')

src/tests/custom/async/cpl-workspace.json

@@ -0,0 +1,9 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "async",
+    "Projects": {
+      "async": "src/async/async.json"
+    },
+    "Scripts": {}
+  }
+}

src/tests/custom/async/src/async/application.py

@@ -0,0 +1,16 @@
+from cpl_core.application import ApplicationABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.console import Console
+from cpl_core.dependency_injection import ServiceProviderABC
+
+
+class Application(ApplicationABC):
+
+    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
+        ApplicationABC.__init__(self, config, services)
+
+    async def configure(self):
+        pass
+
+    async def main(self):
+        Console.write_line('Hello World')

src/tests/custom/async/src/async/async.json

@@ -0,0 +1,43 @@
+{
+  "ProjectSettings": {
+    "Name": "async",
+    "Version": {
+      "Major": "0",
+      "Minor": "0",
+      "Micro": "0"
+    },
+    "Author": "",
+    "AuthorEmail": "",
+    "Description": "",
+    "LongDescription": "",
+    "URL": "",
+    "CopyrightDate": "",
+    "CopyrightName": "",
+    "LicenseName": "",
+    "LicenseDescription": "",
+    "Dependencies": [
+      "sh_cpl>=2021.10.0.post1"
+    ],
+    "PythonVersion": ">=3.9.2",
+    "PythonPath": {
+      "linux": ""
+    },
+    "Classifiers": []
+  },
+  "BuildSettings": {
+    "ProjectType": "console",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "async.main",
+    "EntryPoint": "async",
+    "IncludePackageData": false,
+    "Included": [],
+    "Excluded": [
+      "*/__pycache__",
+      "*/logs",
+      "*/tests"
+    ],
+    "PackageData": {},
+    "ProjectReferences": []
+  }
+}

src/tests/custom/async/src/async/main.py

@@ -0,0 +1,17 @@
+import asyncio
+from cpl_core.application import ApplicationBuilder
+
+from application import Application
+from startup import Startup
+
+
+async def main():
+    app_builder = ApplicationBuilder(Application)
+    app_builder.use_startup(Startup)
+    app = await app_builder.build_async()
+    await app.run_async()
+
+
+if __name__ == '__main__':
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(main())

src/tests/custom/async/src/async/startup.py

@@ -0,0 +1,16 @@
+from cpl_core.application import StartupABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl_core.environment import ApplicationEnvironment
+
+
+class Startup(StartupABC):
+
+    def __init__(self):
+        StartupABC.__init__(self)
+
+    async def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+        return configuration
+
+    async def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
+        return services.build_service_provider()

src/tests/custom/di/cpl-workspace.json

@@ -0,0 +1,9 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "di",
+    "Projects": {
+      "di": "src/di/di.json"
+    },
+    "Scripts": {}
+  }
+}

src/tests/custom/di/src/di/application.py

@@ -0,0 +1,45 @@
+from cpl_core.application import ApplicationABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.console.console import Console
+from cpl_core.dependency_injection import ServiceProviderABC
+from cpl_core.dependency_injection.scope import Scope
+from test_service_service import TestService
+from di_tester_service import DITesterService
+
+
+class Application(ApplicationABC):
+
+    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
+        ApplicationABC.__init__(self, config, services)
+
+    def _part_of_scoped(self):
+        ts: TestService = self._services.get_service(TestService)
+        ts.run()
+        
+    def configure(self):
+        pass
+
+    def main(self):
+        Console.write_line('Scope1')
+        scope1: Scope = self._services.create_scope()
+        ts: TestService = scope1.service_provider.get_service(TestService)
+        ts.run()
+        dit: DITesterService = scope1.service_provider.get_service(DITesterService)
+        dit.run()
+        t = scope1
+        b = t.service_provider
+        scope1.dispose()
+        
+        #Console.write_line('Disposed:')
+        #ts1: TestService = scope1.service_provider.get_service(TestService)
+        #ts1.run()
+        
+        Console.write_line('Scope2')
+        scope2: Scope = self._services.create_scope()
+        ts: TestService = scope2.service_provider.get_service(TestService)
+        ts.run()
+        dit: DITesterService = scope2.service_provider.get_service(DITesterService)
+        dit.run()
+        
+        Console.write_line('Global')
+        self._part_of_scoped()

src/tests/custom/di/src/di/di.json

@@ -0,0 +1,43 @@
+{
+  "ProjectSettings": {
+    "Name": "di",
+    "Version": {
+      "Major": "0",
+      "Minor": "0",
+      "Micro": "0"
+    },
+    "Author": "",
+    "AuthorEmail": "",
+    "Description": "",
+    "LongDescription": "",
+    "URL": "",
+    "CopyrightDate": "",
+    "CopyrightName": "",
+    "LicenseName": "",
+    "LicenseDescription": "",
+    "Dependencies": [
+      "sh_cpl>=2021.10.0.post1"
+    ],
+    "PythonVersion": ">=3.9.2",
+    "PythonPath": {
+      "linux": ""
+    },
+    "Classifiers": []
+  },
+  "BuildSettings": {
+    "ProjectType": "console",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "di.main",
+    "EntryPoint": "di",
+    "IncludePackageData": false,
+    "Included": [],
+    "Excluded": [
+      "*/__pycache__",
+      "*/logs",
+      "*/tests"
+    ],
+    "PackageData": {},
+    "ProjectReferences": []
+  }
+}

src/tests/custom/di/src/di/di_tester_service.py

@@ -0,0 +1,12 @@
+from cpl_core.console.console import Console
+from test_service_service import TestService
+
+
+class DITesterService:
+
+    def __init__(self, ts: TestService):
+        self._ts = ts
+    
+    def run(self):
+        Console.write_line('DIT: ')
+        self._ts.run()

src/tests/custom/di/src/di/main.py

@@ -0,0 +1,14 @@
+from cpl_core.application import ApplicationBuilder
+
+from di.application import Application
+from di.startup import Startup
+
+
+def main():
+    app_builder = ApplicationBuilder(Application)
+    app_builder.use_startup(Startup)
+    app_builder.build().run()
+
+
+if __name__ == '__main__':
+    main()

src/tests/custom/di/src/di/startup.py

@@ -0,0 +1,21 @@
+from cpl_core.application import StartupABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl_core.environment import ApplicationEnvironment
+from test_service_service import TestService
+from di_tester_service import DITesterService
+
+
+class Startup(StartupABC):
+
+    def __init__(self):
+        StartupABC.__init__(self)
+
+    def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+        return configuration
+
+    def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
+        services.add_scoped(TestService)
+        services.add_scoped(DITesterService)
+        
+        return services.build_service_provider()

src/tests/custom/di/src/di/test_service_service.py

@@ -0,0 +1,13 @@
+import string
+from cpl_core.console.console import Console
+from cpl_core.utils.string import String
+
+
+class TestService:
+
+    def __init__(self):
+        self._name = String.random_string(string.ascii_lowercase, 8)
+    
+    
+    def run(self):
+        Console.write_line(f'Im {self._name}')