apitally 0.12.0__py3-none-any.whl → 0.12.1__py3-none-any.whl

apitally/__init__.py

@@ -1 +1 @@
-__version__ = "0.12.0"
+__version__ = "0.12.1"

apitally/litestar.py

@@ -72,16 +72,31 @@ class ApitallyPlugin(InitPluginProtocol):
                 response_time = 0.0
                 response_headers = Headers()
                 response_body = b""
+                response_size = 0
+                response_chunked = False
                 start_time = time.perf_counter()
 
                 async def send_wrapper(message: Message) -> None:
-                    nonlocal response_time, response_status, response_headers, response_body
+                    nonlocal \
+                        response_time, \
+                        response_status, \
+                        response_headers, \
+                        response_body, \
+                        response_size, \
+                        response_chunked
                     if message["type"] == "http.response.start":
                         response_time = time.perf_counter() - start_time
                         response_status = message["status"]
                         response_headers = Headers(message["headers"])
-                    elif message["type"] == "http.response.body" and response_status == 400:
-                        response_body += message["body"]
+                        response_chunked = (
+                            response_headers.get("Transfer-Encoding") == "chunked"
+                            or "Content-Length" not in response_headers
+                        )
+                    elif message["type"] == "http.response.body":
+                        if response_chunked:
+                            response_size += len(message.get("body", b""))
+                        if response_status == 400:
+                            response_body += message.get("body", b"")
                     await send(message)
 
                 await app(scope, receive, send_wrapper)
@@ -91,6 +106,7 @@ class ApitallyPlugin(InitPluginProtocol):
                     response_time=response_time,
                     response_headers=response_headers,
                     response_body=response_body,
+                    response_size=response_size,
                 )
             else:
                 await app(scope, receive, send)  # pragma: no cover
@@ -104,6 +120,7 @@ class ApitallyPlugin(InitPluginProtocol):
         response_time: float,
         response_headers: Headers,
         response_body: bytes,
+        response_size: int = 0,
     ) -> None:
         if response_status < 100 or not request.route_handler.paths:
             return  # pragma: no cover
@@ -120,7 +137,7 @@ class ApitallyPlugin(InitPluginProtocol):
             status_code=response_status,
             response_time=response_time,
             request_size=request.headers.get("Content-Length"),
-            response_size=response_headers.get("Content-Length"),
+            response_size=response_size or response_headers.get("Content-Length"),
         )
         if response_status == 400 and response_body and len(response_body) < 4096:
             with contextlib.suppress(json.JSONDecodeError):

apitally/starlette.py

@@ -62,16 +62,31 @@ class ApitallyMiddleware:
             response_time = 0.0
             response_headers = Headers()
             response_body = b""
+            response_size = 0
+            response_chunked = False
             start_time = time.perf_counter()
 
             async def send_wrapper(message: Message) -> None:
-                nonlocal response_time, response_status, response_headers, response_body
+                nonlocal \
+                    response_time, \
+                    response_status, \
+                    response_headers, \
+                    response_body, \
+                    response_size, \
+                    response_chunked
                 if message["type"] == "http.response.start":
                     response_time = time.perf_counter() - start_time
                     response_status = message["status"]
                     response_headers = Headers(scope=message)
-                elif message["type"] == "http.response.body" and response_status == 422:
-                    response_body += message["body"]
+                    response_chunked = (
+                        response_headers.get("Transfer-Encoding") == "chunked"
+                        or "Content-Length" not in response_headers
+                    )
+                elif message["type"] == "http.response.body":
+                    if response_chunked:
+                        response_size += len(message.get("body", b""))
+                    if response_status == 422:
+                        response_body += message.get("body", b"")
                 await send(message)
 
             try:
@@ -83,6 +98,7 @@ class ApitallyMiddleware:
                     response_time=time.perf_counter() - start_time,
                     response_headers=response_headers,
                     response_body=response_body,
+                    response_size=response_size,
                     exception=e,
                 )
                 raise e from None
@@ -93,6 +109,7 @@ class ApitallyMiddleware:
                     response_time=response_time,
                     response_headers=response_headers,
                     response_body=response_body,
+                    response_size=response_size,
                 )
         else:
             await self.app(scope, receive, send)  # pragma: no cover
@@ -104,6 +121,7 @@ class ApitallyMiddleware:
         response_time: float,
         response_headers: Headers,
         response_body: bytes,
+        response_size: int = 0,
         exception: Optional[BaseException] = None,
     ) -> None:
         path_template, is_handled_path = self.get_path_template(request)
@@ -118,7 +136,7 @@ class ApitallyMiddleware:
                 status_code=response_status,
                 response_time=response_time,
                 request_size=request.headers.get("Content-Length"),
-                response_size=response_headers.get("Content-Length"),
+                response_size=response_size or response_headers.get("Content-Length"),
             )
             if response_status == 422 and response_body and response_headers.get("Content-Type") == "application/json":
                 with contextlib.suppress(json.JSONDecodeError):

{apitally-0.12.0.dist-info → apitally-0.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apitally
-Version: 0.12.0
+Version: 0.12.1
 Summary: Simple API monitoring & analytics for REST APIs built with FastAPI, Flask, Django, Starlette and Litestar.
 Home-page: https://apitally.io
 License: MIT

{apitally-0.12.0.dist-info → apitally-0.12.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-apitally/__init__.py,sha256=eHjt9DPsMbptabS2yGx9Yhbyzq5hFSUHXb7zc8Q_8-o,23
+apitally/__init__.py,sha256=PAuBI8I6F9Yu_86XjI2yaWn8QmCd9ZvK7tkZLWvEg-Q,23
 apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apitally/client/asyncio.py,sha256=Y5sbRLRnJCIJx9VQ2DGgQsYNKGvURV2U1y3VxHuPhgQ,4874
 apitally/client/base.py,sha256=v4LSOYNIOoeL3KTVyBlXBY5LCXc79Lvu9yK5Y_KILSQ,15442
@@ -10,10 +10,10 @@ apitally/django_ninja.py,sha256=dqQtnz2s8YWYHCwvkK5BjokjvpZJpPNhP0vng4kFtrQ,120
 apitally/django_rest_framework.py,sha256=dqQtnz2s8YWYHCwvkK5BjokjvpZJpPNhP0vng4kFtrQ,120
 apitally/fastapi.py,sha256=hEyYZsvIaA3OXZSSFdey5iqeEjfBPHgfNbyX8pLm7GI,123
 apitally/flask.py,sha256=7TJIoAT91-bR_7gZkL0clDk-Whl-V21hbo4nASaDmB4,6447
-apitally/litestar.py,sha256=sQcrHw-JV9AlpnXlrczmaDe0k6tD9PYQsc8nyQul8Ko,8802
+apitally/litestar.py,sha256=O9bSzwJC-dN6ukRqyVNYBhUqxEpzie-bR2bFojcvvMI,9547
 apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/starlette.py,sha256=PA_0BTy9aVtrY2_QrWU7Js5vjW1uxZ476rmg95fXq2g,8881
-apitally-0.12.0.dist-info/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
-apitally-0.12.0.dist-info/METADATA,sha256=gGryZ9u9sLV8mYrcoRhvYK4lQ4bFf9vhbvrCENA6T-I,6994
-apitally-0.12.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-apitally-0.12.0.dist-info/RECORD,,
+apitally/starlette.py,sha256=qmdcAlypqACd4yL_B_5W0ykpkWJaf1YcCAW1yDxaS0c,9615
+apitally-0.12.1.dist-info/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.12.1.dist-info/METADATA,sha256=Fibm2KONAkF7Omu-bpxBWvzvhRbjYdtcN9I7h1oVMbg,6994
+apitally-0.12.1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+apitally-0.12.1.dist-info/RECORD,,