maleo-foundation 0.3.70__py3-none-any.whl → 0.3.72__py3-none-any.whl

maleo_foundation/client/manager.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
+from typing import Optional
+from maleo_foundation.enums import BaseEnums
 from maleo_foundation.managers.client.base import ClientManager
-from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.logging import SimpleConfig
 from maleo_foundation.client.services.encryption import (
     MaleoFoundationAESEncryptionClientService,
@@ -23,11 +24,16 @@ from maleo_foundation.client.services import (
 
 class MaleoFoundationClientManager(ClientManager):
     def __init__(
-        self, log_config: SimpleConfig, service_key: BaseTypes.OptionalString = None
+        self,
+        log_config: SimpleConfig,
+        service_environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
     ) -> None:
         key = "maleo-foundation"
         name = "MaleoFoundation"
-        super().__init__(key, name, log_config, service_key)
+        super().__init__(
+            key, name, log_config, service_environment, service_key, service_environment
+        )
         self._initialize_services()
         self._logger.info("Client manager initialized successfully")
 

maleo_foundation/controller_types.py

@@ -0,0 +1,25 @@
+from google.cloud.pubsub_v1.subscriber.message import Message
+from typing import Awaitable, Callable, Optional, Union
+from maleo_foundation.models.transfers.results.service.controllers.rest import (
+    BaseServiceRESTControllerResults,
+)
+
+
+class ControllerTypes:
+    # * REST controller types
+    SyncRESTController = Callable[..., BaseServiceRESTControllerResults]
+    OptionalSyncRESTController = Optional[
+        Callable[..., BaseServiceRESTControllerResults]
+    ]
+    AsyncRESTController = Callable[..., Awaitable[BaseServiceRESTControllerResults]]
+    OptionalAsyncRESTController = Optional[
+        Callable[..., Awaitable[BaseServiceRESTControllerResults]]
+    ]
+    RESTController = Union[SyncRESTController, AsyncRESTController]
+    OptionalRESTController = Optional[RESTController]
+
+    # * Message controller types
+    SyncMessageController = Callable[[str, Message], bool]
+    AsyncMessageController = Callable[[str, Message], Awaitable[bool]]
+    MessageController = Union[SyncMessageController, AsyncMessageController]
+    OptionalMessageController = Optional[MessageController]

maleo_foundation/managers/client/base.py

@@ -1,8 +1,9 @@
 import httpx
+import os
 from contextlib import asynccontextmanager
 from pydantic import BaseModel, ConfigDict, Field
-from typing import AsyncGenerator, Generator
-from maleo_foundation.types import BaseTypes
+from typing import AsyncGenerator, Generator, Optional
+from maleo_foundation.enums import BaseEnums
 from maleo_foundation.utils.logging import ClientLogger, SimpleConfig
 
 
@@ -107,18 +108,43 @@ class ClientManager:
         key: str,
         name: str,
         log_config: SimpleConfig,
-        service_key: BaseTypes.OptionalString = None,
+        service_environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
     ) -> None:
         self._key = key
         self._name = name
         self._log_config = log_config
-        self._service_key = service_key
+
+        # Ensure environment exists
+        actual_service_environment = service_environment or os.getenv("ENVIRONMENT")
+        if actual_service_environment is None:
+            raise ValueError(
+                "ENVIRONMENT environment variable must be set if 'service_environment' is set to None"
+            )
+        else:
+            self._service_environment = BaseEnums.EnvironmentType(
+                actual_service_environment
+            )
+
+        # Ensure service_key exists
+        actual_service_key = service_key or os.getenv("SERVICE_KEY")
+        if actual_service_key is None:
+            raise ValueError(
+                "SERVICE_KEY environment variable must be set if 'service_key' is set to None"
+            )
+        else:
+            self._service_key = BaseEnums.Service(actual_service_key)
+
+        self._environment = environment
+
         self._initialize_logger()
-        self._logger.info("Initializing client manager")
+        self._logger.info(f"Initializing {self._name} client manager")
 
     def _initialize_logger(self) -> None:
         self._logger = ClientLogger(
             client_key=self._key,
+            environment=self._service_environment,
             service_key=self._service_key,
             **self._log_config.model_dump(),
         )
@@ -131,6 +157,12 @@ class ClientManager:
     def name(self) -> str:
         return self._name
 
+    @property
+    def environment(self) -> BaseEnums.EnvironmentType:
+        if self._environment is None:
+            raise ValueError("Environment has not been initialized.")
+        return self._environment
+
     @property
     def logger(self) -> ClientLogger:
         return self._logger

maleo_foundation/managers/client/google/base.py

@@ -1,7 +1,7 @@
 from google.oauth2.service_account import Credentials
 from pathlib import Path
 from typing import Optional, Union
-from maleo_foundation.types import BaseTypes
+from maleo_foundation.enums import BaseEnums
 from maleo_foundation.managers.client.base import ClientManager
 from maleo_foundation.utils.loaders.credential.google import GoogleCredentialsLoader
 from maleo_foundation.utils.logging import SimpleConfig
@@ -13,11 +13,15 @@ class GoogleClientManager(ClientManager):
         key: str,
         name: str,
         log_config: SimpleConfig,
-        service_key: BaseTypes.OptionalString = None,
+        service_environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
         credentials: Optional[Credentials] = None,
         credentials_path: Optional[Union[Path, str]] = None,
     ) -> None:
-        super().__init__(key, name, log_config, service_key)
+        super().__init__(
+            key, name, log_config, service_environment, service_key, environment
+        )
         if (credentials is not None and credentials_path is not None) or (
             credentials is None and credentials_path is None
         ):

maleo_foundation/managers/client/google/secret.py

@@ -4,7 +4,7 @@ from google.cloud import secretmanager
 from google.oauth2.service_account import Credentials
 from pathlib import Path
 from typing import Optional, Union
-from maleo_foundation.types import BaseTypes
+from maleo_foundation.enums import BaseEnums
 from maleo_foundation.utils.logging import SimpleConfig
 from .base import GoogleClientManager
 
@@ -13,14 +13,23 @@ class GoogleSecretManager(GoogleClientManager):
     def __init__(
         self,
         log_config: SimpleConfig,
-        service_key: BaseTypes.OptionalString = None,
+        service_environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
         credentials: Optional[Credentials] = None,
         credentials_path: Optional[Union[Path, str]] = None,
     ) -> None:
         key = "google-secret-manager"
         name = "GoogleSecretManager"
         super().__init__(
-            key, name, log_config, service_key, credentials, credentials_path
+            key,
+            name,
+            log_config,
+            service_environment,
+            service_key,
+            environment,
+            credentials,
+            credentials_path,
         )
         self._client = secretmanager.SecretManagerServiceClient(
             credentials=self._credentials

maleo_foundation/managers/client/google/storage.py

@@ -15,7 +15,9 @@ class GoogleCloudStorage(GoogleClientManager):
     def __init__(
         self,
         log_config: SimpleConfig,
-        service_key: BaseTypes.OptionalString = None,
+        service_environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
         credentials: Optional[Credentials] = None,
         credentials_path: Optional[Union[Path, str]] = None,
         bucket_name: BaseTypes.OptionalString = None,
@@ -24,7 +26,14 @@ class GoogleCloudStorage(GoogleClientManager):
         key = "google-cloud-storage"
         name = "GoogleCloudStorage"
         super().__init__(
-            key, name, log_config, service_key, credentials, credentials_path
+            key,
+            name,
+            log_config,
+            service_environment,
+            service_key,
+            environment,
+            credentials,
+            credentials_path,
         )
         self._client = Client(credentials=self._credentials)
         self._bucket_name = bucket_name or os.getenv("GCS_BUCKET_NAME")

maleo_foundation/managers/client/google/subscription.py

@@ -5,36 +5,37 @@ from google.cloud.pubsub_v1.subscriber.futures import StreamingPullFuture
 from google.cloud.pubsub_v1.subscriber.message import Message
 from google.oauth2.service_account import Credentials
 from pathlib import Path
-from pydantic import BaseModel
-from typing import Awaitable, Callable, Dict, List, Optional, Union, cast
+from typing import Dict, List, Optional, Union, cast
+from maleo_foundation.controller_types import ControllerTypes
+from maleo_foundation.enums import BaseEnums
 from maleo_foundation.managers.client.google.base import GoogleClientManager
-
-SyncController = Callable[[str, Message], bool]
-AsyncController = Callable[[str, Message], Awaitable[bool]]
-Controller = Union[SyncController, AsyncController]
-OptionalController = Optional[Controller]
-
-
-class SubscriptionConfigurations(BaseModel):
-    subscription_name: str
-    max_messages: int = 10
-    ack_deadline: int = 10
-    controller: OptionalController = None
+from maleo_foundation.models.transfers.general.configurations.pubsub.subscription import (
+    ExtendedSubscriptionConfigurations,
+)
 
 
 class SubscriptionManager(GoogleClientManager):
     def __init__(
         self,
-        subscriptions: List[SubscriptionConfigurations],
+        subscriptions: List[ExtendedSubscriptionConfigurations],
         log_config,
-        service_key: Optional[str] = None,
+        service_environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
         credentials: Optional[Credentials] = None,
         credentials_path: Optional[Union[Path, str]] = None,
     ):
         key = "google-subscription-manager"
         name = "GoogleSubscriptionManager"
         super().__init__(
-            key, name, log_config, service_key, credentials, credentials_path
+            key,
+            name,
+            log_config,
+            service_environment,
+            service_key,
+            environment,
+            credentials,
+            credentials_path,
         )
         self.subscriber = pubsub_v1.SubscriberClient(credentials=self._credentials)
         self.subscriptions = subscriptions
@@ -42,19 +43,28 @@ class SubscriptionManager(GoogleClientManager):
         self.loop: Optional[asyncio.AbstractEventLoop] = None
 
     async def _handle_async_controller(
-        self, controller: AsyncController, subscription_name: str, message: Message
+        self,
+        controller: ControllerTypes.AsyncMessageController,
+        subscription_name: str,
+        message: Message,
     ) -> None:
         success = await controller(subscription_name, message)
         message.ack() if success else message.nack()
 
     def _handle_sync_controller(
-        self, controller: SyncController, subscription_name: str, message: Message
+        self,
+        controller: ControllerTypes.SyncMessageController,
+        subscription_name: str,
+        message: Message,
     ) -> None:
         success = controller(subscription_name, message)
         message.ack() if success else message.nack()
 
     def _message_callback(
-        self, controller: OptionalController, subscription_name: str, message: Message
+        self,
+        controller: ControllerTypes.OptionalMessageController,
+        subscription_name: str,
+        message: Message,
     ):
         # If controller is not given, conduct default message processing
         if controller is None:
@@ -68,13 +78,17 @@ class SubscriptionManager(GoogleClientManager):
                 raise RuntimeError("Event loop not set in SubscriptionManager")
             asyncio.run_coroutine_threadsafe(
                 self._handle_async_controller(
-                    cast(AsyncController, controller), subscription_name, message
+                    cast(ControllerTypes.AsyncMessageController, controller),
+                    subscription_name,
+                    message,
                 ),
                 self.loop,
             )
         else:
             self._handle_sync_controller(
-                cast(SyncController, controller), subscription_name, message
+                cast(ControllerTypes.SyncMessageController, controller),
+                subscription_name,
+                message,
             )
 
     def _default_message_processing(
@@ -94,18 +108,18 @@ class SubscriptionManager(GoogleClientManager):
             message.nack()
 
     async def _start_subscription_listener(
-        self, config: SubscriptionConfigurations
+        self, config: ExtendedSubscriptionConfigurations
     ) -> None:
         if self.credentials.project_id is None:
             raise ValueError("Project ID must be set in credentials")
         subscription_path = self.subscriber.subscription_path(
-            self.credentials.project_id, config.subscription_name
+            self.credentials.project_id, config.id
         )
         flow_control = pubsub_v1.types.FlowControl(max_messages=config.max_messages)
         future = self.subscriber.subscribe(
             subscription_path,
             callback=lambda message: self._message_callback(
-                config.controller, config.subscription_name, message
+                config.controller, config.id, message
             ),
             flow_control=flow_control,
             await_callbacks_on_shutdown=True,
@@ -117,7 +131,7 @@ class SubscriptionManager(GoogleClientManager):
             if not isinstance(e, asyncio.CancelledError):
                 self._logger.error(
                     "Listener error for subscription '%s': %s",
-                    config.subscription_name,
+                    config.id,
                     e,
                     exc_info=True,
                 )

maleo_foundation/managers/client/maleo.py

@@ -74,7 +74,9 @@ class MaleoClientManager(ClientManager):
             key,
             name,
             service_manager.log_config,
-            service_manager.configurations.service.key,
+            service_manager.settings.ENVIRONMENT,
+            service_manager.settings.SERVICE_KEY,
+            environment,
         )
         self._environment = environment
 
@@ -82,10 +84,6 @@ class MaleoClientManager(ClientManager):
     def service_manager(self) -> ServiceManager:
         return self._service_manager
 
-    @property
-    def environment(self) -> BaseEnums.EnvironmentType:
-        return self._environment
-
     def _initialize_controllers(self) -> None:
         # * Initialize managers
         http_controller_manager = ClientHTTPControllerManager(url=self._url)

maleo_foundation/managers/credential.py

@@ -9,9 +9,13 @@ from maleo_foundation.utils.logging import SimpleConfig
 
 
 class CredentialManager:
-    def __init__(self, settings: Settings, log_config: SimpleConfig):
-        self.settings = settings
+    def __init__(
+        self,
+        log_config: SimpleConfig,
+        settings: Settings,
+    ):
         self.log_config = log_config
+        self.settings = settings
         self._initialize()
 
     def _load_google_credentials(self) -> None:

maleo_foundation/managers/service.py

@@ -51,16 +51,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
+        self._settings = settings  # * Initialize settings
 
         # * Disable google cloud logging if environment is local
         if self._settings.ENVIRONMENT == "local":
@@ -134,22 +132,34 @@ 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(),
         )
         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,
@@ -166,8 +176,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 +253,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

maleo_foundation/models/schemas/general.py

@@ -8,6 +8,12 @@ from maleo_foundation.types import BaseTypes
 
 
 class BaseGeneralSchemas:
+    class ServiceContext(BaseModel):
+        key: BaseEnums.Service = Field(..., description="Service's key")
+        environment: BaseEnums.EnvironmentType = Field(
+            ..., description="Service's environment"
+        )
+
     class DateFilter(BaseModel):
         name: str = Field(..., description="Column name.")
         from_date: BaseTypes.OptionalDatetime = Field(None, description="From date.")
@@ -95,12 +101,6 @@ class BaseGeneralSchemas:
 
             return self
 
-    class OperationServiceContext(BaseModel):
-        key: BaseEnums.Service = Field(..., description="Service's key")
-        environment: BaseEnums.EnvironmentType = Field(
-            ..., description="Service's environment"
-        )
-
     class OperationTimestamps(BaseModel):
         started_at: BaseTypes.OptionalDatetime = Field(
             None, description="Started at timestamp (Optional)"
@@ -139,12 +139,8 @@ class BaseGeneralSchemas:
 
     class DatabaseOperationResult(BaseModel):
         data_id: int = Field(..., ge=1, description="Data's ID")
-        old_data: BaseTypes.OptionalStringToAnyDict = Field(
-            None, description="Old data"
-        )
-        new_data: BaseTypes.OptionalStringToAnyDict = Field(
-            None, description="New data"
-        )
+        old_data: BaseTypes.OptionalAny = Field(None, description="Old data")
+        new_data: BaseTypes.OptionalAny = Field(None, description="New data")
 
         @model_validator(mode="after")
         def validate_data(self) -> Self:

maleo_foundation/models/transfers/general/configurations/client/maleo.py

@@ -7,7 +7,7 @@ class MaleoClientConfigurations(BaseModel):
     environment: BaseEnums.EnvironmentType = Field(
         ..., description="Client's environment"
     )
-    key: str = Field(..., description="Client's key")
+    key: BaseEnums.Service = Field(..., description="Client's key")
     name: str = Field(..., description="Client's name")
     url: str = Field(..., description="Client's URL")
 

maleo_foundation/models/transfers/general/configurations/pubsub/subscription.py

@@ -0,0 +1,16 @@
+from pydantic import BaseModel, ConfigDict, Field
+from maleo_foundation.controller_types import ControllerTypes
+
+
+class SubscriptionConfigurations(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    id: str = Field(..., description="Subscription's ID")
+    max_messages: int = Field(10, description="Subscription's Max messages")
+    ack_deadline: int = Field(10, description="Subscription's ACK deadline")
+
+
+class ExtendedSubscriptionConfigurations(SubscriptionConfigurations):
+    controller: ControllerTypes.OptionalMessageController = Field(
+        None, description="Optional message controller"
+    )

maleo_foundation/models/transfers/general/configurations/service.py

@@ -1,8 +1,9 @@
 from pydantic import BaseModel, Field
+from maleo_foundation.enums import BaseEnums
 
 
 class ServiceConfigurations(BaseModel):
-    key: str = Field(..., description="Service's key")
+    key: BaseEnums.Service = Field(..., description="Service's key")
     name: str = Field(..., description="Service's name")
     host: str = Field(..., description="Service's host")
     port: int = Field(..., description="Service's port")

maleo_foundation/models/transfers/general/operation.py

@@ -10,7 +10,7 @@ class Operation(BaseModel):
     request_context: RequestContext = Field(..., description="Request context")
     authentication: Authentication = Field(..., description="Authentication")
     authorization: Optional[Authorization] = Field(None, description="Authorization")
-    service: BaseGeneralSchemas.OperationServiceContext = Field(
+    service: BaseGeneralSchemas.ServiceContext = Field(
         ..., description="Service's context"
     )
     timestamps: BaseGeneralSchemas.OperationTimestamps = Field(
@@ -34,7 +34,7 @@ class DatabaseOperation(BaseModel):
     request_context: RequestContext = Field(..., description="Request context")
     authentication: Authentication = Field(..., description="Authentication")
     authorization: Optional[Authorization] = Field(None, description="Authorization")
-    service: BaseGeneralSchemas.OperationServiceContext = Field(
+    service: BaseGeneralSchemas.ServiceContext = Field(
         ..., description="Service's context"
     )
     timestamps: BaseGeneralSchemas.OperationTimestamps = Field(

maleo_foundation/models/transfers/general/settings.py

@@ -7,7 +7,7 @@ from maleo_foundation.types import BaseTypes
 
 class Settings(BaseSettings):
     ENVIRONMENT: BaseEnums.EnvironmentType = Field(..., description="Environment")
-    SERVICE_KEY: str = Field(..., description="Service's key")
+    SERVICE_KEY: BaseEnums.Service = Field(..., description="Service's key")
     ROOT_PATH: str = Field("", description="Application's root path")
     GOOGLE_CREDENTIALS_PATH: str = Field(
         "/credentials/maleo-google-service-account.json",

maleo_foundation/utils/exceptions/client.py

@@ -4,6 +4,7 @@ from httpx import RequestError
 from pydantic import ValidationError
 from typing import Optional
 from maleo_foundation.enums import BaseEnums
+from maleo_foundation.models.transfers.general.request import RequestContext
 from maleo_foundation.models.transfers.results.client.service import (
     BaseClientServiceResultsTransfers,
 )
@@ -30,10 +31,16 @@ class BaseClientExceptions:
         fail_result_class: type[
             BaseClientServiceResultsTransfers.Fail
         ] = BaseClientServiceResultsTransfers.Fail,
+        request_context: Optional[RequestContext] = None,
     ) -> BaseClientServiceResultsTransfers.Fail:
         if logger:
+            log_string = f"{category} occurred while {summary}: '{str(e)}'"
+            if request_context is not None:
+                log_string = (
+                    f"Request | ID: {request_context.request_id} - {log_string}"
+                )
             logger.error(
-                f"{category} occurred while {summary}: '{str(e)}'",
+                log_string,
                 exc_info=True,
             )
         return fail_result_class(
@@ -77,6 +84,12 @@ class BaseClientExceptions:
         def decorator(func):
             @wraps(func)
             async def wrapper(*args, **kwargs):
+                # Search for RequestContext in args and kwargs
+                request_context: Optional[RequestContext] = None
+                for arg in list(args) + list(kwargs.values()):
+                    if isinstance(arg, RequestContext):
+                        request_context = arg
+                        break
                 try:
                     return await func(*args, **kwargs)
                 except ValidationError as e:
@@ -96,6 +109,7 @@ class BaseClientExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
                 except RequestError as e:
                     return BaseClientExceptions._exception_handler(
@@ -114,6 +128,7 @@ class BaseClientExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
                 except Exception as e:
                     return BaseClientExceptions._exception_handler(
@@ -132,6 +147,7 @@ class BaseClientExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
 
             return wrapper
@@ -159,6 +175,12 @@ class BaseClientExceptions:
         def decorator(func):
             @wraps(func)
             def wrapper(*args, **kwargs):
+                # Search for RequestContext in args and kwargs
+                request_context: Optional[RequestContext] = None
+                for arg in list(args) + list(kwargs.values()):
+                    if isinstance(arg, RequestContext):
+                        request_context = arg
+                        break
                 try:
                     return func(*args, **kwargs)
                 except ValidationError as e:
@@ -178,6 +200,7 @@ class BaseClientExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
                 except RequestError as e:
                     return BaseClientExceptions._exception_handler(
@@ -196,6 +219,7 @@ class BaseClientExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
                 except Exception as e:
                     return BaseClientExceptions._exception_handler(
@@ -214,6 +238,7 @@ class BaseClientExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
 
             return wrapper

maleo_foundation/utils/exceptions/service.py

@@ -4,6 +4,7 @@ from pydantic import ValidationError
 from sqlalchemy.exc import SQLAlchemyError
 from typing import Optional
 from maleo_foundation.enums import BaseEnums
+from maleo_foundation.models.transfers.general.request import RequestContext
 from maleo_foundation.models.transfers.results.service.general import (
     BaseServiceGeneralResultsTransfers,
 )
@@ -30,10 +31,16 @@ class BaseServiceExceptions:
         fail_result_class: type[
             BaseServiceGeneralResultsTransfers.Fail
         ] = BaseServiceGeneralResultsTransfers.Fail,
+        request_context: Optional[RequestContext] = None,
     ) -> BaseServiceGeneralResultsTransfers.Fail:
-        if logger:
+        if logger is not None:
+            log_string = f"{category} occurred while {summary}: '{str(e)}'"
+            if request_context is not None:
+                log_string = (
+                    f"Request | ID: {request_context.request_id} - {log_string}"
+                )
             logger.error(
-                f"{category} occurred while {summary}: '{str(e)}'",
+                log_string,
                 exc_info=True,
             )
         return fail_result_class(
@@ -77,6 +84,12 @@ class BaseServiceExceptions:
         def decorator(func):
             @wraps(func)
             async def wrapper(*args, **kwargs):
+                # Search for RequestContext in args and kwargs
+                request_context: Optional[RequestContext] = None
+                for arg in list(args) + list(kwargs.values()):
+                    if isinstance(arg, RequestContext):
+                        request_context = arg
+                        break
                 try:
                     return await func(*args, **kwargs)
                 except ValidationError as e:
@@ -96,6 +109,7 @@ class BaseServiceExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
                 except SQLAlchemyError as e:
                     return BaseServiceExceptions._exception_handler(
@@ -114,6 +128,7 @@ class BaseServiceExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
                 except Exception as e:
                     return BaseServiceExceptions._exception_handler(
@@ -132,6 +147,7 @@ class BaseServiceExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
 
             return wrapper
@@ -159,6 +175,12 @@ class BaseServiceExceptions:
         def decorator(func):
             @wraps(func)
             def wrapper(*args, **kwargs):
+                # Search for RequestContext in args and kwargs
+                request_context: Optional[RequestContext] = None
+                for arg in list(args) + list(kwargs.values()):
+                    if isinstance(arg, RequestContext):
+                        request_context = arg
+                        break
                 try:
                     return func(*args, **kwargs)
                 except ValidationError as e:
@@ -178,6 +200,7 @@ class BaseServiceExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
                 except SQLAlchemyError as e:
                     return BaseServiceExceptions._exception_handler(
@@ -196,6 +219,7 @@ class BaseServiceExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
                 except Exception as e:
                     return BaseServiceExceptions._exception_handler(
@@ -214,6 +238,7 @@ class BaseServiceExceptions:
                         status_update_type=status_update_type,
                         logger=logger,
                         fail_result_class=fail_result_class,
+                        request_context=request_context,
                     )
 
             return wrapper

maleo_foundation/utils/logging.py

@@ -57,21 +57,33 @@ class SimpleConfig(BaseModel):
 class BaseLogger(logging.Logger):
     def __init__(
         self,
-        dir: str,
         type: BaseEnums.LoggerType,
-        service_key: BaseTypes.OptionalString = None,
+        dir: str,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
         client_key: BaseTypes.OptionalString = None,
         level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
         google_cloud_logging: Optional[GoogleCloudLogging] = None,
     ):
         self._type = type  # * Declare logger type
 
-        # * Ensure service_key exists
-        self._service_key = service_key or os.getenv("SERVICE_KEY")
-        if self._service_key is None:
+        # Ensure environment exists
+        actual_environment = environment or os.getenv("ENVIRONMENT")
+        if actual_environment is None:
+            raise ValueError(
+                "ENVIRONMENT environment variable must be set if 'environment' is set to None"
+            )
+        else:
+            self._environment = BaseEnums.EnvironmentType(actual_environment)
+
+        # Ensure service_key exists
+        actual_service_key = service_key or os.getenv("SERVICE_KEY")
+        if actual_service_key is None:
             raise ValueError(
                 "SERVICE_KEY environment variable must be set if 'service_key' is set to None"
             )
+        else:
+            self._service_key = BaseEnums.Service(actual_service_key)
 
         self._client_key = client_key  # * Declare client key
 
@@ -82,10 +94,11 @@ class BaseLogger(logging.Logger):
             )
 
         # * Define logger name
+        base_name = f"{self._environment} - {self._service_key} - {self._type}"
         if self._type == BaseEnums.LoggerType.CLIENT:
-            self._name = f"{self._service_key} - {self._type} - {self._client_key}"
+            self._name = f"{base_name} - {self._client_key}"
         else:
-            self._name = f"{self._service_key} - {self._type}"
+            self._name = base_name
 
         super().__init__(self._name, level)  # * Init the superclass's logger
 
@@ -111,7 +124,9 @@ class BaseLogger(logging.Logger):
             )
             self.addHandler(cloud_logging_handler)
         else:
-            self.info("Cloud logging is not configured.")
+            self.warning(
+                "Cloud logging is not configured. Will not add cloud loggin handler"
+            )
 
         # * Define log directory
         if self._type == BaseEnums.LoggerType.CLIENT:
@@ -164,13 +179,15 @@ class ApplicationLogger(BaseLogger):
     def __init__(
         self,
         dir: str,
-        service_key: BaseTypes.OptionalString = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
         level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
         google_cloud_logging: Optional[GoogleCloudLogging] = None,
     ):
         super().__init__(
-            dir=dir,
             type=BaseEnums.LoggerType.APPLICATION,
+            dir=dir,
+            environment=environment,
             service_key=service_key,
             client_key=None,
             level=level,
@@ -182,13 +199,15 @@ class CacheLogger(BaseLogger):
     def __init__(
         self,
         dir: str,
-        service_key: BaseTypes.OptionalString = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
         level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
         google_cloud_logging: Optional[GoogleCloudLogging] = None,
     ):
         super().__init__(
             dir=dir,
             type=BaseEnums.LoggerType.CACHE,
+            environment=environment,
             service_key=service_key,
             client_key=None,
             level=level,
@@ -201,13 +220,15 @@ class ClientLogger(BaseLogger):
         self,
         dir: str,
         client_key: str,
-        service_key: BaseTypes.OptionalString = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
         level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
         google_cloud_logging: Optional[GoogleCloudLogging] = None,
     ):
         super().__init__(
-            dir=dir,
             type=BaseEnums.LoggerType.CLIENT,
+            dir=dir,
+            environment=environment,
             service_key=service_key,
             client_key=client_key,
             level=level,
@@ -219,13 +240,15 @@ class DatabaseLogger(BaseLogger):
     def __init__(
         self,
         dir: str,
-        service_key: BaseTypes.OptionalString = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
         level=BaseEnums.LoggerLevel.INFO,
         google_cloud_logging=None,
     ):
         super().__init__(
-            dir=dir,
             type=BaseEnums.LoggerType.DATABASE,
+            dir=dir,
+            environment=environment,
             service_key=service_key,
             client_key=None,
             level=level,
@@ -237,13 +260,15 @@ class MiddlewareLogger(BaseLogger):
     def __init__(
         self,
         dir: str,
-        service_key: BaseTypes.OptionalString = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
         level=BaseEnums.LoggerLevel.INFO,
         google_cloud_logging=None,
     ):
         super().__init__(
-            dir=dir,
             type=BaseEnums.LoggerType.MIDDLEWARE,
+            dir=dir,
+            environment=environment,
             service_key=service_key,
             client_key=None,
             level=level,
@@ -255,13 +280,15 @@ class RepositoryLogger(BaseLogger):
     def __init__(
         self,
         dir: str,
-        service_key: BaseTypes.OptionalString = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
         level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
         google_cloud_logging: Optional[GoogleCloudLogging] = None,
     ):
         super().__init__(
-            dir=dir,
             type=BaseEnums.LoggerType.REPOSITORY,
+            dir=dir,
+            environment=environment,
             service_key=service_key,
             client_key=None,
             level=level,
@@ -273,13 +300,15 @@ class ServiceLogger(BaseLogger):
     def __init__(
         self,
         dir: str,
-        service_key: BaseTypes.OptionalString = None,
+        environment: Optional[BaseEnums.EnvironmentType] = None,
+        service_key: Optional[BaseEnums.Service] = None,
         level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
         google_cloud_logging: Optional[GoogleCloudLogging] = None,
     ):
         super().__init__(
-            dir=dir,
             type=BaseEnums.LoggerType.SERVICE,
+            dir=dir,
+            environment=environment,
             service_key=service_key,
             client_key=None,
             level=level,

{maleo_foundation-0.3.70.dist-info → maleo_foundation-0.3.72.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.3.70
+Version: 0.3.72
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.3.70.dist-info → maleo_foundation-0.3.72.dist-info}/RECORD

@@ -2,12 +2,13 @@ maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 maleo_foundation/authentication.py,sha256=2Y2py-teDSO_YTFdZiPtuYhC8r3qIzn7CKyLNN8b2NQ,2727
 maleo_foundation/authorization.py,sha256=8P1hleBYRv8kda4uQcbHVujHVAlI92YV1Flfzf-oJEU,285
 maleo_foundation/constants.py,sha256=cgW2TjXYEdQRoYCL3fMk3r5B2Yr-Av67CaEAdY5SZ6o,1529
+maleo_foundation/controller_types.py,sha256=Q7kAjUenQ-7QgXdsVLLWKfvEl1_s7r_QfOoftDXT6lc,1097
 maleo_foundation/enums.py,sha256=5ft9F3CcLM2lwDNGVVNFZRwol1Y_BLYJcxi3yPjsS7Y,6277
 maleo_foundation/extended_types.py,sha256=oOAYc5f89WcPt5OWEaNdeceENHiPVr4KDhdttg6bA_w,305
 maleo_foundation/rest_controller_result.py,sha256=uZxBxZ5hB98q1B4hNyRigHcO0560NYfUjq8L662aOPw,2172
 maleo_foundation/types.py,sha256=Tq50KOISbnsMslVGBCqlY77lRAQZa-UUFDGqqwRglow,2466
 maleo_foundation/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo_foundation/client/manager.py,sha256=5Ww2CNbKOT4nifI8roO77xlBrxIKCTCUEJHCNbRjGX4,2729
+maleo_foundation/client/manager.py,sha256=BENie7uqg4iku3rGmM6vq6LOoXrYAbGqwW09irS23PE,2914
 maleo_foundation/client/services/__init__.py,sha256=srDKoa3zRt-PvfHcXlFJbwagT0O3wwicL3qbMb3Odug,1104
 maleo_foundation/client/services/key.py,sha256=2OzlBygNsAW9WkTxHkQNneAy5jvrzXuxHvN-E5mBkxY,7856
 maleo_foundation/client/services/signature.py,sha256=c9uWHDjUsONlA9vwU_EBetsmUNc97qsHf4OfBzyi0MQ,6362
@@ -33,19 +34,19 @@ maleo_foundation/expanded_types/encryption/rsa.py,sha256=LJhZ6mnE4OB1eZnNTg21fv1
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/cache.py,sha256=hML8vi2MXO2m2HeqB4eE6Ed4kl1iVXgEfpkB9tixs1Q,277
 maleo_foundation/managers/configuration.py,sha256=JmJFvKB6xCPwb8iYpwuNMpdcHfwPJYLFgXYcWwewMj8,1740
-maleo_foundation/managers/credential.py,sha256=um1M45deBEzTVfsUcpAtKEp3Rb_dH1qQrr8abkG_GeU,3057
+maleo_foundation/managers/credential.py,sha256=ZQFae0cdERVtTZ2OGUgC8W6lI1RIlm2vjsAnqf2R234,3088
 maleo_foundation/managers/db.py,sha256=y0rQIg-vohhFUtck3v1LCdXov7XYjy9PFiCsVtcg8VI,6496
 maleo_foundation/managers/middleware.py,sha256=Uglwt4X3MauKtBvbPTyHl0-32od3IN6AYYUtiUCoV9I,2464
-maleo_foundation/managers/service.py,sha256=N8Dy0ppSdHIE3NXqmbwcXEIqgtMxnLHs8isVdKJbWAg,12398
+maleo_foundation/managers/service.py,sha256=8oYBSi-qierlXdVhWoXcY1HwcKEsXmOOiWygRLm2vNM,12710
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo_foundation/managers/client/base.py,sha256=iM5xZjLm5VQqqpiYcba-rifW0LgkVd-gRTE6XwdOFqY,4369
-maleo_foundation/managers/client/maleo.py,sha256=aNh3I9EsxeD2rqx5WaXbZ5fjyyXVzvppHJiC98jJYfM,3163
+maleo_foundation/managers/client/base.py,sha256=j48JYpcTzaGJPZzQAixPVCJtAB9EqDVxx-51hVGgw2k,5631
+maleo_foundation/managers/client/maleo.py,sha256=ACZC-gvc36pwrqvEmEKeBDKAOAAqoRfuCXeAa6KrGBQ,3128
 maleo_foundation/managers/client/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo_foundation/managers/client/google/base.py,sha256=MUxGM3wtzdMkbghMdyQkRQ-AI_pG2qpTxq2n69kMF-A,1544
+maleo_foundation/managers/client/google/base.py,sha256=azp4dqmKJyLCNv7uCS93kIs6jWZTbq1cU6mww6RN3FY,1741
 maleo_foundation/managers/client/google/parameter.py,sha256=emBgc1qCQcnETKYvwv35EqARjdO9igD0-F-Xuxx-fyU,1410
-maleo_foundation/managers/client/google/secret.py,sha256=75q32U-kcTljVb19MZQQ5sOVOnf1HkquyK8nIoyeMrY,5014
-maleo_foundation/managers/client/google/storage.py,sha256=uUc3RGu5PyGOKrObP-ub2Vpztqidu5BUADUrRTMxy7E,6569
-maleo_foundation/managers/client/google/subscription.py,sha256=KLXneM39r8Uzvevir_jL7s9-q4iSakNUkD_I66JGbng,5365
+maleo_foundation/managers/client/google/secret.py,sha256=fwqeVL0uyefuZrySpvP9PJ8u-0YuAxZ3Nd9nA6A4UlI,5274
+maleo_foundation/managers/client/google/storage.py,sha256=k-y0LrgjVVUX4PbGLOgBUOt0BEiQKXoHH-U3KtG5Kc4,6829
+maleo_foundation/managers/client/google/subscription.py,sha256=0a9T1jh0CGyLb9CyBiixdZYxmCzdg0X15VYebqYt5M4,5686
 maleo_foundation/middlewares/authentication.py,sha256=b4dPkLKFqJBmhWKEvynTLe45Wax8jCcPq0luIlU_id0,4189
 maleo_foundation/middlewares/base.py,sha256=ZXMJTiuDBa6sIbgD_g1MhhlMkszsYkt3Ocl4boPtbEU,16825
 maleo_foundation/middlewares/cors.py,sha256=1QgRXOcURuEhBYMerclqbECgtAE4CFo0EhB4gJXu8Yg,2294
@@ -54,7 +55,7 @@ maleo_foundation/models/responses.py,sha256=WNAz67ewOyWV0oHyiB_BF_-sfaoDF-FVzcwg
 maleo_foundation/models/table.py,sha256=k0-OtahF2KRmvFUL8TborT6PoIhGsyoVrPJBKGg1QbU,1855
 maleo_foundation/models/schemas/__init__.py,sha256=tmjBCyG4uMRjiTbnbhIjZaR8q7zk0_J_CqnRzsSfoBQ,279
 maleo_foundation/models/schemas/encryption.py,sha256=S86FGlcBhyGxxZ5ObNSHTjSDwBUlUtLOMoCAKd5wE34,687
-maleo_foundation/models/schemas/general.py,sha256=5oQyGc2ZvaIysPnqRCC_KGtyOHmV_kRThwFs_9ZJ9OU,10071
+maleo_foundation/models/schemas/general.py,sha256=q-ENf4Jn8H6tylQt6WKdLybYYXZATig8YBEWkroWVtQ,9994
 maleo_foundation/models/schemas/hash.py,sha256=jthDmu_VTBydffPruAIAiR8l0Xs6IrlgTptaP42zr1M,447
 maleo_foundation/models/schemas/key.py,sha256=LSEDQpaCxavwp5je2O-ZNyOPtrFW_lXDywF9LK-An1w,622
 maleo_foundation/models/schemas/parameter.py,sha256=OE1hg100lEa2IlGlT2Zz6PJ-OcC-6ZfDzsTOeJvvEig,3907
@@ -67,21 +68,22 @@ maleo_foundation/models/transfers/general/credentials.py,sha256=t6OhQb3DyGSfBpbq
 maleo_foundation/models/transfers/general/data.py,sha256=_J-Y5X2Nx8D1lpaR9ctpm54kUbxR7Vy00hO103uXtxE,1408
 maleo_foundation/models/transfers/general/database.py,sha256=VQYnZa8dYrqucSQdzkaPSrzLd4SJnpU8LPytUrWErO0,1245
 maleo_foundation/models/transfers/general/key.py,sha256=QV_kcxAlnrupBcGQK8tqz9FVYbivxwhgIsrmW7XDdME,845
-maleo_foundation/models/transfers/general/operation.py,sha256=M3DraArkFhgjNvA1StWfyS7W0Jhy3hIcdUWUYXlt7Do,2143
+maleo_foundation/models/transfers/general/operation.py,sha256=T804JNy9cjLwgNTNkILLF1JSBu_laUECYBqUN2zEESY,2125
 maleo_foundation/models/transfers/general/request.py,sha256=W2aKxo0lQ-kV-4XpQEzxxa-odwLlGfOulh_wQKgcz9o,1920
-maleo_foundation/models/transfers/general/settings.py,sha256=1QkPq6GP33S5R718be3XBz0BCtApAuxlL-x21EZ2Xmo,1609
+maleo_foundation/models/transfers/general/settings.py,sha256=LOlPVB8ns8NAIVHKVYv13jtlUbkuPHHOwyMqFes0T30,1623
 maleo_foundation/models/transfers/general/signature.py,sha256=TCTIy928EeBBeFLlyQ3_NozpR9FUcWXPQKIYIwyj66k,308
 maleo_foundation/models/transfers/general/token.py,sha256=aF7IXEYS4EnWtWquZexnrXcJBOl5M1lneo7yu7IiKYg,5022
 maleo_foundation/models/transfers/general/configurations/__init__.py,sha256=JG910HvVlFvE406Jku0fdOVYUHjedIsflyqCPafXF_Y,1666
 maleo_foundation/models/transfers/general/configurations/database.py,sha256=4j465vki3bCNGogrJLmMmF1uEXc-sUfyhwMeuaR5JyM,706
 maleo_foundation/models/transfers/general/configurations/middleware.py,sha256=gBm7yv-PYOPcv-u6SXq8cMWfuuo9LwPSXuqoJ4uw9h0,1761
-maleo_foundation/models/transfers/general/configurations/service.py,sha256=1sDBwJYvO7tlKz9YH7eIkfMPWmUqRkx7aW-EMw8tpBQ,306
+maleo_foundation/models/transfers/general/configurations/service.py,sha256=9ls5So7P50gE0T0HjlskDMooL0RO3VmQl_N0H8HwutU,365
 maleo_foundation/models/transfers/general/configurations/cache/__init__.py,sha256=eCEeFFP4jN9FWFHWLadAnP1NoJH4CJQm7WRnXhmHUh0,264
 maleo_foundation/models/transfers/general/configurations/cache/redis.py,sha256=SNnI7hm8giKfR2Kp5sD_fmxo4Q5fkRCdi9zMKwTKPCs,1331
 maleo_foundation/models/transfers/general/configurations/client/__init__.py,sha256=1w17i9CH4bSQ40o8rwIew2F_id25XklFqI1YPowcHvQ,356
-maleo_foundation/models/transfers/general/configurations/client/maleo.py,sha256=0Hk6no800DdaAlv0SZ1OqVGxbp4LtJz1cJ0ZNbBejK4,2063
+maleo_foundation/models/transfers/general/configurations/client/maleo.py,sha256=GkfRvpgcVlSoLNHhMMvf1g42w9Xf73gD5aBIsYukYJo,2077
 maleo_foundation/models/transfers/general/configurations/pubsub/__init__.py,sha256=BJqB2lxd7iFbm__3VKWPclE6ub_FMIVbhaO7yc2KzSU,505
 maleo_foundation/models/transfers/general/configurations/pubsub/publisher.py,sha256=hDBkq__mbALJgiX1cOYi0V-3JitfoEOexjGAEbsJgo0,1596
+maleo_foundation/models/transfers/general/configurations/pubsub/subscription.py,sha256=WZJlySm6exDw84OKxsCY0SCDCepBsBb84Ydy0jL9GKg,633
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=HiV7hPn8rUaN7XeOwC_VugYQ4QQO7kbZ0fsp11GDznQ,355
 maleo_foundation/models/transfers/parameters/client.py,sha256=2V1XvhSmIDDZL7MFVpD_dR5jWIoydQnFW67n9z6rRMA,4041
 maleo_foundation/models/transfers/parameters/general.py,sha256=NUFsrrfByN9OX9QLYc2Bn0LpNPoxrKBuZae-IVhOiyo,791
@@ -117,7 +119,7 @@ maleo_foundation/utils/cache.py,sha256=PWNef00iA2m0g3boR7JbzrJQIRITf5nKgdCmMs3s6
 maleo_foundation/utils/client.py,sha256=KDkIEqGX6Tw07Z5HHW4HrG8IWUVkErlqnVijXnpWZGQ,2940
 maleo_foundation/utils/controller.py,sha256=S69NluxjGCB_toAu3JDLi_izE0-x2ARE_7YK3V8T1Q0,7413
 maleo_foundation/utils/extractor.py,sha256=an9bKvwIniVvUCk0fSetUL_8VGBk_MNEtB2pwgkYb4k,2369
-maleo_foundation/utils/logging.py,sha256=sOQbvrLdlp1Vwx7y14YitzHx4IHh5iYaCt9WvdrapUI,9141
+maleo_foundation/utils/logging.py,sha256=1M1_UJHdcRDxg31aJx4A33xiSPyPok9NQyyO8CtqZhw,10500
 maleo_foundation/utils/merger.py,sha256=UGiuH0EUQJu0WlS1xdPUuvnsNknd3k0DODjdiOTiBdI,704
 maleo_foundation/utils/query.py,sha256=mAoXadZuWx_ic6Z4VQ9K4GZxYgSNzpNS94W6xxqeFyg,8312
 maleo_foundation/utils/repository.py,sha256=fZqmApZUG9KqwrfURvyAIw_-7Y9EsLngoAoNcjJphtQ,2951
@@ -126,9 +128,9 @@ maleo_foundation/utils/dependencies/__init__.py,sha256=jJOo4uCTPiEvpgecsl4JEhKzu
 maleo_foundation/utils/dependencies/auth.py,sha256=3Z0b-Xi5PAKRKlbv-ZIT46YrQFkjiS7NhSDWZTOWm8I,650
 maleo_foundation/utils/dependencies/context.py,sha256=pw18j6LZgHdJQVKCvRH71mFZ_li8jP_wIgbtBMLXpxQ,271
 maleo_foundation/utils/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo_foundation/utils/exceptions/client.py,sha256=gGA7BWf2Fel33lYqMd2LJVvt1x0HO0OqbopAJCcYnbY,9665
+maleo_foundation/utils/exceptions/client.py,sha256=adQ_ByuwpW_fswMBClXSUbvKblyfSLlnG4OMkX38X-w,10998
 maleo_foundation/utils/exceptions/request.py,sha256=p6rfya7HuqlfrvxFZm3KgTf95mPkQ6QCBlLyhiRfGtw,1600
-maleo_foundation/utils/exceptions/service.py,sha256=bhUvZb3rTx2UYwyVxbNjtKw7aru3UIVZptzTlGGk65g,9698
+maleo_foundation/utils/exceptions/service.py,sha256=f7sa31YZ85xV6f6avRhas4YfryF_0DswehrOsbEIrL0,11043
 maleo_foundation/utils/formatter/__init__.py,sha256=qzn45FGoZeArJYmgFpdzKe-jp3yREGSrPfc4a-iZHe4,80
 maleo_foundation/utils/formatter/case.py,sha256=VsDTkKVZgN5b5O4Q6hkEzIDTf635FHS2BF_eY-NNngQ,1359
 maleo_foundation/utils/loaders/__init__.py,sha256=aBVS-zCBdb9t4Keh5cFJ4Vqv5lFHthJoHTaGPVjnvnU,284
@@ -138,7 +140,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=g-cAxkTE2EtHaG8Tv52
 maleo_foundation/utils/loaders/credential/google.py,sha256=GCJl-bsKSSxoE_ERAkIzRrRNIbIEeqYOhHwzFuBr0mk,6576
 maleo_foundation/utils/loaders/key/__init__.py,sha256=RfqIbUxkdlx1xrbzJZPD_JHiRFNFLRuQs8JoUPCGCv4,108
 maleo_foundation/utils/loaders/key/rsa.py,sha256=UXcP0rr4QVacTsHLNQuU05wcow5CHWz-JW-zsVxlbPs,4121
-maleo_foundation-0.3.70.dist-info/METADATA,sha256=PXvEbtQEC5YtlzpyPkCPKB1dEcLxaSrEdmFtGaAkmfY,4150
-maleo_foundation-0.3.70.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.3.70.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.3.70.dist-info/RECORD,,
+maleo_foundation-0.3.72.dist-info/METADATA,sha256=PA8--eQwofJ8-IX0KJCTlh5LCtx81uLthof_u5BIjbI,4150
+maleo_foundation-0.3.72.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.72.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.72.dist-info/RECORD,,