django-devbar 0.5.0__tar.gz → 0.6.0__tar.gz

{django_devbar-0.5.0 → django_devbar-0.6.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: django-devbar
-Version: 0.5.0
+Version: 0.6.0
 Summary: Lightweight performance devbar for Django
 Keywords: django,debug,performance,monitoring,development
 Author: amureki
-Author-email: amureki <oss@amureki.com>
+Author-email: amureki <oss@amureki.me>
 License-Expression: MIT
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -34,7 +34,8 @@ Description-Content-Type: text/markdown
 > [!WARNING]
 > This package is experimental and may introduce breaking changes in minor versions.
 
-Lightweight performance devbar for Django. Shows DB query count, query duration, application time, and detects duplicate queries with visual severity indicators.
+Lightweight performance devbar for Django.
+Shows DB query count, query duration, application time, and detects similar and duplicate queries with visual severity indicators.
 
 ## Showcase
 
@@ -42,13 +43,13 @@ Normal operation – showing query count, duration, and application time:
 
 ![devbar example](https://github.com/amureki/django-devbar/raw/3c6118d4283c211a5d84510de52e1d5c3e5e46e4/docs/devbar-example.svg)
 
-Duplicate queries detected – severity indicator and details shown:
+Similar and duplicate queries detected – severity indicators and details shown:
 
 ![devbar warning example](https://github.com/amureki/django-devbar/raw/3c6118d4283c211a5d84510de52e1d5c3e5e46e4/docs/devbar-example-warning.svg)
 
 [optional] Chrome extension - showing detailed metrics in DevTools panel:
 
-[![Chrome DevTools extension](https://github.com/user-attachments/assets/9bbc41b7-3d93-46e7-aef4-9330a862b8f0)](#chrome-extension)
+[![Chrome DevTools extension](https://github.com/user-attachments/assets/f53a4bb8-fba1-446c-8224-82eac47bd027)](#chrome-extension)
 
 ## Motivation
 
@@ -100,7 +101,7 @@ Django DevBar adds HTTP response headers with performance metrics:
 
 An additional header is included by default in DEBUG mode:
 
-- **DevBar-Data** - JSON header with comprehensive metrics including duplicate query details
+- **DevBar-Data** - JSON header with comprehensive metrics including similar and duplicate query details
 
 This is useful for:
 

{django_devbar-0.5.0 → django_devbar-0.6.0}/README.md

@@ -3,7 +3,8 @@
 > [!WARNING]
 > This package is experimental and may introduce breaking changes in minor versions.
 
-Lightweight performance devbar for Django. Shows DB query count, query duration, application time, and detects duplicate queries with visual severity indicators.
+Lightweight performance devbar for Django.
+Shows DB query count, query duration, application time, and detects similar and duplicate queries with visual severity indicators.
 
 ## Showcase
 
@@ -11,13 +12,13 @@ Normal operation – showing query count, duration, and application time:
 
 ![devbar example](https://github.com/amureki/django-devbar/raw/3c6118d4283c211a5d84510de52e1d5c3e5e46e4/docs/devbar-example.svg)
 
-Duplicate queries detected – severity indicator and details shown:
+Similar and duplicate queries detected – severity indicators and details shown:
 
 ![devbar warning example](https://github.com/amureki/django-devbar/raw/3c6118d4283c211a5d84510de52e1d5c3e5e46e4/docs/devbar-example-warning.svg)
 
 [optional] Chrome extension - showing detailed metrics in DevTools panel:
 
-[![Chrome DevTools extension](https://github.com/user-attachments/assets/9bbc41b7-3d93-46e7-aef4-9330a862b8f0)](#chrome-extension)
+[![Chrome DevTools extension](https://github.com/user-attachments/assets/f53a4bb8-fba1-446c-8224-82eac47bd027)](#chrome-extension)
 
 ## Motivation
 
@@ -69,7 +70,7 @@ Django DevBar adds HTTP response headers with performance metrics:
 
 An additional header is included by default in DEBUG mode:
 
-- **DevBar-Data** - JSON header with comprehensive metrics including duplicate query details
+- **DevBar-Data** - JSON header with comprehensive metrics including similar and duplicate query details
 
 This is useful for:
 

{django_devbar-0.5.0 → django_devbar-0.6.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "django-devbar"
-version = "0.5.0"
+version = "0.6.0"
 description = "Lightweight performance devbar for Django"
 readme = "README.md"
 license = "MIT"
 authors = [
-  { name = "amureki", email = "oss@amureki.com" },
+  { name = "amureki", email = "oss@amureki.me" },
 ]
 requires-python = ">=3.10"
 dependencies = ["django>=4.2"]

{django_devbar-0.5.0 → django_devbar-0.6.0}/src/django_devbar/middleware.py

@@ -75,6 +75,7 @@ class DevBarMiddleware:
                     "s": truncate_sql(q["sql"]),
                     "dur": q["duration"],
                     "dup": 1 if q["is_duplicate"] else 0,
+                    "sim": 1 if q.get("is_similar") else 0,
                 }
                 for q in all_queries
             ]
@@ -113,6 +114,7 @@ class DevBarMiddleware:
         duplicates_html = self._build_duplicates_html(
             stats.get("duplicate_queries", [])
         )
+        similar_html = self._build_similar_html(stats.get("similar_queries", []))
 
         template = _template_engine.get_template("django_devbar/devbar.html")
         html = template.render(
@@ -123,6 +125,7 @@ class DevBarMiddleware:
                     "app_time": stats["python_time"],
                     "query_count": stats["count"],
                     "duplicates_html": duplicates_html,
+                    "similar_html": similar_html,
                 }
             )
         )
@@ -133,11 +136,29 @@ class DevBarMiddleware:
         response.content = content[:idx] + payload + content[idx:]
         response["Content-Length"] = str(len(response.content))
 
+    def _deduplicate_queries(self, queries):
+        seen_sqls = set()
+        unique = []
+        for q in queries:
+            if q["sql"] not in seen_sqls:
+                seen_sqls.add(q["sql"])
+                unique.append({**q, "sql": format_sql(q["sql"])})
+        return unique
+
     def _build_duplicates_html(self, duplicates):
         if not duplicates:
             return ""
-        formatted_duplicates = [
-            {**dup, "sql": format_sql(dup["sql"])} for dup in duplicates
-        ]
+        unique = self._deduplicate_queries(duplicates)
         template = _template_engine.get_template("django_devbar/duplicates.html")
-        return template.render(Context({"duplicates": formatted_duplicates}))
+        return template.render(
+            Context({"duplicates": unique, "total_count": len(duplicates)})
+        )
+
+    def _build_similar_html(self, similar):
+        if not similar:
+            return ""
+        unique = self._deduplicate_queries(similar)
+        template = _template_engine.get_template("django_devbar/similar.html")
+        return template.render(
+            Context({"similar": unique, "total_count": len(similar)})
+        )

{django_devbar-0.5.0 → django_devbar-0.6.0}/src/django_devbar/templates/django_devbar/devbar.html

@@ -13,44 +13,40 @@
     background: rgba(20, 20, 20, 0.92);
     color: #f5f5f5;
 }
-#django-devbar.level-warn { border-left: 3px solid #f59e0b; }
-#django-devbar.has-duplicates { border-left: 3px solid #f59e0b; }
+
 #django-devbar span { opacity: 0.7; }
 #django-devbar strong { opacity: 1; font-weight: 600; }
 #django-devbar details { display: inline; position: relative; }
 #django-devbar summary {
     all: revert;
-    color: #f59e0b; font-weight: 600; cursor: pointer; list-style: none;
+    font-weight: 600; cursor: pointer; list-style: none;
 }
+#django-devbar .dup-details > summary { color: #f87171; }
+#django-devbar .sim-details > summary { color: #fb923c; }
 #django-devbar summary::-webkit-details-marker { display: none; }
-#django-devbar details[open] > .dup-list {
+#django-devbar details[open] > .query-list {
     position: absolute; bottom: 100%; right: -8px; margin-bottom: 8px;
     background: rgba(20, 20, 20, 0.92); border-radius: 4px; padding: 6px;
     width: min(500px, 90vw); max-height: 200px; overflow-y: auto; overflow-x: hidden;
     box-sizing: border-box;
     box-shadow: 0 2px 8px rgba(0,0,0,0.15), 0 1px 2px rgba(0,0,0,0.2);
 }
-#django-devbar .dup-list details {
+#django-devbar .query-list details {
     display: block;
     margin: 0 0 6px 0;
     font-size: 11px;
     color: #f5f5f5;
 }
-#django-devbar .dup-list details:last-child { margin-bottom: 0; }
-#django-devbar .dup-list summary {
+#django-devbar .query-list details:last-child { margin-bottom: 0; }
+#django-devbar .query-list summary {
     all: revert;
     cursor: pointer;
     list-style: none;
     padding: 6px 8px;
-    background: rgba(251, 191, 36, 0.1);
     border-radius: 3px;
-    border-left: 2px solid #fbbf24;
     transition: background 0.15s ease;
 }
-#django-devbar .dup-list summary:hover {
-    background: rgba(251, 191, 36, 0.2);
-}
-#django-devbar .dup-list summary code {
+#django-devbar .query-list summary code {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -58,23 +54,22 @@
     max-width: 420px;
     vertical-align: bottom;
 }
-#django-devbar .dup-list summary::before {
+#django-devbar .query-list summary::before {
     content: '▶ ';
     display: inline-block;
     transition: transform 0.15s ease;
-    color: #fbbf24;
     font-size: 8px;
     margin-right: 6px;
 }
-#django-devbar .dup-list details[open] > summary::before {
+#django-devbar .query-list details[open] > summary::before {
     transform: rotate(90deg);
 }
-#django-devbar .dup-list code {
+#django-devbar .query-list code {
     all: revert;
-    color: #fbbf24; font-family: 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
+    font-family: 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
     overflow-wrap: break-word;
 }
-#django-devbar .dup-list details[open] > code {
+#django-devbar .query-list details[open] > code {
     display: block;
     padding: 8px;
     background: rgba(0, 0, 0, 0.3);
@@ -84,10 +79,16 @@
     line-height: 1.5;
     font-size: 10px;
 }
+#django-devbar .dup-list summary { background: rgba(220, 38, 38, 0.1); border-left: 2px solid #dc2626; }
+#django-devbar .dup-list summary:hover { background: rgba(220, 38, 38, 0.2); }
+#django-devbar .dup-list summary::before, #django-devbar .dup-list code { color: #f87171; }
+#django-devbar .sim-list summary { background: rgba(234, 88, 12, 0.1); border-left: 2px solid #ea580c; }
+#django-devbar .sim-list summary:hover { background: rgba(234, 88, 12, 0.2); }
+#django-devbar .sim-list summary::before, #django-devbar .sim-list code { color: #fb923c; }
 @media (max-width: 640px) { #django-devbar { display: none; } }
 </style>
-<div id="django-devbar"{% if duplicates_html %} class="has-duplicates"{% endif %}>
+<div id="django-devbar" class="{% if duplicates_html %}has-duplicates{% endif %}{% if similar_html %} has-similar{% endif %}">
 <span>queries</span> <strong>{{ query_count }}</strong> <span>·</span>
 <span>db</span> <strong>{{ db_time|floatformat:0 }}ms</strong> <span>·</span>
-<span>app</span> <strong>{{ app_time|floatformat:0 }}ms</strong>{{ duplicates_html|safe }}
+<span>app</span> <strong>{{ app_time|floatformat:0 }}ms</strong>{{ duplicates_html|safe }}{{ similar_html|safe }}
 </div>

django_devbar-0.6.0/src/django_devbar/templates/django_devbar/duplicates.html

@@ -0,0 +1 @@
+{% if duplicates %}<details class="dup-details"><summary>({{ total_count }}d)</summary><div class="query-list dup-list">{% for dup in duplicates %}<details><summary><code>{{ dup.sql }}</code></summary><code>{{ dup.sql }}</code></details>{% endfor %}</div></details>{% endif %}

django_devbar-0.6.0/src/django_devbar/templates/django_devbar/similar.html

@@ -0,0 +1 @@
+{% if similar %}<details class="sim-details"><summary>({{ total_count }}s)</summary><div class="query-list sim-list">{% for q in similar %}<details><summary><code>{{ q.sql }}</code></summary><code>{{ q.sql }}</code></details>{% endfor %}</div></details>{% endif %}

{django_devbar-0.5.0 → django_devbar-0.6.0}/src/django_devbar/tracker.py

@@ -14,31 +14,57 @@ SQL_CLAUSES_RE = re.compile(
 
 _query_count: ContextVar[int] = ContextVar("query_count", default=0)
 _query_duration: ContextVar[float] = ContextVar("query_duration", default=0.0)
-_seen_queries: ContextVar[dict] = ContextVar("seen_queries", default={})
-_duplicate_log: ContextVar[list] = ContextVar("duplicate_log", default=[])
 _query_log: ContextVar[list] = ContextVar("query_log", default=[])
 
 
 def reset():
     _query_count.set(0)
     _query_duration.set(0.0)
-    _seen_queries.set({})
-    _duplicate_log.set([])
     _query_log.set([])
 
 
 def get_stats():
-    duplicate_queries = _duplicate_log.get()
-    duplicate_sqls = {d["sql"] for d in duplicate_queries}
-
     queries = _query_log.get()
+
+    # Count occurrences of each SQL template and each (SQL, params_hash) pair
+    sql_counts = {}
+    duplicate_keys = set()
+    for q in queries:
+        sql = q["sql"]
+        params_hash = q["params_hash"]
+        sql_counts[sql] = sql_counts.get(sql, 0) + 1
+        dup_key = (sql, params_hash)
+        if dup_key in duplicate_keys:
+            q["is_duplicate"] = True
+        else:
+            duplicate_keys.add(dup_key)
+
+    # Similar = SQL template appears 2+ times (matches DDT semantics)
+    similar_sqls = {sql for sql, count in sql_counts.items() if count > 1}
+
+    # Second pass: mark all queries in groups with 2+ members
+    dup_key_counts = {}
     for q in queries:
-        q["is_duplicate"] = q["sql"] in duplicate_sqls
+        dup_key = (q["sql"], q["params_hash"])
+        dup_key_counts[dup_key] = dup_key_counts.get(dup_key, 0) + 1
+
+    duplicate_keys_final = {k for k, count in dup_key_counts.items() if count > 1}
+
+    similar_queries = []
+    duplicate_queries = []
+    for q in queries:
+        q["is_similar"] = q["sql"] in similar_sqls
+        q["is_duplicate"] = (q["sql"], q["params_hash"]) in duplicate_keys_final
+        if q["is_similar"]:
+            similar_queries.append(q)
+        if q["is_duplicate"]:
+            duplicate_queries.append(q)
 
     return {
         "count": _query_count.get(),
         "duration": _query_duration.get(),
         "duplicate_queries": duplicate_queries,
+        "similar_queries": similar_queries,
         "queries": queries,
     }
 
@@ -54,7 +80,6 @@ def _record(sql, params, duration):
     _query_count.set(_query_count.get() + 1)
     _query_duration.set(_query_duration.get() + duration)
 
-    seen = _seen_queries.get()
     params_hash = _hash_params(params)
 
     query_log = _query_log.get()
@@ -62,19 +87,11 @@ def _record(sql, params, duration):
         {
             "sql": sql,
             "duration": round(duration, 2),
+            "params_hash": params_hash,
         }
     )
     _query_log.set(query_log)
 
-    if sql in seen:
-        if params_hash in seen[sql]:
-            duplicates = _duplicate_log.get()
-            duplicates.append({"sql": sql, "duration": round(duration, 2)})
-        else:
-            seen[sql].add(params_hash)
-    else:
-        seen[sql] = {params_hash}
-
 
 def format_sql(sql):
     """Highlight SQL keywords with HTML spans for visual formatting.

django_devbar-0.5.0/src/django_devbar/templates/django_devbar/duplicates.html

@@ -1 +0,0 @@
-{% if duplicates %}<details><summary>({{ duplicates|length }}d)</summary><div class="dup-list">{% for dup in duplicates %}<details><summary><code>{{ dup.sql }}</code></summary><code>{{ dup.sql }}</code></details>{% endfor %}</div></details>{% endif %}