apitally 0.15.0__py3-none-any.whl → 0.15.1__py3-none-any.whl

apitally/common.py

@@ -1,6 +1,8 @@
+import gzip
+import json
 import sys
 from importlib.metadata import PackageNotFoundError, version
-from typing import Dict, Optional, Union
+from typing import Any, Dict, Optional, Union
 
 
 def parse_int(x: Union[str, int, None]) -> Optional[int]:
@@ -12,6 +14,18 @@ def parse_int(x: Union[str, int, None]) -> Optional[int]:
         return None
 
 
+def try_json_loads(s: bytes, encoding: Optional[str] = None) -> Any:
+    if encoding is not None and encoding.lower() == "gzip":
+        try:
+            s = gzip.decompress(s)
+        except Exception:
+            pass
+    try:
+        return json.loads(s)
+    except Exception:
+        return None
+
+
 def get_versions(*packages, app_version: Optional[str] = None) -> Dict[str, str]:
     versions = _get_common_package_versions()
     for package in packages:

apitally/django.py

@@ -22,7 +22,7 @@ from apitally.client.request_logging import (
     RequestLogger,
     RequestLoggingConfig,
 )
-from apitally.common import get_versions, parse_int
+from apitally.common import get_versions, parse_int, try_json_loads
 
 
 if TYPE_CHECKING:
@@ -173,16 +173,15 @@ class ApitallyMiddleware:
                     and content_type.startswith("application/json")
                 ):
                     try:
-                        with contextlib.suppress(json.JSONDecodeError):
-                            body = json.loads(response.content)
-                            if isinstance(body, dict) and "detail" in body and isinstance(body["detail"], list):
-                                # Log Django Ninja / Pydantic validation errors
-                                self.client.validation_error_counter.add_validation_errors(
-                                    consumer=consumer_identifier,
-                                    method=request.method,
-                                    path=path,
-                                    detail=body["detail"],
-                                )
+                        body = try_json_loads(response.content, encoding=response.get("Content-Encoding"))
+                        if isinstance(body, dict) and "detail" in body and isinstance(body["detail"], list):
+                            # Log Django Ninja / Pydantic validation errors
+                            self.client.validation_error_counter.add_validation_errors(
+                                consumer=consumer_identifier,
+                                method=request.method,
+                                path=path,
+                                detail=body["detail"],
+                            )
                     except Exception:  # pragma: no cover
                         logger.exception("Failed to log validation errors")
 

apitally/litestar.py

@@ -1,4 +1,3 @@
-import contextlib
 import json
 import time
 from typing import Callable, Dict, List, Optional, Union
@@ -22,7 +21,7 @@ from apitally.client.request_logging import (
     RequestLogger,
     RequestLoggingConfig,
 )
-from apitally.common import get_versions, parse_int
+from apitally.common import get_versions, parse_int, try_json_loads
 
 
 __all__ = ["ApitallyPlugin", "ApitallyConsumer", "RequestLoggingConfig"]
@@ -199,30 +198,29 @@ class ApitallyPlugin(InitPluginProtocol):
             )
 
             if response_status == 400 and response_body and len(response_body) < 4096:
-                with contextlib.suppress(json.JSONDecodeError):
-                    parsed_body = json.loads(response_body)
-                    if (
-                        isinstance(parsed_body, dict)
-                        and "detail" in parsed_body
-                        and isinstance(parsed_body["detail"], str)
-                        and "validation" in parsed_body["detail"].lower()
-                        and "extra" in parsed_body
-                        and isinstance(parsed_body["extra"], list)
-                    ):
-                        self.client.validation_error_counter.add_validation_errors(
-                            consumer=consumer_identifier,
-                            method=request.method,
-                            path=path,
-                            detail=[
-                                {
-                                    "loc": [error.get("source", "body")] + error["key"].split("."),
-                                    "msg": error["message"],
-                                    "type": "",
-                                }
-                                for error in parsed_body["extra"]
-                                if "key" in error and "message" in error
-                            ],
-                        )
+                body = try_json_loads(response_body, encoding=response_headers.get("Content-Encoding"))
+                if (
+                    isinstance(body, dict)
+                    and "detail" in body
+                    and isinstance(body["detail"], str)
+                    and "validation" in body["detail"].lower()
+                    and "extra" in body
+                    and isinstance(body["extra"], list)
+                ):
+                    self.client.validation_error_counter.add_validation_errors(
+                        consumer=consumer_identifier,
+                        method=request.method,
+                        path=path,
+                        detail=[
+                            {
+                                "loc": [error.get("source", "body")] + error["key"].split("."),
+                                "msg": error["message"],
+                                "type": "",
+                            }
+                            for error in body["extra"]
+                            if "key" in error and "message" in error
+                        ],
+                    )
 
             if response_status == 500 and "exception" in request.state:
                 self.client.server_error_counter.add_server_error(

apitally/starlette.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import contextlib
-import json
 import time
 from typing import Any, Callable, Dict, List, Optional, Union
 from warnings import warn
@@ -23,7 +21,7 @@ from apitally.client.request_logging import (
     RequestLogger,
     RequestLoggingConfig,
 )
-from apitally.common import get_versions, parse_int
+from apitally.common import get_versions, parse_int, try_json_loads
 
 
 __all__ = ["ApitallyMiddleware", "ApitallyConsumer", "RequestLoggingConfig"]
@@ -191,16 +189,15 @@ class ApitallyMiddleware:
                 response_size=response_size,
             )
             if response_status == 422 and response_body and response_headers.get("Content-Type") == "application/json":
-                with contextlib.suppress(json.JSONDecodeError):
-                    body = json.loads(response_body)
-                    if isinstance(body, dict) and "detail" in body and isinstance(body["detail"], list):
-                        # Log FastAPI / Pydantic validation errors
-                        self.client.validation_error_counter.add_validation_errors(
-                            consumer=consumer_identifier,
-                            method=request.method,
-                            path=path,
-                            detail=body["detail"],
-                        )
+                body = try_json_loads(response_body, encoding=response_headers.get("Content-Encoding"))
+                if isinstance(body, dict) and "detail" in body and isinstance(body["detail"], list):
+                    # Log FastAPI / Pydantic validation errors
+                    self.client.validation_error_counter.add_validation_errors(
+                        consumer=consumer_identifier,
+                        method=request.method,
+                        path=path,
+                        detail=body["detail"],
+                    )
             if response_status == 500 and exception is not None:
                 self.client.server_error_counter.add_server_error(
                     consumer=consumer_identifier,

{apitally-0.15.0.dist-info → apitally-0.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apitally
-Version: 0.15.0
+Version: 0.15.1
 Summary: Simple API monitoring & analytics for REST APIs built with FastAPI, Flask, Django, Starlette and Litestar.
 Project-URL: Homepage, https://apitally.io
 Project-URL: Documentation, https://docs.apitally.io

{apitally-0.15.0.dist-info → apitally-0.15.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 apitally/__init__.py,sha256=ShXQBVjyiSOHxoQJS2BvNG395W4KZfqMxZWBAR0MZrE,22
-apitally/common.py,sha256=Y8MRuTUHFUeQkcDrCLUxnqIPRpYIiW8S43T0QUab-_A,1267
-apitally/django.py,sha256=1gLW5aVbIobjHoa5OzC3K1E85mC2a00PpJIAR9ATko4,16937
+apitally/common.py,sha256=FMDBPlYHCqomgAq-Z8JiyTSMAoqJRycPsJzsxncQqQA,1598
+apitally/django.py,sha256=zwe8svC8rfo7TyHfOlkYTeXptxPFoRjvt0bbYvgtJKM,16892
 apitally/django_ninja.py,sha256=-CmrwFFRv7thFOUK_OrOSouhHL9bm5sIBNIQlpyE_2c,166
 apitally/django_rest_framework.py,sha256=-CmrwFFRv7thFOUK_OrOSouhHL9bm5sIBNIQlpyE_2c,166
 apitally/fastapi.py,sha256=IfKfgsmIY8_AtnuMTW2sW4qnkya61CAE2vBoIpcc9tk,169
 apitally/flask.py,sha256=p_u33_FQq2i5AebWB8wYxXX0CPhcX8OJHGWj5dR4sPY,9622
-apitally/litestar.py,sha256=HThNH-gAnFtLyVU4Eh8L_obd0f3TNLYoTZ8IGgz1ZKE,13610
+apitally/litestar.py,sha256=mHoMqBO_gyoopeHljY8e8GTcV29UDf3uhQMxY3GeNpA,13451
 apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/starlette.py,sha256=liK1KSEiQolHm1cNfJm6tkmE3uujoVqj8b-2prUVa3o,13277
+apitally/starlette.py,sha256=iEcN--2eeUW9d78H42WolWEkss2idvXLjK2OQmvULdM,13218
 apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apitally/client/client_asyncio.py,sha256=9mdi9Hmb6-xn7dNdwP84e4PNAHGg2bYdMEgIfPUAtcQ,7003
 apitally/client/client_base.py,sha256=DvivGeHd3dyOASRvkIo44Zh8RzdBMfH8_rROa2lFbgw,3799
@@ -19,7 +19,7 @@ apitally/client/requests.py,sha256=RdJyvIqQGVHvS-wjpAPUwcO7byOJ6jO8dYqNTU2Furg,3
 apitally/client/sentry.py,sha256=qMjHdI0V7c50ruo1WjmjWc8g6oGDv724vSCvcuZ8G9k,1188
 apitally/client/server_errors.py,sha256=4B2BKDFoIpoWc55UVH6AIdYSgzj6zxCdMNUW77JjhZw,3423
 apitally/client/validation_errors.py,sha256=6G8WYWFgJs9VH9swvkPXJGuOJgymj5ooWA9OwjUTbuM,1964
-apitally-0.15.0.dist-info/METADATA,sha256=CZxfxtM3p1RBy5ICdnuhjAWt4CESHhKtAIFEFtKCbjw,8643
-apitally-0.15.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-apitally-0.15.0.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
-apitally-0.15.0.dist-info/RECORD,,
+apitally-0.15.1.dist-info/METADATA,sha256=Z8Es_x6H-rxC5KB26S0i1BFGVBlISkQfNiYPglyS09E,8643
+apitally-0.15.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+apitally-0.15.1.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.15.1.dist-info/RECORD,,