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

apitally/starlette.py

@@ -1,16 +1,18 @@
 from __future__ import annotations
 
 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
@@ -56,10 +58,13 @@ class ApitallyMiddleware:
             self.client.request_logger.config.enabled and self.client.request_logger.config.log_response_body
         )
 
-        _register_event_handler(app, "startup", self.on_startup)
-        _register_event_handler(app, "shutdown", self.client.handle_shutdown)
+        _inject_lifespan_handlers(
+            app,
+            on_startup=self.on_startup,
+            on_shutdown=self.client.handle_shutdown,
+        )
 
-    def on_startup(self) -> None:
+    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()
@@ -289,8 +294,30 @@ def _get_routes(app: Union[ASGIApp, Router]) -> List[BaseRoute]:
     return []  # pragma: no cover
 
 
-def _register_event_handler(app: Union[ASGIApp, Router], event: str, handler: Callable[[], Any]) -> None:
-    if isinstance(app, Router):
-        app.add_event_handler(event, handler)
-    elif hasattr(app, "app"):
-        _register_event_handler(app.app, event, 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.2.dist-info → apitally-0.16.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apitally
-Version: 0.16.2
+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.2.dist-info → apitally-0.16.3.dist-info}/RECORD

@@ -8,7 +8,7 @@ apitally/fastapi.py,sha256=IfKfgsmIY8_AtnuMTW2sW4qnkya61CAE2vBoIpcc9tk,169
 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=g6YmC186uG6Lc9-Gx3Pp4ke-jn8IeKK0nFLBGDnWYv0,12771
+apitally/starlette.py,sha256=081vXTNOy6-zZ8ugXknRtQZnFFqG7XKLW4Ho6oaHEUY,13525
 apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apitally/client/client_asyncio.py,sha256=rTsH5wlLHK3RmyIuEiT6vzjquU-l2OPC34JnC2U6uYw,6658
 apitally/client/client_base.py,sha256=DvivGeHd3dyOASRvkIo44Zh8RzdBMfH8_rROa2lFbgw,3799
@@ -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.2.dist-info/METADATA,sha256=Lycf-s6pDP5lO9B8-pRqcDfHZcJTFZQ--wSuquoDZn0,9321
-apitally-0.16.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-apitally-0.16.2.dist-info/licenses/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
-apitally-0.16.2.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,,