Better modules

Reviewed-on: #193

.gitea/workflows/prepare.yaml

@@ -25,7 +25,11 @@ jobs:
           git tag
           DATE=$(date +'%Y.%m.%d')
           TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
-          BUILD_NUMBER=$(($TAG_COUNT + 1))
+          if [ "$TAG_COUNT" -eq 0 ]; then
+            BUILD_NUMBER=0
+          else
+            BUILD_NUMBER=$(($TAG_COUNT + 1))
+          fi
           
           VERSION_SUFFIX=${{ inputs.version_suffix }}
           if [ -n "$VERSION_SUFFIX" ] && [ "$VERSION_SUFFIX" = "dev" ]; then

.gitignore

@@ -139,3 +139,6 @@ PythonImportHelper-v2-Completion.json
 
 # cpl unittest stuff
 unittests/test_*_playground
+
+# cpl logs
+**/logs/*.jsonl

example/api/src/main.py

@@ -0,0 +1,85 @@
+from starlette.responses import JSONResponse
+
+from cpl.api.api_module import ApiModule
+from cpl.api.application.web_app import WebApp
+from cpl.application.application_builder import ApplicationBuilder
+from cpl.auth import AuthModule
+from cpl.auth.permission.permissions import Permissions
+from cpl.auth.schema import AuthUser, Role
+from cpl.core.configuration import Configuration
+from cpl.core.console import Console
+from cpl.core.environment import Environment
+from cpl.core.utils.cache import Cache
+from cpl.database.mysql.mysql_module import MySQLModule
+from scoped_service import ScopedService
+from service import PingService
+
+
+def main():
+    builder = ApplicationBuilder[WebApp](WebApp)
+
+    Configuration.add_json_file(f"appsettings.json")
+    Configuration.add_json_file(f"appsettings.{Environment.get_environment()}.json")
+    Configuration.add_json_file(f"appsettings.{Environment.get_host_name()}.json", optional=True)
+
+    # builder.services.add_logging()
+    builder.services.add_structured_logging()
+    builder.services.add_transient(PingService)
+    builder.services.add_module(MySQLModule)
+    builder.services.add_module(ApiModule)
+
+    builder.services.add_scoped(ScopedService)
+
+    builder.services.add_cache(AuthUser)
+    builder.services.add_cache(Role)
+
+    app = builder.build()
+    app.with_logging()
+
+    app.with_authentication()
+    app.with_authorization()
+
+    app.with_route(
+        path="/route1",
+        fn=lambda r: JSONResponse("route1"),
+        method="GET",
+        authentication=True,
+        permissions=[Permissions.administrator],
+    )
+    app.with_routes_directory("routes")
+
+    provider = builder.service_provider
+    user_cache = provider.get_service(Cache[AuthUser])
+    role_cache = provider.get_service(Cache[Role])
+
+    if role_cache == user_cache:
+        raise Exception("Cache service is not working")
+
+    s1 = provider.get_service(ScopedService)
+    s2 = provider.get_service(ScopedService)
+
+    if s1.name == s2.name:
+        raise Exception("Scoped service is not working")
+
+    with provider.create_scope() as scope:
+        s3 = scope.get_service(ScopedService)
+        s4 = scope.get_service(ScopedService)
+
+        if s3.name != s4.name:
+            raise Exception("Scoped service is not working")
+
+    if s1.name == s3.name:
+        raise Exception("Scoped service is not working")
+
+    Console.write_line(
+        s1.name,
+        s2.name,
+        s3.name,
+        s4.name,
+    )
+
+    app.run()
+
+
+if __name__ == "__main__":
+    main()

example/api/src/routes/ping.py

@@ -0,0 +1,21 @@
+from urllib.request import Request
+
+from service import PingService
+from starlette.responses import JSONResponse
+
+from cpl.api import APILogger
+from cpl.api.router import Router
+from cpl.core.console import Console
+from cpl.dependency import ServiceProvider
+from scoped_service import ScopedService
+
+
+@Router.authenticate()
+# @Router.authorize(permissions=[Permissions.administrator])
+# @Router.authorize(policies=["test"])
+@Router.get(f"/ping")
+async def ping(r: Request, ping: PingService, logger: APILogger, provider: ServiceProvider, scoped: ScopedService):
+    logger.info(f"Ping: {ping}")
+
+    Console.write_line(scoped.name)
+    return JSONResponse(ping.ping(r))

example/api/src/scoped_service.py

@@ -0,0 +1,14 @@
+from cpl.core.console.console import Console
+from cpl.core.utils.string import String
+
+
+class ScopedService:
+    def __init__(self):
+        self._name = String.random(8)
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    def run(self):
+        Console.write_line(f"Im {self._name}")

example/database/src/application.py

@@ -3,7 +3,8 @@ from cpl.auth.keycloak import KeycloakAdmin
 from cpl.core.console import Console
 from cpl.core.environment import Environment
 from cpl.core.log import LoggerABC
-from cpl.dependency import ServiceProviderABC
+from cpl.dependency import ServiceProvider
+from cpl.dependency.typing import Modules
 from model.city import City
 from model.city_dao import CityDao
 from model.user import User
@@ -11,8 +12,8 @@ from model.user_dao import UserDao
 
 
 class Application(ApplicationABC):
-    def __init__(self, services: ServiceProviderABC):
-        ApplicationABC.__init__(self, services)
+    def __init__(self, services: ServiceProvider, modules: Modules):
+        ApplicationABC.__init__(self, services, modules)
 
         self._logger = services.get_service(LoggerABC)
 

example/database/src/main_simplified.py

@@ -3,6 +3,7 @@ from cpl.application import ApplicationBuilder
 from cpl.auth.permission.permissions_registry import PermissionsRegistry
 from cpl.core.console import Console
 from cpl.core.log import LogLevel
+from cpl.database import DatabaseModule
 from custom_permissions import CustomPermissions
 from startup import Startup
 
@@ -10,13 +11,12 @@ from startup import Startup
 def main():
     builder = ApplicationBuilder(Application).with_startup(Startup)
     builder.services.add_logging()
-
     app = builder.build()
 
     app.with_logging(LogLevel.trace)
     app.with_permissions(CustomPermissions)
     app.with_migrations("./scripts")
-    app.with_seeders()
+    # app.with_seeders()
 
     Console.write_line(CustomPermissions.test.value in PermissionsRegistry.get())
     app.run()

example/database/src/model/city_dao.py

@@ -5,7 +5,7 @@ from model.city import City
 class CityDao(DbModelDaoABC[City]):
 
     def __init__(self):
-        DbModelDaoABC.__init__(self, __name__, City, "city")
+        DbModelDaoABC.__init__(self, City, "city")
 
         self.attribute(City.name, str)
         self.attribute(City.zip, int)

example/database/src/model/user_dao.py

@@ -5,7 +5,7 @@ from model.user import User
 class UserDao(DbModelDaoABC[User]):
 
     def __init__(self):
-        DbModelDaoABC.__init__(self, __name__, User, "users")
+        DbModelDaoABC.__init__(self, User, "users")
 
         self.attribute(User.name, str)
         self.attribute(User.city_id, int, db_name="CityId")

example/database/src/startup.py

@@ -1,11 +1,14 @@
 from cpl import auth
 from cpl.application.abc.startup_abc import StartupABC
 from cpl.auth import permission
+from cpl.auth.auth_module import AuthModule
+from cpl.auth.permission.permission_module import PermissionsModule
 from cpl.core.configuration import Configuration
 from cpl.core.environment import Environment
 from cpl.core.log import Logger, LoggerABC
-from cpl.database import mysql
+from cpl.database import mysql, DatabaseModule
 from cpl.database.abc.data_access_object_abc import DataAccessObjectABC
+from cpl.database.mysql.mysql_module import MySQLModule
 from cpl.dependency import ServiceCollection
 from model.city_dao import CityDao
 from model.user_dao import UserDao
@@ -21,9 +24,10 @@ class Startup(StartupABC):
 
     @staticmethod
     async def configure_services(services: ServiceCollection):
-        services.add_module(mysql)
-        services.add_module(auth)
-        services.add_module(permission)
+        services.add_module(MySQLModule)
+        services.add_module(DatabaseModule)
+        services.add_module(AuthModule)
+        services.add_module(PermissionsModule)
 
         services.add_transient(DataAccessObjectABC, UserDao)
         services.add_transient(DataAccessObjectABC, CityDao)

example/di/src/application.py

@@ -0,0 +1,45 @@
+from cpl.application.abc import ApplicationABC
+from cpl.core.console.console import Console
+from cpl.dependency import ServiceProvider
+from test_abc import TestABC
+from test_service import TestService
+from di_tester_service import DITesterService
+from tester import Tester
+
+
+class Application(ApplicationABC):
+    def __init__(self, services: ServiceProvider):
+        ApplicationABC.__init__(self, services)
+
+    def _part_of_scoped(self):
+        ts: TestService = self._services.get_service(TestService)
+        ts.run()
+
+    def main(self):
+        with self._services.create_scope() as scope:
+            Console.write_line("Scope1")
+            ts: TestService = scope.get_service(TestService)
+            ts.run()
+            dit: DITesterService = scope.get_service(DITesterService)
+            dit.run()
+
+            if ts.name != dit.name:
+                raise Exception("DI is broken!")
+
+        with self._services.create_scope() as scope:
+            Console.write_line("Scope2")
+            ts: TestService = scope.get_service(TestService)
+            ts.run()
+            dit: DITesterService = scope.get_service(DITesterService)
+            dit.run()
+
+            if ts.name != dit.name:
+                raise Exception("DI is broken!")
+
+        Console.write_line("Global")
+        self._part_of_scoped()
+        #from static_test import StaticTest
+        #StaticTest.test()
+
+        self._services.get_service(Tester)
+        Console.write_line(self._services.get_services(TestABC))

example/di/src/di_tester_service.py

@@ -1,11 +1,15 @@
 from cpl.core.console.console import Console
-from di.test_service import TestService
+from test_service import TestService
 
 
 class DITesterService:
     def __init__(self, ts: TestService):
         self._ts = ts
 
+    @property
+    def name(self) -> str:
+        return self._ts.name
+
     def run(self):
         Console.write_line("DIT: ")
         self._ts.run()

example/di/src/main.py

@@ -1,7 +1,7 @@
 from cpl.application import ApplicationBuilder
 
-from di.application import Application
-from di.startup import Startup
+from application import Application
+from startup import Startup
 
 
 def main():

example/di/src/startup.py

@@ -0,0 +1,27 @@
+from cpl.application.abc import StartupABC
+from cpl.dependency import ServiceProvider, ServiceCollection
+from di_tester_service import DITesterService
+from test1_service import Test1Service
+from test2_service import Test2Service
+from test_abc import TestABC
+from test_service import TestService
+from tester import Tester
+
+
+class Startup(StartupABC):
+    def __init__(self):
+        StartupABC.__init__(self)
+
+    @staticmethod
+    def configure_configuration(): ...
+
+    @staticmethod
+    def configure_services(services: ServiceCollection) -> ServiceProvider:
+        services.add_scoped(TestService)
+        services.add_scoped(DITesterService)
+
+        services.add_singleton(TestABC, Test1Service)
+        services.add_singleton(TestABC, Test2Service)
+        services.add_singleton(Tester)
+
+        return services.build()

example/di/src/static_test.py

@@ -0,0 +1,10 @@
+from cpl.dependency import ServiceProvider, ServiceProvider
+from cpl.dependency.inject import inject
+from test_service import TestService
+
+
+class StaticTest:
+    @staticmethod
+    @inject
+    def test(services: ServiceProvider, t1: TestService):
+        t1.run()

example/di/src/test1_service.py

@@ -1,12 +1,12 @@
 import string
 from cpl.core.console.console import Console
 from cpl.core.utils.string import String
-from di.test_abc import TestABC
+from test_abc import TestABC
 
 
 class Test1Service(TestABC):
     def __init__(self):
-        TestABC.__init__(self, String.random_string(string.ascii_lowercase, 8))
+        TestABC.__init__(self, String.random(8))
 
     def run(self):
         Console.write_line(f"Im {self._name}")

example/di/src/test2_service.py

@@ -1,12 +1,12 @@
 import string
 from cpl.core.console.console import Console
 from cpl.core.utils.string import String
-from di.test_abc import TestABC
+from test_abc import TestABC
 
 
 class Test2Service(TestABC):
     def __init__(self):
-        TestABC.__init__(self, String.random_string(string.ascii_lowercase, 8))
+        TestABC.__init__(self, String.random(8))
 
     def run(self):
         Console.write_line(f"Im {self._name}")

example/di/src/test_service.py

@@ -1,5 +1,3 @@
-import string
-
 from cpl.core.console.console import Console
 from cpl.core.utils.string import String
 
@@ -8,5 +6,9 @@ class TestService:
     def __init__(self):
         self._name = String.random(8)
 
+    @property
+    def name(self) -> str:
+        return self._name
+
     def run(self):
         Console.write_line(f"Im {self._name}")

example/di/src/tester.py

@@ -0,0 +1,7 @@
+from cpl.core.console.console import Console
+from test_abc import TestABC
+
+
+class Tester:
+    def __init__(self, t1: TestABC, t2: TestABC, t3: TestABC, t: list[TestABC]):
+        Console.write_line("Tester:", t, t1, t2, t3)

example/general/src/application.py

@@ -1,22 +1,22 @@
 import time
-from typing import Optional
 
 from cpl.application.abc import ApplicationABC
 from cpl.core.configuration import Configuration
 from cpl.core.console import Console
-from cpl.dependency import ServiceProviderABC
 from cpl.core.environment import Environment
 from cpl.core.log import LoggerABC
 from cpl.core.pipes import IPAddressPipe
+from cpl.dependency import ServiceProvider
 from cpl.mail import EMail, EMailClientABC
-from cpl.query.extension.list import List
+from cpl.query import List
+from scoped_service import ScopedService
 from test_service import TestService
 from test_settings import TestSettings
 
 
 class Application(ApplicationABC):
 
-    def __init__(self, services: ServiceProviderABC):
+    def __init__(self, services: ServiceProvider):
         ApplicationABC.__init__(self, services)
         self._logger = self._services.get_service(LoggerABC)
         self._mailer = self._services.get_service(EMailClientABC)
@@ -38,7 +38,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 +48,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)
@@ -62,3 +73,9 @@ class Application(ApplicationABC):
         test_settings1 = Configuration.get(TestSettings)
         Console.write_line(test_settings1.value)
         # self.test_send_mail()
+
+        x = 0
+        while x < 5:
+            Console.write_line("Running...")
+            x += 1
+            time.sleep(5)

example/general/src/hosted_service.py

@@ -0,0 +1,20 @@
+import asyncio
+import time
+
+from cpl.core.console import Console
+from cpl.dependency.hosted.hosted_service import HostedService
+
+
+class Hosted(HostedService):
+    def __init__(self):
+        self._stopped = False
+
+    async def start(self):
+        Console.write_line("Hosted Service Started")
+        while not self._stopped:
+            Console.write_line("Hosted Service Running")
+            await asyncio.sleep(5)
+
+    async def stop(self):
+        Console.write_line("Hosted Service Stopped")
+        self._stopped = True

example/general/src/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/general/src/startup.py

@@ -4,6 +4,9 @@ from cpl.core.configuration import Configuration
 from cpl.core.environment import Environment
 from cpl.core.pipes import IPAddressPipe
 from cpl.dependency import ServiceCollection
+from cpl.mail.mail_module import MailModule
+from hosted_service import Hosted
+from scoped_service import ScopedService
 from test_service import TestService
 
 
@@ -18,6 +21,8 @@ class Startup(StartupABC):
     @staticmethod
     def configure_services(services: ServiceCollection):
         services.add_logging()
-        services.add_module(mail)
+        services.add_module(MailModule)
         services.add_transient(IPAddressPipe)
         services.add_singleton(TestService)
+        services.add_scoped(ScopedService)
+        services.add_hosted_service(Hosted)

example/general/src/test_extension.py

@@ -1,10 +1,10 @@
 from cpl.application.abc import ApplicationExtensionABC
 from cpl.core.console import Console
-from cpl.dependency import ServiceProviderABC
+from cpl.dependency import ServiceProvider
 
 
 class TestExtension(ApplicationExtensionABC):
 
     @staticmethod
-    def run(services: ServiceProviderABC):
+    def run(services: ServiceProvider):
         Console.write_line("Hello World from App Extension")

example/general/src/test_service.py

@@ -1,10 +1,10 @@
 from cpl.core.console.console import Console
-from cpl.dependency import ServiceProviderABC
+from cpl.dependency import ServiceProvider
 from cpl.core.pipes.ip_address_pipe import IPAddressPipe
 
 
 class TestService:
-    def __init__(self, provider: ServiceProviderABC):
+    def __init__(self, provider: ServiceProvider):
         self._provider = provider
 
     def run(self):

example/query/main.py

@@ -0,0 +1,60 @@
+from cpl.core.console import Console
+from cpl.core.utils.benchmark import Benchmark
+from cpl.query.enumerable import Enumerable
+from cpl.query.immutable_list import ImmutableList
+from cpl.query.list import List
+from cpl.query.set import Set
+
+
+def _default():
+    Console.write_line(Enumerable.empty().to_list())
+
+    Console.write_line(Enumerable.range(0, 100).length)
+    Console.write_line(Enumerable.range(0, 100).to_list())
+
+    Console.write_line(Enumerable.range(0, 100).where(lambda x: x % 2 == 0).length)
+    Console.write_line(
+        Enumerable.range(0, 100).where(lambda x: x % 2 == 0).to_list().select(lambda x: str(x)).to_list()
+    )
+    Console.write_line(List)
+
+    s =Enumerable.range(0, 10).to_set()
+    Console.write_line(s)
+    s.add(1)
+    Console.write_line(s)
+
+    data = Enumerable(
+        [
+            {"name": "Alice", "age": 30},
+            {"name": "Dave", "age": 35},
+            {"name": "Charlie", "age": 25},
+            {"name": "Bob", "age": 25},
+        ]
+    )
+
+    Console.write_line(data.order_by(lambda x: x["age"]).to_list())
+    Console.write_line(data.order_by(lambda x: x["age"]).then_by(lambda x: x["name"]).to_list())
+    Console.write_line(data.order_by(lambda x: x["name"]).then_by(lambda x: x["age"]).to_list())
+
+
+def t_benchmark(data: list):
+    Benchmark.all("Enumerable", lambda: Enumerable(data).where(lambda x: x % 2 == 0).select(lambda x: x * 2).to_list())
+    Benchmark.all("Set", lambda: Set(data).where(lambda x: x % 2 == 0).select(lambda x: x * 2).to_list())
+    Benchmark.all("List", lambda: List(data).where(lambda x: x % 2 == 0).select(lambda x: x * 2).to_list())
+    Benchmark.all(
+        "ImmutableList", lambda: ImmutableList(data).where(lambda x: x % 2 == 0).select(lambda x: x * 2).to_list()
+    )
+    Benchmark.all("List comprehension", lambda: [x * 2 for x in data if x % 2 == 0])
+
+
+def main():
+    N = 1_000_000
+    data = list(range(N))
+    t_benchmark(data)
+
+    Console.write_line()
+    _default()
+
+
+if __name__ == "__main__":
+    main()

example/translation/src/application.py

@@ -1,14 +1,14 @@
 from cpl.application import ApplicationABC
 from cpl.core.configuration import ConfigurationABC
 from cpl.core.console import Console
-from cpl.dependency import ServiceProviderABC
+from cpl.dependency import ServiceProvider
 from cpl.translation.translate_pipe import TranslatePipe
 from cpl.translation.translation_service_abc import TranslationServiceABC
 from cpl.translation.translation_settings import TranslationSettings
 
 
 class Application(ApplicationABC):
-    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
+    def __init__(self, config: ConfigurationABC, services: ServiceProvider):
         ApplicationABC.__init__(self, config, services)
 
         self._translate: TranslatePipe = services.get_service(TranslatePipe)

example/translation/src/startup.py

@@ -1,6 +1,6 @@
 from cpl.application import StartupABC
 from cpl.core.configuration import ConfigurationABC
-from cpl.dependency import ServiceProviderABC, ServiceCollection
+from cpl.dependency import ServiceProvider, ServiceCollection
 from cpl.core.environment import Environment
 
 
@@ -12,6 +12,6 @@ class Startup(StartupABC):
         configuration.add_json_file("appsettings.json")
         return configuration
 
-    def configure_services(self, services: ServiceCollection, environment: Environment) -> ServiceProviderABC:
+    def configure_services(self, services: ServiceCollection, environment: Environment) -> ServiceProvider:
         services.add_translation()
         return services.build()

src/cpl-api/cpl/api/__init__.py

@@ -1,35 +1,4 @@
-from cpl.dependency.service_collection import ServiceCollection as _ServiceCollection
-
 from .error import APIError, AlreadyExists, EndpointNotImplemented, Forbidden, NotFound, Unauthorized
 from .logger import APILogger
 from .settings import ApiSettings
-
-def add_api(collection: _ServiceCollection):
-    try:
-        from cpl.database import mysql
-
-        collection.add_module(mysql)
-    except ImportError as e:
-        from cpl.core.errors import dependency_error
-
-        dependency_error("cpl-database", e)
-
-    try:
-        from cpl import auth
-        from cpl.auth import permission
-
-        collection.add_module(auth)
-        collection.add_module(permission)
-    except ImportError as e:
-        from cpl.core.errors import dependency_error
-
-        dependency_error("cpl-auth", e)
-
-    from cpl.api.registry.policy import PolicyRegistry
-    from cpl.api.registry.route import RouteRegistry
-
-    collection.add_singleton(PolicyRegistry)
-    collection.add_singleton(RouteRegistry)
-
-
-_ServiceCollection.with_module(add_api, __name__)
+from .api_module import ApiModule

src/cpl-api/cpl/api/abc/__init__.py

@@ -1 +1 @@
-from .asgi_middleware_abc import ASGIMiddleware
+from .asgi_middleware_abc import ASGIMiddleware

src/cpl-api/cpl/api/api_module.py

@@ -0,0 +1,22 @@
+from cpl.api import ApiSettings
+from cpl.api.registry.policy import PolicyRegistry
+from cpl.api.registry.route import RouteRegistry
+from cpl.auth.auth_module import AuthModule
+from cpl.auth.permission.permission_module import PermissionsModule
+from cpl.database.database_module import DatabaseModule
+from cpl.dependency import ServiceCollection
+from cpl.dependency.module.module import Module
+
+
+class ApiModule(Module):
+    config = [ApiSettings]
+    singleton = [
+        PolicyRegistry,
+        RouteRegistry,
+    ]
+
+    @staticmethod
+    def register(collection: ServiceCollection):
+        collection.add_module(DatabaseModule)
+        collection.add_module(AuthModule)
+        collection.add_module(PermissionsModule)

src/cpl-api/cpl/api/application/__init__.py

@@ -1 +1 @@
-from .web_app import WebApp
+from .web_app import WebApp

src/cpl-api/cpl/api/application/web_app.py

@@ -10,7 +10,7 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse
 from starlette.types import ExceptionHandler
 
-from cpl import api, auth
+from cpl.api.api_module import ApiModule
 from cpl.api.error import APIError
 from cpl.api.logger import APILogger
 from cpl.api.middleware.authentication import AuthenticationMiddleware
@@ -26,42 +26,45 @@ from cpl.api.router import Router
 from cpl.api.settings import ApiSettings
 from cpl.api.typing import HTTPMethods, PartialMiddleware, PolicyResolver
 from cpl.application.abc.application_abc import ApplicationABC
-from cpl.core.configuration import Configuration
-from cpl.dependency.service_provider_abc import ServiceProviderABC
-
-_logger = APILogger("API")
+from cpl.auth.auth_module import AuthModule
+from cpl.auth.permission.permission_module import PermissionsModule
+from cpl.core.configuration.configuration import Configuration
+from cpl.dependency.inject import inject
+from cpl.dependency.service_provider import ServiceProvider
+from cpl.dependency.typing import Modules
 
 PolicyInput = Union[dict[str, PolicyResolver], Policy]
 
 
 class WebApp(ApplicationABC):
-    def __init__(self, services: ServiceProviderABC):
-        super().__init__(services, [auth, api])
+    def __init__(self, services: ServiceProvider, modules: Modules):
+        super().__init__(services, modules, [AuthModule, PermissionsModule, ApiModule])
         self._app: Starlette | None = None
 
+        self._logger = services.get_service(APILogger)
+
         self._api_settings = Configuration.get(ApiSettings)
         self._policies = services.get_service(PolicyRegistry)
         self._routes = services.get_service(RouteRegistry)
 
-        self._middleware: list[Middleware] = [
-            Middleware(RequestMiddleware),
-            Middleware(LoggingMiddleware),
-        ]
+        self._middleware: list[Middleware] = []
         self._exception_handlers: Mapping[Any, ExceptionHandler] = {
             Exception: self._handle_exception,
             APIError: self._handle_exception,
         }
 
-    @staticmethod
-    async def _handle_exception(request: Request, exc: Exception):
+        self.with_middleware(RequestMiddleware)
+        self.with_middleware(LoggingMiddleware)
+
+    async def _handle_exception(self, request: Request, exc: Exception):
         if isinstance(exc, APIError):
-            _logger.error(exc)
+            self._logger.error(exc)
             return JSONResponse({"error": str(exc)}, status_code=exc.status_code)
 
         if hasattr(request.state, "request_id"):
-            _logger.error(f"Request {request.state.request_id}", exc)
+            self._logger.error(f"Request {request.state.request_id}", exc)
         else:
-            _logger.error("Request unknown", exc)
+            self._logger.error("Request unknown", exc)
 
         return JSONResponse({"error": str(exc)}, status_code=500)
 
@@ -69,17 +72,12 @@ class WebApp(ApplicationABC):
         origins = self._api_settings.allowed_origins
 
         if origins is None or origins == "":
-            _logger.warning("No allowed origins specified, allowing all origins")
+            self._logger.warning("No allowed origins specified, allowing all origins")
             return ["*"]
 
-        _logger.debug(f"Allowed origins: {origins}")
+        self._logger.debug(f"Allowed origins: {origins}")
         return origins.split(",")
 
-    def with_database(self) -> Self:
-        self.with_migrations()
-        self.with_seeders()
-        return self
-
     def with_app(self, app: Starlette) -> Self:
         assert app is not None, "app must not be None"
         assert isinstance(app, Starlette), "app must be an instance of Starlette"
@@ -168,9 +166,9 @@ class WebApp(ApplicationABC):
         self._check_for_app()
 
         if isinstance(middleware, Middleware):
-            self._middleware.append(middleware)
+            self._middleware.append(inject(middleware))
         elif callable(middleware):
-            self._middleware.append(Middleware(middleware))
+            self._middleware.append(Middleware(inject(middleware)))
         else:
             raise ValueError("middleware must be of type starlette.middleware.Middleware or a callable")
 
@@ -191,11 +189,11 @@ class WebApp(ApplicationABC):
                 if isinstance(policy, dict):
                     for name, resolver in policy.items():
                         if not isinstance(name, str):
-                            _logger.warning(f"Skipping policy at index {i}, name must be a string")
+                            self._logger.warning(f"Skipping policy at index {i}, name must be a string")
                             continue
 
                         if not callable(resolver):
-                            _logger.warning(f"Skipping policy {name}, resolver must be callable")
+                            self._logger.warning(f"Skipping policy {name}, resolver must be callable")
                             continue
 
                         _policies.append(Policy(name, resolver))
@@ -203,7 +201,7 @@ class WebApp(ApplicationABC):
 
                 _policies.append(policy)
 
-            self._policies.extend_policies(_policies)
+            self._policies.extend(_policies)
 
         self.with_middleware(AuthorizationMiddleware)
         return self
@@ -213,14 +211,14 @@ class WebApp(ApplicationABC):
             for policy_name in rule["policies"]:
                 policy = self._policies.get(policy_name)
                 if not policy:
-                    _logger.fatal(f"Authorization policy '{policy_name}' not found")
+                    self._logger.fatal(f"Authorization policy '{policy_name}' not found")
 
     async def main(self):
-        _logger.debug(f"Preparing API")
+        self._logger.debug(f"Preparing API")
         self._validate_policies()
 
         if self._app is None:
-            routes = [route.to_starlette(self._services.inject) for route in self._routes.all()]
+            routes = [route.to_starlette(inject) for route in self._routes.all()]
 
             app = Starlette(
                 routes=routes,
@@ -238,7 +236,7 @@ class WebApp(ApplicationABC):
         else:
             app = self._app
 
-        _logger.info(f"Start API on {self._api_settings.host}:{self._api_settings.port}")
+        self._logger.info(f"Start API on {self._api_settings.host}:{self._api_settings.port}")
 
         config = uvicorn.Config(
             app, host=self._api_settings.host, port=self._api_settings.port, log_config=None, loop="asyncio"
@@ -246,4 +244,4 @@ class WebApp(ApplicationABC):
         server = uvicorn.Server(config)
         await server.serve()
 
-        _logger.info("Shutdown API")
+        self._logger.info("Shutdown API")

src/cpl-api/cpl/api/logger.py

@@ -1,7 +1,7 @@
-from cpl.core.log.logger import Logger
+from cpl.core.log.wrapped_logger import WrappedLogger
 
 
-class APILogger(Logger):
+class APILogger(WrappedLogger):
 
-    def __init__(self, source: str):
-        Logger.__init__(self, source, "api")
+    def __init__(self):
+        WrappedLogger.__init__(self, "api")

src/cpl-api/cpl/api/middleware/authentication.py

@@ -2,24 +2,22 @@ from keycloak import KeycloakAuthenticationError
 from starlette.types import Scope, Receive, Send
 
 from cpl.api.abc.asgi_middleware_abc import ASGIMiddleware
-from cpl.api.logger import APILogger
 from cpl.api.error import Unauthorized
+from cpl.api.logger import APILogger
 from cpl.api.middleware.request import get_request
 from cpl.api.router import Router
 from cpl.auth.keycloak import KeycloakClient
 from cpl.auth.schema import AuthUserDao, AuthUser
 from cpl.core.ctx import set_user
-from cpl.dependency import ServiceProviderABC
-
-_logger = APILogger(__name__)
 
 
 class AuthenticationMiddleware(ASGIMiddleware):
 
-    @ServiceProviderABC.inject
-    def __init__(self, app, keycloak: KeycloakClient, user_dao: AuthUserDao):
+    def __init__(self, app, logger: APILogger, keycloak: KeycloakClient, user_dao: AuthUserDao):
         ASGIMiddleware.__init__(self, app)
 
+        self._logger = logger
+
         self._keycloak = keycloak
         self._user_dao = user_dao
 
@@ -28,11 +26,11 @@ class AuthenticationMiddleware(ASGIMiddleware):
         url = request.url.path
 
         if url not in Router.get_auth_required_routes():
-            _logger.trace(f"No authentication required for {url}")
+            self._logger.trace(f"No authentication required for {url}")
             return await self._app(scope, receive, send)
 
         if not request.headers.get("Authorization"):
-            _logger.debug(f"Unauthorized access to {url}, missing Authorization header")
+            self._logger.debug(f"Unauthorized access to {url}, missing Authorization header")
             return await Unauthorized(f"Missing header Authorization").asgi_response(scope, receive, send)
 
         auth_header = request.headers.get("Authorization", None)
@@ -41,7 +39,7 @@ class AuthenticationMiddleware(ASGIMiddleware):
 
         token = auth_header.split("Bearer ")[1]
         if not await self._verify_login(token):
-            _logger.debug(f"Unauthorized access to {url}, invalid token")
+            self._logger.debug(f"Unauthorized access to {url}, invalid token")
             return await Unauthorized("Invalid token").asgi_response(scope, receive, send)
 
         # check user exists in db, if not create
@@ -51,7 +49,7 @@ class AuthenticationMiddleware(ASGIMiddleware):
 
         user = await self._get_or_crate_user(keycloak_id)
         if user.deleted:
-            _logger.debug(f"Unauthorized access to {url}, user is deleted")
+            self._logger.debug(f"Unauthorized access to {url}, user is deleted")
             return await Unauthorized("User is deleted").asgi_response(scope, receive, send)
 
         request.state.user = user
@@ -73,8 +71,8 @@ class AuthenticationMiddleware(ASGIMiddleware):
             token_info = self._keycloak.introspect(token)
             return token_info.get("active", False)
         except KeycloakAuthenticationError as e:
-            _logger.debug(f"Keycloak authentication error: {e}")
+            self._logger.debug(f"Keycloak authentication error: {e}")
             return False
         except Exception as e:
-            _logger.error(f"Unexpected error during token verification: {e}")
+            self._logger.error(f"Unexpected error during token verification: {e}")
             return False

src/cpl-api/cpl/api/middleware/authorization.py

@@ -9,17 +9,15 @@ from cpl.api.registry.policy import PolicyRegistry
 from cpl.api.router import Router
 from cpl.auth.schema._administration.auth_user_dao import AuthUserDao
 from cpl.core.ctx.user_context import get_user
-from cpl.dependency.service_provider_abc import ServiceProviderABC
-
-_logger = APILogger(__name__)
 
 
 class AuthorizationMiddleware(ASGIMiddleware):
 
-    @ServiceProviderABC.inject
-    def __init__(self, app, policies: PolicyRegistry, user_dao: AuthUserDao):
+    def __init__(self, app, logger: APILogger, policies: PolicyRegistry, user_dao: AuthUserDao):
         ASGIMiddleware.__init__(self, app)
 
+        self._logger = logger
+
         self._policies = policies
         self._user_dao = user_dao
 
@@ -28,7 +26,7 @@ class AuthorizationMiddleware(ASGIMiddleware):
         url = request.url.path
 
         if url not in Router.get_authorization_rules_paths():
-            _logger.trace(f"No authorization required for {url}")
+            self._logger.trace(f"No authorization required for {url}")
             return await self._app(scope, receive, send)
 
         user = get_user()
@@ -64,7 +62,7 @@ class AuthorizationMiddleware(ASGIMiddleware):
             for policy_name in rule["policies"]:
                 policy = self._policies.get(policy_name)
                 if not policy:
-                    _logger.warning(f"Authorization policy '{policy_name}' not found")
+                    self._logger.warning(f"Authorization policy '{policy_name}' not found")
                     continue
 
                 if not await policy.resolve(user):

src/cpl-api/cpl/api/middleware/logging.py

@@ -7,14 +7,14 @@ from cpl.api.abc.asgi_middleware_abc import ASGIMiddleware
 from cpl.api.logger import APILogger
 from cpl.api.middleware.request import get_request
 
-_logger = APILogger(__name__)
-
 
 class LoggingMiddleware(ASGIMiddleware):
 
-    def __init__(self, app):
+    def __init__(self, app, logger: APILogger):
         ASGIMiddleware.__init__(self, app)
 
+        self._logger = logger
+
     async def __call__(self, scope: Scope, receive: Receive, send: Send):
         if scope["type"] != "http":
             await self._call_next(scope, receive, send)
@@ -53,9 +53,8 @@ class LoggingMiddleware(ASGIMiddleware):
         }
         return {key: value for key, value in headers.items() if key in relevant_keys}
 
-    @classmethod
-    async def _log_request(cls, request: Request):
-        _logger.debug(
+    async def _log_request(self, request: Request):
+        self._logger.debug(
             f"Request {getattr(request.state, 'request_id', '-')}: {request.method}@{request.url.path} from {request.client.host}"
         )
 
@@ -64,7 +63,7 @@ class LoggingMiddleware(ASGIMiddleware):
         user = get_user()
 
         request_info = {
-            "headers": cls._filter_relevant_headers(dict(request.headers)),
+            "headers": self._filter_relevant_headers(dict(request.headers)),
             "args": dict(request.query_params),
             "form-data": (
                 await request.form()
@@ -78,10 +77,9 @@ class LoggingMiddleware(ASGIMiddleware):
             ),
         }
 
-        _logger.trace(f"Request {getattr(request.state, 'request_id', '-')}: {request_info}")
+        self._logger.trace(f"Request {getattr(request.state, 'request_id', '-')}: {request_info}")
 
-    @staticmethod
-    async def _log_after_request(request: Request, status_code: int, duration: float):
-        _logger.info(
+    async def _log_after_request(self, request: Request, status_code: int, duration: float):
+        self._logger.info(
             f"Request finished {getattr(request.state, 'request_id', '-')}: {status_code}-{request.method}@{request.url.path} from {request.client.host} in {duration:.2f}ms"
         )

src/cpl-api/cpl/api/middleware/request.py

@@ -9,16 +9,20 @@ from starlette.types import Scope, Receive, Send
 from cpl.api.abc.asgi_middleware_abc import ASGIMiddleware
 from cpl.api.logger import APILogger
 from cpl.api.typing import TRequest
+from cpl.dependency.inject import inject
+from cpl.dependency.service_provider import ServiceProvider
 
 _request_context: ContextVar[Union[TRequest, None]] = ContextVar("request", default=None)
 
-_logger = APILogger(__name__)
-
 
 class RequestMiddleware(ASGIMiddleware):
 
-    def __init__(self, app):
+    def __init__(self, app, provider: ServiceProvider, logger: APILogger):
         ASGIMiddleware.__init__(self, app)
+
+        self._provider = provider
+        self._logger = logger
+
         self._ctx_token = None
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send):
@@ -26,14 +30,15 @@ class RequestMiddleware(ASGIMiddleware):
         await self.set_request_data(request)
 
         try:
-            await self._app(scope, receive, send)
+            with self._provider.create_scope():
+                inject(await self._app(scope, receive, send))
         finally:
             await self.clean_request_data()
 
     async def set_request_data(self, request: TRequest):
         request.state.request_id = uuid4()
         request.state.start_time = time.time()
-        _logger.trace(f"Set new current request: {request.state.request_id}")
+        self._logger.trace(f"Set new current request: {request.state.request_id}")
 
         self._ctx_token = _request_context.set(request)
 
@@ -45,7 +50,7 @@ class RequestMiddleware(ASGIMiddleware):
         if self._ctx_token is None:
             return
 
-        _logger.trace(f"Clearing current request: {request.state.request_id}")
+        self._logger.trace(f"Clearing current request: {request.state.request_id}")
         _request_context.reset(self._ctx_token)
 
 

src/cpl-api/cpl/api/model/__init__.py

@@ -1,3 +1,3 @@
 from .api_route import ApiRoute
 from .policy import Policy
-from .validation_match import ValidationMatch
+from .validation_match import ValidationMatch

src/cpl-api/cpl/api/model/policy.py

@@ -1,5 +1,5 @@
 from asyncio import iscoroutinefunction
-from typing import Optional, Any, Coroutine, Awaitable
+from typing import Optional
 
 from cpl.api.typing import PolicyResolver
 from cpl.core.ctx import get_user

src/cpl-api/cpl/api/registry/__init__.py

@@ -1,2 +1,2 @@
 from .policy import PolicyRegistry
-from .route import RouteRegistry
+from .route import RouteRegistry

src/cpl-api/cpl/api/registry/route.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-from cpl.api.model.policy import Policy
 from cpl.api.model.api_route import ApiRoute
 from cpl.core.abc.registry_abc import RegistryABC
 

src/cpl-api/cpl/api/router.py

@@ -3,6 +3,7 @@ from enum import Enum
 from cpl.api.model.validation_match import ValidationMatch
 from cpl.api.registry.route import RouteRegistry
 from cpl.api.typing import HTTPMethods
+from cpl.dependency import get_provider
 
 
 class Router:
@@ -92,11 +93,10 @@ class Router:
 
     @classmethod
     def route(cls, path: str, method: HTTPMethods, registry: RouteRegistry = None, **kwargs):
-        if not registry:
-            from cpl.api.model.api_route import ApiRoute
-            from cpl.dependency.service_provider_abc import ServiceProviderABC
+        from cpl.api.model.api_route import ApiRoute
 
-            routes = ServiceProviderABC.get_global_service(RouteRegistry)
+        if not registry:
+            routes = get_provider().get_service(RouteRegistry)
         else:
             routes = registry
 
@@ -143,9 +143,8 @@ class Router:
         """
 
         from cpl.api.model.api_route import ApiRoute
-        from cpl.dependency.service_provider_abc import ServiceProviderABC
 
-        routes = ServiceProviderABC.get_global_service(RouteRegistry)
+        routes = get_provider().get_service(RouteRegistry)
 
         def inner(fn):
             path = getattr(fn, "_route_path", None)

src/cpl-application/cpl/application/__init__.py

@@ -1 +1,2 @@
 from .application_builder import ApplicationBuilder
+from .host import Host

src/cpl-application/cpl/application/abc/application_abc.py

@@ -2,11 +2,12 @@ from abc import ABC, abstractmethod
 from typing import Callable, Self
 
 from cpl.application.host import Host
-from cpl.core.console.console import Console
-from cpl.core.log import LogSettings
+from cpl.core.errors import module_dependency_error
 from cpl.core.log.log_level import LogLevel
+from cpl.core.log.log_settings import LogSettings
 from cpl.core.log.logger_abc import LoggerABC
-from cpl.dependency.service_provider_abc import ServiceProviderABC
+from cpl.dependency.service_provider import ServiceProvider
+from cpl.dependency.typing import TModule
 
 
 def __not_implemented__(package: str, func: Callable):
@@ -17,21 +18,10 @@ class ApplicationABC(ABC):
     r"""ABC for the Application class
 
     Parameters:
-        services: :class:`cpl.dependency.service_provider_abc.ServiceProviderABC`
+        services: :class:`cpl.dependency.service_provider.ServiceProvider`
             Contains instances of prepared objects
     """
 
-    @abstractmethod
-    def __init__(self, services: ServiceProviderABC, required_modules: list[str | object] = None):
-        self._services = services
-        self._required_modules = (
-            [x.__name__ if not isinstance(x, str) else x for x in required_modules] if required_modules else []
-        )
-
-    @property
-    def required_modules(self) -> list[str]:
-        return self._required_modules
-
     @classmethod
     def extend(cls, name: str | Callable, func: Callable[[Self], Self]):
         r"""Extend the Application with a custom method
@@ -48,6 +38,30 @@ class ApplicationABC(ABC):
         setattr(cls, name, func)
         return cls
 
+    @abstractmethod
+    def __init__(
+        self, services: ServiceProvider, loaded_modules: set[TModule], required_modules: list[str | object] = None
+    ):
+        self._services = services
+        self._modules = loaded_modules
+        self._required_modules = (
+            [x.__name__ if not isinstance(x, str) else x for x in required_modules] if required_modules else []
+        )
+
+    def validate_app_required_modules(self):
+        modules_names = {x.__name__ for x in self._modules}
+        for module in self._required_modules:
+            if module in modules_names:
+                continue
+
+            module_dependency_error(
+                type(self).__name__,
+                module.__name__,
+                ImportError(
+                    f"Required module '{module}' for application '{self.__class__.__name__}' is not loaded. Load using 'add_module({module})' method."
+                ),
+            )
+
     def with_logging(self, level: LogLevel = None):
         if level is None:
             from cpl.core.configuration.configuration import Configuration
@@ -58,14 +72,21 @@ class ApplicationABC(ABC):
         logger = self._services.get_service(LoggerABC)
         logger.set_level(level)
 
-    def with_permissions(self, *args, **kwargs):
-        __not_implemented__("cpl-auth", self.with_permissions)
+    def with_permissions(self, *args):
+        try:
+            from cpl.auth import AuthModule
 
-    def with_migrations(self, *args, **kwargs):
-        __not_implemented__("cpl-database", self.with_migrations)
+            AuthModule.with_permissions(*args)
+        except ImportError:
+            __not_implemented__("cpl-auth", self.with_permissions)
 
-    def with_seeders(self, *args, **kwargs):
-        __not_implemented__("cpl-database", self.with_seeders)
+    def with_migrations(self, *args):
+        try:
+            from cpl.database.database_module import DatabaseModule
+
+            DatabaseModule.with_migrations(self._services, *args)
+        except ImportError:
+            __not_implemented__("cpl-database", self.with_migrations)
 
     def with_extension(self, func: Callable[[Self, ...], None], *args, **kwargs):
         r"""Extend the Application with a custom method
@@ -85,7 +106,12 @@ class ApplicationABC(ABC):
         Called by custom Application.main
         """
         try:
-            Host.run(self.main)
+            for module in self._modules:
+                if not hasattr(module, "configure") and not callable(getattr(module, "configure")):
+                    continue
+                module.configure(self._services)
+
+            Host.run_app(self.main)
         except KeyboardInterrupt:
             pass
 

src/cpl-application/cpl/application/abc/application_extension_abc.py

@@ -1,10 +1,10 @@
 from abc import ABC, abstractmethod
 
-from cpl.dependency import ServiceProviderABC
+from cpl.dependency.service_provider import ServiceProvider
 
 
 class ApplicationExtensionABC(ABC):
 
     @staticmethod
     @abstractmethod
-    def run(services: ServiceProviderABC): ...
+    def run(services: ServiceProvider): ...

src/cpl-application/cpl/application/application_builder.py

@@ -7,6 +7,7 @@ from cpl.application.abc.startup_abc import StartupABC
 from cpl.application.abc.startup_extension_abc import StartupExtensionABC
 from cpl.application.host import Host
 from cpl.core.errors import dependency_error
+from cpl.dependency.context import get_provider, use_root_provider
 from cpl.dependency.service_collection import ServiceCollection
 
 TApp = TypeVar("TApp", bound=ApplicationABC)
@@ -21,6 +22,7 @@ class ApplicationBuilder(Generic[TApp]):
         self._app = app if app is not None else ApplicationABC
 
         self._services = ServiceCollection()
+        use_root_provider(self._services.build())
 
         self._startup: Optional[StartupABC] = None
         self._app_extensions: list[Type[ApplicationExtensionABC]] = []
@@ -34,19 +36,12 @@ class ApplicationBuilder(Generic[TApp]):
 
     @property
     def service_provider(self):
-        return self._services.build()
+        provider = get_provider()
+        if provider is None:
+            provider = self._services.build()
+            use_root_provider(provider)
 
-    def validate_app_required_modules(self, app: ApplicationABC):
-        for module in app.required_modules:
-            if module in self._services.loaded_modules:
-                continue
-
-            dependency_error(
-                module,
-                ImportError(
-                    f"Required module '{module}' for application '{app.__class__.__name__}' is not loaded. Load using 'add_module({module})' method."
-                ),
-            )
+        return provider
 
     def with_startup(self, startup: Type[StartupABC]) -> "ApplicationBuilder":
         self._startup = startup
@@ -75,6 +70,7 @@ class ApplicationBuilder(Generic[TApp]):
         for extension in self._app_extensions:
             Host.run(extension.run, self.service_provider)
 
-        app = self._app(self.service_provider)
-        self.validate_app_required_modules(app)
+        use_root_provider(self._services.build())
+        app = self._app(self.service_provider, self._services.loaded_modules)
+        app.validate_app_required_modules()
         return app

src/cpl-application/cpl/application/host.py

@@ -1,17 +1,80 @@
 import asyncio
 from typing import Callable
 
+from cpl.dependency import get_provider
+from cpl.dependency.hosted.startup_task import StartupTask
+
 
 class Host:
-    _loop = asyncio.get_event_loop()
+    _loop: asyncio.AbstractEventLoop | None = None
+    _tasks: dict = {}
 
     @classmethod
-    def get_loop(cls):
+    def get_loop(cls) -> asyncio.AbstractEventLoop:
+        if cls._loop is None:
+            cls._loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(cls._loop)
         return cls._loop
 
+    @classmethod
+    def run_start_tasks(cls):
+        provider = get_provider()
+        tasks = provider.get_services(StartupTask)
+        loop = cls.get_loop()
+
+        for task in tasks:
+            if asyncio.iscoroutinefunction(task.run):
+                loop.run_until_complete(task.run())
+            else:
+                task.run()
+
+    @classmethod
+    def run_hosted_services(cls):
+        provider = get_provider()
+        services = provider.get_hosted_services()
+        loop = cls.get_loop()
+
+        for service in services:
+            if asyncio.iscoroutinefunction(service.start):
+                cls._tasks[service] = loop.create_task(service.start())
+
+    @classmethod
+    async def _stop_all(cls):
+        for service in cls._tasks.keys():
+            if asyncio.iscoroutinefunction(service.stop):
+                await service.stop()
+
+        for task in cls._tasks.values():
+            task.cancel()
+
+        cls._tasks.clear()
+
+    @classmethod
+    def run_app(cls, func: Callable, *args, **kwargs):
+        cls.run_start_tasks()
+        cls.run_hosted_services()
+
+        async def runner():
+            try:
+                if asyncio.iscoroutinefunction(func):
+                    app_task = asyncio.create_task(func(*args, **kwargs))
+                else:
+                    app_task = cls.get_loop().run_in_executor(None, func, *args, **kwargs)
+
+                await asyncio.wait(
+                    [app_task, *cls._tasks.values()],
+                    return_when=asyncio.FIRST_COMPLETED,
+                )
+            except (KeyboardInterrupt, asyncio.CancelledError):
+                pass
+            finally:
+                await cls._stop_all()
+
+        cls.get_loop().run_until_complete(runner())
+
     @classmethod
     def run(cls, func: Callable, *args, **kwargs):
         if asyncio.iscoroutinefunction(func):
-            return cls._loop.run_until_complete(func(*args, **kwargs))
+            return cls.get_loop().run_until_complete(func(*args, **kwargs))
 
         return func(*args, **kwargs)

src/cpl-auth/cpl/auth/__init__.py

@@ -1,84 +1,6 @@
-from enum import Enum
-from typing import Type
-
-from cpl.application.abc import ApplicationABC as _ApplicationABC
 from cpl.auth import permission as _permission
 from cpl.auth.keycloak.keycloak_admin import KeycloakAdmin as _KeycloakAdmin
 from cpl.auth.keycloak.keycloak_client import KeycloakClient as _KeycloakClient
-from cpl.dependency.service_collection import ServiceCollection as _ServiceCollection
-from .auth_logger import AuthLogger
+from .auth_module import AuthModule
 from .keycloak_settings import KeycloakSettings
-from .permission_seeder import PermissionSeeder
-
-
-def _with_permissions(self: _ApplicationABC, *permissions: Type[Enum]) -> _ApplicationABC:
-    from cpl.auth.permission.permissions_registry import PermissionsRegistry
-
-    for perm in permissions:
-        PermissionsRegistry.with_enum(perm)
-    return self
-
-
-def _add_daos(collection: _ServiceCollection):
-    from .schema._administration.auth_user_dao import AuthUserDao
-    from .schema._administration.api_key_dao import ApiKeyDao
-    from .schema._permission.api_key_permission_dao import ApiKeyPermissionDao
-    from .schema._permission.permission_dao import PermissionDao
-    from .schema._permission.role_dao import RoleDao
-    from .schema._permission.role_permission_dao import RolePermissionDao
-    from .schema._permission.role_user_dao import RoleUserDao
-
-    collection.add_singleton(AuthUserDao)
-    collection.add_singleton(ApiKeyDao)
-    collection.add_singleton(ApiKeyPermissionDao)
-    collection.add_singleton(PermissionDao)
-    collection.add_singleton(RoleDao)
-    collection.add_singleton(RolePermissionDao)
-    collection.add_singleton(RoleUserDao)
-
-
-def add_auth(collection: _ServiceCollection):
-    import os
-
-    try:
-        from cpl.database.service.migration_service import MigrationService
-        from cpl.database.model.server_type import ServerType, ServerTypes
-
-        collection.add_singleton(_KeycloakClient)
-        collection.add_singleton(_KeycloakAdmin)
-
-        _add_daos(collection)
-
-        provider = collection.build()
-        migration_service: MigrationService = provider.get_service(MigrationService)
-        if ServerType.server_type == ServerTypes.POSTGRES:
-            migration_service.with_directory(
-                os.path.join(os.path.dirname(os.path.realpath(__file__)), "scripts/postgres")
-            )
-        elif ServerType.server_type == ServerTypes.MYSQL:
-            migration_service.with_directory(os.path.join(os.path.dirname(os.path.realpath(__file__)), "scripts/mysql"))
-    except ImportError as e:
-        from cpl.core.console import Console
-
-        Console.error("cpl-database is not installed", str(e))
-
-
-def add_permission(collection: _ServiceCollection):
-    from .permission_seeder import PermissionSeeder
-    from .permission.permissions_registry import PermissionsRegistry
-    from .permission.permissions import Permissions
-
-    try:
-        from cpl.database.abc.data_seeder_abc import DataSeederABC
-
-        collection.add_singleton(DataSeederABC, PermissionSeeder)
-        PermissionsRegistry.with_enum(Permissions)
-    except ImportError as e:
-        from cpl.core.console import Console
-
-        Console.error("cpl-database is not installed", str(e))
-
-
-_ServiceCollection.with_module(add_auth, __name__)
-_ServiceCollection.with_module(add_permission, _permission.__name__)
-_ApplicationABC.extend(_ApplicationABC.with_permissions, _with_permissions)
+from .logger import AuthLogger

src/cpl-auth/cpl/auth/auth_logger.py

@@ -1,8 +0,0 @@
-from cpl.core.log import Logger
-from cpl.core.typing import Source
-
-
-class AuthLogger(Logger):
-
-    def __init__(self, source: Source):
-        Logger.__init__(self, source, "auth")

src/cpl-auth/cpl/auth/auth_module.py

@@ -0,0 +1,56 @@
+import os
+from enum import Enum
+from typing import Type
+
+from cpl.auth.keycloak_settings import KeycloakSettings
+from cpl.database.database_module import DatabaseModule
+from cpl.database.model.server_type import ServerType, ServerTypes
+from cpl.database.mysql.mysql_module import MySQLModule
+from cpl.database.postgres.postgres_module import PostgresModule
+from cpl.dependency.module.module import Module
+from cpl.dependency.service_provider import ServiceProvider
+from .keycloak.keycloak_admin import KeycloakAdmin
+from .keycloak.keycloak_client import KeycloakClient
+from .schema._administration.api_key_dao import ApiKeyDao
+from .schema._administration.auth_user_dao import AuthUserDao
+from .schema._permission.api_key_permission_dao import ApiKeyPermissionDao
+from .schema._permission.permission_dao import PermissionDao
+from .schema._permission.role_dao import RoleDao
+from .schema._permission.role_permission_dao import RolePermissionDao
+from .schema._permission.role_user_dao import RoleUserDao
+
+
+class AuthModule(Module):
+    dependencies = [DatabaseModule, (MySQLModule, PostgresModule)]
+    config = [KeycloakSettings]
+    singleton = [
+        KeycloakClient,
+        KeycloakAdmin,
+        AuthUserDao,
+        ApiKeyDao,
+        ApiKeyPermissionDao,
+        PermissionDao,
+        RoleDao,
+        RolePermissionDao,
+        RoleUserDao,
+    ]
+    scoped = []
+    transient = []
+
+    @staticmethod
+    def configure(provider: ServiceProvider):
+        paths = {
+            ServerTypes.POSTGRES: "scripts/postgres",
+            ServerTypes.MYSQL: "scripts/mysql",
+        }
+
+        DatabaseModule.with_migrations(
+            provider, str(os.path.join(os.path.dirname(os.path.realpath(__file__)), paths[ServerType.server_type]))
+        )
+
+    @staticmethod
+    def with_permissions(*permissions: Type[Enum]):
+        from cpl.auth.permission.permissions_registry import PermissionsRegistry
+
+        for perm in permissions:
+            PermissionsRegistry.with_enum(perm)

src/cpl-auth/cpl/auth/keycloak/keycloak_admin.py

@@ -1,15 +1,13 @@
 from keycloak import KeycloakAdmin as _KeycloakAdmin, KeycloakOpenIDConnection
 
-from cpl.auth.auth_logger import AuthLogger
 from cpl.auth.keycloak_settings import KeycloakSettings
-
-_logger = AuthLogger("keycloak")
+from cpl.auth.logger import AuthLogger
 
 
 class KeycloakAdmin(_KeycloakAdmin):
 
-    def __init__(self, settings: KeycloakSettings):
-        _logger.info("Initializing Keycloak admin")
+    def __init__(self, logger: AuthLogger, settings: KeycloakSettings):
+        # logger.info("Initializing Keycloak admin")
         _connection = KeycloakOpenIDConnection(
             server_url=settings.url,
             client_id=settings.client_id,

src/cpl-auth/cpl/auth/keycloak/keycloak_client.py

@@ -2,15 +2,13 @@ from typing import Optional
 
 from keycloak import KeycloakOpenID
 
-from cpl.auth.auth_logger import AuthLogger
+from cpl.auth.logger import AuthLogger
 from cpl.auth.keycloak_settings import KeycloakSettings
 
-_logger = AuthLogger("keycloak")
-
 
 class KeycloakClient(KeycloakOpenID):
 
-    def __init__(self, settings: KeycloakSettings):
+    def __init__(self, logger: AuthLogger, settings: KeycloakSettings):
         KeycloakOpenID.__init__(
             self,
             server_url=settings.url,
@@ -18,7 +16,7 @@ class KeycloakClient(KeycloakOpenID):
             realm_name=settings.realm,
             client_secret_key=settings.client_secret,
         )
-        _logger.info("Initializing Keycloak client")
+        logger.info("Initializing Keycloak client")
 
     def get_user_id(self, token: str) -> Optional[str]:
         info = self.introspect(token)

src/cpl-auth/cpl/auth/keycloak/keycloak_user.py

@@ -1,5 +1,5 @@
 from cpl.core.utils.get_value import get_value
-from cpl.dependency import ServiceProviderABC
+from cpl.dependency import ServiceProvider
 
 
 class KeycloakUser:
@@ -32,5 +32,5 @@ class KeycloakUser:
     def id(self) -> str:
         from cpl.auth import KeycloakAdmin
 
-        keycloak_admin: KeycloakAdmin = ServiceProviderABC.get_global_service(KeycloakAdmin)
+        keycloak_admin: KeycloakAdmin = get_provider().get_service(KeycloakAdmin)
         return keycloak_admin.get_user_id(self._username)

src/cpl-auth/cpl/auth/logger.py

@@ -0,0 +1,7 @@
+from cpl.core.log.wrapped_logger import WrappedLogger
+
+
+class AuthLogger(WrappedLogger):
+
+    def __init__(self):
+        WrappedLogger.__init__(self, "auth")

src/cpl-auth/cpl/auth/permission/__init__.py

@@ -0,0 +1,4 @@
+from .permission_module import PermissionsModule
+from .permission_seeder import PermissionSeeder
+from .permissions import Permissions
+from .permissions_registry import PermissionsRegistry