apitally 0.12.1__py3-none-any.whl → 0.13.0a1__py3-none-any.whl

apitally/__init__.py

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

apitally/client/base.py

@@ -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/starlette.py

@@ -59,11 +59,12 @@ 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:
@@ -92,17 +93,11 @@ class ApitallyMiddleware:
             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,
-                    response_size=response_size,
-                    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,
@@ -110,6 +105,7 @@ class ApitallyMiddleware:
                     response_headers=response_headers,
                     response_body=response_body,
                     response_size=response_size,
+                    exception=exception,
                 )
         else:
             await self.app(scope, receive, send)  # pragma: no cover
@@ -129,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,

{apitally-0.12.1.dist-info → apitally-0.13.0a1.dist-info}/METADATA

@@ -1,49 +1,64 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: apitally
-Version: 0.12.1
+Version: 0.13.0a1
 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
-Classifier: Development Status :: 5 - Production/Stable
+Project-URL: homepage, https://apitally.io
+Project-URL: documentation, https://docs.apitally.io
+Project-URL: source, https://github.com/apitally/apitally-py
+Author-email: Apitally <hello@apitally.io>
+License: MIT License
+License-File: LICENSE
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: FastAPI
 Classifier: Framework :: Flask
 Classifier: Intended Audience :: Developers
 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.7
 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: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware
+Classifier: Topic :: Software Development
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
 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.1.dist-info → apitally-0.13.0a1.dist-info}/RECORD

@@ -1,9 +1,4 @@
-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
-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
@@ -12,8 +7,13 @@ apitally/fastapi.py,sha256=hEyYZsvIaA3OXZSSFdey5iqeEjfBPHgfNbyX8pLm7GI,123
 apitally/flask.py,sha256=7TJIoAT91-bR_7gZkL0clDk-Whl-V21hbo4nASaDmB4,6447
 apitally/litestar.py,sha256=O9bSzwJC-dN6ukRqyVNYBhUqxEpzie-bR2bFojcvvMI,9547
 apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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,,
+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.0a1.dist-info/METADATA,sha256=vTzZMzziddl1DodwJaOh5acpkEqUys5tu7N6diwfKSM,7613
+apitally-0.13.0a1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+apitally-0.13.0a1.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.13.0a1.dist-info/RECORD,,

{apitally-0.12.1.dist-info → apitally-0.13.0a1.dist-info}/WHEEL

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