feat: inspection dashboard (verdict + stat tiles), colony trend charts, polished A/B kill-shot cards

app.py

@@ -99,6 +99,57 @@ def parse_response(text: str, hive_name: str) -> dict:
     }
 
 
+def build_dashboard(r: dict) -> str:
+    """Render a polished inspection 'report card' as HTML: a health-verdict
+    banner plus color-coded stat tiles. This is the visual hero of a result."""
+    counts = r.get("yolo_counts") or {}
+    top_probs = r.get("cascade_top_probs", [])
+    queen_conf = int(top_probs[0] * 100) if top_probs else 0
+
+    n_bees = counts.get("bee", 0)
+    n_drones = counts.get("drone", 0)
+    n_mites = counts.get("varroa", 0)
+    queen = r.get("queen_detected", False)
+
+    # Verdict logic: mites drive alarm, missing queen drives watch.
+    if n_mites >= 3:
+        verdict, vcolor, vsub = "ALERT", "#e3493b", f"{n_mites} varroa mites detected - treat soon"
+    elif n_mites >= 1:
+        verdict, vcolor, vsub = "WATCH", "#e8a317", f"{n_mites} varroa mite(s) - monitor"
+    elif not queen and r.get("detector_used"):
+        verdict, vcolor, vsub = "WATCH", "#e8a317", "No queen confirmed on this frame"
+    elif r.get("detector_used"):
+        verdict, vcolor, vsub = "HEALTHY", "#2faa55", "Queen present, no mites detected"
+    else:
+        verdict, vcolor, vsub = "ANALYZED", "#8a8a8a", "Narrative-only (detector offline)"
+
+    def tile(label, value, sub, color):
+        return f"""
+        <div class="stat-tile" style="border-top:3px solid {color};">
+          <div class="stat-val" style="color:{color};">{value}</div>
+          <div class="stat-label">{label}</div>
+          <div class="stat-sub">{sub}</div>
+        </div>"""
+
+    queen_val = "YES" if queen else "-"
+    queen_sub = f"{queen_conf}% confidence" if queen else "not found"
+
+    return f"""
+    <div id="dash">
+      <div class="verdict" style="background:linear-gradient(90deg,{vcolor}33,transparent);border-left:5px solid {vcolor};">
+        <div class="verdict-hive">{r.get('hive','Unnamed Hive')}</div>
+        <div class="verdict-main" style="color:{vcolor};">{verdict}</div>
+        <div class="verdict-sub">{vsub}</div>
+      </div>
+      <div class="stat-row">
+        {tile("QUEEN", queen_val, queen_sub, "#32c864" if queen else "#8a8a8a")}
+        {tile("WORKERS", n_bees, "detected", "#f4a300")}
+        {tile("DRONES", n_drones, "detected", "#ff7d4d")}
+        {tile("MITES", n_mites, "specialist", "#dc46dc" if n_mites else "#5f8a5f")}
+      </div>
+    </div>"""
+
+
 def build_narrative(r: dict, raw: str) -> str:
     top_probs = r.get("cascade_top_probs", [])
     if r["queen_detected"]:
@@ -201,7 +252,7 @@ def _qwen_only(image: Image.Image, prompt_text: str) -> str:
 
 def analyze_frame(image: Image.Image, hive_name: str):
     if image is None:
-        return None, "Upload a frame photo first.", "", _hives_table_state(), gr.update(), gr.update()
+        return None, "", "Upload a frame photo first.", "", _hives_table_state(), gr.update(), gr.update()
 
     # Step 1: YOLO on the MAIN container (file access + log visibility).
     detections, _ = detector.detect(image)
@@ -245,6 +296,7 @@ def analyze_frame(image: Image.Image, hive_name: str):
     except Exception as e:
         return (
             display_image,
+            "",
             f"Model inference failed: {type(e).__name__}: {e}",
             "",
             _hives_table_state(),
@@ -285,6 +337,7 @@ def analyze_frame(image: Image.Image, hive_name: str):
         results["detector_used"] = False
 
     narrative = build_narrative(results, response)
+    dashboard = build_dashboard(results)
 
     # Persist the inspection
     hive_id = db.get_or_create_hive(results["hive"])
@@ -293,6 +346,7 @@ def analyze_frame(image: Image.Image, hive_name: str):
     hive_names = [h["name"] for h in db.list_hives()]
     return (
         display_image,
+        dashboard,
         narrative,
         json.dumps(results, indent=2),
         _hives_table_state(),
@@ -320,64 +374,82 @@ def run_comparison(image: Image.Image):
     counts = detector.summarize_counts(detections)
     yolo_active = detector.is_available()
 
+    # Run the queen cascade so the left side shows the confirmed queen.
+    if yolo_active and detections:
+        try:
+            detections, _ = cascade.verify_queens(image, detections, _qwen_only)
+        except Exception:
+            pass
+        annotated = detector.draw_annotations(image, detections)
+        counts = detector.summarize_counts(detections)
+
     if yolo_active:
-        if counts:
-            prefix = (
-                "A specialist detector has already analyzed this image and found:\n"
-                + "\n".join(f"- {n} {cls}" for cls, n in counts.items())
-                + "\n\nIncorporate these counts into your assessment.\n\n"
-            )
-        else:
-            prefix = (
-                "A specialist detector analyzed this image and found nothing "
-                "definitive. Be conservative.\n\n"
-            )
+        prefix = (
+            "A specialist detector found: "
+            + ", ".join(f"{n} {cls}" for cls, n in counts.items())
+            + ". Incorporate these counts.\n\n"
+        ) if counts else ""
         left_response = _run_qwen(image, prefix=prefix)
         left_results = parse_response(left_response, "")
         left_results["queen_detected"] = counts.get("queen", 0) > 0
         left_results["yolo_counts"] = counts
         left_results["detector_used"] = True
-        left_md = _short_summary(" Apiarist", left_results, extra_counts=counts)
+        left_html = _cmp_apiarist_card(left_results, counts)
         left_image = annotated if annotated is not None else image
     else:
-        left_md = (
-            "### Apiarist\n\n"
-            "*Custom YOLO weights haven't landed yet, "
-            "left column will activate as soon as `weights/honey_bee_detector.pt` is committed.*"
-        )
+        left_html = "<div class='cmp-card cmp-apiarist'><h3>Apiarist</h3><p>Detector offline.</p></div>"
         left_image = image
 
     # ----- RIGHT: Qwen alone (generalist, no specialist context) -----
     right_response = _run_qwen(image, prefix="")
-    right_results = parse_response(right_response, "")
-    right_results["detector_used"] = False
-    right_md = _short_summary(" Qwen alone", right_results)
+    right_html = _cmp_raw_card(right_response)
 
-    return left_image, left_md, image, right_md
+    return left_image, left_html, image, right_html
 
 
-def _short_summary(title: str, r: dict, extra_counts: dict | None = None) -> str:
-    queen = " Queen detected" if r["queen_detected"] else " No queen visible"
-    mite_icon = "" if r["varroa_mites_visible"] >= 3 else ""
-    swarm = (
-        " Swarm cells" if r["swarm_cells_detected"] else " No swarm cells"
+def _cmp_apiarist_card(r: dict, counts: dict) -> str:
+    q = counts.get("queen", 0)
+    rows = "".join(
+        f"<tr><td>{cls.capitalize()}</td><td style='text-align:right;font-weight:700;color:#ffd066'>{n}</td></tr>"
+        for cls, n in (("queen", counts.get("queen", 0)),
+                       ("bee", counts.get("bee", 0)),
+                       ("drone", counts.get("drone", 0)),
+                       ("varroa", counts.get("varroa", 0)))
     )
-    counts_block = ""
-    if extra_counts:
-        counts_block = (
-            "\n**Specialist counts:** "
-            + ", ".join(f"{n} {cls}" for cls, n in extra_counts.items())
-        )
-    return f"""### {title}
-
-{queen}
-{mite_icon} {r['varroa_mites_visible']} varroa mite(s)
-{swarm}
-{counts_block}
-
-**Brood:** {r['brood_pattern']} **Health:** {r['frame_health']}
-**Notes:** {r['notes']}
-"""
+    queen_badge = (
+        "<span style='color:#32ff64;font-weight:700'>QUEEN CONFIRMED</span>"
+        if q else "<span style='color:#c9b285'>no queen this frame</span>"
+    )
+    return f"""
+    <div class="cmp-card cmp-apiarist">
+      <h3 style="color:#32ff64;">Apiarist (specialist + generalist)</h3>
+      <p style="margin:2px 0 8px 0;">{queen_badge}</p>
+      <table style="width:100%;border-collapse:collapse;font-size:0.9rem;">
+        <thead><tr><th style="text-align:left;color:#c9b285">Class</th>
+        <th style="text-align:right;color:#c9b285">Exact count</th></tr></thead>
+        <tbody>{rows}</tbody>
+      </table>
+      <p style="margin-top:10px;font-size:0.84rem;color:#d8c298;">
+        <b>Report:</b> {r.get('notes','')}</p>
+      <p style="font-size:0.74rem;color:#8fae8f;margin-top:6px;">
+        Grounded in pixel-level detections from a custom-trained model.</p>
+    </div>"""
+
+
+def _cmp_raw_card(response: str) -> str:
+    text = (response or "").strip()
+    # Show the generalist's raw prose - typically vague, no hard counts.
+    if len(text) > 420:
+        text = text[:420] + "..."
+    return f"""
+    <div class="cmp-card cmp-raw">
+      <h3 style="color:#bbb;">Raw generalist VLM (no specialist)</h3>
+      <p style="margin:2px 0 8px 0;color:#999;">prose only - no reliable counts</p>
+      <p style="font-size:0.86rem;color:#cfcfcf;white-space:pre-wrap;">{text}</p>
+      <p style="font-size:0.74rem;color:#9a7d7d;margin-top:8px;">
+        A generalist describes the scene but hallucinates or omits exact
+        queen / mite / drone counts.</p>
+    </div>"""
 
 
 # ---------------------------------------------------------------- Hives tab helpers
@@ -427,15 +499,21 @@ def add_hive_action(name, location, marker, notes):
     )
 
 
+def _empty_trend():
+    import pandas as pd
+    return pd.DataFrame({"inspection": [], "count": [], "metric": []})
+
+
 def view_hive_history(hive_name):
+    import pandas as pd
     if not hive_name:
-        return [], "_Pick a hive above to see its inspection history._"
+        return [], "_Pick a hive above to see its inspection history._", _empty_trend()
     hive = next((h for h in db.list_hives() if h["name"] == hive_name), None)
     if not hive:
-        return [], "_Hive not found._"
+        return [], "_Hive not found._", _empty_trend()
     inspections = db.get_inspections_for_hive(hive["id"])
     if not inspections:
-        return [], f"_No inspections recorded for **{hive_name}** yet._"
+        return [], f"_No inspections recorded for **{hive_name}** yet._", _empty_trend()
     rows = []
     for i in inspections:
         rows.append(
@@ -450,11 +528,26 @@ def view_hive_history(hive_name):
         )
     summary = (
         f"### {hive_name}\n"
-        f"**Total inspections:** {len(inspections)}\n"
+        f"**Total inspections:** {len(inspections)}  |  "
         f"**Last inspected:** "
         f"{time.strftime('%Y-%m-%d %H:%M', time.localtime(inspections[0]['created_at']))}"
     )
-    return rows, summary
+
+    # Build a long-format trend frame (oldest -> newest) for the LinePlot.
+    chrono = list(reversed(inspections))
+    trend_rows = []
+    for n, i in enumerate(chrono, start=1):
+        mites = int(i["varroa_mites_visible"] or 0)
+        # bee count isn't stored as a column; derive from structured_json if present
+        bees = 0
+        try:
+            sj = json.loads(i.get("structured_json") or "{}")
+            bees = int((sj.get("yolo_counts") or {}).get("bee", 0))
+        except Exception:
+            bees = 0
+        trend_rows.append({"inspection": n, "count": bees, "metric": "bees"})
+        trend_rows.append({"inspection": n, "count": mites, "metric": "varroa mites"})
+    return rows, summary, pd.DataFrame(trend_rows)
 
 
 # ---------------------------------------------------------------- UI
@@ -556,6 +649,50 @@ table { border-color: rgba(244,163,0,0.25) !important; }
 .sw-drone  { background: #ff5050; }
 .sw-mite   { background: #dc32dc; }
 
+/* ----- Inspection dashboard ----- */
+#dash { margin: 6px 0 4px 0; }
+#dash .verdict {
+    border-radius: 12px; padding: 12px 16px; margin-bottom: 12px;
+}
+#dash .verdict-hive {
+    font-size: 0.8rem; color: #c9b285; letter-spacing: 0.04em;
+    text-transform: uppercase;
+}
+#dash .verdict-main {
+    font-family: 'Fraunces', Georgia, serif; font-weight: 800;
+    font-size: 1.7rem; line-height: 1.1;
+}
+#dash .verdict-sub { font-size: 0.86rem; color: #d8c298; margin-top: 2px; }
+#dash .stat-row {
+    display: grid; grid-template-columns: repeat(4, 1fr); gap: 10px;
+}
+#dash .stat-tile {
+    background: rgba(20,15,10,0.55); border-radius: 10px;
+    padding: 12px 8px 10px 8px; text-align: center;
+    border: 1px solid rgba(244,163,0,0.15);
+}
+#dash .stat-val {
+    font-family: 'Fraunces', Georgia, serif; font-weight: 800;
+    font-size: 1.7rem; line-height: 1;
+}
+#dash .stat-label {
+    font-size: 0.72rem; letter-spacing: 0.08em;
+    color: #c9b285; margin-top: 4px; text-transform: uppercase;
+}
+#dash .stat-sub { font-size: 0.68rem; color: #9c8662; margin-top: 1px; }
+
+/* ----- A/B compare cards ----- */
+.cmp-card { border-radius: 12px; padding: 14px 16px; height: 100%; }
+.cmp-apiarist {
+    border: 1px solid rgba(50,200,100,0.45);
+    background: linear-gradient(160deg, rgba(50,200,100,0.10), transparent);
+}
+.cmp-raw {
+    border: 1px dashed rgba(150,150,150,0.45);
+    background: rgba(40,40,40,0.25);
+}
+.cmp-card h3 { margin-top: 0 !important; }
+
 /* ----- Footer ----- */
 #apiarist-footer {
     margin-top: 22px; padding-top: 14px;
@@ -677,7 +814,9 @@ def build_ui() -> gr.Blocks:
                             </div>
                             """
                         )
-                        narrative_output = gr.Markdown()
+                        dashboard_output = gr.HTML()
+                        with gr.Accordion("Full report + raw model output", open=False):
+                            narrative_output = gr.Markdown()
                         with gr.Accordion("Raw JSON", open=False):
                             json_output = gr.Code(language="json")
 
@@ -724,6 +863,13 @@ def build_ui() -> gr.Blocks:
                     choices=[h["name"] for h in db.list_hives()],
                 )
                 history_summary = gr.Markdown()
+                history_trend = gr.LinePlot(
+                    x="inspection",
+                    y="count",
+                    color="metric",
+                    title="Colony trend (bees & varroa mites over inspections)",
+                    height=240,
+                )
                 history_table = gr.Dataframe(
                     headers=[
                         "When", "Queen?", "Mites", "Swarm?",
@@ -764,15 +910,13 @@ def build_ui() -> gr.Blocks:
 
                 with gr.Row():
                     with gr.Column():
-                        gr.Markdown("### Apiarist (specialist + generalist)")
                         cmp_left_image = gr.Image(
-                            label="Annotated by YOLO + Qwen"
+                            label="Annotated by YOLO + classifier"
                         )
-                        cmp_left_text = gr.Markdown()
+                        cmp_left_text = gr.HTML()
                     with gr.Column():
-                        gr.Markdown("### Raw generalist (Qwen alone)")
                         cmp_right_image = gr.Image(label="No annotations")
-                        cmp_right_text = gr.Markdown()
+                        cmp_right_text = gr.HTML()
 
             # ------- ABOUT TAB -------
             with gr.Tab("About"):
@@ -844,6 +988,7 @@ Off the Grid - Well-Tuned - Off-Brand - Sharing is Caring
             inputs=[image_input, hive_input],
             outputs=[
                 annotated_output,
+                dashboard_output,
                 narrative_output,
                 json_output,
                 hives_table,
@@ -880,7 +1025,7 @@ Off the Grid - Well-Tuned - Off-Brand - Sharing is Caring
         history_select.change(
             fn=view_hive_history,
             inputs=[history_select],
-            outputs=[history_table, history_summary],
+            outputs=[history_table, history_summary, history_trend],
         )
 
         def _build_report():

db.py

@@ -142,7 +142,7 @@ def get_inspections_for_hive(hive_id: int, limit: int = 50) -> list[dict]:
         rows = c.execute(
             """
             SELECT id, queen_detected, varroa_mites_visible, swarm_cells_detected,
-                   brood_pattern, frame_health, notes, created_at
+                   brood_pattern, frame_health, notes, created_at, structured_json
             FROM inspections
             WHERE hive_id = ?
             ORDER BY created_at DESC