moving observe function to toolbar

Author: gone

debug_toolbar/middleware.py

@@ -21,13 +21,6 @@ def show_toolbar(request):
     return settings.DEBUG and request.META.get("REMOTE_ADDR") in settings.INTERNAL_IPS
 
 
-def observe_request(request):
-    """
-    Default function to determine whether to update the toolbar from a client side request
-    """
-    return not DebugToolbar.is_toolbar_request(request)
-
-
 @lru_cache()
 def get_show_toolbar():
     # If SHOW_TOOLBAR_CALLBACK is a string, which is the recommended
@@ -39,17 +32,6 @@ def get_show_toolbar():
         return func_or_path
 
 
-@lru_cache()
-def get_observe_request():
-    # If OBSERVE_REQUEST_CALLBACK is a string, which is the recommended
-    # setup, resolve it to the corresponding callable.
-    func_or_path = dt_settings.get_config()["OBSERVE_REQUEST_CALLBACK"]
-    if isinstance(func_or_path, str):
-        return import_string(func_or_path)
-    else:
-        return func_or_path
-
-
 class DebugToolbarMiddleware:
     """
     Middleware to set up Debug Toolbar on incoming request and render toolbar

debug_toolbar/panels/history/panel.py

@@ -8,10 +8,10 @@
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
-from debug_toolbar.middleware import get_observe_request
 from debug_toolbar.panels import Panel
 from debug_toolbar.panels.history import views
 from debug_toolbar.panels.history.forms import HistoryStoreForm
+from debug_toolbar.toolbar import get_observe_request
 
 
 class HistoryPanel(Panel):

debug_toolbar/settings.py

@@ -37,7 +37,7 @@
     "SHOW_TEMPLATE_CONTEXT": True,
     "SKIP_TEMPLATE_PREFIXES": ("django/forms/widgets/", "admin/widgets/"),
     "SQL_WARNING_THRESHOLD": 500,  # milliseconds
-    "OBSERVE_REQUEST_CALLBACK": "debug_toolbar.middleware.observe_request",
+    "OBSERVE_REQUEST_CALLBACK": "debug_toolbar.toolbar.observe_request",
 }
 
 

debug_toolbar/toolbar.py

@@ -4,6 +4,7 @@
 
 import uuid
 from collections import OrderedDict
+from functools import lru_cache
 
 from django.apps import apps
 from django.core.exceptions import ImproperlyConfigured
@@ -154,3 +155,21 @@ def is_toolbar_request(cls, request):
         except Resolver404:
             return False
         return resolver_match.namespaces and resolver_match.namespaces[-1] == app_name
+
+
+def observe_request(request):
+    """
+    Default function to determine whether to update the toolbar from a client side request
+    """
+    return not DebugToolbar.is_toolbar_request(request)
+
+
+@lru_cache()
+def get_observe_request():
+    # If OBSERVE_REQUEST_CALLBACK is a string, which is the recommended
+    # setup, resolve it to the corresponding callable.
+    func_or_path = dt_settings.get_config()["OBSERVE_REQUEST_CALLBACK"]
+    if isinstance(func_or_path, str):
+        return import_string(func_or_path)
+    else:
+        return func_or_path