Adjusted thresholds and view

app.py

@@ -177,7 +177,7 @@ with gr.Blocks(title="Small Object Detection") as app:
                 person_threshold_slider = gr.Slider(
                     minimum=0.05,
                     maximum=0.95,
-                    value=0.5,
+                    value=0.75,
                     step=0.05,
                     label="Person detection threshold",
                 )
@@ -185,7 +185,7 @@ with gr.Blocks(title="Small Object Detection") as app:
                 ppe_threshold_slider = gr.Slider(
                     minimum=0.05,
                     maximum=0.95,
-                    value=0.4,
+                    value=0.3,
                     step=0.05,
                     label="PPE detection threshold",
                 )
@@ -198,7 +198,7 @@ with gr.Blocks(title="Small Object Detection") as app:
             with gr.Column(scale=1):
 
                 out_ppe_image = gr.Image(
-                    label="Compliance (green = OK, red = missing PPE)",
+                    label="Overview (green = OK, red = violation; #N per person)",
                     height=IMG_HEIGHT,
                 )
 
@@ -208,6 +208,13 @@ with gr.Blocks(title="Small Object Detection") as app:
                     interactive=False,
                 )
 
+        out_ppe_gallery = gr.Gallery(
+            label="Per-person breakdown (click a person — PPE worn + checklist: 1 = present, 0 = missing)",
+            columns=3,
+            height=IMG_HEIGHT,
+            object_fit="contain",
+        )
+
         btn_ppe.click(
             fn=lambda image, p_thr, ppe_thr: run_ppe_compliance(
                 image,
@@ -215,7 +222,7 @@ with gr.Blocks(title="Small Object Detection") as app:
                 ppe_threshold=float(ppe_thr),
             ),
             inputs=[inp_ppe, person_threshold_slider, ppe_threshold_slider],
-            outputs=[out_ppe_image, out_ppe_status],
+            outputs=[out_ppe_image, out_ppe_gallery, out_ppe_status],
             concurrency_limit=1,
         )
 

ppe_compliance.py

@@ -118,18 +118,21 @@ def _color_of(name):
 @torch.no_grad()
 def run_ppe_compliance(
     image,
-    person_threshold=0.5,
-    ppe_threshold=0.4,
+    person_threshold=0.75,
+    ppe_threshold=0.3,
     assoc=0.5,
     person_model=DEFAULT_PERSON_MODEL,
     min_side=960,
 ):
     """Detect persons + PPE and flag per-person missing PPE (all 6 required).
 
-    Returns ``(annotated_PIL, status_text)``.
+    Returns ``(overview_PIL, person_cards, status_text)`` where ``overview_PIL``
+    shows only the numbered person boxes (green=OK / red=violation), and
+    ``person_cards`` is a list of ``(crop_with_checklist_PIL, caption)`` for a
+    per-person gallery.
     """
     if image is None:
-        return None, "Upload an image."
+        return None, [], "Upload an image."
 
     required = list(ALL_PPE)  # all 6 items are required
 
@@ -193,68 +196,93 @@ def run_ppe_compliance(
     if not people:
         lines.append("No persons detected — lower the person threshold or try another image.")
 
-    # Upscale small images so labels/boxes render crisply.
+    # 5) Build per-person CARDS first (crop + PPE boxes + checklist beside it),
+    # off the original image, before the overview is upscaled.
+    cards = [_person_card(im, i, p, ok) for i, p, present, missing, ok in verdicts]
+
+    # 6) Overview image: bounding boxes for detected objects — thin coloured boxes
+    # for the PPE items, plus the numbered person boxes (green = OK, red =
+    # violation). No checklist text on top; that 1/0 detail lives in the cards.
     scale = max(1.0, min_side / max(im.size))
+    overview = im
+    boxes = [(i, [v * scale for v in p["box"]], ok) for i, p, present, missing, ok in verdicts]
     if scale > 1.0:
-        im = im.resize((round(im.size[0] * scale), round(im.size[1] * scale)), Image.LANCZOS)
-        for p in people:
-            p["box"] = [v * scale for v in p["box"]]
-        ppe = [(n, s, [v * scale for v in b]) for (n, s, b) in ppe]
-
-    # 5) Render: thin PPE boxes + a compact per-person CHECKLIST panel placed
-    # OUTSIDE the person box. One short row per required item ("vest 1" present /
-    # "vest 0" missing, green/red), stacked in a column — instead of one long
-    # "no goggles, mask, shoes, glove" sentence that collides in crowded frames.
-    W, H = im.size
-    base = im.convert("RGBA")
-    ov = Image.new("RGBA", (W, H), (0, 0, 0, 0))
-    od = ImageDraw.Draw(ov)
-    rf = _load_font(max(12, int(0.016 * max(W, H))))  # checklist rows
-    GREEN, RED = (40, 200, 90), (235, 45, 55)
-    placed = []  # occupied panel rects, to avoid overlaps
-
-    def overlaps(r):
-        return any(not (r[2] <= q[0] or r[0] >= q[2] or r[3] <= q[1] or r[1] >= q[3]) for q in placed)
-
-    # thin PPE boxes (no inline text — presence is shown in the checklist)
+        overview = im.resize((round(im.size[0] * scale), round(im.size[1] * scale)), Image.LANCZOS)
+    overview = overview.copy()
+    od = ImageDraw.Draw(overview)
+    OW, OH = overview.size
+    nf = _load_font(max(16, int(0.030 * max(OW, OH))))
+    pw = max(3, int(0.006 * max(OW, OH)))
+
+    # PPE item boxes first (thin), so the thicker person boxes sit on top.
+    ppe_w = max(2, int(0.004 * max(OW, OH)))
     for name, s, box in ppe:
-        od.rectangle(box, outline=_color_of(name) + (255,), width=2)
+        b = [int(v * scale) for v in box]
+        od.rectangle(b, outline=_color_of(name), width=ppe_w)
 
-    pw = max(3, int(0.006 * max(W, H)))
-    pad = 5
-    line_h = rf.getbbox("Hg1")[3] + 4
-    for i, p, present, missing, ok in verdicts:
+    for i, box, ok in boxes:
         col = GREEN if ok else RED
-        x1, y1, x2, y2 = [int(v) for v in p["box"]]
-        od.rectangle([x1, y1, x2, y2], outline=col + (255,), width=pw)
-
-        rows = [(f"#{i}", None)] + [(it, it in present) for it in ALL_PPE]
-        txts = [lab if pres is None else f"{lab} {1 if pres else 0}" for lab, pres in rows]
-        p_w = max(od.textbbox((0, 0), t, font=rf)[2] for t in txts) + 2 * pad
-        p_h = line_h * len(rows) + 2 * pad
-
-        # Prefer just right of the box; fall back to the left; keep inside frame.
-        rx = x2 + 6
-        if rx + p_w > W:
-            rx = x1 - p_w - 6
-        if rx < 0:
-            rx = min(x1 + 6, max(0, W - p_w))
-        ry = max(0, min(y1, H - p_h))
-        for _ in range(300):  # nudge down, then to a fresh column, until it fits
-            if not overlaps((rx, ry, rx + p_w, ry + p_h)):
-                break
-            ry += line_h
-            if ry + p_h > H:
-                ry = max(0, min(y1, H - p_h))
-                rx = rx + p_w + 6
-                if rx + p_w > W:
-                    rx = max(0, W - p_w)
-        placed.append((rx, ry, rx + p_w, ry + p_h))
-
-        od.rounded_rectangle((rx, ry, rx + p_w, ry + p_h), radius=5, fill=(0, 0, 0, 175))
-        for k, (lab, pres) in enumerate(rows):
-            tc = col if pres is None else (GREEN if pres else RED)
-            od.text((rx + pad, ry + pad + k * line_h), txts[k], font=rf, fill=tc + (255,))
-
-    out_im = Image.alpha_composite(base, ov).convert("RGB")
-    return out_im, "\n".join(lines)
+        x1, y1, x2, y2 = [int(v) for v in box]
+        od.rectangle([x1, y1, x2, y2], outline=col, width=pw)
+        tag = f"#{i}"
+        tb = od.textbbox((0, 0), tag, font=nf)
+        tw, th = tb[2] - tb[0], tb[3] - tb[1]
+        ty = max(0, y1 - th - 6)
+        od.rectangle([x1, ty, x1 + tw + 8, ty + th + 6], fill=col)
+        od.text((x1 + 4, ty + 2), tag, font=nf, fill=(255, 255, 255))
+
+    return overview, cards, "\n".join(lines)
+
+
+GREEN, RED = (40, 200, 90), (235, 45, 55)
+
+
+def _person_card(im, idx, person, ok, pad=0.12):
+    """One person's crop with PPE boxes drawn, plus a checklist column beside it
+    (item 1 = present / 0 = missing). Returns ``(PIL_card, caption)`` for a gallery.
+    """
+    W, H = im.size
+    x1, y1, x2, y2 = person["box"]
+    bw, bh = x2 - x1, y2 - y1
+    cx1 = max(0, int(x1 - pad * bw)); cy1 = max(0, int(y1 - pad * bh))
+    cx2 = min(W, int(x2 + pad * bw)); cy2 = min(H, int(y2 + pad * bh))
+    crop = im.crop((cx1, cy1, cx2, cy2)).convert("RGB")
+    cw, ch = crop.size
+
+    # Draw the present items' boxes on the crop (with class colour + score).
+    cd = ImageDraw.Draw(crop)
+    cf = _load_font(max(12, int(0.045 * max(cw, ch))))
+    for name, (s, box) in person["present"].items():
+        b = [box[0] - cx1, box[1] - cy1, box[2] - cx1, box[3] - cy1]
+        col = _color_of(name)
+        cd.rectangle(b, outline=col, width=max(2, int(0.006 * max(cw, ch))))
+        t = f"{name} {s:.2f}"
+        tb = cd.textbbox((0, 0), t, font=cf)
+        tw, th = tb[2] - tb[0], tb[3] - tb[1]
+        ty = max(0, b[1] - th - 3)
+        cd.rectangle([b[0], ty, b[0] + tw + 5, ty + th + 3], fill=col)
+        cd.text((b[0] + 2, ty + 1), t, font=cf, fill=(255, 255, 255))
+
+    # Build the checklist panel to the RIGHT of the crop.
+    present = set(person["present"])
+    pf = _load_font(max(14, int(ch / 14)))
+    line_h = pf.getbbox("Hg1")[3] + 6
+    rows = [(f"#{idx}  {'OK' if ok else 'VIOLATION'}", None)] + [(it, it in present) for it in ALL_PPE]
+    txts = [lab if pres is None else f"{lab}  {1 if pres else 0}" for lab, pres in rows]
+    tmp = ImageDraw.Draw(crop)
+    panel_pad = 12
+    panel_w = max(tmp.textbbox((0, 0), t, font=pf)[2] for t in txts) + 2 * panel_pad
+    panel_h = line_h * len(rows) + 2 * panel_pad
+
+    card_h = max(ch, panel_h)
+    card = Image.new("RGB", (cw + panel_w, card_h), (245, 245, 245))
+    card.paste(crop, (0, (card_h - ch) // 2))
+    pd = ImageDraw.Draw(card)
+    x0 = cw + panel_pad
+    y0 = (card_h - panel_h) // 2 + panel_pad
+    for k, (lab, pres) in enumerate(rows):
+        col = (GREEN if ok else RED) if pres is None else (GREEN if pres else RED)
+        pd.text((x0, y0 + k * line_h), txts[k], font=pf, fill=col)
+
+    caption = f"#{idx} — " + ("OK" if ok else "VIOLATION: no " + ", ".join(c for c in ALL_PPE if c not in present))
+    return (card, caption)