DetectPerson v5: WBF fix (avg contributing) + conf=0.30

miner.py

@@ -1,12 +1,7 @@
 """
-Score Vision SN44 — VehicleDetect miner v6 (2026-03-26).
-TTA (3-pass) + inline WBF. Per-class NMS. Letterbox preprocessing.
-
-Model: YOLO11s ONNX, 4 classes trained as:
-  0 = car, 1 = bus, 2 = truck, 3 = motorcycle
-
-Official submission order (remapped in MODEL_TO_OUT):
-  0 = bus, 1 = car, 2 = truck, 3 = motorcycle
+Score Vision SN44 — DetectPerson miner v5 (2026-03-26).
+TTA (3-pass) + inline WBF. Stretch resize preprocessing.
+Single class: person (cls_id=0).
 """
 
 from pathlib import Path
@@ -18,12 +13,7 @@ import onnxruntime as ort
 from numpy import ndarray
 from pydantic import BaseModel
 
-MODEL_TO_OUT: dict[int, int] = {0: 1, 1: 0, 2: 2, 3: 3}
-OUT_NAMES = ["bus", "car", "truck", "motorcycle"]
-NUM_CLASSES = 4
-
-IMG_SIZE = 1280
-CONF_THRESH = 0.35
+CONF_THRESH = 0.30
 TTA_CONF_THRESH = 0.25
 IOU_THRESH = 0.45
 WBF_IOU_THR = 0.55
@@ -32,80 +22,68 @@ TTA_SCALE = 1.2
 
 
 def _wbf(boxes_list: list[np.ndarray], scores_list: list[np.ndarray],
-         labels_list: list[np.ndarray], iou_thr: float = 0.55,
-         skip_box_thr: float = 0.0001) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
-    """Weighted Boxes Fusion (inline, no external dep). Boxes in [0,1] normalized coords."""
+         iou_thr: float = 0.55, skip_box_thr: float = 0.0001
+         ) -> tuple[np.ndarray, np.ndarray]:
+    """Weighted Boxes Fusion for single-class detection. Boxes in [0,1] normalized coords."""
     if not boxes_list:
-        return np.empty((0, 4)), np.empty(0), np.empty(0)
+        return np.empty((0, 4)), np.empty(0)
 
-    # Collect all boxes with model index
-    all_boxes, all_scores, all_labels = [], [], []
-    for model_idx, (bx, sc, lb) in enumerate(zip(boxes_list, scores_list, labels_list)):
+    all_boxes, all_scores = [], []
+    for bx, sc in zip(boxes_list, scores_list):
         for i in range(len(bx)):
             if sc[i] < skip_box_thr:
                 continue
             all_boxes.append(bx[i])
             all_scores.append(sc[i])
-            all_labels.append(int(lb[i]))
 
     if not all_boxes:
-        return np.empty((0, 4)), np.empty(0), np.empty(0)
+        return np.empty((0, 4)), np.empty(0)
 
     all_boxes = np.array(all_boxes)
     all_scores = np.array(all_scores)
-    all_labels = np.array(all_labels, dtype=int)
-
     n_models = len(boxes_list)
-    fused_boxes, fused_scores, fused_labels = [], [], []
-
-    for cls in np.unique(all_labels):
-        cls_mask = all_labels == cls
-        cls_boxes = all_boxes[cls_mask]
-        cls_scores = all_scores[cls_mask]
-
-        order = cls_scores.argsort()[::-1]
-        cls_boxes = cls_boxes[order]
-        cls_scores = cls_scores[order]
-
-        clusters: list[list[int]] = []
-        cluster_boxes: list[np.ndarray] = []
-
-        for i in range(len(cls_boxes)):
-            matched = -1
-            best_iou = iou_thr
-            for c_idx, c_box in enumerate(cluster_boxes):
-                xx1 = max(cls_boxes[i, 0], c_box[0])
-                yy1 = max(cls_boxes[i, 1], c_box[1])
-                xx2 = min(cls_boxes[i, 2], c_box[2])
-                yy2 = min(cls_boxes[i, 3], c_box[3])
-                inter = max(0, xx2 - xx1) * max(0, yy2 - yy1)
-                a1 = (cls_boxes[i, 2] - cls_boxes[i, 0]) * (cls_boxes[i, 3] - cls_boxes[i, 1])
-                a2 = (c_box[2] - c_box[0]) * (c_box[3] - c_box[1])
-                iou = inter / (a1 + a2 - inter + 1e-9)
-                if iou > best_iou:
-                    best_iou = iou
-                    matched = c_idx
-            if matched >= 0:
-                clusters[matched].append(i)
-                # Update cluster box as weighted average
-                idxs = clusters[matched]
-                weights = cls_scores[idxs]
-                w_sum = weights.sum()
-                cluster_boxes[matched] = (cls_boxes[idxs] * weights[:, None]).sum(0) / w_sum
-            else:
-                clusters.append([i])
-                cluster_boxes.append(cls_boxes[i].copy())
-
-        for c_idx, idxs in enumerate(clusters):
-            weights = cls_scores[idxs]
-            score = weights.mean()  # avg of contributing passes, not all n_models
-            fused_boxes.append(cluster_boxes[c_idx])
-            fused_scores.append(score)
-            fused_labels.append(cls)
+
+    order = all_scores.argsort()[::-1]
+    all_boxes = all_boxes[order]
+    all_scores = all_scores[order]
+
+    clusters: list[list[int]] = []
+    cluster_boxes: list[np.ndarray] = []
+
+    for i in range(len(all_boxes)):
+        matched = -1
+        best_iou = iou_thr
+        for c_idx, c_box in enumerate(cluster_boxes):
+            xx1 = max(all_boxes[i, 0], c_box[0])
+            yy1 = max(all_boxes[i, 1], c_box[1])
+            xx2 = min(all_boxes[i, 2], c_box[2])
+            yy2 = min(all_boxes[i, 3], c_box[3])
+            inter = max(0, xx2 - xx1) * max(0, yy2 - yy1)
+            a1 = (all_boxes[i, 2] - all_boxes[i, 0]) * (all_boxes[i, 3] - all_boxes[i, 1])
+            a2 = (c_box[2] - c_box[0]) * (c_box[3] - c_box[1])
+            iou = inter / (a1 + a2 - inter + 1e-9)
+            if iou > best_iou:
+                best_iou = iou
+                matched = c_idx
+        if matched >= 0:
+            clusters[matched].append(i)
+            idxs = clusters[matched]
+            weights = all_scores[idxs]
+            w_sum = weights.sum()
+            cluster_boxes[matched] = (all_boxes[idxs] * weights[:, None]).sum(0) / w_sum
+        else:
+            clusters.append([i])
+            cluster_boxes.append(all_boxes[i].copy())
+
+    fused_boxes, fused_scores = [], []
+    for c_idx, idxs in enumerate(clusters):
+        weights = all_scores[idxs]
+        fused_boxes.append(cluster_boxes[c_idx])
+        fused_scores.append(weights.mean())  # avg of contributing passes
 
     if not fused_boxes:
-        return np.empty((0, 4)), np.empty(0), np.empty(0)
-    return np.array(fused_boxes), np.array(fused_scores), np.array(fused_labels)
+        return np.empty((0, 4)), np.empty(0)
+    return np.array(fused_boxes), np.array(fused_scores)
 
 
 class BoundingBox(BaseModel):
@@ -126,113 +104,112 @@ class TVFrameResult(BaseModel):
 class Miner:
     def __init__(self, path_hf_repo: Path) -> None:
         self.path_hf_repo = path_hf_repo
+        self.class_names = ['person']
         self.session = ort.InferenceSession(
             str(path_hf_repo / "weights.onnx"),
             providers=["CUDAExecutionProvider", "CPUExecutionProvider"],
         )
         self.input_name = self.session.get_inputs()[0].name
+        input_shape = self.session.get_inputs()[0].shape
+        self.input_h = int(input_shape[2])
+        self.input_w = int(input_shape[3])
         self.conf_threshold = CONF_THRESH
         self.tta_conf_threshold = TTA_CONF_THRESH
         self.iou_threshold = IOU_THRESH
 
     def __repr__(self) -> str:
-        return f"VehicleDetect Miner v5 TTA+WBF session={type(self.session).__name__}"
-
-    def _letterbox(self, img: ndarray) -> tuple[np.ndarray, float, int, int]:
-        h, w = img.shape[:2]
-        r = min(IMG_SIZE / h, IMG_SIZE / w)
-        new_w, new_h = int(round(w * r)), int(round(h * r))
-        img_r = cv2.resize(img, (new_w, new_h), interpolation=cv2.INTER_LINEAR)
-        dw, dh = IMG_SIZE - new_w, IMG_SIZE - new_h
-        pad_l, pad_t = dw // 2, dh // 2
-        img_p = cv2.copyMakeBorder(
-            img_r, pad_t, dh - pad_t, pad_l, dw - pad_l,
-            cv2.BORDER_CONSTANT, value=(114, 114, 114),
-        )
-        return img_p, r, pad_l, pad_t
-
-    def _preprocess(self, image_bgr: ndarray) -> tuple[np.ndarray, float, int, int]:
-        img_p, ratio, pad_l, pad_t = self._letterbox(image_bgr)
-        img_rgb = cv2.cvtColor(img_p, cv2.COLOR_BGR2RGB)
-        inp = img_rgb.astype(np.float32) / 255.0
-        inp = np.ascontiguousarray(inp.transpose(2, 0, 1)[np.newaxis])
-        return inp, ratio, pad_l, pad_t
-
-    def _decode_raw(self, raw: np.ndarray, ratio: float, pad_l: int, pad_t: int,
-                    orig_w: int, orig_h: int, conf_thresh: float | None = None
-                    ) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
+        return f"DetectPerson Miner v4 TTA+WBF session={type(self.session).__name__}"
+
+    def _preprocess(self, image_bgr: ndarray) -> tuple[np.ndarray, tuple[int, int]]:
+        h, w = image_bgr.shape[:2]
+        rgb = cv2.cvtColor(image_bgr, cv2.COLOR_BGR2RGB)
+        resized = cv2.resize(rgb, (self.input_w, self.input_h))
+        x = resized.astype(np.float32) / 255.0
+        x = np.transpose(x, (2, 0, 1))[None, ...]
+        return x, (h, w)
+
+    def _decode_raw(self, raw: np.ndarray, orig_h: int, orig_w: int,
+                    conf_thresh: float | None = None) -> tuple[np.ndarray, np.ndarray]:
         pred = raw[0]
+        if pred.ndim != 2:
+            return np.empty((0, 4)), np.empty(0)
         if pred.shape[0] < pred.shape[1]:
-            pred = pred.T
-        bboxes_cx = pred[:, :4]
+            pred = pred.transpose(1, 0)
+        if pred.shape[1] < 5:
+            return np.empty((0, 4)), np.empty(0)
+
+        boxes = pred[:, :4]
         cls_scores = pred[:, 4:]
-        cls_ids = np.argmax(cls_scores, axis=1)
+        if cls_scores.shape[1] == 0:
+            return np.empty((0, 4)), np.empty(0)
+
         confs = np.max(cls_scores, axis=1)
         thresh = conf_thresh if conf_thresh is not None else self.conf_threshold
-        mask = confs >= thresh
-        if not mask.any():
-            return np.empty((0, 4)), np.empty(0), np.empty(0, dtype=int)
-        bboxes_cx, confs, cls_ids = bboxes_cx[mask], confs[mask], cls_ids[mask]
-        cx, cy, bw, bh = bboxes_cx[:, 0], bboxes_cx[:, 1], bboxes_cx[:, 2], bboxes_cx[:, 3]
-        x1 = np.clip((cx - bw / 2 - pad_l) / ratio, 0, orig_w)
-        y1 = np.clip((cy - bh / 2 - pad_t) / ratio, 0, orig_h)
-        x2 = np.clip((cx + bw / 2 - pad_l) / ratio, 0, orig_w)
-        y2 = np.clip((cy + bh / 2 - pad_t) / ratio, 0, orig_h)
-        return np.stack([x1, y1, x2, y2], axis=1), confs, cls_ids
+        keep = confs >= thresh
+        boxes, confs = boxes[keep], confs[keep]
+        if boxes.shape[0] == 0:
+            return np.empty((0, 4)), np.empty(0)
+
+        sx = orig_w / float(self.input_w)
+        sy = orig_h / float(self.input_h)
+        cx, cy, bw, bh = boxes[:, 0], boxes[:, 1], boxes[:, 2], boxes[:, 3]
+        x1 = np.clip((cx - bw / 2) * sx, 0, orig_w)
+        y1 = np.clip((cy - bh / 2) * sy, 0, orig_h)
+        x2 = np.clip((cx + bw / 2) * sx, 0, orig_w)
+        y2 = np.clip((cy + bh / 2) * sy, 0, orig_h)
+        return np.stack([x1, y1, x2, y2], axis=1), confs
 
     def _run_single_pass(self, image_bgr: ndarray, conf_thresh: float | None = None
-                         ) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
+                         ) -> tuple[np.ndarray, np.ndarray]:
         orig_h, orig_w = image_bgr.shape[:2]
-        inp, ratio, pad_l, pad_t = self._preprocess(image_bgr)
+        inp, _ = self._preprocess(image_bgr)
         raw = self.session.run(None, {self.input_name: inp})[0]
-        return self._decode_raw(raw, ratio, pad_l, pad_t, orig_w, orig_h, conf_thresh)
+        return self._decode_raw(raw, orig_h, orig_w, conf_thresh)
 
     def _infer_single(self, image_bgr: ndarray) -> list[BoundingBox]:
         orig_h, orig_w = image_bgr.shape[:2]
 
-        all_boxes, all_scores, all_labels = [], [], []
+        all_boxes, all_scores = [], []
 
-        def _collect(boxes, confs, cls_ids):
+        def _collect(boxes, confs):
             if len(boxes) == 0:
                 return
-            out_cls = np.array([MODEL_TO_OUT[int(c)] for c in cls_ids])
             norm = boxes.copy()
             norm[:, [0, 2]] /= orig_w
             norm[:, [1, 3]] /= orig_h
             norm = np.clip(norm, 0, 1)
             all_boxes.append(norm)
             all_scores.append(confs)
-            all_labels.append(out_cls)
 
         # Pass 1: original (low threshold for TTA)
         _collect(*self._run_single_pass(image_bgr, self.tta_conf_threshold))
 
         # Pass 2: horizontal flip
         flipped = cv2.flip(image_bgr, 1)
-        boxes_f, confs_f, cls_f = self._run_single_pass(flipped, self.tta_conf_threshold)
+        boxes_f, confs_f = self._run_single_pass(flipped, self.tta_conf_threshold)
         if len(boxes_f):
             boxes_f[:, 0], boxes_f[:, 2] = orig_w - boxes_f[:, 2], orig_w - boxes_f[:, 0]
-        _collect(boxes_f, confs_f, cls_f)
+        _collect(boxes_f, confs_f)
 
         # Pass 3: 1.2x scale center crop
         sh, sw = int(orig_h * TTA_SCALE), int(orig_w * TTA_SCALE)
         scaled = cv2.resize(image_bgr, (sw, sh), interpolation=cv2.INTER_LINEAR)
         yo, xo = (sh - orig_h) // 2, (sw - orig_w) // 2
         cropped = scaled[yo:yo + orig_h, xo:xo + orig_w]
-        boxes_s, confs_s, cls_s = self._run_single_pass(cropped, self.tta_conf_threshold)
+        boxes_s, confs_s = self._run_single_pass(cropped, self.tta_conf_threshold)
         if len(boxes_s):
             boxes_s[:, 0] = (boxes_s[:, 0] + xo) / TTA_SCALE
             boxes_s[:, 1] = (boxes_s[:, 1] + yo) / TTA_SCALE
             boxes_s[:, 2] = (boxes_s[:, 2] + xo) / TTA_SCALE
             boxes_s[:, 3] = (boxes_s[:, 3] + yo) / TTA_SCALE
             boxes_s = np.clip(boxes_s, 0, [[orig_w, orig_h, orig_w, orig_h]])
-        _collect(boxes_s, confs_s, cls_s)
+        _collect(boxes_s, confs_s)
 
         if not all_boxes:
             return []
 
-        fused_boxes, fused_scores, fused_labels = _wbf(
-            all_boxes, all_scores, all_labels,
+        fused_boxes, fused_scores = _wbf(
+            all_boxes, all_scores,
             iou_thr=WBF_IOU_THR, skip_box_thr=WBF_SKIP_THR,
         )
         if len(fused_boxes) == 0:
@@ -246,7 +223,6 @@ class Miner:
         keep = fused_scores >= self.conf_threshold
         fused_boxes = fused_boxes[keep]
         fused_scores = fused_scores[keep]
-        fused_labels = fused_labels[keep]
 
         out: list[BoundingBox] = []
         for i in range(len(fused_boxes)):
@@ -256,7 +232,7 @@ class Miner:
                 y1=max(0, min(orig_h, math.floor(b[1]))),
                 x2=max(0, min(orig_w, math.ceil(b[2]))),
                 y2=max(0, min(orig_h, math.ceil(b[3]))),
-                cls_id=int(fused_labels[i]),
+                cls_id=0,
                 conf=max(0.0, min(1.0, float(fused_scores[i]))),
             ))
         return out