apitally 0.14.2__py3-none-any.whl → 0.14.4__py3-none-any.whl

apitally/client/client_asyncio.py

@@ -6,7 +6,7 @@ import random
 import time
 from contextlib import suppress
 from functools import partial
-from typing import Any, AsyncIterator, Dict, Optional, Tuple, Union
+from typing import Any, AsyncIterator, Dict, Optional, Union
 from uuid import UUID
 
 import backoff
@@ -40,7 +40,7 @@ class ApitallyClient(ApitallyClientBase):
         self.proxy = proxy
         self._stop_sync_loop = False
         self._sync_loop_task: Optional[asyncio.Task] = None
-        self._sync_data_queue: asyncio.Queue[Tuple[float, Dict[str, Any]]] = asyncio.Queue()
+        self._sync_data_queue: asyncio.Queue[Dict[str, Any]] = asyncio.Queue()
         self._set_startup_data_task: Optional[asyncio.Task] = None
 
     def get_http_client(self) -> httpx.AsyncClient:
@@ -103,20 +103,19 @@ class ApitallyClient(ApitallyClientBase):
 
     async def send_sync_data(self, client: httpx.AsyncClient) -> None:
         data = self.get_sync_data()
-        self._sync_data_queue.put_nowait((time.time(), data))
+        self._sync_data_queue.put_nowait(data)
 
         i = 0
         while not self._sync_data_queue.empty():
-            timestamp, data = self._sync_data_queue.get_nowait()
+            data = self._sync_data_queue.get_nowait()
             try:
-                if (time_offset := time.time() - timestamp) <= MAX_QUEUE_TIME:
+                if time.time() - data["timestamp"] <= MAX_QUEUE_TIME:
                     if i > 0:
-                        await asyncio.sleep(random.uniform(0.1, 0.3))
-                    data["time_offset"] = time_offset
+                        await asyncio.sleep(random.uniform(0.1, 0.5))
                     await self._send_sync_data(client, data)
                     i += 1
             except httpx.HTTPError:
-                self._sync_data_queue.put_nowait((timestamp, data))
+                self._sync_data_queue.put_nowait(data)
                 break
             finally:
                 self._sync_data_queue.task_done()

apitally/client/client_base.py

@@ -89,6 +89,7 @@ class ApitallyClientBase(ABC):
 
     def get_sync_data(self) -> Dict[str, Any]:
         data = {
+            "timestamp": time.time(),
             "requests": self.request_counter.get_and_reset_requests(),
             "validation_errors": self.validation_error_counter.get_and_reset_validation_errors(),
             "server_errors": self.server_error_counter.get_and_reset_server_errors(),

apitally/client/client_threading.py

@@ -8,7 +8,7 @@ from functools import partial
 from io import BufferedReader
 from queue import Queue
 from threading import Event, Thread
-from typing import Any, Callable, Dict, Optional, Tuple
+from typing import Any, Callable, Dict, Optional
 from uuid import UUID
 
 import backoff
@@ -58,7 +58,7 @@ class ApitallyClient(ApitallyClientBase):
         self.proxies = {"https": proxy} if proxy else None
         self._thread: Optional[Thread] = None
         self._stop_sync_loop = Event()
-        self._sync_data_queue: Queue[Tuple[float, Dict[str, Any]]] = Queue()
+        self._sync_data_queue: Queue[Dict[str, Any]] = Queue()
 
     def start_sync_loop(self) -> None:
         self._stop_sync_loop.clear()
@@ -114,20 +114,19 @@ class ApitallyClient(ApitallyClientBase):
 
     def send_sync_data(self, session: requests.Session) -> None:
         data = self.get_sync_data()
-        self._sync_data_queue.put_nowait((time.time(), data))
+        self._sync_data_queue.put_nowait(data)
 
         i = 0
         while not self._sync_data_queue.empty():
-            timestamp, data = self._sync_data_queue.get_nowait()
+            data = self._sync_data_queue.get_nowait()
             try:
-                if (time_offset := time.time() - timestamp) <= MAX_QUEUE_TIME:
+                if time.time() - data["timestamp"] <= MAX_QUEUE_TIME:
                     if i > 0:
-                        time.sleep(random.uniform(0.1, 0.3))
-                    data["time_offset"] = time_offset
+                        time.sleep(random.uniform(0.1, 0.5))
                     self._send_sync_data(session, data)
                     i += 1
             except requests.RequestException:
-                self._sync_data_queue.put_nowait((timestamp, data))
+                self._sync_data_queue.put_nowait(data)
                 break
             finally:
                 self._sync_data_queue.task_done()

apitally/starlette.py

@@ -222,12 +222,18 @@ class ApitallyMiddleware:
                 },
             )
 
-    @staticmethod
-    def get_path(request: Request) -> Optional[str]:
-        for route in request.app.routes:
-            match, _ = route.matches(request.scope)
-            if match == Match.FULL:
-                return route.path
+    def get_path(self, request: Request, routes: Optional[list[BaseRoute]] = None) -> Optional[str]:
+        if routes is None:
+            routes = request.app.routes
+        for route in routes:
+            if hasattr(route, "routes"):
+                path = self.get_path(request, routes=route.routes)
+                if path is not None:
+                    return path
+            elif hasattr(route, "path"):
+                match, _ = route.matches(request.scope)
+                if match == Match.FULL:
+                    return request.scope.get("root_path", "") + route.path
         return None
 
     def get_consumer(self, request: Request) -> Optional[ApitallyConsumer]:

{apitally-0.14.2.dist-info → apitally-0.14.4.dist-info}/METADATA

@@ -1,12 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: apitally
-Version: 0.14.2
+Version: 0.14.4
 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
 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
@@ -68,9 +69,9 @@ Description-Content-Type: text/markdown
   </picture>
 </p>
 
-<p align="center"><b>API monitoring made easy.</b></p>
+<p align="center"><b>Analytics, logging & monitoring for REST APIs.</b></p>
 
-<p align="center"><i>Apitally is a simple API monitoring & analytics tool with a focus on data privacy.<br>It is super easy to use for API projects in Python or Node.js and never collects sensitive data.</i></p>
+<p align="center"><i>Apitally helps you understand how your APIs are being used and alerts you when things go wrong.<br>It's super easy to use and designed to protect your data privacy.</i></p>
 
 <p align="center">🔗 <b><a href="https://apitally.io" target="_blank">apitally.io</a></b></p>
 
@@ -100,7 +101,7 @@ the 📚 [documentation](https://docs.apitally.io).
 ## Key features
 
 - Middleware for different frameworks to capture metadata about API endpoints,
-  requests and responses (no sensitive data is captured)
+  requests and responses
 - Non-blocking clients that aggregate and send captured data to Apitally in
   regular intervals
 

{apitally-0.14.2.dist-info → apitally-0.14.4.dist-info}/RECORD

@@ -7,18 +7,18 @@ apitally/fastapi.py,sha256=IfKfgsmIY8_AtnuMTW2sW4qnkya61CAE2vBoIpcc9tk,169
 apitally/flask.py,sha256=Th5LsMsTKkWERPrKfSWPhzrp99tg0pDtKXgtlVLx3eo,9279
 apitally/litestar.py,sha256=hAH2-OVVXBDVY8LopfIGv30yYwi-71tSEsKd6648CYc,13098
 apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/starlette.py,sha256=8WAWQPePJAYy-B5TrxawxAeUqBiSXD15Ay17i2B22jc,12500
+apitally/starlette.py,sha256=VaT4-QVSYC0YX1U5kVI-dGROEd64IbjYU5lx5N16yf8,12852
 apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/client/client_asyncio.py,sha256=lRvVKFU6eiapJnB9WrRq6Nuadx-n8NCKwQg-da1vPSM,7064
-apitally/client/client_base.py,sha256=w5AXAbg3hw5Qds5rovCZFtePB9bHNcJsr9l7kDgbroc,3733
-apitally/client/client_threading.py,sha256=MbytG8EopF84nmr5ShAZaq-VviSXYnBfBl7cRFRe1Kg,7479
+apitally/client/client_asyncio.py,sha256=2RibaadLAEdl2i0yAb4dSEDq_r46w6HPFpZVzvt59aQ,6941
+apitally/client/client_base.py,sha256=dXsaB7scd0wCd_DcdiUvNlDLZ2pWbWsGDnJ4fLYvJGg,3771
+apitally/client/client_threading.py,sha256=Y8LlA_8LFHAuXym-T4bY_XFqXxiIDw9qFqO6K3FbZy0,7356
 apitally/client/consumers.py,sha256=w_AFQhVgdtJVt7pVySBvSZwQg-2JVqmD2JQtVBoMkus,2626
 apitally/client/logging.py,sha256=QMsKIIAFo92PNBUleeTgsrsQa7SEal-oJa1oOHUr1wI,507
 apitally/client/request_logging.py,sha256=5i7Gv4yP7iq4tBgw-ppkhlZd_OwMc719ZvWEm16TCvg,13047
 apitally/client/requests.py,sha256=RdJyvIqQGVHvS-wjpAPUwcO7byOJ6jO8dYqNTU2Furg,3685
 apitally/client/server_errors.py,sha256=axEhOxqV5SWjk0QCZTLVv2UMIaTfqPc81Typ4DXt66A,4646
 apitally/client/validation_errors.py,sha256=6G8WYWFgJs9VH9swvkPXJGuOJgymj5ooWA9OwjUTbuM,1964
-apitally-0.14.2.dist-info/METADATA,sha256=AUai6BWmcRZKC2mnN3om1SLIxPkyzPPMRAY-qdu1kus,7577
-apitally-0.14.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-apitally-0.14.2.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
-apitally-0.14.2.dist-info/RECORD,,
+apitally-0.14.4.dist-info/METADATA,sha256=bE7HFJBsn6IamIlJvehQhTd46k3Lx67imr2Yi7eM_PA,7570
+apitally-0.14.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+apitally-0.14.4.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.14.4.dist-info/RECORD,,

{apitally-0.14.2.dist-info → apitally-0.14.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any