maleo-foundation 0.3.33__py3-none-any.whl → 0.3.37__py3-none-any.whl

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/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/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
@@ -65,8 +69,6 @@ class ServiceManager:
 
         self._load_keys()
         self._initialize_loggers()
-        self._initialize_cache()
-        self._initialize_cloud_storage()
         self._initialize_database()
         self._initialize_foundation()
 
@@ -121,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
@@ -162,16 +169,16 @@ 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
 
-    def _initialize_cache(self) -> None:
+    async def initialize_cache(self) -> None:
         self._redis = Redis(
             host=self.configurations.cache.redis.host,
             port=self.configurations.cache.redis.port,
@@ -180,14 +187,9 @@ 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)
-        try:
-            asyncio.run(self._clear_cache())
-        except RuntimeError:
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-            loop.run_until_complete(self._clear_cache())
+        await self._clear_cache()
 
     @property
     def redis(self) -> Redis:
@@ -197,7 +199,7 @@ class ServiceManager:
     def cache(self) -> CacheManagers:
         return self._cache
 
-    def _initialize_cloud_storage(self) -> None:
+    def initialize_cloud_storage(self) -> None:
         environment = (
             BaseEnums.EnvironmentType.STAGING
             if self._settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL

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/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.33.dist-info → maleo_foundation-0.3.37.dist-info}/METADATA

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

{maleo_foundation-0.3.33.dist-info → maleo_foundation-0.3.37.dist-info}/RECORD

@@ -2,7 +2,7 @@ maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 maleo_foundation/authentication.py,sha256=TSszeTEKijy95gdYM_fFGR_VtpPWKDwkP7_AOdoGCA0,1556
 maleo_foundation/authorization.py,sha256=HGXCJ47AU1YFMDSmGhrMMmlHnAyghcFZVUiPa1FSvog,283
 maleo_foundation/constants.py,sha256=LjMIy_Fcr6HLuhIuXs5lCtkyScZXXHOtBMPYx5lwg00,1446
-maleo_foundation/enums.py,sha256=08rkuG3Y4-8kvd5BOBhhIS0UhzBT4kAPQX4L95GqnWQ,5316
+maleo_foundation/enums.py,sha256=x6hVz0gvrKRF1ng8lMgVzwfiA_F6Y4vuOU4rBOgtTUg,4758
 maleo_foundation/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/rest_controller_result.py,sha256=4KbCmk70IEHj1L1bNJfFg1Y3ifnRSnmvK6dYyVJddok,2014
 maleo_foundation/types.py,sha256=bUcCR-qRlxxttMxJQnVmtBic3EXEd_urcC2P55evWPc,2451
@@ -35,9 +35,9 @@ maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 maleo_foundation/managers/cache.py,sha256=IgcA-NAJbW83jRyApuQPbSJdth2LUpix9o-5CMWNwdI,274
 maleo_foundation/managers/configuration.py,sha256=Jcm2A_fS-styLEWZurF7nquitnSYuce05YVuxlDgxe4,1417
 maleo_foundation/managers/credential.py,sha256=i1w9bVozf7FYG8NGfLgJYRdLWBQBf35yyzVOEDgdXSA,3108
-maleo_foundation/managers/db.py,sha256=y5oP3bTXKeXYKqng-E_HZ-3wC0ZPtl5bls0AEEej6zM,6050
+maleo_foundation/managers/db.py,sha256=Y3GrpKT8pIKP4Kr40Z4XtfW3wnj-OYhTlfx_G0cyDvg,6053
 maleo_foundation/managers/middleware.py,sha256=ecTNloglV67xoC_hqIEMIxhfQwzXRKHLI3ThJdd-lbY,2480
-maleo_foundation/managers/service.py,sha256=90OG8qKaDYYpGxM3OllzLABqPguBtGUYI1yFUREAaUA,11783
+maleo_foundation/managers/service.py,sha256=j6dxgQPn7CNjQnmoHw70rEEUnzkcgSgsDrJuptHHpzY,11743
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=o4D_y52Zxl-jOtV59o6ZCJOuS6rlUy7e2x3vs7vB5tk,4314
 maleo_foundation/managers/client/maleo.py,sha256=fhIXKeIjx0VgS8wjX0Cpk05ZHHRiPvmpUQl0890mZxw,2686
@@ -71,7 +71,7 @@ maleo_foundation/models/transfers/general/request.py,sha256=xOeBbtXygK5P6DxPyf3C
 maleo_foundation/models/transfers/general/settings.py,sha256=p0PSec_8y-gpYZjx4r29L5QAV68hHikWetGkI9qqeoo,1690
 maleo_foundation/models/transfers/general/signature.py,sha256=J9xQy2HjpCQOnES7RJqsUnDgjFPuakQ1mxyfdTdstSE,297
 maleo_foundation/models/transfers/general/token.py,sha256=PU-_wLFaY2i8pwRi9-jlk4nh7XzoTKOk0BEsUCGbD80,4979
-maleo_foundation/models/transfers/general/configurations/__init__.py,sha256=xKU7f5V8I-pEzOXlL0CS82Zo60CqDjdB6Bnp3LUzcsg,1272
+maleo_foundation/models/transfers/general/configurations/__init__.py,sha256=B-7xmw6pye01yu2zQZU6vTevu3VDl-zALy0pfpksu0U,1508
 maleo_foundation/models/transfers/general/configurations/database.py,sha256=v-IzSm8kZa1TQByCc8dpIU-8csJN_G2irWeN4EClNlo,690
 maleo_foundation/models/transfers/general/configurations/middleware.py,sha256=-6dk6C2QBDfmTDENhsgyMHpRUGfrSxQY3BDwo_WtgAs,1710
 maleo_foundation/models/transfers/general/configurations/service.py,sha256=8lag1KXkS43IwsMGWka7L-peQ9YT1-dmWeEhQ1hnnLU,304
@@ -116,7 +116,7 @@ maleo_foundation/utils/client.py,sha256=CGwn8eH5WlwnE5tPMfMAH5V3BItBgVmYBZnXpLjT
 maleo_foundation/utils/controller.py,sha256=Ub1R-JN6spmXakYrOY7igwaNt4Sg8LASASdXymxZcCI,6954
 maleo_foundation/utils/exceptions.py,sha256=z24kzEP2geaAEElxXaEy7ln6KodebXvtlu-h1inZ_nw,6376
 maleo_foundation/utils/extractor.py,sha256=ZNX0sQKcUwwh7paUZpdR04a18s8Ru2xNXhWZl-XN3l4,2197
-maleo_foundation/utils/logging.py,sha256=EfigViQmvtIlktr87O91ftlj6RxYaMNegHglfX6M63c,6839
+maleo_foundation/utils/logging.py,sha256=8Pf7GIrV7kywvJWBBOVs7mvptGBV4eBXuEYBaZjA-IM,8674
 maleo_foundation/utils/merger.py,sha256=MdocyCOtIhqjcmqx2mJ0V8vtwsrunRXqhRdrBCruh7Q,622
 maleo_foundation/utils/query.py,sha256=hhISpBAZ4SV_pGf7uGBC6fzLrs_yj5_8gj-kFFeeNrw,8060
 maleo_foundation/utils/repository.py,sha256=pxpws2PDyXwGACms_1azlabqzT6q1x41aYAQRablSnk,2860
@@ -133,7 +133,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=ZglnLdW3lHmaKER4mwGe5N5ERus-bdsamfpwGmQYPIo,6344
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.3.33.dist-info/METADATA,sha256=Ft7Hs95SltAHjPD1QakpOlTCAwAL4n9kR8LVI3DCZXc,3740
-maleo_foundation-0.3.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.3.33.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.3.33.dist-info/RECORD,,
+maleo_foundation-0.3.37.dist-info/METADATA,sha256=g41kKHz_LAJNi_GCrbtwcsrzEz43sT8_GH3Acc6a42o,3740
+maleo_foundation-0.3.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.37.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.37.dist-info/RECORD,,