cv2.rectangle attempt

app.py

@@ -25,7 +25,6 @@ class BoundingBox:
     @property
     def xyxy(self) -> List[float]:
         return [self.xmin, self.ymin, self.xmax, self.ymax]
-
 @dataclass
 class DetectionResult:
     score: float
@@ -49,24 +48,31 @@ class DetectionResult:
 def annotate(image: Union[Image.Image, np.ndarray], detection_results: List[DetectionResult]) -> np.ndarray:
     image_cv2 = np.array(image) if isinstance(image, Image.Image) else image
     image_cv2 = cv2.cvtColor(image_cv2, cv2.COLOR_RGB2BGR)
-
+    
+    # Make the entire background yellow
+    yellow_background = np.full(image_cv2.shape, (0, 255, 255), dtype=np.uint8)
+    
     for detection in detection_results:
         label = detection.label
         score = detection.score
         box = detection.box
         mask = detection.mask
-        color = np.random.randint(0, 256, size=3).tolist()
-
-        cv2.rectangle(image_cv2, (box.xmin, box.ymin), (box.xmax, box.ymax), color, 2)
-        cv2.putText(image_cv2, f'{label}: {score:.2f}', (box.xmin, box.ymin - 10),
-                    cv2.FONT_HERSHEY_SIMPLEX, 0.5, color, 2)
-
+        
         if mask is not None:
             mask_uint8 = (mask * 255).astype(np.uint8)
             contours, _ = cv2.findContours(mask_uint8, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
-            cv2.drawContours(image_cv2, contours, -1, color, 2)
+            cv2.drawContours(yellow_background, contours, -1, (0, 0, 0), cv2.FILLED)
+        
+        # Drawing bounding box (border and inside should be yellow)
+        cv2.rectangle(yellow_background, (box.xmin, box.ymin), (box.xmax, box.ymax), (0, 255, 255), cv2.FILLED)  # Fill inside with yellow
+        cv2.rectangle(yellow_background, (box.xmin, box.ymin), (box.xmax, box.ymax), (0, 255, 255), 2)  # Draw border yellow
 
-    return cv2.cvtColor(image_cv2, cv2.COLOR_BGR2RGB)
+        if mask is not None:
+            # Overlay the insect on top of the yellow background
+            insect_region = image_cv2[box.ymin:box.ymax, box.xmin:box.xmax]
+            yellow_background[box.ymin:box.ymax, box.xmin:box.xmax] = cv2.bitwise_and(yellow_background[box.ymin:box.ymax, box.xmin:box.xmax], insect_region, mask=mask[box.ymin:box.ymax, box.xmin:box.xmax])
+    
+    return cv2.cvtColor(yellow_background, cv2.COLOR_BGR2RGB)
 
 def plot_detections(image: Union[Image.Image, np.ndarray], detections: List[DetectionResult]) -> np.ndarray:
     annotated_image = annotate(image, detections)
@@ -106,7 +112,7 @@ def refine_masks(masks: torch.BoolTensor, polygon_refinement: bool = False) -> L
     return list(masks)
 
 @spaces.GPU
-def detect(image: Image.Image, labels: List[str], threshold: float = 0.3, detector_id: Optional[str] = None) -> List[Dict[str, Any]]:
+def detect(image: Image.Image, labels: List[str], threshold: float = 0.3, detector_id: Optional[str] = None) -> List<Dict[str, Any]]:
     detector_id = detector_id if detector_id else "IDEA-Research/grounding-dino-base"
     object_detector = pipeline(model=detector_id, task="zero-shot-object-detection", device="cuda")
     labels = [label if label.endswith(".") else label+"." for label in labels]