apitally 0.11.2__tar.gz → 0.11.3__tar.gz

{apitally-0.11.2 → apitally-0.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apitally
-Version: 0.11.2
+Version: 0.11.3
 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.11.3/apitally/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.11.3"

{apitally-0.11.2 → apitally-0.11.3}/apitally/client/asyncio.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
+import random
 import time
 from functools import partial
 from typing import Any, Dict, Optional, Tuple
@@ -82,18 +83,21 @@ class ApitallyClient(ApitallyClientBase):
         data = self.get_sync_data()
         self._sync_data_queue.put_nowait((time.time(), data))
 
-        failed_items = []
+        i = 0
         while not self._sync_data_queue.empty():
             timestamp, data = self._sync_data_queue.get_nowait()
             try:
                 if (time_offset := time.time() - timestamp) <= MAX_QUEUE_TIME:
+                    if i > 0:
+                        await asyncio.sleep(random.uniform(0.1, 0.3))
                     data["time_offset"] = time_offset
                     await self._send_sync_data(client, data)
-                self._sync_data_queue.task_done()
+                    i += 1
             except httpx.HTTPError:
-                failed_items.append((timestamp, data))
-        for item in failed_items:
-            self._sync_data_queue.put_nowait(item)
+                self._sync_data_queue.put_nowait((timestamp, data))
+                break
+            finally:
+                self._sync_data_queue.task_done()
 
     @retry(raise_on_giveup=False)
     async def _send_startup_data(self, client: httpx.AsyncClient, data: Dict[str, Any]) -> None:

{apitally-0.11.2 → apitally-0.11.3}/apitally/client/threading.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging
 import queue
+import random
 import time
 from functools import partial
 from threading import Event, Thread
@@ -95,18 +96,21 @@ class ApitallyClient(ApitallyClientBase):
         data = self.get_sync_data()
         self._sync_data_queue.put_nowait((time.time(), data))
 
-        failed_items = []
+        i = 0
         while not self._sync_data_queue.empty():
             timestamp, data = self._sync_data_queue.get_nowait()
             try:
                 if (time_offset := time.time() - timestamp) <= MAX_QUEUE_TIME:
+                    if i > 0:
+                        time.sleep(random.uniform(0.1, 0.3))
                     data["time_offset"] = time_offset
                     self._send_sync_data(session, data)
-                self._sync_data_queue.task_done()
+                    i += 1
             except requests.RequestException:
-                failed_items.append((timestamp, data))
-        for item in failed_items:
-            self._sync_data_queue.put_nowait(item)
+                self._sync_data_queue.put_nowait((timestamp, data))
+                break
+            finally:
+                self._sync_data_queue.task_done()
 
     @retry(raise_on_giveup=False)
     def _send_startup_data(self, session: requests.Session, data: Dict[str, Any]) -> None:

{apitally-0.11.2 → apitally-0.11.3}/apitally/django.py

@@ -94,7 +94,7 @@ class ApitallyMiddleware:
         response = self.get_response(request)
         response_time = time.perf_counter() - start_time
         path = self.get_path(request)
-        if request.method is not None and path is not None:
+        if request.method is not None and request.method != "OPTIONS" and path is not None:
             try:
                 consumer = self.get_consumer(request)
                 consumer_identifier = consumer.identifier if consumer else None

{apitally-0.11.2 → apitally-0.11.3}/apitally/flask.py

@@ -93,7 +93,7 @@ class ApitallyMiddleware:
         response_headers: Headers,
     ) -> None:
         rule, is_handled_path = self.get_rule(environ)
-        if is_handled_path or not self.filter_unhandled_paths:
+        if (is_handled_path or not self.filter_unhandled_paths) and environ["REQUEST_METHOD"] != "OPTIONS":
             consumer = self.get_consumer()
             consumer_identifier = consumer.identifier if consumer else None
             self.client.consumer_registry.add_or_update_consumer(consumer)

{apitally-0.11.2 → apitally-0.11.3}/apitally/starlette.py

@@ -92,7 +92,7 @@ class ApitallyMiddleware(BaseHTTPMiddleware):
         exception: Optional[BaseException] = None,
     ) -> None:
         path_template, is_handled_path = self.get_path_template(request)
-        if is_handled_path or not self.filter_unhandled_paths:
+        if (is_handled_path or not self.filter_unhandled_paths) and request.method != "OPTIONS":
             consumer = self.get_consumer(request)
             consumer_identifier = consumer.identifier if consumer else None
             self.client.consumer_registry.add_or_update_consumer(consumer)

{apitally-0.11.2 → apitally-0.11.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry_dynamic_versioning.backend"
 
 [tool.poetry]
 name = "apitally"
-version = "0.11.2"
+version = "0.11.3"
 description = "Simple API monitoring & analytics for REST APIs built with FastAPI, Flask, Django, Starlette and Litestar."
 readme = "README.md"
 authors = ["Apitally <hello@apitally.io>"]
@@ -51,7 +51,7 @@ pre-commit = [
     { version = "^3.5.0", python = "<3.9" },
     { version = "^3.7.0", python = ">=3.9" }
 ]
-ruff = "^0.5.0"
+ruff = "^0.6.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = [

apitally-0.11.2/apitally/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.11.2"