django-activity-audit 1.3.0.dev12__tar.gz → 1.3.0.dev14__tar.gz

{django_activity_audit-1.3.0.dev12 → django_activity_audit-1.3.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-activity-audit
-Version: 1.3.0.dev12
+Version: 1.3.0.dev14
 Summary: A Django package for easy CRUD operation logging and container logs
 Project-URL: Homepage, https://github.com/shree256/django-activity-audit
 Project-URL: Repository, https://github.com/shree256/django-activity-audit

{django_activity_audit-1.3.0.dev12 → django_activity_audit-1.3.0.dev14}/activity_audit/__init__.py

@@ -1,5 +1,6 @@
 default_app_config = "activity_audit.apps.AuditLoggingConfig"
 
+from activity_audit.constants import LogType
 from activity_audit.utils import (
     get_api_handler,
     get_async_api_handler,
@@ -8,7 +9,9 @@ from activity_audit.utils import (
     get_async_login_handler,
     get_audit_handler,
     get_console_formatter,
-    get_json_formatter,
+    get_app_formatter,
+    get_api_formatter,
+    get_audit_formatter,
     get_json_handler,
     get_login_handler,
 )
@@ -16,8 +19,11 @@ from activity_audit.utils import (
 from . import logger_levels
 
 __all__ = [
+    "LogType",
     "get_console_formatter",
-    "get_json_formatter",
+    "get_app_formatter",
+    "get_api_formatter",
+    "get_audit_formatter",
     "get_json_handler",
     "get_api_handler",
     "get_audit_handler",

django_activity_audit-1.3.0.dev14/activity_audit/constants.py

@@ -0,0 +1,21 @@
+import enum
+
+
+class LogType(str, enum.Enum):
+    APP = "app"
+    API = "api"
+    AUDIT = "audit"
+    LOGIN = "login"
+    CELERYWORKER = "celeryworker"
+    CELERYBEAT = "celerybeat"
+
+
+CONSOLE_FORMAT = (
+    "%(levelname)s %(asctime)s %(pathname)s %(module)s %(funcName)s %(message)s"
+)
+
+REQUEST_TYPES = [
+    "internal",
+    "external",
+]
+

{django_activity_audit-1.3.0.dev12 → django_activity_audit-1.3.0.dev14}/activity_audit/formatters.py

@@ -4,6 +4,7 @@ import json
 import logging
 import uuid
 
+from .constants import LogType
 
 def _json_default(obj):
     """
@@ -29,9 +30,10 @@ def _json_default(obj):
     return str(obj)
 
 
-class JsonFormatter(logging.Formatter):
-    def __init__(self, timestamp_format: str = "%Y-%m-%d %H:%M:%S.%f"):
+class AppFormatter(logging.Formatter):
+    def __init__(self, log_type: str = LogType.APP, timestamp_format: str = "%Y-%m-%d %H:%M:%S.%f"):
         super().__init__()
+        self.log_type = log_type
         self.timestamp_format = timestamp_format
 
     def format(
@@ -50,25 +52,22 @@ class JsonFormatter(logging.Formatter):
             "request_id": getattr(record, "request_id", "") or "",
             "message": record.getMessage(),
             "exception": "",
-            # "extra": {},
+            "log_type": self.log_type,
         }
 
         # Add exception info if present for ERROR
         if record.exc_info:
             log_data["exception"] = "{}".format(self.formatException(record.exc_info))
 
-        # Add extra fields if present
-        # if hasattr(record, "extra"):
-        #     log_data.update(record.extra)
-
         return json.dumps(log_data, default=_json_default)
 
 
 class APIFormatter(logging.Formatter):
     """Custom formatter for audit logs that ensures consistent JSON formatting."""
 
-    def __init__(self, timestamp_format: str = "%Y-%m-%d %H:%M:%S.%f"):
+    def __init__(self, log_type: str = LogType.API, timestamp_format: str = "%Y-%m-%d %H:%M:%S.%f"):
         super().__init__()
+        self.log_type = log_type
         self.timestamp_format = timestamp_format
 
     def format(self, record):
@@ -80,6 +79,7 @@ class APIFormatter(logging.Formatter):
             "level": record.levelname,
             "name": record.name,
             "message": record.getMessage(),
+            "log_type": self.log_type,
         }
 
         # Add all audit-specific fields if they exist
@@ -102,8 +102,9 @@ class APIFormatter(logging.Formatter):
 
 
 class AuditFormatter(logging.Formatter):
-    def __init__(self, timestamp_format: str = "%Y-%m-%d %H:%M:%S.%f"):
+    def __init__(self, log_type: str = LogType.AUDIT, timestamp_format: str = "%Y-%m-%d %H:%M:%S.%f"):
         super().__init__()
+        self.log_type = log_type
         self.timestamp_format = timestamp_format
 
     def format(self, record):
@@ -114,6 +115,7 @@ class AuditFormatter(logging.Formatter):
             "level": record.levelname,
             "name": record.name,
             "message": record.getMessage(),
+            "log_type": self.log_type,
         }
 
         audit_fields = [

{django_activity_audit-1.3.0.dev12 → django_activity_audit-1.3.0.dev14}/activity_audit/handlers.py

@@ -3,7 +3,7 @@ import queue
 
 from logging.handlers import QueueHandler, QueueListener, RotatingFileHandler
 
-from .formatters import APIFormatter, AuditFormatter, JsonFormatter, LoginFormatter
+from .formatters import APIFormatter, AuditFormatter, AppFormatter, LoginFormatter
 from .middleware import get_request_id
 
 
@@ -145,7 +145,7 @@ class AsyncLoginLogHandler(AsyncBaseAuditHandler):
 class AsyncJsonHandler(QueueHandler):
     """
     Non-blocking handler for general JSON logs. Wraps a RotatingFileHandler
-    with JsonFormatter on the background thread.
+    with AppFormatter on the background thread.
     """
 
     def __init__(
@@ -163,7 +163,7 @@ class AsyncJsonHandler(QueueHandler):
         sync_handler = RotatingFileHandler(
             filename, mode, maxBytes, backupCount, encoding, delay
         )
-        sync_handler.setFormatter(JsonFormatter())
+        sync_handler.setFormatter(AppFormatter())
         self._listener = QueueListener(
             log_queue, sync_handler, respect_handler_level=True
         )

{django_activity_audit-1.3.0.dev12 → django_activity_audit-1.3.0.dev14}/activity_audit/utils.py

@@ -7,9 +7,20 @@ def get_console_formatter() -> dict:
     }
 
 
-def get_json_formatter() -> dict:
+def get_app_formatter(log_type: str = "app") -> dict:
     return {
-        "()": "activity_audit.formatters.JsonFormatter",
+        "()": "activity_audit.formatters.AppFormatter",
+        "log_type": log_type,
+    }
+
+def get_api_formatter() -> dict:
+    return {
+        "()": "activity_audit.formatters.APIFormatter"
+    }
+
+def get_audit_formatter() -> dict:
+    return {
+        "()": "activity_audit.formatters.AuditFormatter"
     }
 
 
@@ -30,6 +41,7 @@ def get_json_handler(
     }
 
 
+
 def get_api_handler(
     filename: str = "audit_logs/api.log",
 ) -> dict:

{django_activity_audit-1.3.0.dev12 → django_activity_audit-1.3.0.dev14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "django-activity-audit"
-version = "1.3.0.dev12"
+version = "1.3.0.dev14"
 description = "A Django package for easy CRUD operation logging and container logs"
 authors = [
     { name = "Shreeshan", email = "shreeshan256@gmail.com" }

django_activity_audit-1.3.0.dev12/activity_audit/constants.py

@@ -1,8 +0,0 @@
-CONSOLE_FORMAT = (
-    "%(levelname)s %(asctime)s %(pathname)s %(module)s %(funcName)s %(message)s"
-)
-
-REQUEST_TYPES = [
-    "internal",
-    "external",
-]