Added hosted services #186

.gitea/workflows/build-dev.yaml

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

.gitea/workflows/package.yaml

@@ -36,12 +36,6 @@ 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/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

README.md

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

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

example/api/src/main.py

@@ -1,147 +0,0 @@
-from starlette.responses import JSONResponse
-
-from cpl.dependency.event_bus import EventBusABC
-from cpl.graphql.event_bus.memory import InMemoryEventBus
-from queries.cities import CityGraphType, CityFilter, CitySort
-from queries.hello import UserGraphType  # , UserFilter, UserSort, UserGraphType
-from queries.user import UserFilter, UserSort
-from cpl.api.api_module import ApiModule
-from cpl.application.application_builder import ApplicationBuilder
-from cpl.auth.schema import User, 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 cpl.graphql.application.graphql_app import GraphQLApp
-from cpl.graphql.auth.graphql_auth_module import GraphQLAuthModule
-from cpl.graphql.graphql_module import GraphQLModule
-from model.author_dao import AuthorDao
-from model.author_query import AuthorGraphType, AuthorFilter, AuthorSort
-from model.post_dao import PostDao
-from model.post_query import PostFilter, PostSort, PostGraphType, PostMutation, PostSubscription
-from permissions import PostPermissions
-from queries.hello import HelloQuery
-from scoped_service import ScopedService
-from service import PingService
-from test_data_seeder import TestDataSeeder
-
-
-def main():
-    builder = ApplicationBuilder[GraphQLApp](GraphQLApp)
-
-    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()
-        .add_transient(PingService)
-        .add_module(MySQLModule)
-        .add_module(ApiModule)
-        .add_module(GraphQLModule)
-        .add_module(GraphQLAuthModule)
-        .add_scoped(ScopedService)
-        .add_singleton(EventBusABC, InMemoryEventBus)
-        .add_cache(User)
-        .add_cache(Role)
-        .add_transient(CityGraphType)
-        .add_transient(CityFilter)
-        .add_transient(CitySort)
-        .add_transient(UserGraphType)
-        .add_transient(UserFilter)
-        .add_transient(UserSort)
-        # .add_transient(UserGraphType)
-        # .add_transient(UserFilter)
-        # .add_transient(UserSort)
-        .add_transient(HelloQuery)
-        # test data
-        .add_singleton(TestDataSeeder)
-        # authors
-        .add_transient(AuthorDao)
-        .add_transient(AuthorGraphType)
-        .add_transient(AuthorFilter)
-        .add_transient(AuthorSort)
-        # posts
-        .add_transient(PostDao)
-        .add_transient(PostGraphType)
-        .add_transient(PostFilter)
-        .add_transient(PostSort)
-        .add_transient(PostMutation)
-        .add_transient(PostSubscription)
-    )
-
-    app = builder.build()
-    app.with_logging()
-    app.with_migrations("./scripts")
-
-    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")
-
-    schema = app.with_graphql()
-    schema.query.string_field("ping", resolver=lambda: "pong")
-    schema.query.with_query("hello", HelloQuery)
-    schema.query.dao_collection_field(AuthorGraphType, AuthorDao, "authors", AuthorFilter, AuthorSort)
-    (
-        schema.query.dao_collection_field(PostGraphType, PostDao, "posts", PostFilter, PostSort)
-        # .with_require_any_permission(PostPermissions.read)
-        .with_public()
-    )
-
-    schema.mutation.with_mutation("post", PostMutation).with_public()
-
-    schema.subscription.with_subscription(PostSubscription)
-
-    app.with_auth_root_queries(True)
-    app.with_auth_root_mutations(True)
-
-    app.with_playground()
-    app.with_graphiql()
-
-    app.with_permissions(PostPermissions)
-
-    provider = builder.service_provider
-    user_cache = provider.get_service(Cache[User])
-    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/model/author.py

@@ -1,30 +0,0 @@
-from datetime import datetime
-from typing import Self
-
-from cpl.core.typing import SerialId
-from cpl.database.abc import DbModelABC
-
-
-class Author(DbModelABC[Self]):
-
-    def __init__(
-        self,
-        id: int,
-        first_name: str,
-        last_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._first_name = first_name
-        self._last_name = last_name
-
-    @property
-    def first_name(self) -> str:
-        return self._first_name
-
-    @property
-    def last_name(self) -> str:
-        return self._last_name

example/api/src/model/author_dao.py

@@ -1,11 +0,0 @@
-from cpl.database.abc import DbModelDaoABC
-from model.author import Author
-
-
-class AuthorDao(DbModelDaoABC):
-
-    def __init__(self):
-        DbModelDaoABC.__init__(self, Author, "authors")
-
-        self.attribute(Author.first_name, str, db_name="firstname")
-        self.attribute(Author.last_name, str, db_name="lastname")

example/api/src/model/author_query.py

@@ -1,37 +0,0 @@
-from cpl.graphql.schema.db_model_graph_type import DbModelGraphType
-from cpl.graphql.schema.filter.db_model_filter import DbModelFilter
-from cpl.graphql.schema.sort.sort import Sort
-from cpl.graphql.schema.sort.sort_order import SortOrder
-from model.author import Author
-
-class AuthorFilter(DbModelFilter[Author]):
-    def __init__(self):
-        DbModelFilter.__init__(self, public=True)
-        self.int_field("id")
-        self.string_field("firstName")
-        self.string_field("lastName")
-
-class AuthorSort(Sort[Author]):
-    def __init__(self):
-        Sort.__init__(self)
-        self.field("id", SortOrder)
-        self.field("firstName", SortOrder)
-        self.field("lastName", SortOrder)
-
-class AuthorGraphType(DbModelGraphType[Author]):
-
-    def __init__(self):
-        DbModelGraphType.__init__(self, public=True)
-
-        self.int_field(
-            "id",
-            resolver=lambda root: root.id,
-        ).with_public(True)
-        self.string_field(
-            "firstName",
-            resolver=lambda root: root.first_name,
-        ).with_public(True)
-        self.string_field(
-            "lastName",
-            resolver=lambda root: root.last_name,
-        ).with_public(True)

example/api/src/model/post.py

@@ -1,44 +0,0 @@
-from datetime import datetime
-from typing import Self
-
-from cpl.core.typing import SerialId
-from cpl.database.abc import DbModelABC
-
-
-class Post(DbModelABC[Self]):
-
-    def __init__(
-        self,
-        id: int,
-        author_id: SerialId,
-        title: str,
-        content: 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._author_id = author_id
-        self._title = title
-        self._content = content
-
-    @property
-    def author_id(self) -> SerialId:
-        return self._author_id
-
-    @property
-    def title(self) -> str:
-        return self._title
-
-    @title.setter
-    def title(self, value: str):
-        self._title = value
-
-    @property
-    def content(self) -> str:
-        return self._content
-
-    @content.setter
-    def content(self, value: str):
-        self._content = value

example/api/src/model/post_dao.py

@@ -1,15 +0,0 @@
-from cpl.database.abc import DbModelDaoABC
-from model.author_dao import AuthorDao
-from model.post import Post
-
-
-class PostDao(DbModelDaoABC[Post]):
-
-    def __init__(self, authors: AuthorDao):
-        DbModelDaoABC.__init__(self, Post, "posts")
-
-        self.attribute(Post.author_id, int, db_name="authorId")
-        self.reference("author", "id", Post.author_id, "authors", authors)
-
-        self.attribute(Post.title, str)
-        self.attribute(Post.content, str)

example/api/src/model/post_query.py

@@ -1,148 +0,0 @@
-from cpl.dependency.event_bus import EventBusABC
-from cpl.graphql.query_context import QueryContext
-from cpl.graphql.schema.db_model_graph_type import DbModelGraphType
-from cpl.graphql.schema.filter.db_model_filter import DbModelFilter
-from cpl.graphql.schema.input import Input
-from cpl.graphql.schema.mutation import Mutation
-from cpl.graphql.schema.sort.sort import Sort
-from cpl.graphql.schema.sort.sort_order import SortOrder
-from cpl.graphql.schema.subscription import Subscription
-from model.author_dao import AuthorDao
-from model.author_query import AuthorGraphType, AuthorFilter
-from model.post import Post
-from model.post_dao import PostDao
-
-
-class PostFilter(DbModelFilter[Post]):
-    def __init__(self):
-        DbModelFilter.__init__(self, public=True)
-        self.int_field("id")
-        self.filter_field("author", AuthorFilter)
-        self.string_field("title")
-        self.string_field("content")
-
-
-class PostSort(Sort[Post]):
-    def __init__(self):
-        Sort.__init__(self)
-        self.field("id", SortOrder)
-        self.field("title", SortOrder)
-        self.field("content", SortOrder)
-
-
-class PostGraphType(DbModelGraphType[Post]):
-
-    def __init__(self, authors: AuthorDao):
-        DbModelGraphType.__init__(self, public=True)
-
-        self.int_field(
-            "id",
-            resolver=lambda root: root.id,
-        ).with_optional().with_public(True)
-
-        async def _a(root: Post):
-            return await authors.get_by_id(root.author_id)
-
-        def r_name(ctx: QueryContext):
-            return ctx.user.username == "admin"
-
-        self.object_field("author", AuthorGraphType, resolver=_a).with_public(True)  # .with_require_any([], [r_name]))
-        self.string_field(
-            "title",
-            resolver=lambda root: root.title,
-        ).with_public(True)
-        self.string_field(
-            "content",
-            resolver=lambda root: root.content,
-        ).with_public(True)
-
-
-class PostCreateInput(Input[Post]):
-    title: str
-    content: str
-    author_id: int
-
-    def __init__(self):
-        Input.__init__(self)
-        self.string_field("title").with_required()
-        self.string_field("content").with_required()
-        self.int_field("author_id").with_required()
-
-
-class PostUpdateInput(Input[Post]):
-    title: str
-    content: str
-    author_id: int
-
-    def __init__(self):
-        Input.__init__(self)
-        self.int_field("id").with_required()
-        self.string_field("title").with_required(False)
-        self.string_field("content").with_required(False)
-
-
-class PostSubscription(Subscription):
-    def __init__(self, bus: EventBusABC):
-        Subscription.__init__(self)
-        self._bus = bus
-
-        def selector(event: Post, info) -> bool:
-            return event.id == 101
-
-        self.subscription_field("postChange", PostGraphType, selector).with_public()
-
-
-class PostMutation(Mutation):
-
-    def __init__(self, posts: PostDao, authors: AuthorDao, bus: EventBusABC):
-        Mutation.__init__(self)
-
-        self._posts = posts
-        self._authors = authors
-        self._bus = bus
-
-        self.field("create", int, resolver=self.create_post).with_public().with_required().with_argument(
-            "input",
-            PostCreateInput,
-        ).with_required()
-        self.field("update", bool, resolver=self.update_post).with_public().with_required().with_argument(
-            "input",
-            PostUpdateInput,
-        ).with_required()
-        self.field("delete", bool, resolver=self.delete_post).with_public().with_required().with_argument(
-            "id",
-            int,
-        ).with_required()
-        self.field("restore", bool, resolver=self.restore_post).with_public().with_required().with_argument(
-            "id",
-            int,
-        ).with_required()
-
-    async def create_post(self, input: PostCreateInput) -> int:
-        return await self._posts.create(Post(0, input.author_id, input.title, input.content))
-
-    async def update_post(self, input: PostUpdateInput) -> bool:
-        post = await self._posts.get_by_id(input.id)
-        if post is None:
-            return False
-
-        post.title = input.title if input.title is not None else post.title
-        post.content = input.content if input.content is not None else post.content
-
-        await self._posts.update(post)
-        await self._bus.publish("postChange", post)
-        return True
-
-    async def delete_post(self, id: int) -> bool:
-        post = await self._posts.get_by_id(id)
-        if post is None:
-            return False
-        await self._posts.delete(post)
-        return True
-
-    async def restore_post(self, id: int) -> bool:
-        post = await self._posts.get_by_id(id)
-        if post is None:
-            return False
-        await self._posts.restore(post)
-        return True

example/api/src/permissions.py

@@ -1,8 +0,0 @@
-from enum import Enum
-
-
-class PostPermissions(Enum):
-
-    read = "post.read"
-    write = "post.write"
-    delete = "post.delete"

example/api/src/queries/cities.py

@@ -1,39 +0,0 @@
-from cpl.graphql.schema.filter.filter import Filter
-from cpl.graphql.schema.graph_type import GraphType
-
-from cpl.graphql.schema.sort.sort import Sort
-from cpl.graphql.schema.sort.sort_order import SortOrder
-
-
-class City:
-    def __init__(self, id: int, name: str):
-        self.id = id
-        self.name = name
-
-
-class CityFilter(Filter[City]):
-    def __init__(self):
-        Filter.__init__(self)
-        self.field("id", int)
-        self.field("name", str)
-
-
-class CitySort(Sort[City]):
-    def __init__(self):
-        Sort.__init__(self)
-        self.field("id", SortOrder)
-        self.field("name", SortOrder)
-
-
-class CityGraphType(GraphType[City]):
-    def __init__(self):
-        GraphType.__init__(self)
-
-        self.int_field(
-            "id",
-            resolver=lambda root: root.id,
-        )
-        self.string_field(
-            "name",
-            resolver=lambda root: root.name,
-        )

example/api/src/queries/hello.py

@@ -1,70 +0,0 @@
-from queries.cities import CityFilter, CitySort, CityGraphType, City
-from queries.user import User, UserFilter, UserSort, UserGraphType
-from cpl.api.middleware.request import get_request
-from cpl.auth.schema import UserDao, User
-from cpl.graphql.schema.filter.filter import Filter
-from cpl.graphql.schema.graph_type import GraphType
-from cpl.graphql.schema.query import Query
-from cpl.graphql.schema.sort.sort import Sort
-from cpl.graphql.schema.sort.sort_order import SortOrder
-
-users = [User(i, f"User {i}") for i in range(1, 101)]
-cities = [City(i, f"City {i}") for i in range(1, 101)]
-
-# class UserFilter(Filter[User]):
-#     def __init__(self):
-#         Filter.__init__(self)
-#         self.field("id", int)
-#         self.field("username", str)
-#
-#
-# class UserSort(Sort[User]):
-#     def __init__(self):
-#         Sort.__init__(self)
-#         self.field("id", SortOrder)
-#         self.field("username", SortOrder)
-#
-# class UserGraphType(GraphType[User]):
-#
-#     def __init__(self):
-#         GraphType.__init__(self)
-#
-#         self.int_field(
-#             "id",
-#             resolver=lambda root: root.id,
-#         )
-#         self.string_field(
-#             "username",
-#             resolver=lambda root: root.username,
-#         )
-
-
-class HelloQuery(Query):
-    def __init__(self):
-        Query.__init__(self)
-        self.string_field(
-            "message",
-            resolver=lambda name: f"Hello {name} {get_request().state.request_id}",
-        ).with_argument("name", str, "Name to greet", "world")
-
-        self.collection_field(
-            UserGraphType,
-            "users",
-            UserFilter,
-            UserSort,
-            resolver=lambda: users,
-        )
-        self.collection_field(
-            CityGraphType,
-            "cities",
-            CityFilter,
-            CitySort,
-            resolver=lambda: cities,
-        )
-        # self.dao_collection_field(
-        #     UserGraphType,
-        #     UserDao,
-        #     "Users",
-        #     UserFilter,
-        #     UserSort,
-        # )

example/api/src/queries/user.py

@@ -1,39 +0,0 @@
-from cpl.graphql.schema.filter.filter import Filter
-from cpl.graphql.schema.graph_type import GraphType
-from cpl.graphql.schema.sort.sort import Sort
-from cpl.graphql.schema.sort.sort_order import SortOrder
-
-
-class User:
-    def __init__(self, id: int, name: str):
-        self.id = id
-        self.name = name
-
-
-class UserFilter(Filter[User]):
-    def __init__(self):
-        Filter.__init__(self)
-        self.field("id", int)
-        self.field("name", str)
-
-
-class UserSort(Sort[User]):
-    def __init__(self):
-        Sort.__init__(self)
-        self.field("id", SortOrder)
-        self.field("name", SortOrder)
-
-
-class UserGraphType(GraphType[User]):
-
-    def __init__(self):
-        GraphType.__init__(self)
-
-        self.int_field(
-            "id",
-            resolver=lambda root: root.id,
-        )
-        self.string_field(
-            "name",
-            resolver=lambda root: root.name,
-        )

example/api/src/scripts/0-posts.sql

@@ -1,22 +0,0 @@
-CREATE TABLE IF NOT EXISTS `authors` (
-    `id` INT(30) NOT NULL AUTO_INCREMENT,
-    `firstname` VARCHAR(64) NOT NULL,
-    `lastname` VARCHAR(64) NOT NULL,
-    deleted BOOLEAN NOT NULL DEFAULT FALSE,
-    editorId INT NULL,
-    created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    PRIMARY KEY(`id`)
-    );
-
-CREATE TABLE IF NOT EXISTS `posts` (
-    `id` INT(30) NOT NULL AUTO_INCREMENT,
-    `authorId` INT(30) NOT NULL REFERENCES `authors`(`id`) ON DELETE CASCADE,
-    `title` TEXT NOT NULL,
-    `content` TEXT NOT NULL,
-    deleted BOOLEAN NOT NULL DEFAULT FALSE,
-    editorId INT NULL,
-    created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    PRIMARY KEY(`id`)
-);

example/api/src/test_data_seeder.py

@@ -1,48 +0,0 @@
-from faker import Faker
-
-from cpl.database.abc import DataSeederABC
-from cpl.query import Enumerable
-from model.author import Author
-from model.author_dao import AuthorDao
-from model.post import Post
-from model.post_dao import PostDao
-
-
-fake = Faker()
-
-
-class TestDataSeeder(DataSeederABC):
-
-    def __init__(self, authors: AuthorDao, posts: PostDao):
-        DataSeederABC.__init__(self)
-
-        self._authors = authors
-        self._posts = posts
-
-    async def seed(self):
-        if await self._authors.count() == 0:
-            await self._seed_authors()
-
-        if await self._posts.count() == 0:
-            await self._seed_posts()
-
-    async def _seed_authors(self):
-        authors = Enumerable.range(0, 35).select(
-            lambda x: Author(
-                0,
-                fake.first_name(),
-                fake.last_name(),
-        )
-        ).to_list()
-        await self._authors.create_many(authors, skip_editor=True)
-
-    async def _seed_posts(self):
-        posts = Enumerable.range(0, 100).select(
-            lambda x: Post(
-                id=0,
-                author_id=fake.random_int(min=1, max=35),
-                title=fake.sentence(nb_words=6),
-                content=fake.paragraph(nb_sentences=6),
-            )
-        ).to_list()
-        await self._posts.create_many(posts, skip_editor=True)

example/custom/api/src/main.py

@@ -0,0 +1,77 @@
+from starlette.responses import JSONResponse
+
+from cpl import api
+from cpl.api.application.web_app import WebApp
+from cpl.application import ApplicationBuilder
+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 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(api)
+
+    builder.services.add_scoped(ScopedService)
+
+    builder.services.add_cache(AuthUser)
+    builder.services.add_cache(Role)
+
+    app = builder.build()
+    app.with_logging()
+    app.with_database()
+
+    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/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/application.py

@@ -4,7 +4,6 @@ from cpl.core.console import Console
 from cpl.core.environment import Environment
 from cpl.core.log import LoggerABC
 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
@@ -12,8 +11,8 @@ from model.user_dao import UserDao
 
 
 class Application(ApplicationABC):
-    def __init__(self, services: ServiceProvider, modules: Modules):
-        ApplicationABC.__init__(self, services, modules)
+    def __init__(self, services: ServiceProvider):
+        ApplicationABC.__init__(self, services)
 
         self._logger = services.get_service(LoggerABC)
 

example/custom/database/src/main_simplified.py

@@ -3,7 +3,6 @@ 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
 
@@ -11,12 +10,13 @@ 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/custom/database/src/model/city.py

@@ -5,16 +5,16 @@ from cpl.core.typing import SerialId
 from cpl.database.abc.db_model_abc import DbModelABC
 
 
-class City(DbModelABC[Self]):
+class City(DbModelABC):
     def __init__(
         self,
         id: int,
         name: str,
         zip: str,
         deleted: bool = False,
-        editor_id: SerialId | None = None,
-        created: datetime | None= None,
-        updated: datetime | None= None,
+        editor_id: Optional[SerialId] = None,
+        created: Optional[datetime] = None,
+        updated: Optional[datetime] = None,
     ):
         DbModelABC.__init__(self, id, deleted, editor_id, created, updated)
         self._name = name

example/custom/database/src/model/user.py

@@ -5,7 +5,7 @@ from cpl.core.typing import SerialId
 from cpl.database.abc.db_model_abc import DbModelABC
 
 
-class User(DbModelABC[Self]):
+class User(DbModelABC):
 
     def __init__(
         self,
@@ -13,9 +13,9 @@ class User(DbModelABC[Self]):
         name: str,
         city_id: int = 0,
         deleted: bool = False,
-        editor_id: SerialId | None = None,
-        created: datetime | None= None,
-        updated: datetime | None= None,
+        editor_id: Optional[SerialId] = None,
+        created: Optional[datetime] = None,
+        updated: Optional[datetime] = None,
     ):
         DbModelABC.__init__(self, id, deleted, editor_id, created, updated)
         self._name = name

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, DatabaseModule
+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,10 +21,9 @@ class Startup(StartupABC):
 
     @staticmethod
     async def configure_services(services: ServiceCollection):
-        services.add_module(MySQLModule)
-        services.add_module(DatabaseModule)
-        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/application.py

@@ -1,4 +1,3 @@
-import asyncio
 import time
 
 from cpl.application.abc import ApplicationABC
@@ -8,7 +7,6 @@ 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.dependency.typing import Modules
 from cpl.mail import EMail, EMailClientABC
 from cpl.query import List
 from scoped_service import ScopedService
@@ -18,8 +16,8 @@ from test_settings import TestSettings
 
 class Application(ApplicationABC):
 
-    def __init__(self, services: ServiceProvider, modules: Modules):
-        ApplicationABC.__init__(self, services, modules)
+    def __init__(self, services: ServiceProvider):
+        ApplicationABC.__init__(self, services)
         self._logger = self._services.get_service(LoggerABC)
         self._mailer = self._services.get_service(EMailClientABC)
 
@@ -37,7 +35,7 @@ class Application(ApplicationABC):
     def _wait(time_ms: int):
         time.sleep(time_ms)
 
-    async def main(self):
+    def main(self):
         self._logger.debug(f"Host: {Environment.get_host_name()}")
         self._logger.debug(f"Environment: {Environment.get_environment()}")
         Console.write_line(List(range(0, 10)).select(lambda x: f"x={x}").to_list())
@@ -77,7 +75,7 @@ class Application(ApplicationABC):
         # self.test_send_mail()
 
         x = 0
-        while x < 500:
+        while x < 5:
             Console.write_line("Running...")
             x += 1
-            await asyncio.sleep(5)
+            time.sleep(5)

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/hosted_service.py

@@ -1,10 +1,8 @@
 import asyncio
-from datetime import datetime
+import time
 
 from cpl.core.console import Console
-from cpl.core.time.cron import Cron
-from cpl.core.service.cronjob import CronjobABC
-from cpl.core.service.hosted_service import HostedService
+from cpl.dependency.hosted.hosted_service import HostedService
 
 
 class Hosted(HostedService):
@@ -19,12 +17,4 @@ class Hosted(HostedService):
 
     async def stop(self):
         Console.write_line("Hosted Service Stopped")
-        self._stopped = True
-
-
-class MyCronJob(CronjobABC):
-    def __init__(self):
-        CronjobABC.__init__(self, Cron("*/1 * * * *"))  # Every minute
-
-    async def loop(self):
-        Console.write_line(f"[{datetime.now()}] Hello from Cronjob!")
+        self._stopped = True

example/custom/general/src/startup.py

@@ -1,10 +1,10 @@
+from cpl import mail
 from cpl.application.abc import StartupABC
 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, MyCronJob
+from example.custom.general.src.hosted_service import Hosted
 from scoped_service import ScopedService
 from test_service import TestService
 
@@ -20,9 +20,8 @@ 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)
         services.add_hosted_service(Hosted)
-        services.add_hosted_service(MyCronJob)

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)

install.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Find and combine requirements from src/*/requirements.txt,
+# Find and combine requirements from src/cpl-*/requirements.txt,
 # filtering out lines whose *package name* starts with "cpl-".
 # Works with pinned versions, extras, markers, editable installs, and VCS refs.
 
 shopt -s nullglob
 
-req_files=(src/*/requirements.txt)
+req_files=(src/cpl-*/requirements.txt)
 if ((${#req_files[@]} == 0)); then
-  echo "No requirements files found at src/*/requirements.txt" >&2
+  echo "No requirements files found at src/cpl-*/requirements.txt" >&2
   exit 1
 fi
 

src/api/cpl/api/__init__.py

@@ -1,6 +0,0 @@
-from .error import APIError, AlreadyExists, EndpointNotImplemented, Forbidden, NotFound, Unauthorized
-from .logger import APILogger
-from .settings import ApiSettings
-from .api_module import ApiModule
-
-__version__ = "1.0.0"

src/api/cpl/api/abc/web_app_abc.py

@@ -1,45 +0,0 @@
-from abc import ABC
-from enum import Enum
-from typing import Self
-
-from starlette.applications import Starlette
-
-from cpl.api.model.api_route import ApiRoute
-from cpl.api.model.validation_match import ValidationMatch
-from cpl.api.typing import HTTPMethods, PartialMiddleware, TEndpoint, PolicyInput
-from cpl.application.abc.application_abc import ApplicationABC
-from cpl.dependency.service_provider import ServiceProvider
-from cpl.dependency.typing import Modules
-
-
-class WebAppABC(ApplicationABC, ABC):
-
-    def __init__(self, services: ServiceProvider, modules: Modules, required_modules: list[str | object] = None):
-        ApplicationABC.__init__(self, services, modules, required_modules)
-
-    def with_routes_directory(self, directory: str) -> Self: ...
-    def with_app(self, app: Starlette) -> Self: ...
-    def with_routes(
-        self,
-        routes: list[ApiRoute],
-        method: HTTPMethods,
-        authentication: bool = False,
-        roles: list[str | Enum] = None,
-        permissions: list[str | Enum] = None,
-        policies: list[str] = None,
-        match: ValidationMatch = None,
-    ) -> Self: ...
-    def with_route(
-        self,
-        path: str,
-        fn: TEndpoint,
-        method: HTTPMethods,
-        authentication: bool = False,
-        roles: list[str | Enum] = None,
-        permissions: list[str | Enum] = None,
-        policies: list[str] = None,
-        match: ValidationMatch = None,
-    ) -> Self: ...
-    def with_middleware(self, middleware: PartialMiddleware) -> Self: ...
-    def with_authentication(self) -> Self: ...
-    def with_authorization(self, *policies: list[PolicyInput] | PolicyInput) -> Self: ...