Update app.py

app.py

@@ -1,74 +1,69 @@
-import os
-import random
-import cv2
 import gradio as gr
+import cv2
 from services.video_service import get_random_video_frame
-from services.overlay_service import overlay_boxes
 from services.thermal_service import detect_thermal_anomalies
-from services.metrics_service import update_metrics, get_metrics_text
+from services.overlay_service import overlay_boxes
+from services.metrics_service import update_metrics
+from PIL import Image
+import numpy as np
 
-# Global Configurations
-TEMP_IMAGE_PATH = "temp_frame.jpg"
+# Global control variables
 paused = False
-frame_rate = 1  # Default frames per second
-
-# Gradio state variables
-global_frame_rate = frame_rate
+frame_rate = 1  # seconds
 
+# Monitoring logic
 def monitor_feed():
     global paused
-
     if paused:
-        return TEMP_IMAGE_PATH, get_metrics_text()
+        yield None, update_metrics()
+        return
 
     frame = get_random_video_frame()
 
-    if frame is None:
-        return TEMP_IMAGE_PATH, get_metrics_text()
+    # Convert OpenCV BGR to PIL RGB
+    frame_rgb = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
+    pil_image = Image.fromarray(frame_rgb)
+
+    detected_boxes = detect_thermal_anomalies(pil_image)  # Pass PIL image
 
-    detected_boxes = detect_thermal_anomalies(frame)
     frame = overlay_boxes(frame, detected_boxes)
 
-    update_metrics(detected=bool(detected_boxes), anomaly_name="Anomaly")
+    update_metrics()
 
-    cv2.imwrite(TEMP_IMAGE_PATH, frame)
+    yield frame, update_metrics()
 
-    return TEMP_IMAGE_PATH, get_metrics_text()
+# Helper functions for controls
+def toggle_pause():
+    global paused
+    paused = not paused
+    return "▶️ Resume" if paused else "⏸️ Pause"
+
+def set_fps(new_rate):
+    global frame_rate
+    frame_rate = max(0.1, new_rate)  # prevent too fast
+    return frame_rate
 
 def loop_monitor():
     while True:
-        yield monitor_feed()
-
-def pause_stream():
-    global paused
-    paused = True
+        yield from monitor_feed()
 
-def resume_stream():
+def build_interface():
     global paused
-    paused = False
-
-def update_frame_rate(new_rate):
-    global global_frame_rate
-    global_frame_rate = int(new_rate)
 
-def build_interface():
-    with gr.Blocks(title="Solar Surveillance Thermal Detection") as app:
-        gr.Markdown("# ✨ Solar Surveillance Thermal Anomaly Detection")
+    with gr.Blocks() as app:
+        gr.Markdown("# Solar Surveillance Monitor")
 
         with gr.Row():
-            video_output = gr.Image(label="Video Feed", elem_id="video-feed")
-            metrics_output = gr.Textbox(label="Live Metrics", elem_id="metrics-box")
+            video_output = gr.Image(label="Surveillance Video")
+            metrics_output = gr.JSON(label="Live Metrics")
 
         with gr.Row():
-            with gr.Column():
-                pause_button = gr.Button("Pause")
-                resume_button = gr.Button("Resume")
-            with gr.Column():
-                frame_rate_slider = gr.Slider(1, 10, step=1, value=global_frame_rate, label="Frame Rate (fps)")
+            pause_resume_btn = gr.Button("⏸️ Pause")
+            fps_slider = gr.Slider(0.1, 5, value=frame_rate, label="Frame Update Interval (seconds)")
 
-        pause_button.click(pause_stream)
-        resume_button.click(resume_stream)
-        frame_rate_slider.change(update_frame_rate, inputs=[frame_rate_slider])
+        # Events
+        pause_resume_btn.click(toggle_pause, outputs=pause_resume_btn)
+        fps_slider.change(set_fps, inputs=fps_slider, outputs=fps_slider)
 
         app.load(loop_monitor, outputs=[video_output, metrics_output])
 
@@ -76,4 +71,4 @@ def build_interface():
 
 if __name__ == "__main__":
     demo = build_interface()
-    demo.launch(server_name="0.0.0.0", server_port=7860)
+    demo.launch(share=True)  # Automatically create public link if running on Spaces