apitally 0.17.0__tar.gz → 0.18.1__tar.gz

{apitally-0.17.0 → apitally-0.18.1}/.github/workflows/tests.yaml

@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         deps:
           - fastapi starlette
           - fastapi==0.94.1 starlette
@@ -64,10 +64,6 @@ jobs:
           - blacksheep
           - blacksheep==2.1.0
         exclude:
-          - python: "3.8"
-            deps: blacksheep
-          - python: "3.8"
-            deps: blacksheep==2.1.0
           - python: "3.12"
             deps: djangorestframework==3.12.* django==3.2.* uritemplate
           - python: "3.12"

{apitally-0.17.0 → apitally-0.18.1}/.pre-commit-config.yaml

@@ -8,12 +8,12 @@ repos:
       - id: trailing-whitespace
       - id: mixed-line-ending
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.11.9
+    rev: v0.11.11
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]
       - id: ruff-format
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.7.3
+    rev: 0.7.8
     hooks:
       - id: uv-lock

apitally-0.18.1/.tool-versions

@@ -0,0 +1 @@
+uv 0.7.8

{apitally-0.17.0 → apitally-0.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apitally
-Version: 0.17.0
+Version: 0.18.1
 Summary: Simple API monitoring & analytics for REST APIs built with FastAPI, Flask, Django, Starlette, Litestar and BlackSheep.
 Project-URL: Homepage, https://apitally.io
 Project-URL: Documentation, https://docs.apitally.io
@@ -19,7 +19,6 @@ 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
@@ -31,7 +30,7 @@ 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-Python: <4.0,>=3.9
 Requires-Dist: backoff>=2.0.0
 Provides-Extra: blacksheep
 Requires-Dist: blacksheep>=2; extra == 'blacksheep'

{apitally-0.17.0 → apitally-0.18.1}/apitally/starlette.py

@@ -38,12 +38,14 @@ class ApitallyMiddleware:
         app_version: Optional[str] = None,
         openapi_url: Optional[str] = "/openapi.json",
         identify_consumer_callback: Optional[Callable[[Request], Union[str, ApitallyConsumer, None]]] = None,
+        capture_client_disconnects: bool = False,
         proxy: Optional[Union[str, Proxy]] = None,
     ) -> None:
         self.app = app
         self.app_version = app_version
         self.openapi_url = openapi_url
         self.identify_consumer_callback = identify_consumer_callback
+        self.capture_client_disconnects = capture_client_disconnects
         self.client = ApitallyClient(
             client_id=client_id,
             env=env,
@@ -72,7 +74,7 @@ class ApitallyMiddleware:
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
         if self.client.enabled and scope["type"] == "http" and scope["method"] != "OPTIONS":
             timestamp = time.time()
-            request = Request(scope)
+            request = Request(scope, receive, send)
             request_size = parse_int(request.headers.get("Content-Length"))
             request_body = b""
             request_body_too_large = request_size is not None and request_size > MAX_BODY_SIZE
@@ -89,6 +91,7 @@ class ApitallyMiddleware:
 
             async def receive_wrapper() -> Message:
                 nonlocal request_body, request_body_too_large
+
                 message = await receive()
                 if message["type"] == "http.request" and self.capture_request_body and not request_body_too_large:
                     request_body += message.get("body", b"")
@@ -107,6 +110,7 @@ class ApitallyMiddleware:
                     response_chunked, \
                     response_content_type, \
                     response_size
+
                 if message["type"] == "http.response.start":
                     response_time = time.perf_counter() - start_time
                     response_status = message["status"]
@@ -118,9 +122,11 @@ class ApitallyMiddleware:
                     response_content_type = response_headers.get("Content-Type")
                     response_size = parse_int(response_headers.get("Content-Length")) if not response_chunked else 0
                     response_body_too_large = response_size is not None and response_size > MAX_BODY_SIZE
+
                 elif message["type"] == "http.response.body":
                     if response_chunked and response_size is not None:
                         response_size += len(message.get("body", b""))
+
                     if (
                         (self.capture_response_body or response_status == 422)
                         and RequestLogger.is_supported_content_type(response_content_type)
@@ -130,6 +136,11 @@ class ApitallyMiddleware:
                         if len(response_body) > MAX_BODY_SIZE:
                             response_body_too_large = True
                             response_body = b""
+
+                if self.capture_client_disconnects and await request.is_disconnected():
+                    # Client closed connection (report NGINX specific status code)
+                    response_status = 499
+
                 await send(message)
 
             try:

{apitally-0.17.0 → apitally-0.18.1}/pyproject.toml

@@ -16,7 +16,6 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -29,7 +28,7 @@ classifiers = [
     "Topic :: System :: Monitoring",
     "Typing :: Typed",
 ]
-requires-python = ">=3.8,<4.0"
+requires-python = ">=3.9,<4.0"
 dependencies = ["backoff>=2.0.0"]
 dynamic = ["version"]
 
@@ -61,22 +60,12 @@ Documentation = "https://docs.apitally.io"
 Repository = "https://github.com/apitally/apitally-py"
 
 [dependency-groups]
-dev = [
-    "ipykernel~=6.29.0",
-    "mypy~=1.14.0; python_version<'3.9'",
-    "mypy~=1.15.0; python_version>='3.9'",
-    "pre-commit~=3.5.0; python_version<'3.9'",
-    "pre-commit~=4.2.0; python_version>='3.9'",
-    "ruff~=0.11.0",
-]
+dev = ["ipykernel~=6.29.0", "mypy~=1.15.0", "pre-commit~=4.2.0", "ruff~=0.11.0"]
 test = [
-    "pytest~=7.4.4; python_version<'3.9'",
-    "pytest~=8.3.3; python_version>='3.9'",
+    "pytest~=8.3.3",
     "pytest-asyncio~=0.21.2",
-    "pytest-cov~=5.0.0; python_version<'3.9'",
-    "pytest-cov~=6.1.1; python_version>='3.9'",
-    "pytest-httpx~=0.22.0; python_version<'3.9'",
-    "pytest-httpx~=0.33.0; python_version>='3.9'",
+    "pytest-cov~=6.1.1",
+    "pytest-httpx~=0.33.0",
     "pytest-mock~=3.14.0",
     "requests-mock~=1.12.1",
 ]
@@ -115,7 +104,7 @@ select = ["E", "F", "W", "I"]
 lines-after-imports = 2
 
 [tool.mypy]
-python_version = "3.12"
+python_version = "3.13"
 check_untyped_defs = true
 
 [tool.pytest.ini_options]

apitally-0.18.1/renovate.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["github>apitally/renovate-config"],
+  "ignoreDeps": ["pytest-asyncio"]
+}

{apitally-0.17.0 → apitally-0.18.1}/tests/test_client_asyncio.py

@@ -4,7 +4,6 @@ import asyncio
 import gzip
 import json
 import re
-import sys
 import time
 from typing import TYPE_CHECKING
 
@@ -127,13 +126,11 @@ async def test_send_log_data(client: ApitallyClient, httpx_mock: HTTPXMock):
     request = httpx_mock.get_request(url=url_pattern)
     assert request is not None
 
-    if sys.version_info >= (3, 9):
-        # This doesn't work in Python 3.8 because of a bug in httpx
-        json_lines = gzip.decompress(request.read()).strip().split(b"\n")
-        assert len(json_lines) == 1
-        json_data = json.loads(json_lines[0])
-        assert json_data["request"]["path"] == "/test"
-        assert json_data["response"]["status_code"] == 200
+    json_lines = gzip.decompress(request.read()).strip().split(b"\n")
+    assert len(json_lines) == 1
+    json_data = json.loads(json_lines[0])
+    assert json_data["request"]["path"] == "/test"
+    assert json_data["response"]["status_code"] == 200
 
     if pytest_httpx.__version__ < "0.31.0":
         httpx_mock.reset(True)  # type: ignore[call-arg]