Update 40 restore person count labels

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Update ke-40 - 2026-05-02
+- Perbaiki anotasi mode `YOLOv8n` semua kelas agar objek person kembali diberi label berurutan `person 1`, `person 2`, dan seterusnya.
+- Non-person tetap ditampilkan sebagai kelas objek masing-masing dengan nomor terpisah.
+- Minor update dinaikkan ke-40.
+
 ## Update ke-39 - 2026-05-02
 - Tambah repo artefak training terpisah melalui `HF_ARTIFACT_REPO`.
 - Panel training sekarang mengambil ulang grafik, confusion matrix, `results.csv`, log, dan summary terakhir dari repo artefak saat Space rebuild.

app.py

@@ -24,7 +24,7 @@ from ultralytics import YOLO
 CM_INIT = {"tp": 0, "fp": 0, "fn": 0, "tn": 0, "person": 0, "not_person": 0}
 EVAL_CLASSES = ["Person", "Not Person/Background"]
 APP_VERSION = os.getenv("APP_VERSION", "v0.9.0")
-APP_MINOR_UPDATE = os.getenv("APP_MINOR_UPDATE", "39")
+APP_MINOR_UPDATE = os.getenv("APP_MINOR_UPDATE", "40")
 
 
 # Gradio/Spaces can trigger noisy asyncio cleanup traces ("Invalid file descriptor: -1")
@@ -180,11 +180,11 @@ def _annotate_person_instances(
     return annotated, len(person_boxes)
 
 
-def _annotate_all_instances(
-    image_rgb: np.ndarray,
-    result: Any,
-    annotation_style: str,
-) -> Tuple[np.ndarray, int]:
+def _annotate_all_instances(
+    image_rgb: np.ndarray,
+    result: Any,
+    annotation_style: str,
+) -> Tuple[np.ndarray, int]:
     annotated = image_rgb.copy()
     if result.boxes is None:
         return annotated, 0
@@ -192,48 +192,65 @@ def _annotate_all_instances(
     classes = result.boxes.cls.cpu().numpy()
     boxes = result.boxes.xyxy.cpu().numpy()
     names = getattr(result, "names", {})
-    count = 0
-
-    for i, (x1, y1, x2, y2) in enumerate(boxes.tolist(), start=1):
-        cls_id = int(classes[i - 1])
-        if isinstance(names, dict):
-            cls_name = str(names.get(cls_id, f"class_{cls_id}"))
-        elif isinstance(names, list) and 0 <= cls_id < len(names):
-            cls_name = str(names[cls_id])
-        else:
-            cls_name = f"class_{cls_id}"
-
-        if annotation_style == "Border + Label":
-            cv2.rectangle(annotated, (int(x1), int(y1)), (int(x2), int(y2)), (59, 130, 246), 2)
-        label = f"{cls_name} {i}"
-        (tw, th), baseline = cv2.getTextSize(label, cv2.FONT_HERSHEY_SIMPLEX, 0.6, 2)
-        if annotation_style == "Label saja":
-            label_x = max(0, min(int(x1), annotated.shape[1] - tw - 8))
-            label_y = max(th + 4, min(int(y1) + th + 4, annotated.shape[0] - 6))
-            text_y1 = max(0, label_y - th - baseline - 6)
-            text_y2 = min(annotated.shape[0], label_y + 2)
-            text_x1 = label_x
-            text_x2 = min(annotated.shape[1], label_x + tw + 10)
-            text_org = (label_x + 4, label_y - 4)
-        else:
-            text_y1 = max(0, int(y1) - th - baseline - 6)
-            text_y2 = int(y1)
-            text_x1 = int(x1)
-            text_x2 = min(annotated.shape[1], int(x1) + tw + 10)
-            text_org = (int(x1) + 4, max(14, int(y1) - 6))
-        cv2.rectangle(annotated, (text_x1, text_y1), (text_x2, text_y2), (59, 130, 246), -1)
-        cv2.putText(
-            annotated,
-            label,
-            text_org,
-            cv2.FONT_HERSHEY_SIMPLEX,
-            0.6,
-            (255, 255, 255),
-            2,
-            cv2.LINE_AA,
-        )
-        count += 1
-    return annotated, count
+    items = []
+    person_id = _resolve_person_class_id(result)
+    person_counter = 0
+    other_counter = 0
+
+    for box, cls_raw in zip(boxes.tolist(), classes.tolist()):
+        x1, y1, x2, y2 = box
+        cls_id = int(cls_raw)
+        if isinstance(names, dict):
+            cls_name = str(names.get(cls_id, f"class_{cls_id}"))
+        elif isinstance(names, list) and 0 <= cls_id < len(names):
+            cls_name = str(names[cls_id])
+        else:
+            cls_name = f"class_{cls_id}"
+        items.append((int(x1), int(y1), int(x2), int(y2), cls_id, cls_name))
+
+    items.sort(key=lambda item: (item[1], item[0]))
+
+    for x1, y1, x2, y2, cls_id, cls_name in items:
+        is_person = cls_id == person_id or cls_name.lower() == "person"
+        if is_person:
+            person_counter += 1
+            label = f"person {person_counter}"
+            color = (34, 197, 94)
+            text_color = (0, 0, 0)
+        else:
+            other_counter += 1
+            label = f"{cls_name} {other_counter}"
+            color = (59, 130, 246)
+            text_color = (255, 255, 255)
+        if annotation_style == "Border + Label":
+            cv2.rectangle(annotated, (x1, y1), (x2, y2), color, 2)
+        (tw, th), baseline = cv2.getTextSize(label, cv2.FONT_HERSHEY_SIMPLEX, 0.6, 2)
+        if annotation_style == "Label saja":
+            label_x = max(0, min(x1, annotated.shape[1] - tw - 8))
+            label_y = max(th + 4, min(y1 + th + 4, annotated.shape[0] - 6))
+            text_y1 = max(0, label_y - th - baseline - 6)
+            text_y2 = min(annotated.shape[0], label_y + 2)
+            text_x1 = label_x
+            text_x2 = min(annotated.shape[1], label_x + tw + 10)
+            text_org = (label_x + 4, label_y - 4)
+        else:
+            text_y1 = max(0, y1 - th - baseline - 6)
+            text_y2 = y1
+            text_x1 = x1
+            text_x2 = min(annotated.shape[1], x1 + tw + 10)
+            text_org = (x1 + 4, max(14, y1 - 6))
+        cv2.rectangle(annotated, (text_x1, text_y1), (text_x2, text_y2), color, -1)
+        cv2.putText(
+            annotated,
+            label,
+            text_org,
+            cv2.FONT_HERSHEY_SIMPLEX,
+            0.6,
+            text_color,
+            2,
+            cv2.LINE_AA,
+        )
+    return annotated, len(items)
 
 
 def get_detection_scope(model_choice: str) -> str: