apitally 0.14.2__tar.gz → 0.14.4__tar.gz

{apitally-0.14.2 → apitally-0.14.4}/.github/workflows/publish.yaml

@@ -14,9 +14,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
         with:
-          version: "0.5.1"
+          version: "0.5.14"
           enable-cache: true
       - name: Build package
         run: uv build

{apitally-0.14.2 → apitally-0.14.4}/.github/workflows/tests.yaml

@@ -24,12 +24,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
         with:
-          version: "0.5.1"
+          version: "0.5.14"
           enable-cache: true
       - name: Install Python
-        run: uv python install 3.12
+        run: uv python install 3.13
       - name: Install dependencies
         run: uv sync --all-extras --frozen
       - name: Run checks
@@ -81,9 +81,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
         with:
-          version: "0.5.1"
+          version: "0.5.14"
           enable-cache: true
       - name: Install Python
         run: uv python install ${{ matrix.python }}

{apitally-0.14.2 → apitally-0.14.4}/.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: trailing-whitespace
       - id: mixed-line-ending
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.8.2
+    rev: v0.8.6
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]

{apitally-0.14.2 → apitally-0.14.4}/PKG-INFO

@@ -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 → apitally-0.14.4}/README.md

@@ -6,9 +6,9 @@
   </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>
 
@@ -38,7 +38,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 → apitally-0.14.4}/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-0.14.2 → apitally-0.14.4}/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-0.14.2 → apitally-0.14.4}/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-0.14.2 → apitally-0.14.4}/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 → apitally-0.14.4}/pyproject.toml

@@ -80,7 +80,7 @@ Repository = "https://github.com/apitally/apitally-py"
 [dependency-groups]
 dev = [
     "ipykernel~=6.29.0",
-    "mypy~=1.13.0",
+    "mypy~=1.14.0",
     "pre-commit~=3.5.0; python_version<'3.9'",
     "pre-commit~=4.0.1; python_version>='3.9'",
     "ruff~=0.8.0",

{apitally-0.14.2 → apitally-0.14.4}/tests/test_starlette.py

@@ -40,7 +40,7 @@ async def app(request: FixtureRequest, module_mocker: MockerFixture) -> Starlett
 def get_starlette_app() -> Starlette:
     from starlette.applications import Starlette
     from starlette.responses import PlainTextResponse, StreamingResponse
-    from starlette.routing import Route
+    from starlette.routing import Mount, Route
 
     from apitally.starlette import ApitallyConsumer, ApitallyMiddleware, RequestLoggingConfig
 
@@ -79,16 +79,27 @@ def get_starlette_app() -> Starlette:
     def identify_consumer(request: Request) -> Optional[ApitallyConsumer]:
         return ApitallyConsumer("test", name="Test")
 
-    routes = [
-        Route("/foo/", foo),
-        Route("/foo/{bar}/", foo_bar),
-        Route("/bar/", bar, methods=["POST"]),
-        Route("/baz/", baz, methods=["POST"]),
-        Route("/val/", val),
-        Route("/stream/", stream),
-        Route("/task/", task, methods=["POST"]),
-    ]
-    app = Starlette(routes=routes)
+    sub_app = Starlette(
+        routes=[
+            Route("/foo", foo),
+            Route("/foo/{bar}", foo_bar),
+            Route("/bar", bar, methods=["POST"]),
+            Route("/baz", baz, methods=["POST"]),
+            Route("/val", val),
+        ]
+    )
+    app = Starlette(
+        routes=[
+            Mount("/api", sub_app),
+            Mount(
+                "/test",
+                routes=[
+                    Route("/task", task, methods=["POST"]),
+                ],
+            ),
+            Route("/stream", stream),
+        ]
+    )
     app.add_middleware(
         ApitallyMiddleware,
         client_id=CLIENT_ID,
@@ -104,7 +115,7 @@ def get_starlette_app() -> Starlette:
 
 
 def get_fastapi_app() -> Starlette:
-    from fastapi import FastAPI, Query
+    from fastapi import APIRouter, FastAPI, Query
     from fastapi.responses import PlainTextResponse, StreamingResponse
 
     from apitally.fastapi import ApitallyConsumer, ApitallyMiddleware, RequestLoggingConfig
@@ -125,28 +136,30 @@ def get_fastapi_app() -> Starlette:
         identify_consumer_callback=identify_consumer,
     )
 
-    @app.get("/foo/")
+    router = APIRouter()
+
+    @router.get("/foo")
     def foo():
         return "foo"
 
-    @app.get("/foo/{bar}/")
+    @router.get("/foo/{bar}")
     def foo_bar(bar: str):
         return PlainTextResponse(f"foo: {bar}")
 
-    @app.post("/bar/")
+    @router.post("/bar")
     async def bar(request: Request):
         body = await request.body()
         return PlainTextResponse("bar: " + body.decode())
 
-    @app.post("/baz/")
+    @router.post("/baz")
     def baz():
         raise ValueError("baz")
 
-    @app.get("/val/")
+    @router.get("/val")
     def val(foo: int = Query()):
         return "val"
 
-    @app.get("/stream/")
+    @app.get("/stream")
     def stream():
         def stream_response():
             yield b"foo"
@@ -154,7 +167,7 @@ def get_fastapi_app() -> Starlette:
 
         return StreamingResponse(stream_response())
 
-    @app.post("/task/")
+    @app.post("/test/task")
     def task(background_tasks: BackgroundTasks):
         def task_func_with_error():
             raise ValueError("task")
@@ -162,6 +175,8 @@ def get_fastapi_app() -> Starlette:
         background_tasks.add_task(task_func_with_error)
         return "ok"
 
+    app.include_router(router, prefix="/api")
+
     return app
 
 
@@ -171,29 +186,29 @@ def test_middleware_requests_ok(app: Starlette, mocker: MockerFixture):
     mock = mocker.patch("apitally.client.requests.RequestCounter.add_request")
     client = TestClient(app)
 
-    response = client.get("/foo/")
+    response = client.get("/api/foo")
     assert response.status_code == 200
     mock.assert_called_once()
     assert mock.call_args is not None
     assert mock.call_args.kwargs["consumer"] == "test"
     assert mock.call_args.kwargs["method"] == "GET"
-    assert mock.call_args.kwargs["path"] == "/foo/"
+    assert mock.call_args.kwargs["path"] == "/api/foo"
     assert mock.call_args.kwargs["status_code"] == 200
     assert mock.call_args.kwargs["response_time"] > 0
 
-    response = client.get("/foo/123/")
+    response = client.get("/api/foo/123")
     assert response.status_code == 200
     assert mock.call_count == 2
     assert mock.call_args is not None
-    assert mock.call_args.kwargs["path"] == "/foo/{bar}/"
+    assert mock.call_args.kwargs["path"] == "/api/foo/{bar}"
 
-    response = client.post("/bar/")
+    response = client.post("/api/bar")
     assert response.status_code == 200
     assert mock.call_count == 3
     assert mock.call_args is not None
     assert mock.call_args.kwargs["method"] == "POST"
 
-    response = client.get("/stream/")
+    response = client.get("/stream")
     assert response.status_code == 200
     assert mock.call_count == 4
     assert mock.call_args is not None
@@ -207,12 +222,12 @@ def test_middleware_requests_error(app: Starlette, mocker: MockerFixture):
     mock2 = mocker.patch("apitally.client.server_errors.ServerErrorCounter.add_server_error")
     client = TestClient(app, raise_server_exceptions=False)
 
-    response = client.post("/baz/")
+    response = client.post("/api/baz")
     assert response.status_code == 500
     mock1.assert_called_once()
     assert mock1.call_args is not None
     assert mock1.call_args.kwargs["method"] == "POST"
-    assert mock1.call_args.kwargs["path"] == "/baz/"
+    assert mock1.call_args.kwargs["path"] == "/api/baz"
     assert mock1.call_args.kwargs["status_code"] == 500
     assert mock1.call_args.kwargs["response_time"] > 0
 
@@ -222,7 +237,7 @@ def test_middleware_requests_error(app: Starlette, mocker: MockerFixture):
     assert isinstance(exception, ValueError)
 
     # Throws a ValueError in a background task, but returns 200
-    response = client.post("/task/")
+    response = client.post("/test/task")
     assert response.status_code == 200
     assert mock1.call_count == 2
     assert mock1.call_args is not None
@@ -236,7 +251,7 @@ def test_middleware_requests_unhandled(app: Starlette, mocker: MockerFixture):
     mock = mocker.patch("apitally.client.requests.RequestCounter.add_request")
     client = TestClient(app)
 
-    response = client.post("/xxx/")
+    response = client.post("/xxx")
     assert response.status_code == 404
     mock.assert_not_called()
 
@@ -248,7 +263,7 @@ def test_middleware_validation_error(app: Starlette, mocker: MockerFixture):
     client = TestClient(app)
 
     # Validation error as foo must be an integer
-    response = client.get("/val?foo=bar")
+    response = client.get("/api/val?foo=bar")
     assert response.status_code == 422
 
     # FastAPI only
@@ -256,7 +271,7 @@ def test_middleware_validation_error(app: Starlette, mocker: MockerFixture):
         mock.assert_called_once()
         assert mock.call_args is not None
         assert mock.call_args.kwargs["method"] == "GET"
-        assert mock.call_args.kwargs["path"] == "/val/"
+        assert mock.call_args.kwargs["path"] == "/api/val"
         assert len(mock.call_args.kwargs["detail"]) == 1
         assert mock.call_args.kwargs["detail"][0]["loc"] == ["query", "foo"]
 
@@ -269,13 +284,13 @@ def test_middleware_request_logging(app: Starlette, mocker: MockerFixture):
     mock = mocker.patch("apitally.client.request_logging.RequestLogger.log_request")
     client = TestClient(app)
 
-    response = client.get("/foo/123/?foo=bar", headers={"Test-Header": "test"})
+    response = client.get("/api/foo/123?foo=bar", headers={"Test-Header": "test"})
     assert response.status_code == 200
     mock.assert_called_once()
     assert mock.call_args is not None
     assert mock.call_args.kwargs["request"]["method"] == "GET"
-    assert mock.call_args.kwargs["request"]["path"] == "/foo/{bar}/"
-    assert mock.call_args.kwargs["request"]["url"] == "http://testserver/foo/123/?foo=bar"
+    assert mock.call_args.kwargs["request"]["path"] == "/api/foo/{bar}"
+    assert mock.call_args.kwargs["request"]["url"] == "http://testserver/api/foo/123?foo=bar"
     assert ("test-header", "test") in mock.call_args.kwargs["request"]["headers"]
     assert mock.call_args.kwargs["request"]["consumer"] == "test"
     assert mock.call_args.kwargs["response"]["status_code"] == 200
@@ -284,18 +299,18 @@ def test_middleware_request_logging(app: Starlette, mocker: MockerFixture):
     assert mock.call_args.kwargs["response"]["size"] > 0
     assert mock.call_args.kwargs["response"]["body"] == b"foo: 123"
 
-    response = client.post("/bar/", content=b"foo")
+    response = client.post("/api/bar", content=b"foo")
     assert response.status_code == 200
     assert mock.call_count == 2
     assert mock.call_args is not None
     assert mock.call_args.kwargs["request"]["method"] == "POST"
-    assert mock.call_args.kwargs["request"]["path"] == "/bar/"
-    assert mock.call_args.kwargs["request"]["url"] == "http://testserver/bar/"
+    assert mock.call_args.kwargs["request"]["path"] == "/api/bar"
+    assert mock.call_args.kwargs["request"]["url"] == "http://testserver/api/bar"
     assert mock.call_args.kwargs["request"]["body"] == b"foo"
     assert mock.call_args.kwargs["response"]["body"] == b"bar: foo"
 
     mocker.patch("apitally.starlette.MAX_BODY_SIZE", 2)
-    response = client.post("/bar/", content=b"foo")
+    response = client.post("/api/bar", content=b"foo")
     assert response.status_code == 200
     assert mock.call_count == 3
     assert mock.call_args is not None
@@ -312,6 +327,9 @@ def test_get_startup_data(app: Starlette, mocker: MockerFixture):
 
     data = _get_startup_data(app=app.middleware_stack, app_version="1.2.3", openapi_url=None)
     assert len(data["paths"]) == 7
+    assert {"method": "get", "path": "/api/foo"} in data["paths"]
+    assert {"method": "post", "path": "/test/task"} in data["paths"]
+    assert {"method": "get", "path": "/stream"} in data["paths"]
     assert data["versions"]["starlette"]
     assert data["versions"]["app"] == "1.2.3"
     assert data["client"] == "python:starlette"