maleo-foundation 0.0.39__py3-none-any.whl → 0.0.41__py3-none-any.whl

maleo_foundation/enums.py

@@ -61,6 +61,12 @@ class BaseEnums:
                 BaseEnums.RESTControllerResponseType.FILE: responses.FileResponse,
             }.get(self, responses.Response)
 
+    class LoggerType(StrEnum):
+        MIDDLEWARE = "middleware"
+        DATABASE = "database"
+        APPLICATION = "application"
+        CLIENT = "client"
+
     class LoggerLevel(IntEnum):
         CRITICAL = logging.CRITICAL
         FATAL = logging.FATAL

maleo_foundation/utils/logger.py

@@ -3,28 +3,42 @@ import os
 from datetime import datetime
 from maleo_foundation.clients.google.cloud.logging import GoogleCloudLogging
 from maleo_foundation.enums import BaseEnums
+from maleo_foundation.types import BaseTypes
 
 class BaseLogger(logging.Logger):
     def __init__(
         self,
         base_dir:str,
-        service_name:str,
-        category:str,
+        type:BaseEnums.LoggerType,
+        service_name:BaseTypes.OptionalString = None,
+        client_name:BaseTypes.OptionalString = None,
         level:BaseEnums.LoggerLevel = BaseEnums.LoggerLevel.INFO
     ):
         """
         Custom extended logger with file, console, and Google Cloud Logging.
 
-        - Logs are stored in `base_dir/logs/{category}`
+        - Logs are stored in `base_dir/logs/{type}`
         - Uses Google Cloud Logging if configured
 
         Args:
             base_dir (str): Base directory for logs (e.g., "/path/to/maleo_security")
             service_name (str): The service name (e.g., "maleo_security")
-            category (str): Log category (e.g., "application", "middleware")
+            type (str): Log type (e.g., "application", "middleware")
         """
+        #* Ensure service_name exists
+        service_name = service_name or os.getenv("SERVICE_NAME")
+        if service_name is None:
+            raise ValueError("SERVICE_NAME environment variable must be set if service_name is set to None")
+
+        #* Ensure client_name is valid if logger type is a client
+        if type == BaseEnums.LoggerType.CLIENT and client_name is None:
+            raise ValueError("'client_name' parameter must be provided if 'logger_type' is 'client'")
+
         #* Define logger name
-        name = f"{service_name} - {category}"
+        if type == BaseEnums.LoggerType.CLIENT:
+            name = f"{service_name} - {type} - {client_name}"
+        else:
+            name = f"{service_name} - {type}"
         super().__init__(name, level)
 
         #* Clear existing handlers to prevent duplicates
@@ -48,7 +62,7 @@ class BaseLogger(logging.Logger):
             self.warning(f"Failed to initialize Google Cloud Logging: {str(e)}")
 
         #* Define log directory
-        log_dir = os.path.join(base_dir, f"logs/{category}")
+        log_dir = os.path.join(base_dir, f"logs/{type}")
         os.makedirs(log_dir, exist_ok=True)
 
         #* Generate timestamped filename

{maleo_foundation-0.0.39.dist-info → maleo_foundation-0.0.41.dist-info}/METADATA

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

{maleo_foundation-0.0.39.dist-info → maleo_foundation-0.0.41.dist-info}/RECORD

@@ -1,7 +1,7 @@
 maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/constants.py,sha256=aBmEfWlBqZxi0k-n6h2NM1YRLOjMnheEiLyQcjP-zCQ,1164
 maleo_foundation/controller.py,sha256=9ceIEajWLouLBph2NQe7L7tQNnQyyW_ETojilSeFv6M,2991
-maleo_foundation/enums.py,sha256=skLmbrD7DqL1CJN2BCRfWYu5QU1XZVIa_SoJnZbZcrs,2201
+maleo_foundation/enums.py,sha256=uXA5fLFeDXwlspUjU4DXSB68dfanxEwIJhsAMZXhsYo,2359
 maleo_foundation/extended_types.py,sha256=pIKt-_9tby4rmune3fmWcCW_mohaNRh_1lywBmdc-L4,301
 maleo_foundation/query.py,sha256=qJV9-QX5bphsmijXf4I8cuwMnqlJkm0dxypJ9Qz1eS8,3850
 maleo_foundation/types.py,sha256=D_EtYK-sNeELSbc-ngX65iuQCRhZQB4TtV73P6Gl76o,1206
@@ -47,10 +47,10 @@ maleo_foundation/models/transfers/results/service/controllers/__init__.py,sha256
 maleo_foundation/models/transfers/results/service/controllers/rest.py,sha256=wCuFyOTQkuBs2cqjPsWnPy0XIsCfMqGByhrSy57qp7Y,1107
 maleo_foundation/utils/__init__.py,sha256=tfgaHZI2PDgxEVSQztfnDMN5S6L5Y4FcK5v_Wkf5snE,245
 maleo_foundation/utils/exceptions.py,sha256=mcvBwHm6uWpVQkPtO1T2j-GaTYEiyPOeGxiDL9-sjNA,3639
-maleo_foundation/utils/logger.py,sha256=S9YtXy6AO7qP1vkcPXqnzPbgCIoTfr2DZGCT9vuA1_Q,2446
+maleo_foundation/utils/logger.py,sha256=rfViHIMN6p9LeyH_fU_PiWvGuhHcivgk9zRQuXyw6ik,3180
 maleo_foundation/utils/formatter/__init__.py,sha256=iKf5YCbEdg1qKnFHyKqqcQbqAqEeRUf8mhI3v3dQoj8,78
 maleo_foundation/utils/formatter/case.py,sha256=TmvvlfzGdC_omMTB5vAa40TZBxQ3hnr-SYeo0M52Rlg,1352
-maleo_foundation-0.0.39.dist-info/METADATA,sha256=cfFp2YRumuQ4SP57WT9KwQxY0BYXaCdO0hdf9KCMel0,3160
-maleo_foundation-0.0.39.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-maleo_foundation-0.0.39.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.0.39.dist-info/RECORD,,
+maleo_foundation-0.0.41.dist-info/METADATA,sha256=sMX6yNYfAGGFalLxQj-MmV82Vesp_HPGa6fX7EZnCcA,3160
+maleo_foundation-0.0.41.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+maleo_foundation-0.0.41.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.0.41.dist-info/RECORD,,