Removed ServiceProviderABC #186

src/cpl-core/cpl/core/ctx/user_context.py

@@ -2,15 +2,15 @@ from contextvars import ContextVar
 from typing import Optional
 
 from cpl.auth.schema._administration.auth_user import AuthUser
+from cpl.dependency import get_provider
 
 _user_context: ContextVar[Optional[AuthUser]] = ContextVar("user", default=None)
 
 
 def set_user(user: Optional[AuthUser]):
-    from cpl.dependency.service_provider_abc import ServiceProviderABC
     from cpl.core.log.logger_abc import LoggerABC
 
-    logger = ServiceProviderABC.get_global_service(LoggerABC)
+    logger = get_provider().get_service(LoggerABC)
     logger.trace("Setting user context", user.id)
     _user_context.set(user)
 

src/cpl-core/cpl/core/log/structured_logger.py

@@ -9,6 +9,7 @@ from starlette.requests import Request
 from cpl.core.log.log_level import LogLevel
 from cpl.core.log.logger import Logger
 from cpl.core.typing import Source, Messages
+from cpl.dependency import get_provider
 
 
 class StructuredLogger(Logger):
@@ -99,10 +100,9 @@ class StructuredLogger(Logger):
         if user is None:
             return
 
-        from cpl.dependency.service_provider_abc import ServiceProviderABC
         from cpl.auth.keycloak.keycloak_admin import KeycloakAdmin
 
-        keycloak = ServiceProviderABC.get_global_service(KeycloakAdmin)
+        keycloak = get_provider().get_service(KeycloakAdmin)
         kc_user = keycloak.get_user(user.keycloak_id)
         message["user"] = {
             "id": str(user.id),

src/cpl-core/cpl/core/log/wrapped_logger.py

@@ -4,7 +4,7 @@ from typing import Type
 from cpl.core.log import LoggerABC, LogLevel
 from cpl.core.typing import Messages
 from cpl.dependency.inject import inject
-from cpl.dependency.service_provider_abc import ServiceProviderABC
+from cpl.dependency.service_provider import ServiceProvider
 
 
 class WrappedLogger(LoggerABC):
@@ -19,12 +19,12 @@ class WrappedLogger(LoggerABC):
         self._set_logger()
 
     @inject
-    def _set_logger(self, services: ServiceProviderABC):
+    def _set_logger(self, services: ServiceProvider):
         from cpl.core.log import Logger
 
         t_logger: Type[Logger] = services.get_service_type(LoggerABC)
         if t_logger is None:
-            raise Exception("No LoggerABC service registered in ServiceProviderABC")
+            raise Exception("No LoggerABC service registered in ServiceProvider")
 
         self._logger = t_logger(self._source, self._file_prefix)
 
@@ -43,8 +43,8 @@ class WrappedLogger(LoggerABC):
         from cpl.dependency import ServiceCollection
 
         ignore_classes = [
-            ServiceProviderABC,
-            ServiceProviderABC.__subclasses__(),
+            ServiceProvider,
+            ServiceProvider.__subclasses__(),
             ServiceCollection,
             WrappedLogger,
             WrappedLogger.__subclasses__(),