apitally 0.11.0__py3-none-any.whl → 0.11.2__py3-none-any.whl

apitally/__init__.py

@@ -1 +1 @@
-__version__ = "0.11.0"
+__version__ = "0.11.2"

apitally/client/asyncio.py

@@ -28,8 +28,9 @@ class ApitallyClient(ApitallyClientBase):
     def __init__(self, client_id: str, env: str) -> None:
         super().__init__(client_id=client_id, env=env)
         self._stop_sync_loop = False
-        self._sync_loop_task: Optional[asyncio.Task[Any]] = None
+        self._sync_loop_task: Optional[asyncio.Task] = None
         self._sync_data_queue: asyncio.Queue[Tuple[float, Dict[str, Any]]] = asyncio.Queue()
+        self._set_startup_data_task: Optional[asyncio.Task] = None
 
     def get_http_client(self) -> httpx.AsyncClient:
         return httpx.AsyncClient(base_url=self.hub_url, timeout=REQUEST_TIMEOUT)
@@ -67,9 +68,9 @@ 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)
-        asyncio.create_task(self._set_startup_data_task())
+        self._set_startup_data_task = asyncio.create_task(self._set_startup_data())
 
-    async def _set_startup_data_task(self) -> None:
+    async def _set_startup_data(self) -> None:
         async with self.get_http_client() as client:
             await self.send_startup_data(client)
 

apitally/client/base.py

@@ -244,6 +244,7 @@ class ServerErrorCounter:
         self.error_counts: Counter[ServerError] = Counter()
         self.sentry_event_ids: Dict[ServerError, str] = {}
         self._lock = threading.Lock()
+        self._tasks: Set[asyncio.Task] = set()
 
     def add_server_error(self, consumer: Optional[str], method: str, path: str, exception: BaseException) -> None:
         if not isinstance(exception, BaseException):
@@ -267,20 +268,20 @@ class ServerErrorCounter:
             from sentry_sdk.scope import Scope
         except ImportError:
             return  # pragma: no cover
-        if not hasattr(Scope, "get_isolation_scope") or not hasattr(Scope, "last_event_id"):
+        if not hasattr(Scope, "get_isolation_scope") or not hasattr(Scope, "_last_event_id"):
             # sentry-sdk < 2.2.0 is not supported
             return  # pragma: no cover
         if Hub.current.client is None:
             return  # sentry-sdk not initialized
 
         scope = Scope.get_isolation_scope()
-        if event_id := scope.last_event_id():
+        if event_id := scope._last_event_id:
             self.sentry_event_ids[server_error] = event_id
             return
 
         async def _wait_for_sentry_event_id(scope: Scope) -> None:
             i = 0
-            while not (event_id := scope.last_event_id()) and i < 100:
+            while not (event_id := scope._last_event_id) and i < 100:
                 i += 1
                 await asyncio.sleep(0.001)
             if event_id:
@@ -288,7 +289,9 @@ class ServerErrorCounter:
 
         with contextlib.suppress(RuntimeError):  # ignore no running loop
             loop = asyncio.get_running_loop()
-            loop.create_task(_wait_for_sentry_event_id(scope))
+            task = loop.create_task(_wait_for_sentry_event_id(scope))
+            self._tasks.add(task)
+            task.add_done_callback(self._tasks.discard)
 
     def get_and_reset_server_errors(self) -> List[Dict[str, Any]]:
         data: List[Dict[str, Any]] = []

apitally/client/threading.py

@@ -38,7 +38,7 @@ try:
 
     ipython = get_ipython()  # type: ignore
 except NameError:
-    from atexit import register as register_exit
+    from atexit import register as register_exit  # type: ignore[assignment]
 
 
 class ApitallyClient(ApitallyClientBase):

apitally/django.py

@@ -252,7 +252,9 @@ def _get_drf_schema(urlconfs: List[Optional[str]]) -> Optional[Dict[str, Any]]:
     from rest_framework.schemas.openapi import SchemaGenerator
 
     schemas = []
-    with contextlib.suppress(AssertionError):  # uritemplate and inflection must be installed for OpenAPI schema support
+    # AssertionError is raised if uritemplate or inflection are not installed (required for OpenAPI schema support)
+    # AttributeError is raised if app is using CoreAPI schema (deprecated) instead of OpenAPI
+    with contextlib.suppress(AssertionError, AttributeError):
         for urlconf in urlconfs:
             generator = SchemaGenerator(urlconf=urlconf)
             schema = generator.get_schema()

apitally/starlette.py

@@ -44,12 +44,15 @@ class ApitallyMiddleware(BaseHTTPMiddleware):
         self.identify_consumer_callback = identify_consumer_callback
         self.client = ApitallyClient(client_id=client_id, env=env)
         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)
         super().__init__(app)
 
     def delayed_set_startup_data(self, app_version: Optional[str] = None, openapi_url: Optional[str] = None) -> None:
-        asyncio.create_task(self._delayed_set_startup_data(app_version, openapi_url))
+        self._delayed_set_startup_data_task = asyncio.create_task(
+            self._delayed_set_startup_data(app_version, openapi_url)
+        )
 
     async def _delayed_set_startup_data(
         self, app_version: Optional[str] = None, openapi_url: Optional[str] = None

{apitally-0.11.0.dist-info → apitally-0.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apitally
-Version: 0.11.0
+Version: 0.11.2
 Summary: Simple API monitoring & analytics for REST APIs built with FastAPI, Flask, Django, Starlette and Litestar.
 Home-page: https://apitally.io
 License: MIT
@@ -29,7 +29,8 @@ Provides-Extra: litestar
 Provides-Extra: sentry
 Provides-Extra: starlette
 Requires-Dist: backoff (>=2.0.0)
-Requires-Dist: django (>=2.2) ; extra == "django-ninja" or extra == "django-rest-framework"
+Requires-Dist: django (>=2.2) ; (python_version >= "3.10") and (extra == "django-ninja" or extra == "django-rest-framework")
+Requires-Dist: django (>=2.2,<5) ; (python_version < "3.10") and (extra == "django-ninja" or extra == "django-rest-framework")
 Requires-Dist: django-ninja (>=0.18.0) ; extra == "django-ninja"
 Requires-Dist: djangorestframework (>=3.10.0) ; extra == "django-rest-framework"
 Requires-Dist: fastapi (>=0.87.0) ; extra == "fastapi"

{apitally-0.11.0.dist-info → apitally-0.11.2.dist-info}/RECORD

@@ -1,19 +1,19 @@
-apitally/__init__.py,sha256=raMu9XA9JEjvdoTmFqcOw7qhJX24rYDP7XmS59TAO-Q,23
+apitally/__init__.py,sha256=bmMNWd6X6fx5JJd3CqzukH9Aez4xKCZuJNcmMU1pbEc,23
 apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/client/asyncio.py,sha256=7Q1LRENXdN69pmRHc3IXdxWVKoWrfYoJiImj4ufyLcw,4692
-apitally/client/base.py,sha256=IbAyC1VCONGA1B_Wj0jM82pkAn_cnVKe_iqR5xy3Zp0,15299
+apitally/client/asyncio.py,sha256=L8cnh2Pd_abC9Y5dnoH18kPHjcQ1n_ngmJJu7yU1G2Q,4774
+apitally/client/base.py,sha256=v4LSOYNIOoeL3KTVyBlXBY5LCXc79Lvu9yK5Y_KILSQ,15442
 apitally/client/logging.py,sha256=QMsKIIAFo92PNBUleeTgsrsQa7SEal-oJa1oOHUr1wI,507
-apitally/client/threading.py,sha256=tgADSLbqQFnf5JqFmDT3ul3Jch00jZtU2MUJmOP22A4,5085
+apitally/client/threading.py,sha256=NhKgA8b9F1Sa0BdnTCcyVyWKI6vy9shGF9umG70kpfc,5113
 apitally/common.py,sha256=GbVmnXxhRvV30d7CfCQ9r0AeXj14Mv9Jm_Yd1bRWP28,1088
-apitally/django.py,sha256=J4dLh3vYFFm3bKgoQesGmghRmPDV5sOU2DpC6OxvW-Y,13612
+apitally/django.py,sha256=vqBloQH4WaxvIlVpDZoazPcj5ljFapi1kvUHRgkd0O4,13763
 apitally/django_ninja.py,sha256=dqQtnz2s8YWYHCwvkK5BjokjvpZJpPNhP0vng4kFtrQ,120
 apitally/django_rest_framework.py,sha256=dqQtnz2s8YWYHCwvkK5BjokjvpZJpPNhP0vng4kFtrQ,120
 apitally/fastapi.py,sha256=hEyYZsvIaA3OXZSSFdey5iqeEjfBPHgfNbyX8pLm7GI,123
 apitally/flask.py,sha256=KZxWN1xeXUazYYluu3aoKkZQ_aRljHmtjZi1AxvzpGw,6402
 apitally/litestar.py,sha256=sQcrHw-JV9AlpnXlrczmaDe0k6tD9PYQsc8nyQul8Ko,8802
 apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apitally/starlette.py,sha256=ib73Xe8GUMDwR4uREZsJjtmJtgk7uNEiINr9ex3Atm0,8612
-apitally-0.11.0.dist-info/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
-apitally-0.11.0.dist-info/METADATA,sha256=822XloDi47QyB8-wm7sWbNwMU9BQ7n7BVuszSwEXDvc,6834
-apitally-0.11.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-apitally-0.11.0.dist-info/RECORD,,
+apitally/starlette.py,sha256=tizWLlKMltKU1w3pUqa4EHfY3wjneUVZyvndmgl82c4,8747
+apitally-0.11.2.dist-info/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.11.2.dist-info/METADATA,sha256=enN-rzxB2Ooc8jFKhJrksz4cxrRH39f_43TkpW3ksrQ,6994
+apitally-0.11.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+apitally-0.11.2.dist-info/RECORD,,