apitally 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

apitally/__init__.py

@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.7.1"

apitally/django.py

@@ -40,18 +40,25 @@ class ApitallyMiddleware:
 
     def __init__(self, get_response: Callable[[HttpRequest], HttpResponse]) -> None:
         self.get_response = get_response
-        self.ninja_available = _check_import("ninja")
+        self.drf_available = _check_import("rest_framework")
         self.drf_endpoint_enumerator = None
-        if _check_import("rest_framework"):
-            from rest_framework.schemas.generators import EndpointEnumerator
-
-            self.drf_endpoint_enumerator = EndpointEnumerator()
+        self.ninja_available = _check_import("ninja")
+        self.callbacks = set()
 
         if self.config is None:
             config = getattr(settings, "APITALLY_MIDDLEWARE", {})
             self.configure(**config)
             assert self.config is not None
 
+        if self.drf_available:
+            from rest_framework.schemas.generators import EndpointEnumerator
+
+            self.drf_endpoint_enumerator = EndpointEnumerator()
+            if None not in self.config.urlconfs:
+                self.callbacks.update(_get_drf_callbacks(self.config.urlconfs))
+        if self.ninja_available and None not in self.config.urlconfs:
+            self.callbacks.update(_get_ninja_callbacks(self.config.urlconfs))
+
         self.client = ApitallyClient(client_id=self.config.client_id, env=self.config.env)
         self.client.start_sync_loop()
         self.client.set_app_info(
@@ -124,6 +131,8 @@ class ApitallyMiddleware:
     def get_path(self, request: HttpRequest) -> Optional[str]:
         if (match := request.resolver_match) is not None:
             try:
+                if self.callbacks and match.func not in self.callbacks:
+                    return None
                 if self.drf_endpoint_enumerator is not None:
                     from rest_framework.schemas.generators import is_api_view
 
@@ -206,6 +215,13 @@ def _get_drf_paths(urlconfs: List[Optional[str]]) -> List[Dict[str, str]]:
     ]
 
 
+def _get_drf_callbacks(urlconfs: List[Optional[str]]) -> Set[Callable]:
+    from rest_framework.schemas.generators import EndpointEnumerator
+
+    enumerators = [EndpointEnumerator(urlconf=urlconf) for urlconf in urlconfs]
+    return {callback for enumerator in enumerators for _, _, callback in enumerator.get_api_endpoints()}
+
+
 def _get_drf_schema(urlconfs: List[Optional[str]]) -> Optional[Dict[str, Any]]:
     from rest_framework.schemas.openapi import SchemaGenerator
 
@@ -237,6 +253,15 @@ def _get_ninja_paths(urlconfs: List[Optional[str]]) -> List[Dict[str, str]]:
     return endpoints
 
 
+def _get_ninja_callbacks(urlconfs: List[Optional[str]]) -> Set[Callable]:
+    return {
+        path_view.get_view()
+        for api in _get_ninja_api_instances(urlconfs=urlconfs)
+        for _, router in api._routers
+        for path_view in router.path_operations.values()
+    }
+
+
 def _get_ninja_schema(urlconfs: List[Optional[str]]) -> Optional[Dict[str, Any]]:
     schemas = []
     for api in _get_ninja_api_instances(urlconfs=urlconfs):

{apitally-0.7.0.dist-info → apitally-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apitally
-Version: 0.7.0
+Version: 0.7.1
 Summary: API monitoring for REST APIs built with FastAPI, Flask, Django, Starlette and Litestar.
 Home-page: https://apitally.io
 License: MIT

{apitally-0.7.0.dist-info → apitally-0.7.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-apitally/__init__.py,sha256=RaANGbRu5e-vehwXI1-Qe2ggPPfs1TQaZj072JdbLk4,22
+apitally/__init__.py,sha256=2KJZDSMOG7KS82AxYOrZ4ZihYxX0wjfUjDsIZh3L024,22
 apitally/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apitally/client/asyncio.py,sha256=uR5JlH37G6gZvAJ7A1gYOGkjn3zjC-4I6avA1fncXHs,4433
 apitally/client/base.py,sha256=E_yUTItAtZWPOx80K3Pm55CNBgF_NZ6RMyXZTnjSV9c,8511
 apitally/client/logging.py,sha256=QMsKIIAFo92PNBUleeTgsrsQa7SEal-oJa1oOHUr1wI,507
 apitally/client/threading.py,sha256=ihQzUStrSQFynpqXgFpseAXrHuc5Et1QvG-YHlzqDr8,4831
 apitally/common.py,sha256=GbVmnXxhRvV30d7CfCQ9r0AeXj14Mv9Jm_Yd1bRWP28,1088
-apitally/django.py,sha256=tp1bsBGyfG41yKMBHrqNG2rOyO4ToB7Fal40TTN4qvo,11052
+apitally/django.py,sha256=SHSM00eRsvoJC2d4c4tK6gctKLnxLfrw4LoZ4CWPm4U,12124
 apitally/django_ninja.py,sha256=iMvZd7j04nbOLpJgYxs7tpbsyXlZuhmHjcswXMvyUlU,82
 apitally/django_rest_framework.py,sha256=iMvZd7j04nbOLpJgYxs7tpbsyXlZuhmHjcswXMvyUlU,82
 apitally/fastapi.py,sha256=Q3n2bVREKQ_V_2yCQ48ngPtr-NJxDskpT_l20xhSbpM,85
@@ -13,7 +13,7 @@ apitally/flask.py,sha256=xxyrHchMiPuEMP3c_Us_niJn9K7x87RDvxD5GtntEvU,4769
 apitally/litestar.py,sha256=Pl1tEbxve3vqrdflWdvZjPFrEVxNIr6NjuQVf4YSpzY,7171
 apitally/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apitally/starlette.py,sha256=9VKGdNuKPrRcnQv7GeyV5cLa7TpgidxMVnAKSxMsWjI,7345
-apitally-0.7.0.dist-info/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
-apitally-0.7.0.dist-info/METADATA,sha256=huzvHmuBeVxea6HKDwXnT6ei8zrBI7RD7pdweMdKkEQ,6736
-apitally-0.7.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-apitally-0.7.0.dist-info/RECORD,,
+apitally-0.7.1.dist-info/LICENSE,sha256=vbLzC-4TddtXX-_AFEBKMYWRlxC_MN0g66QhPxo8PgY,1065
+apitally-0.7.1.dist-info/METADATA,sha256=SO16kB-1EwZGAm28P4m4E2EMltFfmKUy4uF44X4LB30,6736
+apitally-0.7.1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+apitally-0.7.1.dist-info/RECORD,,