Update app.py

app.py

@@ -1,56 +1,61 @@
-# app.py
+### Updated app.py
 
 import gradio as gr
 import cv2
 import random
-from services.video_service import get_video_frame
+from services.video_service import get_random_video_frame
 from services.detection_service import detect_objects
 from services.thermal_service import detect_thermal_anomalies
 from services.shadow_detection import detect_shadow_coverage
 from services.salesforce_dispatcher import send_to_salesforce
 
-# List of videos to cycle or pick randomly
-VIDEO_LIST = [
-    "data/drone_day.mp4",
-    "data/thermal_hotspot.mp4",
-    "data/shadow_dust_issue.mp4",
-    "data/alert_response.mp4",
-]
-
-# Pick a random video at app startup
-selected_video = random.choice(VIDEO_LIST)
-frame_gen = get_video_frame(selected_video)
+# Initialize frame generator
+frame_gen = get_random_video_frame()
 
 def monitor_feed():
     try:
         frame = next(frame_gen)
-        if frame is None:
-            return None
+
         temp_path = "temp.jpg"
         cv2.imwrite(temp_path, frame)
 
         detections = detect_objects(temp_path)
         thermal_boxes = detect_thermal_anomalies(temp_path)
-        shadow_flag = detect_shadow_coverage(temp_path)
+        shadow_issue = detect_shadow_coverage(temp_path)
+
+        # Draw detections
+        for det in detections:
+            box = det['box']
+            cv2.rectangle(frame, (int(box['xmin']), int(box['ymin'])), (int(box['xmax']), int(box['ymax'])), (0, 255, 0), 2)
+
+        # Draw thermal anomalies
+        for box in thermal_boxes:
+            cv2.rectangle(frame, (int(box[0]), int(box[1])), (int(box[2]), int(box[3])), (0, 0, 255), 2)
+
+        # Overlay text based on detections
+        overlay_text = []
+        if any(d['label'] == 'person' for d in detections):
+            overlay_text.append("Intrusion Detected")
+        if thermal_boxes:
+            overlay_text.append("Thermal Anomaly")
+        if shadow_issue:
+            overlay_text.append("Shadow Coverage Issue")
+
+        for idx, text in enumerate(overlay_text):
+            cv2.putText(frame, text, (10, 30 + idx * 40), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 0, 255), 2)
+
+        # 🚨 Commented out Salesforce integration for now
+        # alert_payload = {
+        #     "detections": detections,
+        #     "thermal": bool(thermal_boxes),
+        #     "shadow_issue": shadow_issue,
+        # }
+        # send_to_salesforce(alert_payload)
 
-        alert_payload = {
-            "detections": detections,
-            "thermal": bool(thermal_boxes),
-            "shadow_issue": shadow_flag,
-        }
-
-        send_to_salesforce(alert_payload)
         return frame
 
     except StopIteration:
         return None
 
-iface = gr.Interface(
-    fn=monitor_feed,
-    inputs=[],
-    outputs="image",
-    live=True,
-    title="Solar Surveillance Feed Simulation"
-)
-
+iface = gr.Interface(fn=monitor_feed, inputs=[], outputs="image", live=True, title="Solar Surveillance Feed Simulation", cache_examples=False)
 iface.launch()