vavacars-data-utils 1.4.4__tar.gz → 1.5.3__tar.gz

{vavacars_data_utils-1.4.4 → vavacars_data_utils-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: vavacars_data_utils
-Version: 1.4.4
+Version: 1.5.3
 Summary: Package with utils
 Home-page: https://dev.azure.com/vavacars/DataScience/_git/Data.Utils
 Author: Vavacars Data Science Team

{vavacars_data_utils-1.4.4 → vavacars_data_utils-1.5.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = vavacars_data_utils
-version = 1.4.4
+version = 1.5.3
 author = Vavacars Data Science Team
 author_email = acg@vava.cars
 description = Package with utils

vavacars_data_utils-1.5.3/vava_utils/logging/__init__.py

@@ -0,0 +1 @@
+from .logging_middleware import LoggingMiddleware

vavacars_data_utils-1.5.3/vava_utils/logging/logging_middleware.py

@@ -0,0 +1,152 @@
+from fastapi import Request, Response
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.responses import JSONResponse
+from starlette.background import BackgroundTask
+import logging
+import json
+import re
+from typing import Any, Callable, List, Tuple, Union
+
+DEFAULT_MAX_LOG_SIZE = 10000
+DEFAULT_LOG_FORMAT = "PATH: {path} | METHOD: {method} | STATUS: {status_code} | REQUEST: {req} | RESPONSE: {res}"
+ALLOWED_MEDIA_TYPES = {None, "application/json", "text/plain", "text/html"}
+logger = logging.getLogger(__name__)
+
+
+def create_path_matcher(pattern: str) -> Callable[[str], bool]:
+    """
+    Creates a path matcher function from a glob-style pattern:
+     - '*' matches any single segment (i.e. any run of chars except '.')
+     - matches either exactly or with any number of leading segments
+    """
+    # Escape dots, then turn '*' into “any run of non-dot chars”
+    regex_body = re.escape(pattern).replace(r"\*", "[^.]*")
+    # Allow an optional “anything.” prefix
+    full_regex = re.compile(rf"^(?:.*\.)?{regex_body}$")
+    return lambda path: bool(full_regex.match(path))
+
+
+DEFAULT_PATTERN_MAP = [
+    # ("similarVehicles.*.vehicles", lambda lst: {"size": len(lst)}),
+    # ("password", lambda _: "[REMOVED]"),
+    ("similarVehicles.*.vehicles", lambda lst: {"size": len(lst), "first_element": lst[0] if lst else None}),
+]
+
+
+class LoggingMiddleware(BaseHTTPMiddleware):
+    def __init__(
+        self,
+        app,
+        log_format: Union[str, Callable] = DEFAULT_LOG_FORMAT,
+        max_log_size: int = DEFAULT_MAX_LOG_SIZE,
+        pattern_map: List[Tuple[str, Callable]] = [],
+    ):
+        super().__init__(app)
+        self.max_log_size = max_log_size
+        self.log_format = log_format
+
+        self.summary_map = []
+        for pattern, summary_fn in pattern_map:
+            matcher_fn = create_path_matcher(pattern)
+            self.summary_map.append((matcher_fn, summary_fn))
+
+    def _format_log(self, path, method, status_code, req, res):
+        """Format the log message according to the specified format."""
+        # If a custom formatter function is provided, use it
+        if callable(self.log_format):
+            return self.log_format(path=path, method=method, status_code=status_code, request=req, response=res)
+        else:  # is string
+            return self.log_format.format(path=path, method=method, status_code=status_code, request=req, response=res)
+
+    def _process(self, data: bytes) -> str:
+        """
+        Decode JSON, apply summaries, truncate by size, fallback to one-line.
+        """
+        text = data.decode("utf-8", errors="ignore")
+        try:
+            payload = json.loads(text)
+
+            def apply(node: Any, path: List[str] = []) -> Any:
+                if not isinstance(node, (dict, list)):
+                    return node
+                path = path or []
+                path_str = ".".join(path)
+
+                for pattern_fn, summary_fn in self.summary_map:
+                    if pattern_fn(path_str):
+                        return summary_fn(node)
+
+                if isinstance(node, dict):
+                    return {k: apply(v, path + [k]) for k, v in node.items()}
+                if isinstance(node, list):
+                    return [apply(v, path + ["*"]) for v in node]
+                return node
+
+            summarized = apply(payload)
+            dumped = json.dumps(summarized, ensure_ascii=False)
+            if len(dumped) > self.max_log_size:
+                return f"[json] payload too large ({len(dumped)} chars)"
+            return dumped
+        except Exception:
+            text = text.replace("\r", " ").replace("\n", " ").replace("\t", " ")
+            if len(text) > self.max_log_size:
+                return text[: self.max_log_size] + "…"
+            return text
+
+    def _log_info(
+        self,
+        method: str,
+        path: str,
+        req_bytes: bytes,
+        res_bytes: bytes,
+        status_code: int,
+        media_type: str,
+    ):
+        if method.upper() == "OPTIONS":
+            return
+
+        req = self._process(req_bytes)
+        if media_type in ALLOWED_MEDIA_TYPES:
+            res = self._process(res_bytes)
+        else:
+            res = f"[{media_type}] - Not logged"
+
+        # Use the custom formatter
+        msg = self._format_log(path, method, status_code, req, res)
+
+        if 200 <= status_code < 300:
+            logger.info(msg)
+        elif 400 <= status_code < 500:
+            logger.warning(msg)
+        else:
+            logger.error(msg)
+
+    async def dispatch(self, request: Request, call_next):
+        req_body = await request.body()
+        try:
+            response = await call_next(request)
+            body = b""
+            async for chunk in response.body_iterator:
+                body += chunk
+
+            response = Response(
+                content=body,
+                status_code=response.status_code,
+                headers=dict(response.headers),
+                media_type=response.media_type,
+            )
+        except Exception as e:
+            body = str(e).encode("utf-8")
+            response = JSONResponse(content={"detail": str(e)}, status_code=500)
+            raise
+        finally:
+            response.background = BackgroundTask(
+                self._log_info,
+                request.method,
+                request.url.path,
+                req_body,
+                body,
+                response.status_code,
+                response.media_type,
+            )
+        return response

{vavacars_data_utils-1.4.4 → vavacars_data_utils-1.5.3}/vavacars_data_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: vavacars_data_utils
-Version: 1.4.4
+Version: 1.5.3
 Summary: Package with utils
 Home-page: https://dev.azure.com/vavacars/DataScience/_git/Data.Utils
 Author: Vavacars Data Science Team

{vavacars_data_utils-1.4.4 → vavacars_data_utils-1.5.3}/vavacars_data_utils.egg-info/SOURCES.txt

@@ -14,6 +14,8 @@ setup.cfg
 ./vava_utils/email/email_helper.py
 ./vava_utils/loganalytics/__init__.py
 ./vava_utils/loganalytics/loganalytics_helper.py
+./vava_utils/logging/__init__.py
+./vava_utils/logging/logging_middleware.py
 ./vava_utils/salesforce/__init__.py
 ./vava_utils/salesforce/salesforce_helper.py
 ./vava_utils/smartiq/__init__.py
@@ -45,6 +47,8 @@ vava_utils/email/__init__.py
 vava_utils/email/email_helper.py
 vava_utils/loganalytics/__init__.py
 vava_utils/loganalytics/loganalytics_helper.py
+vava_utils/logging/__init__.py
+vava_utils/logging/logging_middleware.py
 vava_utils/salesforce/__init__.py
 vava_utils/salesforce/salesforce_helper.py
 vava_utils/smartiq/__init__.py