Fixed test action installation

Reviewed-on: #199

.gitea/workflows/build-dev.yaml

@@ -16,61 +16,68 @@ jobs:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, application, auth, core, dependency ]
     with:
-      working_directory: src/cpl-api
+      working_directory: src/api
     secrets: inherit
 
   application:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-application
+      working_directory: src/application
     secrets: inherit
 
   auth:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency,  database ]
     with:
-      working_directory: src/cpl-auth
+      working_directory: src/auth
+    secrets: inherit
+
+  cli:
+    uses: ./.gitea/workflows/package.yaml
+    needs: [ prepare, core ]
+    with:
+      working_directory: src/cli
     secrets: inherit
 
   core:
     uses: ./.gitea/workflows/package.yaml
     needs: [prepare]
     with:
-      working_directory: src/cpl-core
+      working_directory: src/core
     secrets: inherit
 
   database:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-database
+      working_directory: src/database
     secrets: inherit
 
   dependency:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core ]
     with:
-      working_directory: src/cpl-dependency
+      working_directory: src/dependency
     secrets: inherit
 
   mail:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-mail
+      working_directory: src/mail
     secrets: inherit
 
   query:
     uses: ./.gitea/workflows/package.yaml
     needs: [prepare]
     with:
-      working_directory: src/cpl-query
+      working_directory: src/query
     secrets: inherit
 
   translation:
     uses: ./.gitea/workflows/package.yaml
     needs: [ prepare, core, dependency ]
     with:
-      working_directory: src/cpl-translation
+      working_directory: src/translation
     secrets: inherit

.gitea/workflows/package.yaml

@@ -36,6 +36,12 @@ jobs:
           echo "Set version to $(cat /workspace/sh-edraft.de/cpl/version.txt)"
           cat pyproject.toml
 
+      - name: Set package version
+        run: |
+          sed -i -E "s/^__version__ = \".*\"/__version__ = \"$(cat /workspace/sh-edraft.de/cpl/version.txt)\"/" cpl/*/__init__.py
+          echo "Set version to $(cat /workspace/sh-edraft.de/cpl/version.txt)"
+          cat cpl/*/__init__.py
+
       - name: Set pip conf
         run: |
           cat > .pip.conf <<'EOF'

.gitea/workflows/test_before_merge.yaml

@@ -23,4 +23,23 @@ jobs:
         run: python3.12 -m pip install black
 
       - name: Checking black
-        run: python3.12 -m black src --check
+        run: python3.12 -m black src --check
+
+  test:
+    runs-on: [ runner ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Setting up Python 3.12
+        run: |
+          apt install -y python3.12-dev
+          bash ./install.sh
+          bash ./install.sh -dev
+
+      - name: Testing with pytest
+        run: |
+          python3.12 -m pytest

README.md

@@ -0,0 +1,22 @@
+## Prepare for development
+
+After cloning the repository, run the following commands to set up your development environment:
+
+```bash
+python -m venv .venv
+source .venv/bin/activate
+# On Windows use `.venv\Scripts\activate`
+# On Windows with git bash use `source .venv/Scripts/activate`
+bash install.sh
+```
+
+Install cpl-cli as a development package:
+
+```bash
+pip install -e src/core
+pip install -e src/cli
+# test with:
+cpl v
+```
+
+When using Pycharm, mark all directories under `src/` as "Sources Root" and `exa` to ensure proper module resolution.

cpl.workspace.json

@@ -0,0 +1,13 @@
+{
+  "name": "cpl",
+  "projects": [
+    "src/cli/cpl.project.json",
+    "src/core/cpl.project.json",
+    "src/mail/cpl.project.json",
+    "test/cpl.project.json"
+  ],
+  "defaultProject": "cpl-cli",
+  "scripts": {
+    "format": "black src"
+  }
+}

example/general/src/application.py

@@ -75,9 +75,3 @@ class Application(ApplicationABC):
         test_settings1 = Configuration.get(TestSettings)
         Console.write_line(test_settings1.value)
         # self.test_send_mail()
-
-        x = 0
-        while x < 500:
-            Console.write_line("Running...")
-            x += 1
-            await asyncio.sleep(5)

example/general/src/hosted_service.py

@@ -3,8 +3,8 @@ from datetime import datetime
 
 from cpl.core.console import Console
 from cpl.core.time.cron import Cron
-from cpl.dependency.hosted.cronjob import CronjobABC
+from cpl.core.service.cronjob import CronjobABC
-from cpl.dependency.hosted.hosted_service import HostedService
+from cpl.core.service.hosted_service import HostedService
 
 
 class Hosted(HostedService):

example/general/src/main.py

@@ -1,11 +1,13 @@
 from application import Application
 from cpl.application import ApplicationBuilder
+from cpl.core.console import Console
 from test_extension import TestExtension
 from startup import Startup
 from test_startup_extension import TestStartupExtension
 
 
 def main():
+    Console.write_line("\n\n--- Application Starting ---\n")
     app_builder = ApplicationBuilder(Application)
     app_builder.with_startup(Startup)
     app_builder.with_extension(TestStartupExtension)

install.sh

@@ -1,61 +1,64 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Find and combine requirements from src/cpl-*/requirements.txt,
+# Optionaler Dev-Installationsmodus
-# filtering out lines whose *package name* starts with "cpl-".
+dev_mode=false
-# Works with pinned versions, extras, markers, editable installs, and VCS refs.
+if [[ "${1:-}" == "-dev" ]]; then
+  dev_mode=true
+fi
 
 shopt -s nullglob
 
-req_files=(src/cpl-*/requirements.txt)
+# Wähle die passende Requirements-Datei
+pattern='requirements.txt'
+msg_hint='src/*/requirements.txt'
+if $dev_mode; then
+  pattern='requirements.dev.txt'
+  msg_hint='src/*/requirements.dev.txt'
+fi
+
+req_files=(src/*/"$pattern")
 if ((${#req_files[@]} == 0)); then
-  echo "No requirements files found at src/cpl-*/requirements.txt" >&2
+  echo "Keine Requirements-Dateien gefunden unter '$msg_hint'" >&2
   exit 1
 fi
 
 tmp_combined="$(mktemp)"
 trap 'rm -f "$tmp_combined"' EXIT
 
-# Concatenate, trim comments/whitespace, filter out cpl-* packages, dedupe.
+# Kombiniere, filtere Kommentare/Whitespace, entferne cpl-*, dedupliziere.
-# We keep non-package options/flags/constraints as-is.
 awk '
   function trim(s){ sub(/^[[:space:]]+/,"",s); sub(/[[:space:]]+$/,"",s); return s }
 
   {
     line=$0
-    # drop full-line comments and strip inline comments
     if (line ~ /^[[:space:]]*#/) next
-    sub(/#[^!].*$/,"",line)  # strip trailing comment (simple heuristic)
+    sub(/#[^!].*$/,"",line)
     line=trim(line)
     if (line == "") next
 
-    # Determine the package *name* even for "-e", extras, pins, markers, or VCS "@"
     e = line
-    sub(/^-e[[:space:]]+/,"",e)           # remove editable prefix
+    sub(/^-e[[:space:]]+/,"",e)
-    # Tokenize up to the first of these separators: space, [ < > = ! ~ ; @
     token = e
-    sub(/\[.*/,"",token)                  # remove extras quickly
+    sub(/\[.*/,"",token)
     n = split(token, a, /[<>=!~;@[:space:]]/)
     name = tolower(a[1])
 
-    # If the first token (name) starts with "cpl-", skip this requirement
     if (name ~ /^cpl-/) next
-
     print line
   }
 ' "${req_files[@]}" | sort -u > "$tmp_combined"
 
 if ! [ -s "$tmp_combined" ]; then
-  echo "Nothing to install after filtering out cpl-* packages." >&2
+  echo "Nichts zu installieren nach dem Entfernen von cpl-* Paketen." >&2
   exit 0
 fi
 
-echo "Installing dependencies (excluding cpl-*) from:"
+echo "Installiere Abhängigkeiten (ohne cpl-*) aus:"
 printf '  - %s\n' "${req_files[@]}"
 echo
-echo "Final set to install:"
+echo "Finale Menge zur Installation:"
 cat "$tmp_combined"
 echo
 
-# Use python -m pip for reliability; change to python3 if needed.
+python -m pip install -r "$tmp_combined"
-python -m pip install -r "$tmp_combined"

pyproject.toml

@@ -1,2 +1,18 @@
 [tool.black]
-line-length = 120
+line-length = 120
+
+[tool.pytest.ini_options]
+pythonpath = [
+    "src/api",
+    "src/application",
+    "src/auth",
+    "src/cli",
+    "src/core",
+    "src/database",
+    "src/dependency",
+    "src/graphql",
+    "src/mail",
+    "src/query",
+    "src/translation"
+]
+testpaths = ["test"]

src/api/cpl/api/__init__.py

@@ -2,3 +2,5 @@ from .error import APIError, AlreadyExists, EndpointNotImplemented, Forbidden, N
 from .logger import APILogger
 from .settings import ApiSettings
 from .api_module import ApiModule
+
+__version__ = "1.0.0"

src/application/cpl/application/__init__.py

@@ -1,2 +1,4 @@
 from .application_builder import ApplicationBuilder
 from .host import Host
+
+__version__ = "1.0.0"

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

@@ -22,22 +22,6 @@ class ApplicationABC(ABC):
             Contains instances of prepared objects
     """
 
-    @classmethod
-    def extend(cls, name: str | Callable, func: Callable[[Self], Self]):
-        r"""Extend the Application with a custom method
-
-        Parameters:
-            name: :class:`str`
-                Name of the method
-            func: :class:`Callable[[Self], Self]`
-                Function that takes the Application as a parameter and returns it
-        """
-        if callable(name):
-            name = name.__name__
-
-        setattr(cls, name, func)
-        return cls
-
     @abstractmethod
     def __init__(
         self, services: ServiceProvider, loaded_modules: set[TModule], required_modules: list[str | object] = None

src/application/cpl/application/application_builder.py

@@ -14,7 +14,7 @@ TApp = TypeVar("TApp", bound=ApplicationABC)
 
 class ApplicationBuilder(Generic[TApp]):
 
-    def __init__(self, app: Type[ApplicationABC]):
+    def __init__(self, app: Type[TApp]):
         assert app is not None, "app must not be None"
         assert issubclass(app, ApplicationABC), "app must be an subclass of ApplicationABC or its subclass"
 

src/application/cpl/application/host.py

@@ -1,14 +1,34 @@
 import asyncio
 from typing import Callable
 
-from cpl.dependency import get_provider
+from cpl.core.property import classproperty
-from cpl.dependency.hosted.startup_task import StartupTask
+from cpl.dependency.context import get_provider, use_root_provider
+from cpl.dependency.service_collection import ServiceCollection
+from cpl.core.service.startup_task import StartupTask
 
 
 class Host:
     _loop: asyncio.AbstractEventLoop | None = None
     _tasks: dict = {}
 
+    _service_collection: ServiceCollection | None = None
+
+    @classproperty
+    def services(cls) -> ServiceCollection:
+        if cls._service_collection is None:
+            cls._service_collection = ServiceCollection()
+
+        return cls._service_collection
+
+    @classmethod
+    def get_provider(cls):
+        provider = get_provider()
+        if provider is None:
+            provider = cls.services.build()
+            use_root_provider(provider)
+
+        return provider
+
     @classmethod
     def get_loop(cls) -> asyncio.AbstractEventLoop:
         if cls._loop is None:
@@ -18,7 +38,7 @@ class Host:
 
     @classmethod
     def run_start_tasks(cls):
-        provider = get_provider()
+        provider = cls.get_provider()
         tasks = provider.get_services(StartupTask)
         loop = cls.get_loop()
 
@@ -30,7 +50,7 @@ class Host:
 
     @classmethod
     def run_hosted_services(cls):
-        provider = get_provider()
+        provider = cls.get_provider()
         services = provider.get_hosted_services()
         loop = cls.get_loop()
 
@@ -49,6 +69,10 @@ class Host:
 
         cls._tasks.clear()
 
+    @classmethod
+    async def wait_for_all(cls):
+        await asyncio.gather(*cls._tasks.values())
+
     @classmethod
     def run_app(cls, func: Callable, *args, **kwargs):
         cls.run_start_tasks()
@@ -62,10 +86,9 @@ class Host:
                     func(*args, **kwargs)
             except (KeyboardInterrupt, asyncio.CancelledError):
                 pass
-            finally:
-                await cls._stop_all()
 
         cls.get_loop().run_until_complete(runner())
+        cls.get_loop().run_until_complete(cls.wait_for_all())
 
     @classmethod
     def run(cls, func: Callable, *args, **kwargs):

src/auth/cpl/auth/__init__.py

@@ -4,3 +4,5 @@ from cpl.auth.keycloak.keycloak_client import KeycloakClient as _KeycloakClient
 from .auth_module import AuthModule
 from .keycloak_settings import KeycloakSettings
 from .logger import AuthLogger
+
+__version__ = "1.0.0"

src/cli/cpl.project.json

@@ -0,0 +1,29 @@
+{
+  "name": "cpl-cli",
+  "version": "0.1.0",
+  "type": "console",
+  "license": "MIT",
+  "author": "Sven Heidemann",
+  "description": "CLI for the CPL library",
+  "homepage": "",
+  "keywords": [],
+  "dependencies": {
+    "click": "~8.3.0"
+  },
+  "devDependencies": {
+    "black": "~25.9"
+  },
+  "references": [],
+  "main": "cpl/cli/main.py",
+  "directory": "cpl/cli",
+  "build": {
+    "include": [
+      "_templates/"
+    ],
+    "exclude": [
+      "**/__pycache__",
+      "**/logs",
+      "**/tests"
+    ]
+  }
+}

src/cli/cpl/cli/.cpl/generate/abc.py.schematic

@@ -0,0 +1,9 @@
+from abc import ABC
+
+
+class <Name>ABC(ABC):
+
+    def __init__(self):
+        ABC.__init__(self)
+
+        print("<schematic> <multi_camelName> initialized")

src/cli/cpl/cli/.cpl/generate/app.py.schematic

@@ -0,0 +1,16 @@
+from cpl.application.abc import ApplicationABC
+from cpl.core.environment import Environment
+from cpl.core.log import LoggerABC
+from cpl.dependency import ServiceProvider
+from cpl.dependency.typing import Modules
+
+
+class <Name>(ApplicationABC):
+    def __init__(self, services: ServiceProvider, modules: Modules):
+        ApplicationABC.__init__(self, services, modules)
+
+        self._logger = services.get_service(LoggerABC)
+
+    async def main(self):
+        self._logger.debug(f"Host: {Environment.get_host_name()}")
+        self._logger.debug(f"Environment: {Environment.get_environment()}")

src/cli/cpl/cli/.cpl/generate/config.py.schematic

@@ -0,0 +1,10 @@
+from cpl.core.configuration import ConfigurationModelABC
+
+
+class <Name>Config(ConfigurationModelABC):
+
+    def __init__(
+        self,
+        src: dict = None,
+    ):
+        ConfigurationModelABC.__init__(self, src)

src/cli/cpl/cli/.cpl/generate/cron_job.py.schematic

@@ -0,0 +1,9 @@
+from cpl.core.console import Console
+from cpl.core.service import CronjobABC
+
+class CronJob(CronjobABC):
+    def __init__(self):
+        CronjobABC.__init__(self, Cron("*/1 * * * *"))
+
+    async def loop(self):
+        Console.write_line(f"[{datetime.now()}] Hello, World!")

src/cli/cpl/cli/.cpl/generate/data_access_object.py.schematic

@@ -0,0 +1,9 @@
+from cpl.database.abc import DbModelDaoABC
+
+
+class <Name>Dao(DbModelDaoABC[<Name>]):
+
+    def __init__(self):
+        DbModelDaoABC.__init__(self, <Name>, "<multi_name>")
+
+        self.attribute(<Name>.name, str)

src/cli/cpl/cli/.cpl/generate/db_model.py.schematic

@@ -0,0 +1,23 @@
+from datetime import datetime
+from typing import Self
+
+from cpl.core.typing import SerialId
+from cpl.database.abc import DbModelABC
+
+
+class <Name>(DbModelABC[Self]):
+    def __init__(
+        self,
+        id: SerialId,
+        name: str,
+        deleted: bool = False,
+        editor_id: SerialId | None = None,
+        created: datetime | None = None,
+        updated: datetime | None = None,
+    ):
+        DbModelABC.__init__(self, id, deleted, editor_id, created, updated)
+        self._name = name
+
+    @property
+    def name(self) -> str:
+        return self._name

src/cli/cpl/cli/.cpl/generate/db_model_join.py.schematic

@@ -0,0 +1,29 @@
+from datetime import datetime
+from typing import Self
+
+from cpl.core.typing import SerialId
+from cpl.database.abc import DbJoinModelABC
+
+
+class <Name>Join(DbJoinModelABC[Self]):
+    def __init__(
+            self,
+            id: SerialId,
+            source_id: SerialId,
+            reference_id: SerialId,
+            deleted: bool = False,
+            editor_id: SerialId | None = None,
+            created: datetime | None = None,
+            updated: datetime | None = None,
+    ):
+        DbJoinModelABC.__init__(self, source_id, reference_id, id, deleted, editor_id, created, updated)
+        self._source_id = source_id
+        self._reference_id = reference_id
+
+    @property
+    def source_id(self) -> int:
+        return self._source_id
+
+    @property
+    def reference(self) -> int:
+        return self._reference_id

src/cli/cpl/cli/.cpl/generate/enum.py.schematic

@@ -0,0 +1,5 @@
+from enum import Enum
+
+
+class <Name>Enum(Enum):
+    KEY = "value"