maleo-foundation 0.3.35__tar.gz → 0.3.37__tar.gz

{maleo_foundation-0.3.35 → maleo_foundation-0.3.37}/PKG-INFO

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

{maleo_foundation-0.3.35 → maleo_foundation-0.3.37}/maleo_foundation/enums.py

@@ -126,17 +126,14 @@ class BaseEnums:
                 BaseEnums.RESTControllerResponseType.FILE: responses.FileResponse,
             }.get(self, responses.Response)
 
-    class ServiceLoggerType(StrEnum):
-        REPOSITORY = "repository"
-        DATABASE = "database"
-        APPLICATION = "application"
-
     class LoggerType(StrEnum):
-        MIDDLEWARE = "middleware"
-        REPOSITORY = "repository"
-        DATABASE = "database"
         APPLICATION = "application"
+        CACHE = "cache"
         CLIENT = "client"
+        DATABASE = "database"
+        MIDDLEWARE = "middleware"
+        REPOSITORY = "repository"
+        SERVICE = "service"
 
     class LoggerLevel(IntEnum):
         CRITICAL = logging.CRITICAL
@@ -148,26 +145,10 @@ class BaseEnums:
         DEBUG = logging.DEBUG
         NOTSET = logging.NOTSET
 
-    class CacheType(StrEnum):
+    class CacheLayer(StrEnum):
+        CLIENT = "client"
         REPOSITORY = "repository"
         ROUTER = "router"
-        CLIENT = "client"
-
-    class CacheTTL(IntEnum):
-        TTL_15SC = int(15)
-        TTL_30SC = int(30)
-        TTL_1MN = int(1*60)
-        TTL_5MN = int(5*60)
-        TTL_10MN = int(10*60)
-        TTL_30MN = int(30*60)
-        TTL_1HR = int(1*60*60)
-        TTL_6HR = int(6*60*60)
-        TTL_12HR = int(12*60*60)
-        TTL_1DY = int(1*24*60*60)
-        TTL_3DY = int(3*24*60*60)
-        TTL_1WK = int(1*7*24*60*60)
-        TTL_2WK = int(2*7*24*60*60)
-        TTL_1MO = int(1*30*24*60*60)
 
     class Expiration(IntEnum):
         EXP_15SC = int(15)

{maleo_foundation-0.3.35 → maleo_foundation-0.3.37}/maleo_foundation/managers/db.py

@@ -8,7 +8,7 @@ from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.orm import sessionmaker, Session, declarative_base
 from typing import Generator
 from maleo_foundation.types import BaseTypes
-from maleo_foundation.utils.logging import ServiceLogger
+from maleo_foundation.utils.logging import DatabaseLogger
 
 class MetadataManager:
     Base: DeclarativeMeta = declarative_base()
@@ -17,7 +17,7 @@ class MetadataManager:
 class SessionManager:
     def __init__(
         self,
-        logger: ServiceLogger,
+        logger: DatabaseLogger,
         engine: Engine
     ):
         self._logger = logger
@@ -80,7 +80,7 @@ class DatabaseManager:
     def __init__(
         self,
         metadata: MetaData,
-        logger: ServiceLogger,
+        logger: DatabaseLogger,
         url: BaseTypes.OptionalString = None
     ):
         self._metadata = metadata #* Define database metadata

{maleo_foundation-0.3.35 → maleo_foundation-0.3.37}/maleo_foundation/managers/service.py

@@ -30,8 +30,12 @@ from maleo_foundation.types import BaseTypes
 from maleo_foundation.utils.exceptions import BaseExceptions
 from maleo_foundation.utils.logging import (
     SimpleConfig,
-    ServiceLogger,
-    MiddlewareLogger
+    ApplicationLogger,
+    CacheLogger,
+    DatabaseLogger,
+    MiddlewareLogger,
+    RepositoryLogger,
+    ServiceLogger
 )
 from .credential import CredentialManager
 from .configuration import ConfigurationManager
@@ -119,32 +123,37 @@ class ServiceManager:
         return self._keys
 
     def _initialize_loggers(self) -> None:
-        #* Service's loggers
-        application = ServiceLogger(
-            type=BaseEnums.LoggerType.APPLICATION,
+        application = ApplicationLogger(
             service_key=self.configurations.service.key,
             **self._log_config.model_dump()
         )
-        database = ServiceLogger(
-            type=BaseEnums.LoggerType.DATABASE,
+        cache = CacheLogger(
             service_key=self.configurations.service.key,
             **self._log_config.model_dump()
         )
-        repository = ServiceLogger(
-            type=BaseEnums.LoggerType.REPOSITORY,
+        database = DatabaseLogger(
             service_key=self.configurations.service.key,
             **self._log_config.model_dump()
         )
-        #* Middleware's logger
         middleware = MiddlewareLogger(
             service_key=self.configurations.service.key,
             **self._log_config.model_dump()
         )
+        repository = RepositoryLogger(
+            service_key=self.configurations.service.key,
+            **self._log_config.model_dump()
+        )
+        service = ServiceLogger(
+            service_key=self.configurations.service.key,
+            **self._log_config.model_dump()
+        )
         self._loggers = Loggers(
             application=application,
-            repository=repository,
+            cache=cache,
             database=database,
-            middleware=middleware
+            middleware=middleware,
+            repository=repository,
+            service=service
         )
 
     @property
@@ -160,13 +169,13 @@ class ServiceManager:
             async for key in self._redis.scan_iter(f"{prefix}*"):
                 await self._redis.delete(key)
 
-    def check_redis_connection(self) -> bool:
+    async def check_redis_connection(self) -> bool:
         try:
-            self._redis.ping()
-            self._loggers.application.info("Redis connection check successful.")
+            await self._redis.ping()
+            self._loggers.cache.info("Redis connection check successful.")
             return True
         except RedisError as e:
-            self._loggers.application.error(f"Redis connection check failed: {e}", exc_info=True)
+            self._loggers.cache.error(f"Redis connection check failed: {e}", exc_info=True)
             return False
 
     async def initialize_cache(self) -> None:
@@ -178,7 +187,7 @@ class ServiceManager:
             decode_responses=self.configurations.cache.redis.decode_responses,
             health_check_interval=self.configurations.cache.redis.health_check_interval
         )
-        self.check_redis_connection()
+        await self.check_redis_connection()
         self._cache = CacheManagers(redis=self._redis)
         await self._clear_cache()
 

{maleo_foundation-0.3.35 → maleo_foundation-0.3.37}/maleo_foundation/models/transfers/general/configurations/__init__.py

@@ -1,5 +1,12 @@
 from pydantic import BaseModel, ConfigDict, Field
-from maleo_foundation.utils.logging import MiddlewareLogger, ServiceLogger
+from maleo_foundation.utils.logging import (
+    ApplicationLogger,
+    CacheLogger,
+    DatabaseLogger,
+    MiddlewareLogger,
+    RepositoryLogger,
+    ServiceLogger
+)
 from .cache import CacheConfigurations
 from .client import ClientConfigurations
 from .database import DatabaseConfigurations
@@ -18,7 +25,9 @@ class Configurations(BaseModel):
 class Loggers(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    application: ServiceLogger = Field(..., description="Application logger")
-    repository: ServiceLogger = Field(..., description="Repository logger")
-    database: ServiceLogger = Field(..., description="Database logger")
-    middleware: MiddlewareLogger = Field(..., description="Middleware logger")
+    application: ApplicationLogger = Field(..., description="Application logger")
+    cache: CacheLogger = Field(..., description="Cache logger")
+    database: DatabaseLogger = Field(..., description="Database logger")
+    middleware: MiddlewareLogger = Field(..., description="Middleware logger")
+    repository: RepositoryLogger = Field(..., description="Repository logger")
+    service: ServiceLogger = Field(..., description="Service logger")

{maleo_foundation-0.3.35 → maleo_foundation-0.3.37}/maleo_foundation/utils/logging.py

@@ -72,9 +72,6 @@ class BaseLogger(logging.Logger):
 
         #* Define logger name
         if self._type == BaseEnums.LoggerType.CLIENT:
-            #* Ensure client_key is valid if logger type is client
-            if self._client_key is None:
-                raise ValueError("'client_key' parameter must be provided if 'logger_type' is 'client'")
             self._name = f"{self._service_key} - {self._type} - {self._client_key}"
         else:
             self._name = f"{self._service_key} - {self._type}"
@@ -145,35 +142,34 @@ class BaseLogger(logging.Logger):
             handler.close()
         self.handlers.clear()
 
-class MiddlewareLogger(BaseLogger):
+class ApplicationLogger(BaseLogger):
     def __init__(
         self,
         dir: str,
         service_key: BaseTypes.OptionalString = None,
-        level = BaseEnums.LoggerLevel.INFO,
-        google_cloud_logging = None
+        level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
+        google_cloud_logging: Optional[GoogleCloudLogging] = None
     ):
         super().__init__(
             dir=dir,
-            type=BaseEnums.LoggerType.MIDDLEWARE,
+            type=BaseEnums.LoggerType.APPLICATION,
             service_key=service_key,
             client_key=None,
             level=level,
             google_cloud_logging=google_cloud_logging
         )
 
-class ServiceLogger(BaseLogger):
+class CacheLogger(BaseLogger):
     def __init__(
         self,
         dir: str,
-        type: BaseEnums.ServiceLoggerType,
         service_key: BaseTypes.OptionalString = None,
         level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
         google_cloud_logging: Optional[GoogleCloudLogging] = None
     ):
         super().__init__(
             dir=dir,
-            type=type,
+            type=BaseEnums.LoggerType.CACHE,
             service_key=service_key,
             client_key=None,
             level=level,
@@ -196,4 +192,72 @@ class ClientLogger(BaseLogger):
             client_key=client_key,
             level=level,
             google_cloud_logging=google_cloud_logging
+        )
+
+class DatabaseLogger(BaseLogger):
+    def __init__(
+        self,
+        dir: str,
+        service_key: BaseTypes.OptionalString = None,
+        level = BaseEnums.LoggerLevel.INFO,
+        google_cloud_logging = None
+    ):
+        super().__init__(
+            dir=dir,
+            type=BaseEnums.LoggerType.DATABASE,
+            service_key=service_key,
+            client_key=None,
+            level=level,
+            google_cloud_logging=google_cloud_logging
+        )
+
+class MiddlewareLogger(BaseLogger):
+    def __init__(
+        self,
+        dir: str,
+        service_key: BaseTypes.OptionalString = None,
+        level = BaseEnums.LoggerLevel.INFO,
+        google_cloud_logging = None
+    ):
+        super().__init__(
+            dir=dir,
+            type=BaseEnums.LoggerType.MIDDLEWARE,
+            service_key=service_key,
+            client_key=None,
+            level=level,
+            google_cloud_logging=google_cloud_logging
+        )
+
+class RepositoryLogger(BaseLogger):
+    def __init__(
+        self,
+        dir: str,
+        service_key: BaseTypes.OptionalString = None,
+        level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
+        google_cloud_logging: Optional[GoogleCloudLogging] = None
+    ):
+        super().__init__(
+            dir=dir,
+            type=BaseEnums.LoggerType.REPOSITORY,
+            service_key=service_key,
+            client_key=None,
+            level=level,
+            google_cloud_logging=google_cloud_logging
+        )
+
+class ServiceLogger(BaseLogger):
+    def __init__(
+        self,
+        dir: str,
+        service_key: BaseTypes.OptionalString = None,
+        level: BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO,
+        google_cloud_logging: Optional[GoogleCloudLogging] = None
+    ):
+        super().__init__(
+            dir=dir,
+            type=BaseEnums.LoggerType.SERVICE,
+            service_key=service_key,
+            client_key=None,
+            level=level,
+            google_cloud_logging=google_cloud_logging
         )

{maleo_foundation-0.3.35 → maleo_foundation-0.3.37}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.3.35 → maleo_foundation-0.3.37}/pyproject.toml

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