Modularization

example/api/src/main.py

@@ -2,6 +2,7 @@ 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
@@ -9,6 +10,7 @@ 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
 
@@ -23,7 +25,8 @@ def main():
     # builder.services.add_logging()
     builder.services.add_structured_logging()
     builder.services.add_transient(PingService)
-    builder.services.add_module(api)
+    builder.services.add_module(MySQLModule)
+    builder.services.add_module(ApiModule)
 
     builder.services.add_scoped(ScopedService)
 

example/custom/database/cpl.json

@@ -1,40 +0,0 @@
-{
-  "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/di/cpl-workspace.json

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

example/custom/general/cpl-workspace.json

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

example/custom/general/src/general.json

@@ -1,51 +0,0 @@
-{
-  "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/test/custom.py

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

example/general/src/startup.py

@@ -4,7 +4,8 @@ from cpl.core.configuration import Configuration
 from cpl.core.environment import Environment
 from cpl.core.pipes import IPAddressPipe
 from cpl.dependency import ServiceCollection
-from example.custom.general.src.hosted_service import Hosted
+from cpl.mail.mail_module import MailModule
+from hosted_service import Hosted
 from scoped_service import ScopedService
 from test_service import TestService
 
@@ -20,7 +21,7 @@ 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)