Update services/plantation/plant_count.py

services/plantation/plant_count.py

@@ -1,30 +1,27 @@
-# services/plantation/plant_count.py
 import cv2
 import numpy as np
 from ultralytics import YOLO
 import os
 
-# Load YOLOv8n model
+# Load YOLOv8n model (lighter for plant counting)
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-MODEL_PATH = os.path.join(BASE_DIR, "../../models/yolov8n.pt")
+MODEL_PATH = os.path.abspath(os.path.join(BASE_DIR, "../../models/yolov8n.pt"))
 model = YOLO(MODEL_PATH)
 
-def detect_plants(frame):
+def process_plants(frame):
     """
-    Count plants/trees in a frame using YOLOv8n.
+    Count plants in a frame.
     Args:
         frame: Input frame (numpy array)
     Returns:
-        dict: Detection results with numbered labels
-        numpy array: Annotated frame
+        list: List of detected plants
+        numpy array: Annotated frame with numbered labels
     """
-    # Run YOLOv8 inference
     results = model(frame)
 
     detections = []
     line_counter = 1  # Initialize counter for numbered labels
 
-    # Process detections
     for r in results:
         for box in r.boxes:
             conf = float(box.conf[0])
@@ -32,32 +29,26 @@ def detect_plants(frame):
                 continue
             cls = int(box.cls[0])
             label = model.names[cls]
-            if label != "tree":  # Assuming "tree" class exists
+            if label != "plant":  # Assuming "plant" class exists
                 continue
             xyxy = box.xyxy[0].cpu().numpy()
             x_min, y_min, x_max, y_max = map(int, xyxy)
 
             # Add numbered label
-            detection_label = f"Line {line_counter} - Tree (Conf: {conf:.2f})"
+            detection_label = f"Line {line_counter} - {label.capitalize()} (Conf: {conf:.2f})"
             detections.append({
+                "type": label,
                 "label": detection_label,
                 "confidence": conf,
                 "coordinates": [x_min, y_min, x_max, y_max]
             })
 
             # Draw bounding box and label
-            color = (34, 139, 34)  # ForestGreen for trees
+            color = (34, 139, 34)  # ForestGreen for plants
             cv2.rectangle(frame, (x_min, y_min), (x_max, y_max), color, 2)
             cv2.putText(frame, detection_label, (x_min, y_min - 10), 
                         cv2.FONT_HERSHEY_SIMPLEX, 0.5, color, 2)
             
             line_counter += 1
 
-    return {"detections": detections, "frame": frame}
-
-def process_plants(frame):
-    """
-    Wrapper function for integration with app.py.
-    """
-    result = detect_plants(frame)
-    return result["detections"], result["frame"]
+    return detections, frame