Update utils/bubble_detect_rtdetr.py

utils/bubble_detect_rtdetr.py

@@ -7,6 +7,7 @@ import cv2
 from shapely.geometry import Polygon
 from shapely.ops import unary_union
 from transformers import AutoImageProcessor, RTDetrForObjectDetection
+from utils.polygon_utils import sanitize_polygon
 
 MODEL_NAME = "ogkalu/comic-text-and-bubble-detector"
 
@@ -217,6 +218,7 @@ def refine_bubble_from_bbox(image_pil, bbox):
 def detect_and_refine_bubbles(full_img, conf_threshold=0.30):
     detections = detect_bubbles_rtdetr(full_img, conf_threshold)
 
+    # raw boxes from RT-DETR
     bubble_boxes = [d["bbox"] for d in detections if d["class"] == 0]
 
     bubble_polygons = []
@@ -225,30 +227,36 @@ def detect_and_refine_bubbles(full_img, conf_threshold=0.30):
     for i, bbox in enumerate(bubble_boxes):
         outer, inner = refine_bubble_from_bbox(full_img, bbox)
 
-        if outer is None or len(outer) == 0:
-            print(f"⚠️ Bubble {i}: outer empty → fallback rect")
+        # -----------------------------
+        # Sanitize outer polygon
+        # -----------------------------
+        outer = sanitize_polygon(outer)
+        if outer is None:
+            print(f"⚠️ Bubble {i}: outer invalid → fallback to rectangle")
             x1, y1, x2, y2 = map(int, bbox)
-            outer = [(x1,y1),(x2,y1),(x2,y2),(x1,y2)]
-
-        if inner is None or len(inner) == 0:
-            print(f"⚠️ Bubble {i}: inner empty → using outer")
+            outer = [(x1,y1), (x2,y1), (x2,y2), (x1,y2)]
+
+        # -----------------------------
+        # Sanitize inner polygon
+        # -----------------------------
+        inner = sanitize_polygon(inner)
+        if inner is None:
+            print(f"⚠️ Bubble {i}: inner invalid → using outer")
             inner = outer
 
         bubble_polygons.append(outer)
         interior_polygons.append(inner)
 
-    print("✨ RT-DETR refined bubbles:", len(bubble_polygons))
+    print(f"✨ RT-DETR refined bubbles: {len(bubble_polygons)}")
 
-    # Extra debugging
-    for i, p in enumerate(interior_polygons):
-        if p is None or len(p) == 0:
-            print(f"❌ interior[{i}] INVALID")
+    # Debug summary
+    for i, poly in enumerate(interior_polygons):
+        if poly is None or len(poly) < 4:
+            print(f"❌ interior[{i}] INVALID ({poly})")
         else:
-            print(f"✓ interior[{i}] OK ({len(p)} pts)")
+            print(f"✓ interior[{i}] OK ({len(poly)} pts)")
 
     return bubble_polygons, interior_polygons, bubble_boxes
-
-
 # ------------------------------------------------------------
 # Polygon → mask
 # ------------------------------------------------------------