Added hosted services #186

.gitea/workflows/prepare.yaml

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

example/custom/api/src/main.py

@@ -2,7 +2,6 @@ from starlette.responses import JSONResponse
 
 from cpl import api
 from cpl.api.application.web_app import WebApp
-from cpl.api_module import ApiModule
 from cpl.application import ApplicationBuilder
 from cpl.auth.permission.permissions import Permissions
 from cpl.auth.schema import AuthUser, Role
@@ -10,7 +9,6 @@ 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
 
@@ -25,8 +23,7 @@ def main():
     # 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_module(api)
 
     builder.services.add_scoped(ScopedService)
 

example/custom/database/cpl.json

@@ -0,0 +1,40 @@
+{
+  "Project": {
+    "Name": "database",
+    "Version": {
+      "Major": "0",
+      "Minor": "0",
+      "Micro": "0"
+    },
+    "Author": "",
+    "AuthorEmail": "",
+    "Description": "",
+    "LongDescription": "",
+    "URL": "",
+    "CopyrightDate": "",
+    "CopyrightName": "",
+    "LicenseName": "",
+    "LicenseDescription": "",
+    "Dependencies": [
+      "sh_cpl==2021.4.2.dev1"
+    ],
+    "PythonVersion": ">=3.9.2",
+    "PythonPath": {},
+    "Classifiers": []
+  },
+  "Build": {
+    "ProjectType": "console",
+    "SourcePath": "src",
+    "OutputPath": "dist",
+    "Main": "main",
+    "EntryPoint": "database",
+    "IncludePackageData": false,
+    "Included": [],
+    "Excluded": [
+      "*/__pycache__",
+      "*/logs",
+      "*/tests"
+    ],
+    "PackageData": {}
+  }
+}

example/custom/database/src/startup.py

@@ -1,14 +1,11 @@
 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.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
@@ -24,9 +21,9 @@ class Startup(StartupABC):
 
     @staticmethod
     async def configure_services(services: ServiceCollection):
-        services.add_module(MySQLModule)
-        services.add_module(AuthModule)
-        services.add_module(PermissionsModule)
+        services.add_module(mysql)
+        services.add_module(auth)
+        services.add_module(permission)
 
         services.add_transient(DataAccessObjectABC, UserDao)
         services.add_transient(DataAccessObjectABC, CityDao)

example/custom/di/cpl-workspace.json

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

example/custom/di/src/di/application.py

@@ -1,10 +1,11 @@
 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
+from di.static_test import StaticTest
+from di.test_abc import TestABC
+from di.test_service import TestService
+from di.di_tester_service import DITesterService
+from di.tester import Tester
 
 
 class Application(ApplicationABC):
@@ -38,8 +39,7 @@ class Application(ApplicationABC):
 
         Console.write_line("Global")
         self._part_of_scoped()
-        #from static_test import StaticTest
-        #StaticTest.test()
+        StaticTest.test()
 
         self._services.get_service(Tester)
         Console.write_line(self._services.get_services(TestABC))

example/custom/di/src/di/di_tester_service.py

@@ -1,5 +1,5 @@
 from cpl.core.console.console import Console
-from test_service import TestService
+from di.test_service import TestService
 
 
 class DITesterService:

example/custom/di/src/di/main.py

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

example/custom/di/src/di/startup.py

@@ -1,11 +1,11 @@
 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
+from di.di_tester_service import DITesterService
+from di.test1_service import Test1Service
+from di.test2_service import Test2Service
+from di.test_abc import TestABC
+from di.test_service import TestService
+from di.tester import Tester
 
 
 class Startup(StartupABC):

example/custom/di/src/di/static_test.py

@@ -1,6 +1,6 @@
 from cpl.dependency import ServiceProvider, ServiceProvider
 from cpl.dependency.inject import inject
-from test_service import TestService
+from di.test_service import TestService
 
 
 class StaticTest:

example/custom/di/src/di/test1_service.py

@@ -1,7 +1,7 @@
 import string
 from cpl.core.console.console import Console
 from cpl.core.utils.string import String
-from test_abc import TestABC
+from di.test_abc import TestABC
 
 
 class Test1Service(TestABC):

example/custom/di/src/di/test2_service.py

@@ -1,7 +1,7 @@
 import string
 from cpl.core.console.console import Console
 from cpl.core.utils.string import String
-from test_abc import TestABC
+from di.test_abc import TestABC
 
 
 class Test2Service(TestABC):

example/custom/di/src/di/tester.py

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

example/custom/general/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "Workspace": {
+    "DefaultProject": "general",
+    "Projects": {
+      "general": "src/general/general.json"
+    }
+  }
+}

example/custom/general/src/general.json

@@ -0,0 +1,51 @@
+{
+  "Project": {
+    "Name": "general",
+    "Version": {
+      "Major": "2021",
+      "Minor": "04",
+      "Micro": "01"
+    },
+    "Author": "Sven Heidemann",
+    "AuthorEmail": "sven.heidemann@sh-edraft.de",
+    "Description": "sh-edraft Common Python library",
+    "LongDescription": "sh-edraft Common Python library",
+    "URL": "https://www.sh-edraft.de",
+    "CopyrightDate": "2020 - 2021",
+    "CopyrightName": "sh-edraft.de",
+    "LicenseName": "MIT",
+    "LicenseDescription": "MIT, see LICENSE for more details.",
+    "Dependencies": [
+      "cpl-core==2022.10.0.post9",
+      "cpl-translation==2022.10.0.post2",
+      "cpl-query==2022.10.0.post2"
+    ],
+    "DevDependencies": [
+      "cpl-cli==2022.10"
+    ],
+    "PythonVersion": ">=3.10",
+    "PythonPath": {
+      "linux": "../../venv/bin/python",
+      "win32": ""
+    },
+    "Classifiers": []
+  },
+  "Build": {
+    "ProjectType": "console",
+    "SourcePath": "",
+    "OutputPath": "dist",
+    "Main": "main",
+    "EntryPoint": "",
+    "IncludePackageData": true,
+    "Included": [
+      "*/templates"
+    ],
+    "Excluded": [
+      "*/__pycache__",
+      "*/logs",
+      "*/tests"
+    ],
+    "PackageData": {},
+    "ProjectReferences": []
+  }
+}

example/custom/general/src/startup.py

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

example/custom/general/test/custom.py

@@ -0,0 +1,3 @@
+class Custom:
+    def __init__(self):
+        print("hello")

example/custom/query/main.py

@@ -48,9 +48,9 @@ def t_benchmark(data: list):
 
 
 def main():
-    N = 1_000_000
+    N = 10_000_000
     data = list(range(N))
-    t_benchmark(data)
+    #t_benchmark(data)
 
     Console.write_line()
     _default()

example/di/src/tester.py

@@ -1,7 +0,0 @@
-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)

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

@@ -1,4 +1,36 @@
+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__)

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

@@ -25,10 +25,7 @@ from cpl.api.registry.route import RouteRegistry
 from cpl.api.router import Router
 from cpl.api.settings import ApiSettings
 from cpl.api.typing import HTTPMethods, PartialMiddleware, PolicyResolver
-from cpl.api_module import ApiModule
 from cpl.application.abc.application_abc import ApplicationABC
-from cpl.auth.auth_module import AuthModule
-from cpl.auth.permission.permission_module import PermissionsModule
 from cpl.core.configuration import Configuration
 from cpl.dependency.inject import inject
 from cpl.dependency.service_provider import ServiceProvider
@@ -38,7 +35,7 @@ PolicyInput = Union[dict[str, PolicyResolver], Policy]
 
 class WebApp(ApplicationABC):
     def __init__(self, services: ServiceProvider):
-        super().__init__(services, [AuthModule, PermissionsModule, ApiModule])
+        super().__init__(services, [auth, api])
         self._app: Starlette | None = None
 
         self._logger = services.get_service(APILogger)

src/cpl-api/cpl/api_module.py

@@ -1,26 +0,0 @@
-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.core.errors import dependency_error
-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.dependency.module import Module, TModule
-
-
-class ApiModule(Module):
-
-    @staticmethod
-    def dependencies() -> list[TModule]:
-        return [AuthModule, DatabaseModule, PermissionsModule]
-
-    @staticmethod
-    def register(collection: "ServiceCollection"):
-        collection.add_module(DatabaseModule)
-
-        collection.add_module(AuthModule)
-        collection.add_module(PermissionsModule)
-
-        collection.add_singleton(PolicyRegistry)
-        collection.add_singleton(RouteRegistry)

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

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

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

@@ -49,7 +49,6 @@ class ApplicationBuilder(Generic[TApp]):
                 continue
 
             dependency_error(
-                type(app).__name__,
                 module,
                 ImportError(
                     f"Required module '{module}' for application '{app.__class__.__name__}' is not loaded. Load using 'add_module({module})' method."
@@ -83,7 +82,6 @@ class ApplicationBuilder(Generic[TApp]):
         for extension in self._app_extensions:
             Host.run(extension.run, self.service_provider)
 
-        use_root_provider(self._services.build())
         app = self._app(self.service_provider)
         self.validate_app_required_modules(app)
         return app

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

@@ -51,6 +51,8 @@ class Host:
 
     @classmethod
     def run_app(cls, func: Callable, *args, **kwargs):
+        loop = cls.get_loop()
+
         cls.run_start_tasks()
         cls.run_hosted_services()
 
@@ -59,7 +61,8 @@ class Host:
                 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)
+                    loop = asyncio.get_running_loop()
+                    app_task = loop.run_in_executor(None, func, *args, **kwargs)
 
                 await asyncio.wait(
                     [app_task, *cls._tasks.values()],
@@ -70,11 +73,11 @@ class Host:
             finally:
                 await cls._stop_all()
 
-        cls.get_loop().run_until_complete(runner())
+        loop.run_until_complete(runner())
 
     @classmethod
     def run(cls, func: Callable, *args, **kwargs):
         if asyncio.iscoroutinefunction(func):
-            return cls.get_loop().run_until_complete(func(*args, **kwargs))
+            return cls._loop.run_until_complete(func(*args, **kwargs))
 
         return func(*args, **kwargs)

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

@@ -5,8 +5,10 @@ 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 .keycloak_settings import KeycloakSettings
+from cpl.dependency.service_collection import ServiceCollection as _ServiceCollection
 from .logger import AuthLogger
+from .keycloak_settings import KeycloakSettings
+from .permission_seeder import PermissionSeeder
 
 
 def _with_permissions(self: _ApplicationABC, *permissions: Type[Enum]) -> _ApplicationABC:
@@ -17,5 +19,66 @@ def _with_permissions(self: _ApplicationABC, *permissions: Type[Enum]) -> _Appli
     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)

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

@@ -1,44 +0,0 @@
-import os
-
-from cpl.auth.keycloak.keycloak_admin import KeycloakAdmin as _KeycloakAdmin
-from cpl.auth.keycloak.keycloak_client import KeycloakClient as _KeycloakClient
-from cpl.database.database_module import DatabaseModule
-from cpl.database.model.server_type import ServerType, ServerTypes
-from cpl.database.service.migration_service import MigrationService
-from cpl.dependency.module import Module, TModule
-from cpl.dependency.service_collection import ServiceCollection
-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):
-    @staticmethod
-    def dependencies() -> list[TModule]:
-        return [DatabaseModule]
-
-    @staticmethod
-    def register(collection: ServiceCollection):
-        collection.add_singleton(_KeycloakClient)
-        collection.add_singleton(_KeycloakAdmin)
-
-        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)
-
-        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"))

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

@@ -1,20 +0,0 @@
-from cpl.auth.auth_module import AuthModule
-from cpl.auth.permission.permission_seeder import PermissionSeeder
-from cpl.auth.permission.permissions import Permissions
-from cpl.auth.permission.permissions_registry import PermissionsRegistry
-from cpl.database.abc.data_seeder_abc import DataSeederABC
-from cpl.dependency.module import Module, TModule
-from cpl.dependency.service_collection import ServiceCollection
-
-
-class PermissionsModule(Module):
-    @staticmethod
-    def dependencies() -> list[TModule]:
-        from cpl.database.database_module import DatabaseModule
-
-        return [DatabaseModule, AuthModule]
-
-    @staticmethod
-    def register(collection: ServiceCollection):
-        collection.add_singleton(DataSeederABC, PermissionSeeder)
-        PermissionsRegistry.with_enum(Permissions)

src/cpl-core/cpl/core/errors.py

@@ -3,8 +3,8 @@ import traceback
 from cpl.core.console import Console
 
 
-def dependency_error(src: str, package_name: str, e: ImportError = None) -> None:
-    Console.error(f"'{package_name}' is required to use feature: {src}. Please install it and try again.")
+def dependency_error(package_name: str, e: ImportError) -> None:
+    Console.error(f"'{package_name}' is required to use this feature. Please install it and try again.")
     tb = traceback.format_exc()
     if not tb.startswith("NoneType: None"):
         Console.write_line("->", tb)
@@ -13,14 +13,3 @@ def dependency_error(src: str, package_name: str, e: ImportError = None) -> None
         Console.write_line("->", str(e))
 
     exit(1)
-
-def module_dependency_error(src: str, module: str, e: ImportError = None) -> None:
-    Console.error(f"'{module}' is required to use feature: {src}. Please initialize it with `add_module({module})`.")
-    tb = traceback.format_exc()
-    if not tb.startswith("NoneType: None"):
-        Console.write_line("->", tb)
-
-    elif e is not None:
-        Console.write_line("->", str(e))
-
-    exit(1)

src/cpl-database/cpl/database/__init__.py

@@ -1,6 +1,8 @@
 import os
+from typing import Type
 
 from cpl.application.abc import ApplicationABC as _ApplicationABC
+from cpl.dependency import ServiceCollection as _ServiceCollection
 from . import mysql as _mysql
 from . import postgres as _postgres
 from .table_manager import TableManager
@@ -30,5 +32,43 @@ def _with_seeders(self: _ApplicationABC) -> _ApplicationABC:
     return self
 
 
+def _add(collection: _ServiceCollection, db_context: Type, default_port: int, server_type: str):
+    from cpl.core.console import Console
+    from cpl.core.configuration import Configuration
+    from cpl.database.abc.db_context_abc import DBContextABC
+    from cpl.database.model.server_type import ServerTypes, ServerType
+    from cpl.database.model.database_settings import DatabaseSettings
+    from cpl.database.service.migration_service import MigrationService
+    from cpl.database.service.seeder_service import SeederService
+    from cpl.database.schema.executed_migration_dao import ExecutedMigrationDao
+
+    try:
+        ServerType.set_server_type(ServerTypes(server_type))
+        Configuration.set("DB_DEFAULT_PORT", default_port)
+
+        collection.add_singleton(DBContextABC, db_context)
+        collection.add_singleton(ExecutedMigrationDao)
+        collection.add_singleton(MigrationService)
+        collection.add_singleton(SeederService)
+    except ImportError as e:
+        Console.error("cpl-database is not installed", str(e))
+
+
+def add_mysql(collection: _ServiceCollection):
+    from cpl.database.mysql.db_context import DBContext
+    from cpl.database.model import ServerTypes
+
+    _add(collection, DBContext, 3306, ServerTypes.MYSQL.value)
+
+
+def add_postgres(collection: _ServiceCollection):
+    from cpl.database.mysql.db_context import DBContext
+    from cpl.database.model import ServerTypes
+
+    _add(collection, DBContext, 5432, ServerTypes.POSTGRES.value)
+
+
+_ServiceCollection.with_module(add_mysql, _mysql.__name__)
+_ServiceCollection.with_module(add_postgres, _postgres.__name__)
 _ApplicationABC.extend(_ApplicationABC.with_migrations, _with_migrations)
 _ApplicationABC.extend(_ApplicationABC.with_seeders, _with_seeders)

src/cpl-database/cpl/database/database_module.py

@@ -1,22 +0,0 @@
-from cpl.core.errors import module_dependency_error
-from cpl.database.model.server_type import ServerType
-from cpl.database.schema.executed_migration_dao import ExecutedMigrationDao
-from cpl.database.service.migration_service import MigrationService
-from cpl.database.service.seeder_service import SeederService
-from cpl.dependency.module import Module, TModule
-from cpl.dependency.service_collection import ServiceCollection
-
-
-class DatabaseModule(Module):
-    @staticmethod
-    def dependencies() -> list[TModule]:
-        if not ServerType.has_server_type:
-            module_dependency_error(__name__, "MySQLModule or PostgresModule")
-
-        return []
-
-    @staticmethod
-    def register(collection: ServiceCollection):
-        collection.add_singleton(ExecutedMigrationDao)
-        collection.add_singleton(MigrationService)
-        collection.add_singleton(SeederService)

src/cpl-database/cpl/database/model/server_type.py

@@ -15,11 +15,6 @@ class ServerType:
         assert isinstance(server_type, ServerTypes), f"Expected ServerType but got {type(server_type)}"
         cls._server_type = server_type
 
-    @classmethod
-    @property
-    def has_server_type(cls) -> bool:
-        return cls._server_type is not None
-
     @classmethod
     @property
     def server_type(cls) -> ServerTypes:

src/cpl-database/cpl/database/mysql/mysql_module.py

@@ -1,19 +0,0 @@
-from cpl.core.configuration.configuration import Configuration
-from cpl.database.abc.db_context_abc import DBContextABC
-from cpl.database.model.server_type import ServerTypes, ServerType
-from cpl.database.mysql.db_context import DBContext
-from cpl.dependency.module import Module, TModule
-from cpl.dependency.service_collection import ServiceCollection
-
-
-class MySQLModule(Module):
-    @staticmethod
-    def dependencies() -> list[TModule]:
-        return []
-
-    @staticmethod
-    def register(collection: ServiceCollection):
-        ServerType.set_server_type(ServerTypes(ServerTypes.MYSQL.value))
-        Configuration.set("DB_DEFAULT_PORT", 3306)
-
-        collection.add_singleton(DBContextABC, DBContext)

src/cpl-database/cpl/database/postgres/postgres_module.py

@@ -1,20 +0,0 @@
-from cpl.core.configuration.configuration import Configuration
-from cpl.database.abc.db_context_abc import DBContextABC
-from cpl.database.database_module import DatabaseModule
-from cpl.database.model.server_type import ServerTypes, ServerType
-from cpl.database.postgres.db_context import DBContext
-from cpl.dependency.module import Module, TModule
-from cpl.dependency.service_collection import ServiceCollection
-
-
-class PostgresModule(Module):
-    @staticmethod
-    def dependencies() -> list[TModule]:
-        return [DatabaseModule]
-
-    @staticmethod
-    def register(collection: ServiceCollection):
-        ServerType.set_server_type(ServerTypes(ServerTypes.POSTGRES.value))
-        Configuration.set("DB_DEFAULT_PORT", 5432)
-
-        collection.add_singleton(DBContextABC, DBContext)

src/cpl-dependency/cpl/dependency/context.py

@@ -2,7 +2,7 @@ import contextvars
 from contextlib import contextmanager
 
 
-_current_provider = contextvars.ContextVar("current_provider", default=None)
+_current_provider = contextvars.ContextVar("current_provider")
 
 
 def use_root_provider(provider: "ServiceProvider"):

src/cpl-dependency/cpl/dependency/hosted/__init__.py

@@ -1,2 +0,0 @@
-from .hosted_service import HostedService
-from .startup_task import StartupTask

src/cpl-dependency/cpl/dependency/module.py

@@ -1,14 +0,0 @@
-from abc import abstractmethod, ABC
-from typing import Type
-
-TModule = Type["Module"]
-
-class Module(ABC):
-
-    @staticmethod
-    @abstractmethod
-    def dependencies() -> list[TModule]: ...
-
-    @staticmethod
-    @abstractmethod
-    def register(collection: "ServiceCollection"): ...

src/cpl-dependency/cpl/dependency/service_collection.py

@@ -1,11 +1,9 @@
-from inspect import isclass
 from typing import Union, Type, Callable, Self
 
 from cpl.core.log.logger_abc import LoggerABC
 from cpl.core.typing import T, Service
 from cpl.core.utils.cache import Cache
 from cpl.dependency.hosted.startup_task import StartupTask
-from cpl.dependency.module import Module
 from cpl.dependency.service_descriptor import ServiceDescriptor
 from cpl.dependency.service_lifetime import ServiceLifetimeEnum
 from cpl.dependency.service_provider import ServiceProvider
@@ -18,7 +16,7 @@ class ServiceCollection:
 
     @classmethod
     def with_module(cls, func: Callable, name: str = None) -> type[Self]:
-        # cls._modules[func.__name__ if name is None else name] = func
+        cls._modules[func.__name__ if name is None else name] = func
         return cls
 
     def __init__(self):
@@ -76,23 +74,16 @@ class ServiceCollection:
         sp = ServiceProvider(self._service_descriptors)
         return sp
 
-    def add_module(self, module: Type[Module]) -> Self:
-        assert isclass(module), "Module must be a Module"
-        assert issubclass(module, Module), f"Module must be subclass of {Module.__name__}"
+    def add_module(self, module: str | object) -> Self:
+        if not isinstance(module, str):
+            module = module.__name__
 
-        name = module.__name__
-        if module in self._modules:
+        if module not in self._modules:
             raise ValueError(f"Module {module} not found")
 
-        for dependency in module.dependencies():
-            if dependency.__name__ not in self._loaded_modules:
-                self.add_module(dependency)
-
-        module().register(self)
-
-        if name not in self._loaded_modules:
-            self._loaded_modules.add(name)
-
+        self._modules[module](self)
+        if module not in self._loaded_modules:
+            self._loaded_modules.add(module)
         return self
 
     def add_logging(self) -> Self: