Merge pull request #25 from mongkok/request-scope-interface

Add Request.scope mapping interface

Author: mongkok

debug_toolbar/middleware.py

@@ -20,7 +20,7 @@
 
 def show_toolbar(request: Request, settings: DebugToolbarSettings) -> bool:
     if settings.ALLOWED_IPS is not None:
-        remote_addr, _ = request.scope["client"]
+        remote_addr, _ = request["client"]
         return request.app.debug and remote_addr in settings.ALLOWED_IPS
     return request.app.debug
 
@@ -63,7 +63,7 @@ async def dispatch(
         request.scope["route"] = matched_route(request)
 
         if (
-            not request.scope["route"]
+            not request["route"]
             or not self.show_toolbar(request, self.settings)
             or self.settings.API_URL in request.url.path
         ):

debug_toolbar/panels/logging.py

@@ -92,7 +92,7 @@ def nav_subtitle(self) -> str:
         return f"{record_count} message{pluralize(record_count)}"
 
     async def process_request(self, request: Request) -> Response:
-        if is_coroutine(request.scope["route"].endpoint):
+        if is_coroutine(request["route"].endpoint):
             self.thread_id = threading.get_ident()
         else:
             self.thread_id = await run_in_threadpool(threading.get_ident)

debug_toolbar/panels/profiling.py

@@ -15,7 +15,7 @@ class ProfilingPanel(Panel):
 
     async def process_request(self, request: Request) -> Response:
         self.profiler = Profiler(**self.toolbar.settings.PROFILER_OPTIONS)
-        is_async = is_coroutine(request.scope["route"].endpoint)
+        is_async = is_coroutine(request["route"].endpoint)
 
         async def call(func: t.Callable) -> None:
             await run_in_threadpool(func) if not is_async else func()

debug_toolbar/panels/request.py

@@ -16,7 +16,7 @@ def nav_subtitle(self) -> str:
         return get_name_from_obj(self.endpoint)
 
     async def generate_stats(self, request: Request, response: Response) -> Stats:
-        self.endpoint = request.scope["endpoint"]
+        self.endpoint = request["endpoint"]
         stats: t.Dict[str, t.Any] = {"request": request}
 
         if hasattr(self, "_form"):

debug_toolbar/panels/routes.py

@@ -11,5 +11,5 @@ class RoutesPanel(Panel):
     async def generate_stats(self, request: Request, response: Response) -> Stats:
         return {
             "routes": request.app.routes,
-            "endpoint": request.scope["endpoint"],
+            "endpoint": request["endpoint"],
         }

debug_toolbar/panels/sqlalchemy.py

@@ -56,10 +56,10 @@ def after_execute(
         self.add_query(str(conn.engine.url), query)
 
     async def add_engines(self, request: Request):
-        route = request.scope["route"]
+        route = request["route"]
 
         if hasattr(route, "dependant"):
-            if request.scope.get("fastapi_astack") is None:
+            if "fastapi_astack" not in request:
                 async with AsyncExitStack() as stack:
                     request.scope["fastapi_astack"] = stack
 

debug_toolbar/templates/panels/request.html

@@ -9,7 +9,7 @@ <h4>Endpoint information</h4>
   </thead>
   <tbody>
     <tr>
-      <td>{{ get_name_from_obj(request.scope.endpoint) }}</td>
+      <td>{{ get_name_from_obj(request.endpoint) }}</td>
       <td>
         {% if request.path_params %}
           {% for k, v in request.path_params.items() %}