maleo-foundation 0.3.71__py3-none-any.whl → 0.3.74__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -40,6 +40,7 @@ from maleo_foundation.utils.logging import (
     DatabaseLogger,
     MiddlewareLogger,
     RepositoryLogger,
+    RouterLogger,
     ServiceLogger,
 )
 from .credential import CredentialManager
@@ -51,20 +52,14 @@ class ServiceManager:
         self,
         db_metadata: MetaData,
         log_config: SimpleConfig,
-        settings: Optional[Settings] = None,
+        settings: Settings,
         additional_topics_configurations: Optional[
             AdditionalTopicsConfigurations
         ] = None,
     ):
         self._db_metadata = db_metadata  # * Declare DB Metadata
         self._log_config = log_config  # * Declare log config
-        self._settings = (
-            settings if settings is not None else Settings()  # type: ignore
-        )  # * Initialize settings
-
-        # * Disable google cloud logging if environment is local
-        if self._settings.ENVIRONMENT == "local":
-            self._log_config.google_cloud_logging = None
+        self._settings = settings  # * Initialize settings
 
         # * Initialize Credential Manager
         self._credential_manager = CredentialManager(
@@ -134,22 +129,39 @@ class ServiceManager:
 
     def _initialize_loggers(self) -> None:
         application = ApplicationLogger(
-            service_key=self.configurations.service.key, **self._log_config.model_dump()
+            environment=self.settings.ENVIRONMENT,
+            service_key=self.settings.SERVICE_KEY,
+            **self._log_config.model_dump(),
         )
         cache = CacheLogger(
-            service_key=self.configurations.service.key, **self._log_config.model_dump()
+            environment=self.settings.ENVIRONMENT,
+            service_key=self.settings.SERVICE_KEY,
+            **self._log_config.model_dump(),
         )
         database = DatabaseLogger(
-            service_key=self.configurations.service.key, **self._log_config.model_dump()
+            environment=self.settings.ENVIRONMENT,
+            service_key=self.settings.SERVICE_KEY,
+            **self._log_config.model_dump(),
         )
         middleware = MiddlewareLogger(
-            service_key=self.configurations.service.key, **self._log_config.model_dump()
+            environment=self.settings.ENVIRONMENT,
+            service_key=self.settings.SERVICE_KEY,
+            **self._log_config.model_dump(),
         )
         repository = RepositoryLogger(
-            service_key=self.configurations.service.key, **self._log_config.model_dump()
+            environment=self.settings.ENVIRONMENT,
+            service_key=self.settings.SERVICE_KEY,
+            **self._log_config.model_dump(),
+        )
+        router = RouterLogger(
+            environment=self.settings.ENVIRONMENT,
+            service_key=self.settings.SERVICE_KEY,
+            **self._log_config.model_dump(),
         )
         service = ServiceLogger(
-            service_key=self.configurations.service.key, **self._log_config.model_dump()
+            environment=self.settings.ENVIRONMENT,
+            service_key=self.settings.SERVICE_KEY,
+            **self._log_config.model_dump(),
         )
         self._loggers = Loggers(
             application=application,
@@ -157,6 +169,7 @@ class ServiceManager:
             database=database,
             middleware=middleware,
             repository=repository,
+            router=router,
             service=service,
         )
 
@@ -166,8 +179,8 @@ class ServiceManager:
 
     async def _clear_cache(self) -> None:
         prefixes = [
-            self.configurations.service.key,
-            f"google-cloud-storage:{self.configurations.service.key}",
+            self.settings.SERVICE_KEY,
+            f"google-cloud-storage:{self.settings.SERVICE_KEY}",
         ]
         for prefix in prefixes:
             async for key in self._redis.scan_iter(f"{prefix}*"):
@@ -243,7 +256,9 @@ class ServiceManager:
 
     def _initialize_foundation(self) -> None:
         self._foundation = MaleoFoundationClientManager(
-            log_config=self._log_config, service_key=self._settings.SERVICE_KEY
+            log_config=self._log_config,
+            service_environment=self._settings.ENVIRONMENT,
+            service_key=self._settings.SERVICE_KEY,
         )
 
     @property
@@ -294,6 +309,7 @@ class ServiceManager:
         self._loggers.application.info("Configuring middlewares")
         self._middleware = MiddlewareManager(
             app=self._app,
+            settings=self._settings,
             configurations=self.configurations.middleware,
             keys=self._keys,
             logger=self._loggers.middleware,

maleo_foundation/middlewares/authentication.py

@@ -3,10 +3,11 @@ from starlette.authentication import AuthenticationBackend, AuthenticationError
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.requests import HTTPConnection
 from typing import Tuple
-from maleo_foundation.authentication import Token, Credentials, User
+from maleo_foundation.authentication import Credentials, User
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.client.manager import MaleoFoundationClientManager
 from maleo_foundation.models.schemas import BaseGeneralSchemas
+from maleo_foundation.models.transfers.general.authentication import Token
 from maleo_foundation.models.transfers.parameters.token import (
     MaleoFoundationTokenParametersTransfers,
 )
@@ -67,7 +68,7 @@ class Backend(AuthenticationBackend):
                     User(authenticated=True, username=payload.u_u, email=payload.u_e),
                 )
 
-        return Credentials(), User(authenticated=False)
+        return Credentials(), User()
 
 
 def add_authentication_middleware(