plain.admin 0.28.0__tar.gz → 0.29.0__tar.gz

{plain_admin-0.28.0 → plain_admin-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.admin
-Version: 0.28.0
+Version: 0.29.0
 Summary: Admin dashboard and tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_admin-0.28.0 → plain_admin-0.29.0}/plain/admin/assets/toolbar/toolbar.js

@@ -50,6 +50,12 @@ var plainToolbar = {
     var toolbar = document.querySelector("#plaintoolbar");
     var tab = toolbar.querySelector("div[data-toolbar-tab=" + tabName + "]");
 
+    // If the tab doesn't exist for some reason, quit
+    if (!tab) {
+      console.warn("Toolbar tab " + tabName + " does not exist");
+      return;
+    }
+
     // Hide all children in the tab parent
     for (var i = 0; i < tab.parentNode.children.length; i++) {
       var child = tab.parentNode.children[i];

{plain_admin-0.28.0 → plain_admin-0.29.0}/plain/admin/querystats/core.py

@@ -1,3 +1,4 @@
+import datetime
 import time
 import traceback
 from collections import Counter
@@ -143,7 +144,7 @@ class QueryStats:
                 "method": request.method,
                 "unique_id": request.unique_id,
             },
-            "timestamp": time.time(),
+            "timestamp": datetime.datetime.now().isoformat(),
             "total_time_display": self.total_time_display,
             "queries": self.queries,
         }

{plain_admin-0.28.0 → plain_admin-0.29.0}/plain/admin/querystats/middleware.py

@@ -55,14 +55,15 @@ class QueryStatsMiddleware:
         if self.should_ignore_request(request):
             return self.get_response(request)
 
-        # Previously we wrapped this in execute_wrapper too,
-        # but now there's a chicken and the egg issue with "querystats" being by the view,
-        # which hasn't been processed yet (on the initial request)
-        is_admin = self.is_admin_request(request)
+        def is_tracking():
+            return "querystats" in request.session
+
+        querystats = QueryStats(include_tracebacks=is_tracking())
+
+        with connection.execute_wrapper(querystats):
+            is_admin = self.is_admin_request(request)
 
         if settings.DEBUG or is_admin:
-            tracking = "querystats" in request.session
-            querystats = QueryStats(include_tracebacks=tracking)
             with connection.execute_wrapper(querystats):
                 response = self.get_response(request)
 
@@ -74,7 +75,7 @@ class QueryStatsMiddleware:
             # by using the server timing API which can be parsed client-side
             response.headers["Server-Timing"] = querystats.as_server_timing()
 
-            if tracking and querystats.num_queries > 0:
+            if is_tracking() and querystats.num_queries > 0:
                 request.session["querystats"][request.unique_id] = json.dumps(
                     querystats.as_context_dict(request), cls=QueryStatsJSONEncoder
                 )

{plain_admin-0.28.0 → plain_admin-0.29.0}/plain/admin/querystats/views.py

@@ -1,4 +1,3 @@
-import datetime
 import json
 
 from plain.auth.views import AuthViewMixin
@@ -56,10 +55,6 @@ class QuerystatsView(AuthViewMixin, TemplateView):
             )
         )
 
-        # Convert the timestamps back to a python datetime object
-        for data in querystats.values():
-            data["timestamp"] = datetime.datetime.fromtimestamp(data["timestamp"])
-
         context["querystats"] = querystats
         context["querystats_enabled"] = "querystats" in self.request.session
 

{plain_admin-0.28.0 → plain_admin-0.29.0}/plain/admin/templates/querystats/querystats.html

@@ -41,7 +41,7 @@
                         <span class="text-sm">{{ qs.request.path }}</span>
                         <span class="font-semibold bg-white/5 rounded-sm px-1 py-0.5 text-xs">{{ qs.request.method }}</span>
                         <div class="text-xs text-stone-400">{{ qs.summary }}</div>
-                        <div class="text-xs text-stone-500">{{ qs.timestamp|timesince }} ago</div>
+                        <div class="text-xs text-stone-500">{{ qs.timestamp|fromisoformat|timesince }} ago</div>
                     </button>
                 </li>
                 {% endfor %}
@@ -58,7 +58,7 @@
                     </div>
                     <div class="text-right">
                         <div class="text-xs text-white/60">Request ID <code>{{ qs.request.unique_id }}</code></div>
-                        <div class="text-xs text-white/60"><code>{{ qs.timestamp }}</code></div>
+                        <div class="text-xs text-white/60"><code>{{ qs.timestamp|fromisoformat }}</code></div>
                     </div>
                 </div>
 
@@ -92,10 +92,12 @@
                                 <span class="font-medium">Parameters</span>
                                 <pre><code class="font-mono">{{ query.params|pprint }}</code></pre>
                             </div>
+                            {% if query.tb|default(false) %}
                             <details>
                                 <summary>Traceback</summary>
                                 <pre><code class="block overflow-x-auto font-mono text-xs">{{ query.tb }}</code></pre>
                             </details>
+                            {% endif %}
                         </div>
                     </details>
                     {% else %}

plain_admin-0.29.0/plain/admin/templates/toolbar/exception.html

@@ -0,0 +1,16 @@
+<div class="px-6 py-4">
+    <div class="p-2 mb-5 border-amber-500 border rounded">
+        <div class="text-amber-500 text-lg flex justify-between items-center">
+            <div>
+                <span class="font-bold">Exception</span>
+                {{ exception }}
+            </div>
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-5 h-5 bi bi-exclamation-triangle-fill" viewBox="0 0 16 16">
+                <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
+            </svg>
+        </div>
+        <div class="text-amber-400 text-xs mt-3 bg-white/5 p-2 rounded overflow-auto">
+            <pre><code>{{ exception._traceback_string }}</code></pre>
+        </div>
+    </div>
+</div>

plain_admin-0.29.0/plain/admin/templates/toolbar/querystats.html

@@ -0,0 +1,28 @@
+<div id="querystats-container" class="h-full">
+    <div class="px-6 py-4 text-center">
+        <p>Loading querystats...</p>
+    </div>
+</div>
+<script>
+(function() {
+    var container = document.getElementById('querystats-container');
+    var loaded = false;
+    var parent = container.parentNode;
+    var observer = new IntersectionObserver(function(entries) {
+        entries.forEach(function(entry) {
+            if (entry.isIntersecting && !loaded) {
+                loaded = true;
+                var iframe = document.createElement('iframe');
+                iframe.src = "{{ url('admin:querystats:querystats') }}";
+                iframe.frameBorder = "0";
+                iframe.style.width = "100%";
+                iframe.style.height = "100%";
+                container.innerHTML = '';
+                container.appendChild(iframe);
+                observer.disconnect();
+            }
+        });
+    }, { root: parent, threshold: 0 });
+    observer.observe(container);
+})();
+</script>

plain_admin-0.29.0/plain/admin/templates/toolbar/request.html

@@ -0,0 +1,60 @@
+<dl class="text-sm grid grid-cols-1 sm:grid-cols-[max-content_1fr] sm:gap-y-2 gap-x-8 px-6 py-4">
+    <dt>Request ID</dt>
+    <dd class="text-sm text-white/50">{{ request.unique_id }}</dd>
+
+    <dt>Query params</dt>
+    <dd class="text-sm text-white/50">{{ request.query_params }}</dd>
+
+    <dt>Method</dt>
+    <dd class="text-sm text-white/50">{{ request.method }}</dd>
+
+    {% if request.resolver_match %}
+    <dt>View</dt>
+    <dd class="text-sm text-white/50">{{ request.resolver_match.view.view_class|pprint }}</dd>
+
+    <dt>URL pattern</dt>
+    <dd class="text-sm text-white/50">
+        <pre><code>{{ request.resolver_match.route }}</code></pre>
+    </dd>
+
+    <dt>URL name</dt>
+    <dd class="text-sm text-white/50">
+        <pre><code>{{ request.resolver_match.namespaced_url_name }}</code></pre>
+    </dd>
+
+    <dt>URL args</dt>
+    <dd class="text-sm text-white/50">
+        <pre><code>{{ request.resolver_match.args }}</code></pre>
+    </dd>
+
+    <dt>URL kwargs</dt>
+    <dd class="text-sm text-white/50">
+        <pre><code>{{ request.resolver_match.kwargs }}</code></pre>
+    </dd>
+    {% endif %}
+
+    {% if template_names is defined %}
+    <dt>Template names</dt>
+    <dd class="text-sm text-white/50">
+        <pre><code>{{ template_names }}</code></pre>
+    </dd>
+    {% endif %}
+
+    {% if object|default(false) %}
+    <dt>Primary object</dt>
+    <dd class="text-sm text-white/50 inline-flex items-center" title="PK: {{ object.pk|default('unknown') }}">
+        <pre><code>{{ object.__repr__() }}</code></pre>
+        {% if object|get_admin_model_detail_url %}
+        <a class="ml-2 inline-flex items-center p-1 text-blue-500 hover:text-blue-400" href="{{ object|get_admin_model_detail_url }}">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-3 h-3 bi bi-database-fill" viewBox="0 0 16 16">
+                <path d="M3.904 1.777C4.978 1.289 6.427 1 8 1s3.022.289 4.096.777C13.125 2.245 14 2.993 14 4s-.875 1.755-1.904 2.223C11.022 6.711 9.573 7 8 7s-3.022-.289-4.096-.777C2.875 5.755 2 5.007 2 4s.875-1.755 1.904-2.223"/>
+                <path d="M2 6.161V7c0 1.007.875 1.755 1.904 2.223C4.978 9.71 6.427 10 8 10s3.022-.289 4.096-.777C13.125 8.755 14 8.007 14 7v-.839c-.457.432-1.004.751-1.49.972C11.278 7.693 9.682 8 8 8s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
+                <path d="M2 9.161V10c0 1.007.875 1.755 1.904 2.223C4.978 12.711 6.427 13 8 13s3.022-.289 4.096-.777C13.125 11.755 14 11.007 14 10v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
+                <path d="M2 12.161V13c0 1.007.875 1.755 1.904 2.223C4.978 15.711 6.427 16 8 16s3.022-.289 4.096-.777C13.125 14.755 14 14.007 14 13v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
+            </svg>
+        </a>
+        {% endif %}
+    </dd>
+    {% endif %}
+
+</dl>

plain_admin-0.29.0/plain/admin/templates/toolbar/toolbar.html

@@ -0,0 +1,94 @@
+{% if toolbar.should_render() %}
+{% set panels=toolbar.get_panels() %}
+<script defer src="{{ asset('toolbar/toolbar.js') }}"></script>
+<div id="plaintoolbar" class="print:hidden text-stone-300 fixed bottom-0 w-full z-30 hidden sm:flex sm:flex-col">
+
+    <div id="plaintoolbar-details" class="hidden relative text-sm border-white/5 shadow-xl border-t inset-shadow-xs inset-shadow-stone-800 rounded-t-xl bg-stone-950/95 backdrop-blur-sm">
+
+        <div class="flex border-b border-white/5 px-2">
+            <div class="flex flex-grow">
+                {% for panel in panels %}
+                <button {% if loop.first %}data-active{% endif %} data-toolbar-tab="{{ panel.name }}" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">{{ panel.name }}</button>
+                {% endfor %}
+                <button data-plaintoolbar-expand class="flex-grow cursor-pointer inline-flex h-full" type="button"></button>
+            </div>
+            <div class="px-4 flex items-center space-x-4">
+                <button title="Hide toolbar for 1 hour" class="cursor-pointer hover:text-white text-white/50" type="button" data-plaintoolbar-hideuntil>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
+                        <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
+                        <path d="M8 1a7 7 0 1 0 4.95 11.95l.707.707A8.001 8.001 0 1 1 8 0z"/>
+                        <path d="M7.5 3a.5.5 0 0 1 .5.5v5.21l3.248 1.856a.5.5 0 0 1-.496.868l-3.5-2A.5.5 0 0 1 7 9V3.5a.5.5 0 0 1 .5-.5"/>
+                    </svg>
+                </button>
+                <button class="cursor-pointer hover:text-white text-white/50" type="button" data-plaintoolbar-expand>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
+                        <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708"/>
+                    </svg>
+                </button>
+            </div>
+        </div>
+
+        <div data-resizer class="cursor-grab w-20 h-1.5 top-1 bg-white/15 rounded-full absolute top-0 left-1/2 -translate-x-1/2"></div>
+
+        <div class="overflow-auto h-[30vh] flex flex-col">
+            {% for panel in panels %}
+            <div data-toolbar-tab="{{ panel.name }}" {% if not loop.first %}style="display: none;"{% endif %}>
+                {{ panel.render() }}
+            </div>
+            {% endfor %}
+        </div>
+
+    </div>
+
+    <div class="flex px-3 text-xs border-t border-white/5 space-x-4 py-2 bg-stone-950 shadow-xl">
+        <div class="flex items-center">
+            <code class="ml-1.5 bg-white/10 px-1.5 rounded-sm whitespace-nowrap text-mono">{{ toolbar.version }}</code>
+
+            {% if request.impersonator is defined %}
+            <div class="flex items-center ml-1 font-light">
+                Impersonating&nbsp;<span class="font-medium">{{ request.user }}</span>
+                </span>
+                <a href="{{ url('admin:impersonate:stop') }}" title="Stop impersonating" class="flex items-center px-1 ml-1 text-red-300 hover:text-white">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4 bi bi-x-octagon-fill" viewBox="0 0 16 16">
+                        <path d="M11.46.146A.5.5 0 0 0 11.107 0H4.893a.5.5 0 0 0-.353.146L.146 4.54A.5.5 0 0 0 0 4.893v6.214a.5.5 0 0 0 .146.353l4.394 4.394a.5.5 0 0 0 .353.146h6.214a.5.5 0 0 0 .353-.146l4.394-4.394a.5.5 0 0 0 .146-.353V4.893a.5.5 0 0 0-.146-.353L11.46.146zm-6.106 4.5L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 1 1 .708-.708z"/>
+                    </svg>
+                </a>
+            </div>
+            {% endif %}
+        </div>
+        <button type="button" data-plaintoolbar-expand class="flex-grow cursor-pointer"></button>
+        <div class="flex items-center space-x-4">
+            {% include "querystats/toolbar.html" %}
+
+            <div class="flex items-center space-x-3 transition-all">
+
+                {% if toolbar.request_exception() %}
+                <button class="cursor-pointer text-amber-500 hover:text-amber-400" type="button" data-toolbar-tab="Exception">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4 bi bi-exclamation-triangle-fill" viewBox="0 0 16 16">
+                        <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
+                    </svg>
+                </button>
+                {% endif %}
+
+                <a href="{{ url('admin:index') }}" class="hover:underline">Admin</a>
+
+                {% include "toolbar/links.html" ignore missing %}
+
+                <button data-plaintoolbar-expand class="hover:text-white cursor-pointer" type="button" title="Expand toolbar">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
+                        <path fill-rule="evenodd" d="M7.646 4.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1-.708.708L8 5.707l-5.646 5.647a.5.5 0 0 1-.708-.708z"/>
+                    </svg>
+                </button>
+
+                <button data-plaintoolbar-hide class="hover:text-red-500 cursor-pointer" type="button" title="Hide toolbar">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x w-4 h-4" viewBox="0 0 16 16">
+                        <path d="M2.146 2.854a.5.5 0 1 1 .708-.708L8 7.293l5.146-5.147a.5.5 0 0 1 .708.708L8.707 8l5.147 5.146a.5.5 0 0 1-.708.708L8 8.707l-5.146 5.147a.5.5 0 0 1-.708-.708L7.293 8z"/>
+                    </svg>
+                </button>
+
+            </div>
+        </div>
+    </div>
+
+</div>
+{% endif %}

plain_admin-0.29.0/plain/admin/toolbar.py

@@ -0,0 +1,109 @@
+import sys
+import traceback
+
+from plain.runtime import settings
+from plain.templates import Template
+from plain.urls.exceptions import Resolver404
+from plain.utils.safestring import mark_safe
+
+
+class Toolbar:
+    def __init__(self, request):
+        self.request = request
+        self.version = settings.ADMIN_TOOLBAR_VERSION
+
+    def should_render(self):
+        if settings.DEBUG:
+            return True
+
+        if hasattr(self.request, "impersonator"):
+            return self.request.impersonator.is_admin
+
+        if self.request.user:
+            return self.request.user.is_admin
+
+        return False
+
+    def request_exception(self):
+        # We can capture the exception currently being handled here, if any.
+        exception = sys.exception()
+
+        if exception and not isinstance(exception, Resolver404):
+            exception._traceback_string = "".join(
+                traceback.format_tb(exception.__traceback__)
+            )
+            return exception
+
+    def get_panels(self):
+        panels = [panel(self.request) for panel in _toolbar_panel_registry.get_panels()]
+
+        if self.request_exception():
+            exception = self.request_exception()
+            panels = [
+                _ExceptionToolbarPanel(self.request, exception),
+            ] + panels
+
+        return panels
+
+
+class ToolbarPanel:
+    name: str
+    template_name: str
+
+    def __init__(self, request):
+        self.request = request
+
+    def get_template_context(self):
+        return {
+            "request": self.request,
+        }
+
+    def render(self):
+        template = Template(self.template_name)
+        context = self.get_template_context()
+        return mark_safe(template.render(context))
+
+
+class _ToolbarPanelRegistry:
+    def __init__(self):
+        self._panels = {}
+
+    def register_panel(self, panel_class):
+        self._panels[panel_class.name] = panel_class
+
+    def get_panels(self):
+        return self._panels.values()
+
+
+_toolbar_panel_registry = _ToolbarPanelRegistry()
+
+
+def register_toolbar_panel(panel_class):
+    _toolbar_panel_registry.register_panel(panel_class)
+    return panel_class
+
+
+class _ExceptionToolbarPanel(ToolbarPanel):
+    name = "Exception"
+    template_name = "toolbar/exception.html"
+
+    def __init__(self, request, exception):
+        super().__init__(request)
+        self.exception = exception
+
+    def get_template_context(self):
+        context = super().get_template_context()
+        context["exception"] = self.exception
+        return context
+
+
+@register_toolbar_panel
+class _RequestToolbarPanel(ToolbarPanel):
+    name = "Request"
+    template_name = "toolbar/request.html"
+
+
+@register_toolbar_panel
+class _QuerystatsToolbarPanel(ToolbarPanel):
+    name = "Querystats"
+    template_name = "toolbar/querystats.html"

{plain_admin-0.28.0 → plain_admin-0.29.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.admin"
-version = "0.28.0"
+version = "0.29.0"
 description = "Admin dashboard and tools for Plain."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 license = "BSD-3-Clause"

plain_admin-0.28.0/plain/admin/templates/toolbar/toolbar.html

@@ -1,245 +0,0 @@
-{% if toolbar.should_render() %}
-{% set exception=toolbar.request_exception() %}
-<script defer src="{{ asset('toolbar/toolbar.js') }}"></script>
-<div id="plaintoolbar" class="print:hidden text-stone-300 fixed bottom-0 w-full z-30 hidden sm:flex sm:flex-col">
-
-    <div id="plaintoolbar-details" class="{% if not exception %}hidden{% endif %} relative text-sm border-white/5 shadow-xl border-t inset-shadow-xs inset-shadow-stone-800 rounded-t-xl bg-stone-950/95 backdrop-blur-sm">
-
-        <div class="flex items-center border-b border-white/5 px-2 justify-between">
-            <div class="flex items-center">
-                <button data-active data-toolbar-tab="request" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">Request</button>
-                {% if request.session is defined %}
-                <button data-toolbar-tab="session" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">Session</button>
-                {% endif %}
-                <button data-toolbar-tab="querystats" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">Querystats</button>
-                {% if toolbar.metadata %}
-                <button data-toolbar-tab="metadata" class="data-active:border-yellow-500 px-4 py-2.5 -mb-px cursor-pointer border-b border-transparent hover:border-yellow-600" type="button">Metadata</button>
-                {% endif %}
-            </div>
-            <div class="px-4 flex items-center space-x-4">
-                <button title="Hide toolbar for 1 hour" class="cursor-pointer hover:text-white text-white/50" type="button" data-plaintoolbar-hideuntil>
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
-                        <path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022zm2.004.45a7 7 0 0 0-.985-.299l.219-.976q.576.129 1.126.342zm1.37.71a7 7 0 0 0-.439-.27l.493-.87a8 8 0 0 1 .979.654l-.615.789a7 7 0 0 0-.418-.302zm1.834 1.79a7 7 0 0 0-.653-.796l.724-.69q.406.429.747.91zm.744 1.352a7 7 0 0 0-.214-.468l.893-.45a8 8 0 0 1 .45 1.088l-.95.313a7 7 0 0 0-.179-.483m.53 2.507a7 7 0 0 0-.1-1.025l.985-.17q.1.58.116 1.17zm-.131 1.538q.05-.254.081-.51l.993.123a8 8 0 0 1-.23 1.155l-.964-.267q.069-.247.12-.501m-.952 2.379q.276-.436.486-.908l.914.405q-.24.54-.555 1.038zm-.964 1.205q.183-.183.35-.378l.758.653a8 8 0 0 1-.401.432z"/>
-                        <path d="M8 1a7 7 0 1 0 4.95 11.95l.707.707A8.001 8.001 0 1 1 8 0z"/>
-                        <path d="M7.5 3a.5.5 0 0 1 .5.5v5.21l3.248 1.856a.5.5 0 0 1-.496.868l-3.5-2A.5.5 0 0 1 7 9V3.5a.5.5 0 0 1 .5-.5"/>
-                    </svg>
-                </button>
-                <button class="cursor-pointer hover:text-white text-white/50" type="button" data-plaintoolbar-expand>
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
-                        <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708"/>
-                    </svg>
-                </button>
-            </div>
-        </div>
-
-        <div data-resizer class="cursor-grab w-20 h-1.5 top-1 bg-white/15 rounded-full absolute top-0 left-1/2 -translate-x-1/2"></div>
-
-        <div class="overflow-auto h-[30vh] flex flex-col">
-            <div data-toolbar-tab="request" class="px-6 py-4">
-
-                {% if exception %}
-                <div class="p-2 mb-5 border-amber-500 border rounded">
-                    <div class="text-amber-500 text-lg flex justify-between items-center">
-                        <div>
-                            <span class="font-bold">Exception</span>
-                            {{ exception }}
-                        </div>
-                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-5 h-5 bi bi-exclamation-triangle-fill" viewBox="0 0 16 16">
-                            <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
-                        </svg>
-                    </div>
-                    <div class="text-amber-400 text-xs mt-3 bg-white/5 p-2 rounded overflow-auto">
-                        <pre><code>{{ exception._traceback_string }}</code></pre>
-                    </div>
-                </div>
-                {% endif %}
-
-                <dl class="text-sm grid grid-cols-1 sm:grid-cols-[max-content_1fr] sm:gap-y-2 gap-x-8">
-                    <dt>Request ID</dt>
-                    <dd class="text-sm text-white/50">{{ request.unique_id }}</dd>
-
-                    <dt>Query params</dt>
-                    <dd class="text-sm text-white/50">{{ request.query_params }}</dd>
-
-                    <dt>Method</dt>
-                    <dd class="text-sm text-white/50">{{ request.method }}</dd>
-
-                    {% if request.resolver_match %}
-                    <dt>View</dt>
-                    <dd class="text-sm text-white/50">{{ request.resolver_match.view.view_class|pprint }}</dd>
-
-                    <dt>URL pattern</dt>
-                    <dd class="text-sm text-white/50">
-                        <pre><code>{{ request.resolver_match.route }}</code></pre>
-                    </dd>
-
-                    <dt>URL name</dt>
-                    <dd class="text-sm text-white/50">
-                        <pre><code>{{ request.resolver_match.namespaced_url_name }}</code></pre>
-                    </dd>
-
-                    <dt>URL args</dt>
-                    <dd class="text-sm text-white/50">
-                        <pre><code>{{ request.resolver_match.args }}</code></pre>
-                    </dd>
-
-                    <dt>URL kwargs</dt>
-                    <dd class="text-sm text-white/50">
-                        <pre><code>{{ request.resolver_match.kwargs }}</code></pre>
-                    </dd>
-                    {% endif %}
-
-                    {% if template_names is defined %}
-                    <dt>Template names</dt>
-                    <dd class="text-sm text-white/50">
-                        <pre><code>{{ template_names }}</code></pre>
-                    </dd>
-                    {% endif %}
-
-                    {% if object|default(false) %}
-                    <dt>Primary object</dt>
-                    <dd class="text-sm text-white/50 inline-flex items-center" title="PK: {{ object.pk|default('unknown') }}">
-                        <pre><code>{{ object.__repr__() }}</code></pre>
-                        {% if object|get_admin_model_detail_url %}
-                        <a class="ml-2 inline-flex items-center p-1 text-blue-500 hover:text-blue-400" href="{{ object|get_admin_model_detail_url }}">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-3 h-3 bi bi-database-fill" viewBox="0 0 16 16">
-                                <path d="M3.904 1.777C4.978 1.289 6.427 1 8 1s3.022.289 4.096.777C13.125 2.245 14 2.993 14 4s-.875 1.755-1.904 2.223C11.022 6.711 9.573 7 8 7s-3.022-.289-4.096-.777C2.875 5.755 2 5.007 2 4s.875-1.755 1.904-2.223"/>
-                                <path d="M2 6.161V7c0 1.007.875 1.755 1.904 2.223C4.978 9.71 6.427 10 8 10s3.022-.289 4.096-.777C13.125 8.755 14 8.007 14 7v-.839c-.457.432-1.004.751-1.49.972C11.278 7.693 9.682 8 8 8s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
-                                <path d="M2 9.161V10c0 1.007.875 1.755 1.904 2.223C4.978 12.711 6.427 13 8 13s3.022-.289 4.096-.777C13.125 11.755 14 11.007 14 10v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
-                                <path d="M2 12.161V13c0 1.007.875 1.755 1.904 2.223C4.978 15.711 6.427 16 8 16s3.022-.289 4.096-.777C13.125 14.755 14 14.007 14 13v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"/>
-                            </svg>
-                        </a>
-                        {% endif %}
-                    </dd>
-                    {% endif %}
-
-                </dl>
-            </div>
-
-            {% if request.session is defined %}
-            <div data-toolbar-tab="session" style="display: none;">
-                <div class="px-6 py-4">
-                    <dl class="text-sm grid grid-cols-1 sm:grid-cols-[max-content_1fr] sm:gap-y-2 gap-x-8">
-                        <dt>Session ID</dt>
-                        <dd class="text-sm text-white/50">{{ request.session.session_key }}</dd>
-
-                        {% for k, v in request.session.items() %}
-                        <dt>session["{{ k }}"]</dt>
-                        <dd class="text-sm text-white/50 max-h-32 overflow-auto">
-                            {% if v is iterable and not v|string %}
-                            <pre><code>{{ v }}</code></pre>
-                            {% else %}
-                            {{ v }}
-                            {% endif %}
-                        </dd>
-                        {% endfor %}
-                    </dl>
-                </div>
-            </div>
-            {% endif %}
-
-            <div data-toolbar-tab="querystats" style="display: none;" class="h-full">
-                <div id="querystats-container" class="h-full">
-                    <div class="px-6 py-4 text-center">
-                        <p>Loading querystats...</p>
-                    </div>
-                </div>
-                <script>
-                (function() {
-                    var container = document.getElementById('querystats-container');
-                    var loaded = false;
-                    var parent = container.parentNode;
-                    var observer = new IntersectionObserver(function(entries) {
-                        entries.forEach(function(entry) {
-                            if (entry.isIntersecting && !loaded) {
-                                loaded = true;
-                                var iframe = document.createElement('iframe');
-                                iframe.src = "{{ url('admin:querystats:querystats') }}";
-                                iframe.frameBorder = "0";
-                                iframe.style.width = "100%";
-                                iframe.style.height = "100%";
-                                container.innerHTML = '';
-                                container.appendChild(iframe);
-                                observer.disconnect();
-                            }
-                        });
-                    }, { root: parent, threshold: 0 });
-                    observer.observe(container);
-                })();
-                </script>
-            </div>
-
-            {% if toolbar.metadata %}
-            <div data-toolbar-tab="metadata" style="display: none;">
-                <div class="px-6 py-4">
-                    <dl class="text-sm grid grid-cols-1 sm:grid-cols-[max-content_1fr] sm:gap-y-2 gap-x-8">
-                        {% for k, v in toolbar.metadata.items() %}
-                        <dt>{{ k }}</dt>
-                        <dd class="text-sm text-white/50 max-h-32 overflow-auto">
-                            {% if v is iterable and not v|string %}
-                            <pre><code>{{ v }}</code></pre>
-                            {% else %}
-                            {{ v }}
-                            {% endif %}
-                        </dd>
-                        {% endfor %}
-                    </dl>
-                </div>
-            </div>
-            {% endif %}
-        </div>
-
-    </div>
-
-    <div class="flex px-3 text-xs border-t border-white/5 space-x-4 py-2 bg-stone-950 shadow-xl">
-        <div class="flex items-center">
-            <code class="ml-1.5 bg-white/10 px-1.5 rounded-sm whitespace-nowrap text-mono">{{ toolbar.version }}</code>
-
-            {% if request.impersonator is defined %}
-            <div class="flex items-center ml-1 font-light">
-                Impersonating&nbsp;<span class="font-medium">{{ request.user }}</span>
-                </span>
-                <a href="{{ url('admin:impersonate:stop') }}" title="Stop impersonating" class="flex items-center px-1 ml-1 text-red-300 hover:text-white">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4 bi bi-x-octagon-fill" viewBox="0 0 16 16">
-                        <path d="M11.46.146A.5.5 0 0 0 11.107 0H4.893a.5.5 0 0 0-.353.146L.146 4.54A.5.5 0 0 0 0 4.893v6.214a.5.5 0 0 0 .146.353l4.394 4.394a.5.5 0 0 0 .353.146h6.214a.5.5 0 0 0 .353-.146l4.394-4.394a.5.5 0 0 0 .146-.353V4.893a.5.5 0 0 0-.146-.353L11.46.146zm-6.106 4.5L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 1 1 .708-.708z"/>
-                    </svg>
-                </a>
-            </div>
-            {% endif %}
-        </div>
-        <button type="button" data-plaintoolbar-expand class="flex-grow cursor-pointer"></button>
-        <div class="flex items-center space-x-4">
-            {% include "querystats/toolbar.html" %}
-
-            <div class="flex items-center space-x-3 transition-all">
-
-                {% if exception %}
-                <button class="cursor-pointer text-amber-500 hover:text-amber-400" type="button" data-toolbar-tab="request">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4 bi bi-exclamation-triangle-fill" viewBox="0 0 16 16">
-                        <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
-                    </svg>
-                </button>
-                {% endif %}
-
-                <a href="{{ url('admin:index') }}" class="hover:underline">Admin</a>
-
-                {% include "toolbar/links.html" ignore missing %}
-
-                <button data-plaintoolbar-expand class="hover:text-white cursor-pointer" type="button" title="Expand toolbar">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="w-4 h-4" viewBox="0 0 16 16">
-                        <path fill-rule="evenodd" d="M7.646 4.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1-.708.708L8 5.707l-5.646 5.647a.5.5 0 0 1-.708-.708z"/>
-                    </svg>
-                </button>
-
-                <button data-plaintoolbar-hide class="hover:text-red-500 cursor-pointer" type="button" title="Hide toolbar">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x w-4 h-4" viewBox="0 0 16 16">
-                        <path d="M2.146 2.854a.5.5 0 1 1 .708-.708L8 7.293l5.146-5.147a.5.5 0 0 1 .708.708L8.707 8l5.147 5.146a.5.5 0 0 1-.708.708L8 8.707l-5.146 5.147a.5.5 0 0 1-.708-.708L7.293 8z"/>
-                    </svg>
-                </button>
-
-            </div>
-        </div>
-    </div>
-
-</div>
-{% endif %}

plain_admin-0.28.0/plain/admin/toolbar.py

@@ -1,34 +0,0 @@
-import sys
-import traceback
-
-from plain.runtime import settings
-from plain.urls.exceptions import Resolver404
-
-
-class Toolbar:
-    def __init__(self, request):
-        self.request = request
-        self.version = settings.ADMIN_TOOLBAR_VERSION
-        self.metadata = {}
-
-    def should_render(self):
-        if settings.DEBUG:
-            return True
-
-        if hasattr(self.request, "impersonator"):
-            return self.request.impersonator.is_admin
-
-        if self.request.user:
-            return self.request.user.is_admin
-
-        return False
-
-    def request_exception(self):
-        # We can capture the exception currently being handled here, if any.
-        exception = sys.exception()
-
-        if exception and not isinstance(exception, Resolver404):
-            exception._traceback_string = "".join(
-                traceback.format_tb(exception.__traceback__)
-            )
-            return exception