Added enumerable order & added array & removed collection

Reviewed-on: #193

.gitignore

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

example/custom/api/src/main.py

@@ -4,8 +4,10 @@ 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.environment import Environment
+from cpl.core.utils.cache import Cache
 from service import PingService
 
 
@@ -16,10 +18,14 @@ def main():
     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_logging()
+    builder.services.add_structured_logging()
     builder.services.add_transient(PingService)
     builder.services.add_module(api)
 
+    builder.services.add_cache(AuthUser)
+    builder.services.add_cache(Role)
+
     app = builder.build()
     app.with_logging()
     app.with_database()
@@ -30,6 +36,10 @@ def main():
     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])
+
     app.run()
 
 

example/custom/api/src/routes/ping.py

@@ -1,17 +1,16 @@
 from urllib.request import Request
 
+from service import PingService
 from starlette.responses import JSONResponse
 
+from cpl.api import APILogger
 from cpl.api.router import Router
-from cpl.auth.permission.permissions import Permissions
-from cpl.core.log import Logger
-from service import PingService
 
 
 @Router.authenticate()
-@Router.authorize(permissions=[Permissions.administrator])
+# @Router.authorize(permissions=[Permissions.administrator])
 # @Router.authorize(policies=["test"])
 @Router.get(f"/ping")
-async def ping(r: Request, ping: PingService, logger: Logger):
+async def ping(r: Request, ping: PingService, logger: APILogger):
     logger.info(f"Ping: {ping}")
     return JSONResponse(ping.ping(r))

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

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

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

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

example/custom/query/main.py

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

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

@@ -1,5 +1,9 @@
 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:

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

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

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

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

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

@@ -29,7 +29,6 @@ from cpl.application.abc.application_abc import ApplicationABC
 from cpl.core.configuration import Configuration
 from cpl.dependency.service_provider_abc import ServiceProviderABC
 
-_logger = APILogger("API")
 
 PolicyInput = Union[dict[str, PolicyResolver], Policy]
 
@@ -39,6 +38,8 @@ class WebApp(ApplicationABC):
         super().__init__(services, [auth, api])
         self._app: Starlette | None = None
 
+        self._logger = services.get_service(APILogger)
+
         self._api_settings = Configuration.get(ApiSettings)
         self._policies = services.get_service(PolicyRegistry)
         self._routes = services.get_service(RouteRegistry)
@@ -52,16 +53,15 @@ class WebApp(ApplicationABC):
             APIError: self._handle_exception,
         }
 
-    @staticmethod
+    async def _handle_exception(self, request: Request, exc: Exception):
-    async def _handle_exception(request: Request, exc: Exception):
         if isinstance(exc, APIError):
-            _logger.error(exc)
+            self._logger.error(exc)
             return JSONResponse({"error": str(exc)}, status_code=exc.status_code)
 
         if hasattr(request.state, "request_id"):
-            _logger.error(f"Request {request.state.request_id}", exc)
+            self._logger.error(f"Request {request.state.request_id}", exc)
         else:
-            _logger.error("Request unknown", exc)
+            self._logger.error("Request unknown", exc)
 
         return JSONResponse({"error": str(exc)}, status_code=500)
 
@@ -69,10 +69,10 @@ class WebApp(ApplicationABC):
         origins = self._api_settings.allowed_origins
 
         if origins is None or origins == "":
-            _logger.warning("No allowed origins specified, allowing all origins")
+            self._logger.warning("No allowed origins specified, allowing all origins")
             return ["*"]
 
-        _logger.debug(f"Allowed origins: {origins}")
+        self._logger.debug(f"Allowed origins: {origins}")
         return origins.split(",")
 
     def with_database(self) -> Self:
@@ -191,11 +191,11 @@ class WebApp(ApplicationABC):
                 if isinstance(policy, dict):
                     for name, resolver in policy.items():
                         if not isinstance(name, str):
-                            _logger.warning(f"Skipping policy at index {i}, name must be a string")
+                            self._logger.warning(f"Skipping policy at index {i}, name must be a string")
                             continue
 
                         if not callable(resolver):
-                            _logger.warning(f"Skipping policy {name}, resolver must be callable")
+                            self._logger.warning(f"Skipping policy {name}, resolver must be callable")
                             continue
 
                         _policies.append(Policy(name, resolver))
@@ -203,7 +203,7 @@ class WebApp(ApplicationABC):
 
                 _policies.append(policy)
 
-            self._policies.extend_policies(_policies)
+            self._policies.extend(_policies)
 
         self.with_middleware(AuthorizationMiddleware)
         return self
@@ -213,10 +213,10 @@ class WebApp(ApplicationABC):
             for policy_name in rule["policies"]:
                 policy = self._policies.get(policy_name)
                 if not policy:
-                    _logger.fatal(f"Authorization policy '{policy_name}' not found")
+                    self._logger.fatal(f"Authorization policy '{policy_name}' not found")
 
     async def main(self):
-        _logger.debug(f"Preparing API")
+        self._logger.debug(f"Preparing API")
         self._validate_policies()
 
         if self._app is None:
@@ -238,7 +238,7 @@ class WebApp(ApplicationABC):
         else:
             app = self._app
 
-        _logger.info(f"Start API on {self._api_settings.host}:{self._api_settings.port}")
+        self._logger.info(f"Start API on {self._api_settings.host}:{self._api_settings.port}")
 
         config = uvicorn.Config(
             app, host=self._api_settings.host, port=self._api_settings.port, log_config=None, loop="asyncio"
@@ -246,4 +246,4 @@ class WebApp(ApplicationABC):
         server = uvicorn.Server(config)
         await server.serve()
 
-        _logger.info("Shutdown API")
+        self._logger.info("Shutdown API")

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

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

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

@@ -0,0 +1,4 @@
+from .authentication import AuthenticationMiddleware
+from .authorization import AuthorizationMiddleware
+from .logging import LoggingMiddleware
+from .request import RequestMiddleware

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

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

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

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

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

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

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

@@ -9,16 +9,19 @@ from starlette.types import Scope, Receive, Send
 from cpl.api.abc.asgi_middleware_abc import ASGIMiddleware
 from cpl.api.logger import APILogger
 from cpl.api.typing import TRequest
+from cpl.dependency import ServiceProviderABC
 
 _request_context: ContextVar[Union[TRequest, None]] = ContextVar("request", default=None)
 
-_logger = APILogger(__name__)
-
 
 class RequestMiddleware(ASGIMiddleware):
 
-    def __init__(self, app):
+    @ServiceProviderABC.inject
+    def __init__(self, app, logger: APILogger):
         ASGIMiddleware.__init__(self, app)
+
+        self._logger = logger
+
         self._ctx_token = None
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send):
@@ -33,7 +36,7 @@ class RequestMiddleware(ASGIMiddleware):
     async def set_request_data(self, request: TRequest):
         request.state.request_id = uuid4()
         request.state.start_time = time.time()
-        _logger.trace(f"Set new current request: {request.state.request_id}")
+        self._logger.trace(f"Set new current request: {request.state.request_id}")
 
         self._ctx_token = _request_context.set(request)
 
@@ -45,7 +48,7 @@ class RequestMiddleware(ASGIMiddleware):
         if self._ctx_token is None:
             return
 
-        _logger.trace(f"Clearing current request: {request.state.request_id}")
+        self._logger.trace(f"Clearing current request: {request.state.request_id}")
         _request_context.reset(self._ctx_token)
 
 

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

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

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

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

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

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

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

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

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

@@ -92,8 +92,9 @@ class Router:
 
     @classmethod
     def route(cls, path: str, method: HTTPMethods, registry: RouteRegistry = None, **kwargs):
+        from cpl.api.model.api_route import ApiRoute
+
         if not registry:
-            from cpl.api.model.api_route import ApiRoute
             from cpl.dependency.service_provider_abc import ServiceProviderABC
 
             routes = ServiceProviderABC.get_global_service(RouteRegistry)

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

@@ -2,9 +2,8 @@ from abc import ABC, abstractmethod
 from typing import Callable, Self
 
 from cpl.application.host import Host
-from cpl.core.console.console import Console
-from cpl.core.log import LogSettings
 from cpl.core.log.log_level import LogLevel
+from cpl.core.log.log_settings import LogSettings
 from cpl.core.log.logger_abc import LoggerABC
 from cpl.dependency.service_provider_abc import ServiceProviderABC
 

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

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from cpl.dependency import ServiceProviderABC
+from cpl.dependency.service_provider_abc import ServiceProviderABC
 
 
 class ApplicationExtensionABC(ABC):

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

@@ -6,7 +6,7 @@ from cpl.auth import permission as _permission
 from cpl.auth.keycloak.keycloak_admin import KeycloakAdmin as _KeycloakAdmin
 from cpl.auth.keycloak.keycloak_client import KeycloakClient as _KeycloakClient
 from cpl.dependency.service_collection import ServiceCollection as _ServiceCollection
-from .auth_logger import AuthLogger
+from .logger import AuthLogger
 from .keycloak_settings import KeycloakSettings
 from .permission_seeder import PermissionSeeder
 

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

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

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

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

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

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

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

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

src/cpl-auth/cpl/auth/permission_seeder.py

@@ -14,14 +14,13 @@ from cpl.auth.schema import (
 )
 from cpl.core.utils.get_value import get_value
 from cpl.database.abc.data_seeder_abc import DataSeederABC
-from cpl.database.db_logger import DBLogger
+from cpl.database.logger import DBLogger
-
-_logger = DBLogger(__name__)
 
 
 class PermissionSeeder(DataSeederABC):
     def __init__(
         self,
+        logger: DBLogger,
         permission_dao: PermissionDao,
         role_dao: RoleDao,
         role_permission_dao: RolePermissionDao,
@@ -29,6 +28,7 @@ class PermissionSeeder(DataSeederABC):
         api_key_permission_dao: ApiKeyPermissionDao,
     ):
         DataSeederABC.__init__(self)
+        self._logger = logger
         self._permission_dao = permission_dao
         self._role_dao = role_dao
         self._role_permission_dao = role_permission_dao
@@ -40,7 +40,7 @@ class PermissionSeeder(DataSeederABC):
         possible_permissions = [permission for permission in PermissionsRegistry.get()]
 
         if len(permissions) == len(possible_permissions):
-            _logger.info("Permissions already existing")
+            self._logger.info("Permissions already existing")
             await self._update_missing_descriptions()
             return
 
@@ -53,7 +53,7 @@ class PermissionSeeder(DataSeederABC):
 
         await self._permission_dao.delete_many(to_delete, hard_delete=True)
 
-        _logger.warning("Permissions incomplete")
+        self._logger.warning("Permissions incomplete")
         permission_names = [permission.name for permission in permissions]
         await self._permission_dao.create_many(
             [

src/cpl-auth/cpl/auth/schema/_administration/api_key_dao.py

@@ -3,15 +3,12 @@ from typing import Optional
 from cpl.auth.schema._administration.api_key import ApiKey
 from cpl.database import TableManager
 from cpl.database.abc import DbModelDaoABC
-from cpl.database.db_logger import DBLogger
-
-_logger = DBLogger(__name__)
 
 
 class ApiKeyDao(DbModelDaoABC[ApiKey]):
 
     def __init__(self):
-        DbModelDaoABC.__init__(self, __name__, ApiKey, TableManager.get("api_keys"))
+        DbModelDaoABC.__init__(self, ApiKey, TableManager.get("api_keys"))
 
         self.attribute(ApiKey.identifier, str)
         self.attribute(ApiKey.key, str, "keystring")