apitally 0.16.1__py3-none-any.whl → 0.16.3__py3-none-any.whl

apitally/client/client_asyncio.py

@@ -41,7 +41,6 @@ class ApitallyClient(ApitallyClientBase):
         self._stop_sync_loop = False
         self._sync_loop_task: Optional[asyncio.Task] = None
         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:
         if httpx.__version__ >= "0.26.0":
@@ -67,7 +66,7 @@ class ApitallyClient(ApitallyClientBase):
                 try:
                     async with self.get_http_client() as client:
                         tasks = [self.send_sync_data(client), self.send_log_data(client)]
-                        if not self._startup_data_sent and last_sync_time > 0:  # not on first sync
+                        if not self._startup_data_sent:
                             tasks.append(self.send_startup_data(client))
                         await asyncio.gather(*tasks)
                     last_sync_time = now
@@ -92,11 +91,6 @@ class ApitallyClient(ApitallyClientBase):
     def set_startup_data(self, data: Dict[str, Any]) -> None:
         self._startup_data_sent = False
         self._startup_data = self.add_uuids_to_data(data)
-        self._set_startup_data_task = asyncio.create_task(self._set_startup_data())
-
-    async def _set_startup_data(self) -> None:
-        async with self.get_http_client() as client:
-            await self.send_startup_data(client)
 
     async def send_startup_data(self, client: httpx.AsyncClient) -> None:
         if self._startup_data is not None:

apitally/client/client_threading.py

@@ -80,7 +80,7 @@ class ApitallyClient(ApitallyClientBase):
                 if (now - last_sync_time) >= self.sync_interval:
                     try:
                         with requests.Session() as session:
-                            if not self._startup_data_sent and last_sync_time > 0:  # not on first sync
+                            if not self._startup_data_sent:
                                 self.send_startup_data(session)
                             self.send_sync_data(session)
                             self.send_log_data(session)
@@ -105,8 +105,6 @@ class ApitallyClient(ApitallyClientBase):
     def set_startup_data(self, data: Dict[str, Any]) -> None:
         self._startup_data_sent = False
         self._startup_data = self.add_uuids_to_data(data)
-        with requests.Session() as session:
-            self.send_startup_data(session)
 
     def send_startup_data(self, session: requests.Session) -> None:
         if self._startup_data is not None:

apitally/django.py

@@ -75,13 +75,13 @@ class ApitallyMiddleware:
             request_logging_config=self.config.request_logging_config,
             proxy=self.config.proxy,
         )
-        self.client.start_sync_loop()
         self.client.set_startup_data(
             _get_startup_data(
                 app_version=self.config.app_version,
                 urlconfs=self.config.urlconfs,
             )
         )
+        self.client.start_sync_loop()
 
         self.capture_request_body = (
             self.client.request_logger.config.enabled and self.client.request_logger.config.log_request_body

apitally/flask.py

@@ -51,7 +51,6 @@ class ApitallyMiddleware:
             request_logging_config=request_logging_config,
             proxy=proxy,
         )
-        self.client.start_sync_loop()
         self.delayed_set_startup_data(app_version, openapi_url)
 
         self.capture_request_body = (
@@ -73,6 +72,7 @@ class ApitallyMiddleware:
     def _delayed_set_startup_data(self, app_version: Optional[str] = None, openapi_url: Optional[str] = None) -> None:
         data = _get_startup_data(self.app, app_version, openapi_url)
         self.client.set_startup_data(data)
+        self.client.start_sync_loop()
 
     def __call__(self, environ: WSGIEnvironment, start_response: StartResponse) -> Iterable[bytes]:
         if not self.client.enabled:

apitally/starlette.py

@@ -1,17 +1,18 @@
 from __future__ import annotations
 
-import asyncio
 import time
-from typing import Any, Callable, Dict, List, Optional, Union
+from contextlib import asynccontextmanager
+from typing import Any, Awaitable, Callable, Dict, List, Optional, Union
 from warnings import warn
 
 from httpx import HTTPStatusError, Proxy
+from starlette.applications import Starlette
 from starlette.datastructures import Headers
 from starlette.requests import Request
 from starlette.routing import BaseRoute, Match, Router
 from starlette.schemas import EndpointInfo, SchemaGenerator
 from starlette.testclient import TestClient
-from starlette.types import ASGIApp, Message, Receive, Scope, Send
+from starlette.types import ASGIApp, Lifespan, Message, Receive, Scope, Send
 
 from apitally.client.client_asyncio import ApitallyClient
 from apitally.client.consumers import Consumer as ApitallyConsumer
@@ -40,6 +41,8 @@ class ApitallyMiddleware:
         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.client = ApitallyClient(
             client_id=client_id,
@@ -47,10 +50,6 @@ class ApitallyMiddleware:
             request_logging_config=request_logging_config,
             proxy=proxy,
         )
-        self.client.start_sync_loop()
-        self._delayed_set_startup_data_task: Optional[asyncio.Task] = None
-        self.delayed_set_startup_data(app_version, openapi_url)
-        _register_shutdown_handler(app, self.client.handle_shutdown)
 
         self.capture_request_body = (
             self.client.request_logger.config.enabled and self.client.request_logger.config.log_request_body
@@ -59,17 +58,16 @@ class ApitallyMiddleware:
             self.client.request_logger.config.enabled and self.client.request_logger.config.log_response_body
         )
 
-    def delayed_set_startup_data(self, app_version: Optional[str] = None, openapi_url: Optional[str] = None) -> None:
-        self._delayed_set_startup_data_task = asyncio.create_task(
-            self._delayed_set_startup_data(app_version, openapi_url)
+        _inject_lifespan_handlers(
+            app,
+            on_startup=self.on_startup,
+            on_shutdown=self.client.handle_shutdown,
         )
 
-    async def _delayed_set_startup_data(
-        self, app_version: Optional[str] = None, openapi_url: Optional[str] = None
-    ) -> None:
-        await asyncio.sleep(1.0)  # Short delay to allow app routes to be registered first
-        data = _get_startup_data(self.app, app_version, openapi_url)
+    async def on_startup(self) -> None:
+        data = _get_startup_data(self.app, app_version=self.app_version, openapi_url=self.openapi_url)
         self.client.set_startup_data(data)
+        self.client.start_sync_loop()
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
         if self.client.enabled and scope["type"] == "http" and scope["method"] != "OPTIONS":
@@ -296,8 +294,30 @@ def _get_routes(app: Union[ASGIApp, Router]) -> List[BaseRoute]:
     return []  # pragma: no cover
 
 
-def _register_shutdown_handler(app: Union[ASGIApp, Router], shutdown_handler: Callable[[], Any]) -> None:
-    if isinstance(app, Router):
-        app.add_event_handler("shutdown", shutdown_handler)
-    elif hasattr(app, "app"):
-        _register_shutdown_handler(app.app, shutdown_handler)
+def _inject_lifespan_handlers(
+    app: Union[ASGIApp, Router],
+    on_startup: Callable[[], Awaitable[Any]],
+    on_shutdown: Callable[[], Awaitable[Any]],
+) -> None:
+    """
+    Ensures the given startup and shutdown functions are called as part of the app's lifespan context manager.
+    """
+    router = app
+    while not isinstance(router, Router) and hasattr(router, "app"):
+        router = router.app
+    if not isinstance(router, Router):
+        raise TypeError("app must be a Starlette or Router instance")
+
+    lifespan: Optional[Lifespan] = getattr(router, "lifespan_context", None)
+
+    @asynccontextmanager
+    async def wrapped_lifespan(app: Starlette):
+        await on_startup()
+        if lifespan is not None:
+            async with lifespan(app):
+                yield
+        else:
+            yield
+        await on_shutdown()
+
+    router.lifespan_context = wrapped_lifespan

{apitally-0.16.1.dist-info → apitally-0.16.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apitally
-Version: 0.16.1
+Version: 0.16.3
 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
@@ -49,9 +49,9 @@ 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: fastapi>=0.94.1; extra == 'fastapi'
 Requires-Dist: httpx>=0.22.0; extra == 'fastapi'
-Requires-Dist: starlette<1.0.0,>=0.22.0; extra == 'fastapi'
+Requires-Dist: starlette<1.0.0,>=0.26.1; extra == 'fastapi'
 Provides-Extra: flask
 Requires-Dist: flask>=2.0.0; extra == 'flask'
 Requires-Dist: requests>=2.26.0; extra == 'flask'
@@ -62,7 +62,7 @@ Provides-Extra: sentry
 Requires-Dist: sentry-sdk>=2.2.0; extra == 'sentry'
 Provides-Extra: starlette
 Requires-Dist: httpx>=0.22.0; extra == 'starlette'
-Requires-Dist: starlette<1.0.0,>=0.21.0; extra == 'starlette'
+Requires-Dist: starlette<1.0.0,>=0.26.1; extra == 'starlette'
 Description-Content-Type: text/markdown
 
 <p align="center">

{apitally-0.16.1.dist-info → apitally-0.16.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
 apitally/__init__.py,sha256=ShXQBVjyiSOHxoQJS2BvNG395W4KZfqMxZWBAR0MZrE,22
 apitally/blacksheep.py,sha256=KvcPFeiwQgWZmRglbm8SLaN6_WRs5kZ3SymB1IuLR-A,9616
 apitally/common.py,sha256=azDxepViH0QW0MuufTHxeSQyLGzCkocAX_KPziWTx8A,1605
-apitally/django.py,sha256=zwe8svC8rfo7TyHfOlkYTeXptxPFoRjvt0bbYvgtJKM,16892
+apitally/django.py,sha256=f_k7yYlvvvhJMR53NcXCfmlLxLX3CeLO9ephF4bzKbo,16892
 apitally/django_ninja.py,sha256=-CmrwFFRv7thFOUK_OrOSouhHL9bm5sIBNIQlpyE_2c,166
 apitally/django_rest_framework.py,sha256=-CmrwFFRv7thFOUK_OrOSouhHL9bm5sIBNIQlpyE_2c,166
 apitally/fastapi.py,sha256=IfKfgsmIY8_AtnuMTW2sW4qnkya61CAE2vBoIpcc9tk,169
-apitally/flask.py,sha256=p_u33_FQq2i5AebWB8wYxXX0CPhcX8OJHGWj5dR4sPY,9622
+apitally/flask.py,sha256=OoCEnjtnD51GUGq-adK80ebuiLj-5HXubxffCv5XTCM,9622
 apitally/litestar.py,sha256=mHoMqBO_gyoopeHljY8e8GTcV29UDf3uhQMxY3GeNpA,13451
 apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/starlette.py,sha256=iEcN--2eeUW9d78H42WolWEkss2idvXLjK2OQmvULdM,13218
+apitally/starlette.py,sha256=081vXTNOy6-zZ8ugXknRtQZnFFqG7XKLW4Ho6oaHEUY,13525
 apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/client/client_asyncio.py,sha256=9mdi9Hmb6-xn7dNdwP84e4PNAHGg2bYdMEgIfPUAtcQ,7003
+apitally/client/client_asyncio.py,sha256=rTsH5wlLHK3RmyIuEiT6vzjquU-l2OPC34JnC2U6uYw,6658
 apitally/client/client_base.py,sha256=DvivGeHd3dyOASRvkIo44Zh8RzdBMfH8_rROa2lFbgw,3799
-apitally/client/client_threading.py,sha256=7JPu2Uulev7X2RiSLx4HJYfvAP6Z5zB_yuSevMfQC7I,7389
+apitally/client/client_threading.py,sha256=sxMRcxRgk1SxJjSq-qpIcDVmD3Q7Kv4CVT5zEUVt0KM,7257
 apitally/client/consumers.py,sha256=w_AFQhVgdtJVt7pVySBvSZwQg-2JVqmD2JQtVBoMkus,2626
 apitally/client/logging.py,sha256=QMsKIIAFo92PNBUleeTgsrsQa7SEal-oJa1oOHUr1wI,507
 apitally/client/request_logging.py,sha256=SMvQd3WDolnb8u9rHVh2_OgXwFjL2jLZt-GpZNQ1XGk,14115
@@ -20,7 +20,7 @@ apitally/client/requests.py,sha256=SDptGOg9XvaEKFj2o3oxJz-JAuZzUrqpHnbOQixf99o,3
 apitally/client/sentry.py,sha256=qMjHdI0V7c50ruo1WjmjWc8g6oGDv724vSCvcuZ8G9k,1188
 apitally/client/server_errors.py,sha256=4B2BKDFoIpoWc55UVH6AIdYSgzj6zxCdMNUW77JjhZw,3423
 apitally/client/validation_errors.py,sha256=6G8WYWFgJs9VH9swvkPXJGuOJgymj5ooWA9OwjUTbuM,1964
-apitally-0.16.1.dist-info/METADATA,sha256=eS5sdPc9rWZRyr8WS_ZcvjSxtmiByflQ8n1GI01_0VI,9321
-apitally-0.16.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-apitally-0.16.1.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
-apitally-0.16.1.dist-info/RECORD,,
+apitally-0.16.3.dist-info/METADATA,sha256=NbeWFQBfMfdu1Ao_0zGhBTMsNO3m1xmWZ6KNhGe2qNQ,9321
+apitally-0.16.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+apitally-0.16.3.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.16.3.dist-info/RECORD,,