Update app.py

app.py

@@ -1,44 +1,128 @@
 import gradio as gr
 import cv2
+import os
+import random
+import time
+
 from services.video_service import get_random_video_frame
+from services.overlay_service import overlay_boxes
 from services.detection_service import detect_objects
 from services.thermal_service import detect_thermal_anomalies
-from services.overlay_service import overlay_boxes
 
 TEMP_IMAGE_PATH = "temp.jpg"
 
 def monitor_feed():
     frame = get_random_video_frame()
     if frame is None:
-        return None, 0, 0  # 🛡️ If invalid frame, return defaults to keep app alive
+        return None, "No frame available", 0, 0
+    
+    # Save current frame
+    cv2.imwrite(TEMP_IMAGE_PATH, frame)
+
+    # Object detection
+    detections = detect_objects(TEMP_IMAGE_PATH)
+
+    # Thermal detection
+    thermal_detections = detect_thermal_anomalies(TEMP_IMAGE_PATH)
+
+    # Merge all detections
+    all_detections = detections + thermal_detections
+
+    # Overlay bounding boxes
+    result_image = overlay_boxes(TEMP_IMAGE_PATH, all_detections)
+
+    if result_image is not None:
+        cv2.imwrite(TEMP_IMAGE_PATH, result_image)
+    
+    # For metric panel
+    anomaly_count = len([d for d in all_detections if d[4] != "normal"])
+    total_count = len(all_detections)
+
+    return TEMP_IMAGE_PATH, f"Detected {anomaly_count} anomalies", anomaly_count, total_count
 
+def build_interface():
+    with gr.Blocks() as demo:
+        with gr.Row():
+            image_display = gr.Image(label="Solar Drone Monitoring", interactive=False)
+            with gr.Column():
+                anomaly_info = gr.Textbox(label="Anomaly Summary", interactive=False)
+                anomaly_count = gr.Number(label="Anomaly Count", interactive=False)
+                total_objects = gr.Number(label="Total Detections", interactive=False)
+
+        def loop_monitor():
+            while True:
+                time.sleep(1)  # every 1 second
+                yield monitor_feed()
+
+        demo.load(loop_monitor, outputs=[image_display, anomaly_info, anomaly_count, total_objects])
+
+    return demo
+
+if __name__ == "__main__":
+    demo = build_interface()
+    demo.queue()
+    demo.launch(server_name="0.0.0.0", server_port=7860, share=True)
+import gradio as gr
+import cv2
+import os
+import random
+import time
+
+from services.video_service import get_random_video_frame
+from services.overlay_service import overlay_boxes
+from services.detection_service import detect_objects
+from services.thermal_service import detect_thermal_anomalies
+
+TEMP_IMAGE_PATH = "temp.jpg"
+
+def monitor_feed():
+    frame = get_random_video_frame()
+    if frame is None:
+        return None, "No frame available", 0, 0
+    
+    # Save current frame
     cv2.imwrite(TEMP_IMAGE_PATH, frame)
 
-    boxes = detect_objects(TEMP_IMAGE_PATH)
-    thermal_boxes = detect_thermal_anomalies(TEMP_IMAGE_PATH)
+    # Object detection
+    detections = detect_objects(TEMP_IMAGE_PATH)
+
+    # Thermal detection
+    thermal_detections = detect_thermal_anomalies(TEMP_IMAGE_PATH)
+
+    # Merge all detections
+    all_detections = detections + thermal_detections
 
-    all_boxes = boxes + thermal_boxes
-    image_with_boxes = overlay_boxes(TEMP_IMAGE_PATH, all_boxes)
+    # Overlay bounding boxes
+    result_image = overlay_boxes(TEMP_IMAGE_PATH, all_detections)
 
-    return image_with_boxes, len(all_boxes), len(thermal_boxes)
+    if result_image is not None:
+        cv2.imwrite(TEMP_IMAGE_PATH, result_image)
+    
+    # For metric panel
+    anomaly_count = len([d for d in all_detections if d[4] != "normal"])
+    total_count = len(all_detections)
+
+    return TEMP_IMAGE_PATH, f"Detected {anomaly_count} anomalies", anomaly_count, total_count
 
 def build_interface():
-    with gr.Blocks(theme=gr.themes.Soft()) as demo:
-        gr.Markdown("# 🚀 Solar Surveillance POC Demo")
+    with gr.Blocks() as demo:
         with gr.Row():
-            image_display = gr.Image(label="🔴 Live Surveillance Feed", interactive=False)
+            image_display = gr.Image(label="Solar Drone Monitoring", interactive=False)
             with gr.Column():
-                total_detections = gr.Number(label="Total Detections", value=0, interactive=False)
-                thermal_alerts = gr.Number(label="Thermal Alerts", value=0, interactive=False)
-
-        demo.load(
-            fn=monitor_feed,
-            inputs=[],
-            outputs=[image_display, total_detections, thermal_alerts],
-            every=1  # auto-refresh every 1 second
-        )
+                anomaly_info = gr.Textbox(label="Anomaly Summary", interactive=False)
+                anomaly_count = gr.Number(label="Anomaly Count", interactive=False)
+                total_objects = gr.Number(label="Total Detections", interactive=False)
+
+        def loop_monitor():
+            while True:
+                time.sleep(1)  # every 1 second
+                yield monitor_feed()
+
+        demo.load(loop_monitor, outputs=[image_display, anomaly_info, anomaly_count, total_objects])
+
     return demo
 
 if __name__ == "__main__":
     demo = build_interface()
-    demo.launch(server_name="0.0.0.0", server_port=7860)
+    demo.queue()
+    demo.launch(server_name="0.0.0.0", server_port=7860, share=True)