PyPI - maleo-foundation - Versions diffs - 0.0.99__tar.gz → 0.1.1__tar.gz - Mend

@@ -15,7 +15,7 @@ from maleo_foundation.managers.db import DatabaseManager
 from maleo_foundation.services.token import BaseTokenService
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.keyloader import load_key
-from maleo_foundation.utils.logging import GoogleCloudLogging, ServiceLogger
+from maleo_foundation.utils.logging import GoogleCloudLogging, ServiceLogger, ClientLoggerManager
 class Settings(BaseSettings):
     GOOGLE_CREDENTIALS_PATH:str = Field("/creds/maleo-google-service-account.json", description="Internal credential's file path")
@@ -84,10 +84,13 @@ class Configurations(BaseModel):
     class Config:
         arbitrary_types_allowed=True
+ClientLoggerManagers = Dict[str, ClientLoggerManager]
 class Loggers(BaseModel):
     application:ServiceLogger = Field(..., description="Application logger")
     database:ServiceLogger = Field(..., description="Database logger")
     middleware:ServiceLogger = Field(..., description="Middleware logger")
+    client:ClientLoggerManagers = Field(default_factory=dict, description="Client logger manager")
     class Config:
         arbitrary_types_allowed=True
@@ -112,7 +115,8 @@ class ServiceManager:
         db_metadata:MetaData,
         base_dir:BaseTypes.OptionalString = None,
         settings:Optional[Settings] = None,
-        google_cloud_logging:Optional[GoogleCloudLogging] = None
+        google_cloud_logging:Optional[GoogleCloudLogging] = None,
+        client_logger_managers:ClientLoggerManagers = {}
     ):
         self._db_metadata = db_metadata
@@ -138,6 +142,7 @@ class ServiceManager:
         else:
             self._google_cloud_logging = google_cloud_logging
+        self._client_logger_managers = client_logger_managers
         self._initialize_loggers()
         self._load_credentials()
         self._parse_keys()
@@ -169,7 +174,11 @@ class ServiceManager:
         application = ServiceLogger(logs_dir=self._logs_dir, type=BaseEnums.LoggerType.APPLICATION, google_cloud_logging=self._google_cloud_logging)
         database = ServiceLogger(logs_dir=self._logs_dir, type=BaseEnums.LoggerType.DATABASE, google_cloud_logging=self._google_cloud_logging)
         middleware = ServiceLogger(logs_dir=self._logs_dir, type=BaseEnums.LoggerType.MIDDLEWARE, google_cloud_logging=self._google_cloud_logging)
-        self._loggers = Loggers(application=application, database=database, middleware=middleware)
+        client = self._client_logger_managers
+        for key, logger_manager in client.items():
+            application.info(f"Initializing logger manager for client '{key}'")
+            logger_manager.initialize()
+        self._loggers = Loggers(application=application, database=database, middleware=middleware, client=client)
     @property
     def loggers(self) -> Loggers:
@@ -258,6 +267,7 @@ class ServiceManager:
         return result.data.token
     async def dispose(self) -> None:
+        self._loggers.application.info("Disposing service manager")
         if self._database is not None:
             self._database.dispose()
             self._database = None

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

@@ -23,7 +23,9 @@ class GoogleSecretManager(GoogleClientManager):
     def dispose(self) -> None:
         if self._client is not None:
+            self._logger.info("Disposing Google Secret Manager (GSM) client manager")
             self._client = None
+            self._logger.info("Google Secret Manager (GCS) client manager disposed successfully")
     @retry.Retry(predicate=retry.if_exception_type(Exception), timeout=5)
     def get(self, name:str, version:str = "latest") -> Optional[str]:

@@ -35,8 +35,10 @@ class GoogleCloudStorage(GoogleClientManager):
     def dispose(self) -> None:
         if self._client is not None:
+            self._logger.info("Disposing Google Cloud Storage (GCS) client manager")
             self._client.close()
             self._client = None
+            self._logger.info("Google Cloud Storage (GCS) client manager disposed successfully")
     def generate_signed_url(self, location:str) -> str:
         """

@@ -101,16 +101,22 @@ class DatabaseManager:
     def dispose(self) -> None:
         #* Dispose session
         if self._session is not None:
+            self._logger.info("Disposing Session Manager")
             self._session.dispose()
             self._session = None
         #* Dispose engine
         if self._engine is not None:
+            self._logger.info("Disposing Engine Manager")
             self._engine.dispose()
             self._engine = None
+            self._logger.info("Engine Manager disposed successfully")
+        #* Dispose metadata
+        if self._metadata is not None:
+            self._logger.info("Disposing DB Metadata")
+            self._metadata = None
+            self._logger.info("DB Metadata diposed succesfully")
         #* Dispose logger
         if self._logger is not None:
+            self._logger.info("Disposing database's logger")
             self._logger.dispose()
-            self._logger = None
-        #* Dispose metadata
-        if self._metadata is not None:
-            self._metadata = None
+            self._logger = None

@@ -179,4 +179,27 @@ class ClientLogger(BaseLogger):
             client_key=client_key,
             level=level,
             google_cloud_logging=google_cloud_logging
-        )
+        )
+class ClientLoggerManager:
+    _logger:Optional[ClientLogger] = None
+    @classmethod
+    def initialize(
+        cls,
+        logs_dir:str,
+        client_key:str,
+        service_key:BaseTypes.OptionalString = None,
+        level:BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
+        google_cloud_logging:Optional[GoogleCloudLogging] = None
+    ) -> None:
+        """Initialize client logger if not already initialized."""
+        if cls._logger is None:
+            cls.logger = ClientLogger(logs_dir=logs_dir, client_key=client_key, service_key=service_key, level=level, google_cloud_logging=google_cloud_logging)
+    @classmethod
+    def get(cls) -> ClientLogger:
+        """Return client logger (if exist) or raise Runtime Error"""
+        if cls._logger is None:
+            raise RuntimeError("Logger has not been initialized. Initialize it first.")
+        return cls._logger

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "maleo_foundation"
-version = "0.0.99"
+version = "0.1.1"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }

maleo-foundation 0.0.99__tar.gz → 0.1.1__tar.gz

maleo-foundation 0.0.99tar.gz → 0.1.1tar.gz