PyPI - apitally - Versions diffs - 0.12.0__py3-none-any.whl → 0.13.0__py3-none-any.whl - Mend

apitally 0.12.0py3-none-any.whl → 0.13.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

apitally/__init__.py +1 -1
apitally/client/base.py +6 -1
apitally/litestar.py +21 -4
apitally/starlette.py +30 -14
{apitally-0.12.0.dist-info → apitally-0.13.0.dist-info}/METADATA +38 -24
{apitally-0.12.0.dist-info → apitally-0.13.0.dist-info}/RECORD +12 -12
{apitally-0.12.0.dist-info → apitally-0.13.0.dist-info}/WHEEL +1 -1
{apitally-0.12.0.dist-info → apitally-0.13.0.dist-info/licenses}/LICENSE +0 -0

apitally/__init__.py CHANGED Viewed

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

apitally/client/base.py CHANGED Viewed

@@ -4,6 +4,7 @@ import asyncio
 import contextlib
 import os
 import re
+import sys
 import threading
 import time
 import traceback
@@ -328,7 +329,11 @@ class ServerErrorCounter:
         cutoff = MAX_EXCEPTION_TRACEBACK_LENGTH - len(prefix)
         lines = []
         length = 0
-        for line in traceback.format_exception(exception)[::-1]:
+        if sys.version_info >= (3, 10):
+            traceback_lines = traceback.format_exception(exception)
+        else:
+            traceback_lines = traceback.format_exception(type(exception), exception, exception.__traceback__)
+        for line in traceback_lines[::-1]:
             if length + len(line) > cutoff:
                 lines.append(prefix)
                 break

apitally/litestar.py CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -59,40 +59,53 @@ class ApitallyMiddleware:
         if scope["type"] == "http" and scope["method"] != "OPTIONS":
             request = Request(scope)
             response_status = 0
-            response_time = 0.0
+            response_time: Optional[float] = None
             response_headers = Headers()
             response_body = b""
+            response_size = 0
+            response_chunked = False
+            exception: Optional[BaseException] = None
             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:
                 await self.app(scope, receive, send_wrapper)
             except BaseException as e:
-                self.add_request(
-                    request=request,
-                    response_status=500,
-                    response_time=time.perf_counter() - start_time,
-                    response_headers=response_headers,
-                    response_body=response_body,
-                    exception=e,
-                )
+                exception = e
                 raise e from None
-            else:
+            finally:
+                if response_time is None:
+                    response_time = time.perf_counter() - start_time
                 self.add_request(
                     request=request,
                     response_status=response_status,
                     response_time=response_time,
                     response_headers=response_headers,
                     response_body=response_body,
+                    response_size=response_size,
+                    exception=exception,
                 )
         else:
             await self.app(scope, receive, send)  # pragma: no cover
@@ -104,6 +117,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)
@@ -111,6 +125,8 @@ class ApitallyMiddleware:
             consumer = self.get_consumer(request)
             consumer_identifier = consumer.identifier if consumer else None
             self.client.consumer_registry.add_or_update_consumer(consumer)
+            if response_status == 0 and exception is not None:
+                response_status = 500
             self.client.request_counter.add_request(
                 consumer=consumer_identifier,
                 method=request.method,
@@ -118,7 +134,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.13.0.dist-info}/METADATA RENAMED Viewed

@@ -1,49 +1,64 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: apitally
-Version: 0.12.0
+Version: 0.13.0
 Summary: Simple API monitoring & analytics for REST APIs built with FastAPI, Flask, Django, Starlette and Litestar.
-Home-page: https://apitally.io
-License: MIT
-Author: Apitally
-Author-email: hello@apitally.io
-Requires-Python: >=3.8,<4.0
+Project-URL: Homepage, https://apitally.io
+Project-URL: Documentation, https://docs.apitally.io
+Project-URL: Repository, https://github.com/apitally/apitally-py
+Author-email: Apitally <hello@apitally.io>
+License: MIT License
+License-File: LICENSE
 Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: FastAPI
 Classifier: Framework :: Flask
 Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware
+Classifier: Topic :: Software Development
+Classifier: Topic :: System :: Monitoring
 Classifier: Typing :: Typed
+Requires-Python: <4.0,>=3.8
+Requires-Dist: backoff>=2.0.0
 Provides-Extra: django-ninja
+Requires-Dist: django-ninja>=0.18.0; extra == 'django-ninja'
+Requires-Dist: django<5,>=2.2; (python_version < '3.10') and extra == 'django-ninja'
+Requires-Dist: django>=2.2; (python_version >= '3.10') and extra == 'django-ninja'
+Requires-Dist: requests>=2.26.0; extra == 'django-ninja'
 Provides-Extra: django-rest-framework
+Requires-Dist: django<5,>=2.2; (python_version < '3.10') and extra == 'django-rest-framework'
+Requires-Dist: django>=2.2; (python_version >= '3.10') and extra == 'django-rest-framework'
+Requires-Dist: djangorestframework>=3.10.0; extra == 'django-rest-framework'
+Requires-Dist: inflection>=0.5.1; extra == 'django-rest-framework'
+Requires-Dist: requests>=2.26.0; extra == 'django-rest-framework'
+Requires-Dist: uritemplate>=3.0.0; extra == 'django-rest-framework'
 Provides-Extra: fastapi
+Requires-Dist: fastapi>=0.88.0; extra == 'fastapi'
+Requires-Dist: httpx>=0.22.0; extra == 'fastapi'
+Requires-Dist: starlette<1.0.0,>=0.22.0; extra == 'fastapi'
 Provides-Extra: flask
+Requires-Dist: flask>=2.0.0; extra == 'flask'
+Requires-Dist: requests>=2.26.0; extra == 'flask'
 Provides-Extra: litestar
+Requires-Dist: httpx>=0.22.0; extra == 'litestar'
+Requires-Dist: litestar>=2.0.0; extra == 'litestar'
 Provides-Extra: sentry
+Requires-Dist: sentry-sdk>=2.2.0; extra == 'sentry'
 Provides-Extra: starlette
-Requires-Dist: backoff (>=2.0.0)
-Requires-Dist: django (>=2.2) ; (python_version >= "3.10") and (extra == "django-ninja" or extra == "django-rest-framework")
-Requires-Dist: django (>=2.2,<5) ; (python_version < "3.10") and (extra == "django-ninja" or extra == "django-rest-framework")
-Requires-Dist: django-ninja (>=0.18.0) ; extra == "django-ninja"
-Requires-Dist: djangorestframework (>=3.10.0) ; extra == "django-rest-framework"
-Requires-Dist: fastapi (>=0.87.0) ; extra == "fastapi"
-Requires-Dist: flask (>=2.0.0) ; extra == "flask"
-Requires-Dist: httpx (>=0.22.0) ; extra == "fastapi" or extra == "litestar" or extra == "starlette"
-Requires-Dist: inflection (>=0.5.1) ; extra == "django-rest-framework"
-Requires-Dist: litestar (>=2.0.0) ; extra == "litestar"
-Requires-Dist: requests (>=2.26.0) ; extra == "django-ninja" or extra == "django-rest-framework" or extra == "flask"
-Requires-Dist: sentry-sdk (>=2.2.0) ; extra == "sentry"
-Requires-Dist: starlette (>=0.21.0,<1.0.0) ; extra == "fastapi" or extra == "starlette"
-Requires-Dist: uritemplate (>=3.0.0) ; extra == "django-rest-framework"
-Project-URL: Documentation, https://docs.apitally.io
-Project-URL: Repository, https://github.com/apitally/apitally-py
+Requires-Dist: httpx>=0.22.0; extra == 'starlette'
+Requires-Dist: starlette<1.0.0,>=0.21.0; extra == 'starlette'
 Description-Content-Type: text/markdown
 <p align="center">
@@ -193,4 +208,3 @@ on GitHub or
 ## License
 This library is licensed under the terms of the MIT license.

{apitally-0.12.0.dist-info → apitally-0.13.0.dist-info}/RECORD RENAMED Viewed

@@ -1,19 +1,19 @@
-apitally/__init__.py,sha256=eHjt9DPsMbptabS2yGx9Yhbyzq5hFSUHXb7zc8Q_8-o,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
-apitally/client/logging.py,sha256=QMsKIIAFo92PNBUleeTgsrsQa7SEal-oJa1oOHUr1wI,507
-apitally/client/threading.py,sha256=cASa0C9nyRp5gf5IzCDj6TE-v8t8SW4zJ38W6NdJ3Q8,5204
+apitally/__init__.py,sha256=ShXQBVjyiSOHxoQJS2BvNG395W4KZfqMxZWBAR0MZrE,22
 apitally/common.py,sha256=GbVmnXxhRvV30d7CfCQ9r0AeXj14Mv9Jm_Yd1bRWP28,1088
 apitally/django.py,sha256=Zw8a971UwGKaEMPUtmlBbjufAYwMkSjRSQlss8FDY-E,13795
 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=B1QTvw5nf9pdnuQda5XsCfConMN81ze8WQ0ldmiTdkc,9589
+apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apitally/client/asyncio.py,sha256=Y5sbRLRnJCIJx9VQ2DGgQsYNKGvURV2U1y3VxHuPhgQ,4874
+apitally/client/base.py,sha256=BC_KNDuhDQcjTasvztPey9879ITcuARhgCm6HSYbGTI,15663
+apitally/client/logging.py,sha256=QMsKIIAFo92PNBUleeTgsrsQa7SEal-oJa1oOHUr1wI,507
+apitally/client/threading.py,sha256=cASa0C9nyRp5gf5IzCDj6TE-v8t8SW4zJ38W6NdJ3Q8,5204
+apitally-0.13.0.dist-info/METADATA,sha256=-MZ4Xne70XtcDIT3waW4QvrMGnLdu-Sfz-CghqyJcf4,7599
+apitally-0.13.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+apitally-0.13.0.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.13.0.dist-info/RECORD,,

{apitally-0.12.0.dist-info → apitally-0.13.0.dist-info}/WHEEL RENAMED Viewed

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.7.0
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any

{apitally-0.12.0.dist-info → apitally-0.13.0.dist-info/licenses}/LICENSE RENAMED Viewed

File without changes

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

apitally 0.12.0py3-none-any.whl → 0.13.0py3-none-any.whl