Merge branch 'main' into debug-toolbar

bookwyrm/settings.py

@@ -93,6 +93,7 @@ INSTALLED_APPS = [
     "django_celery_beat",
     "imagekit",
     "storages",
+    "debug_toolbar",
 ]
 
 MIDDLEWARE = [
@@ -106,6 +107,7 @@ MIDDLEWARE = [
     "bookwyrm.middleware.IPBlocklistMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "debug_toolbar.middleware.DebugToolbarMiddleware",
 ]
 
 ROOT_URLCONF = "bookwyrm.urls"
@@ -356,3 +358,12 @@ else:
 OTEL_EXPORTER_OTLP_ENDPOINT = env("OTEL_EXPORTER_OTLP_ENDPOINT", None)
 OTEL_EXPORTER_OTLP_HEADERS = env("OTEL_EXPORTER_OTLP_HEADERS", None)
 OTEL_SERVICE_NAME = env("OTEL_SERVICE_NAME", None)
+
+def show_toolbar(_):
+    """workaround for docker"""
+    return True
+
+
+DEBUG_TOOLBAR_CONFIG = {
+    "SHOW_TOOLBAR_CALLBACK": show_toolbar,
+}

bookwyrm/urls.py

@@ -1,7 +1,9 @@
 """ url routing for the app and api """
+import debug_toolbar
+
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.urls import path, re_path
+from django.urls import path, re_path, include
 from django.views.generic.base import TemplateView
 
 from bookwyrm import settings, views
@@ -642,4 +644,5 @@ urlpatterns = [
     re_path(
         r"^summary_revoke_key/?$", views.summary_revoke_key, name="summary-revoke-key"
     ),
+    path("__debug__/", include(debug_toolbar.urls)),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

docker-compose.yml

@@ -36,7 +36,7 @@ services:
     networks:
       - main
     ports:
-      - 8000
+      - 8000:8000
   redis_activity:
     image: redis
     command: redis-server --requirepass ${REDIS_ACTIVITY_PASSWORD} --appendonly yes --port ${REDIS_ACTIVITY_PORT}

requirements.txt

@@ -28,9 +28,11 @@ opentelemetry-instrumentation-django==0.27b0
 opentelemetry-instrumentation-celery==0.27b0
 
 # Dev
+black==21.4b0
 pytest-django==4.1.0
 pytest==6.1.2
 pytest-cov==2.10.1
 pytest-env==0.6.2
 pytest-xdist==2.3.0
 pytidylib==0.3.2
+django-debug-toolbar==3.2.1