Update app.py

app.py

@@ -1,74 +1,62 @@
 import gradio as gr
 import cv2
+import numpy as np
 from services.video_service import get_random_video_frame
-from services.thermal_service import detect_thermal_anomalies
 from services.overlay_service import overlay_boxes
+from services.thermal_service import detect_thermal_anomalies
 from services.metrics_service import update_metrics
-from PIL import Image
-import numpy as np
 
-# Global control variables
+# Control Variables
+frame_rate = 1
 paused = False
-frame_rate = 1  # seconds
 
-# Monitoring logic
+# Temp image path (optional, depends if thermal needs)
+TEMP_IMAGE_PATH = "temp.jpg"
+
 def monitor_feed():
     global paused
     if paused:
-        yield None, update_metrics()
-        return
-
-    frame = get_random_video_frame()
-
-    # 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
-
-    frame = overlay_boxes(frame, detected_boxes)
+        frame = np.zeros((480, 640, 3), dtype=np.uint8)
+        detected_boxes = []
+    else:
+        frame = get_random_video_frame()
+        cv2.imwrite(TEMP_IMAGE_PATH, frame)
+        detected_boxes = detect_thermal_anomalies(TEMP_IMAGE_PATH)
+        frame = overlay_boxes(frame, detected_boxes)
+    
+    metrics = update_metrics(detected_boxes)
+    return frame[:, :, ::-1], metrics
 
-    update_metrics()
-
-    yield frame, update_metrics()
+def loop_monitor():
+    while True:
+        yield monitor_feed()
 
-# Helper functions for controls
 def toggle_pause():
     global paused
     paused = not paused
-    return "▶️ Resume" if paused else "⏸️ Pause"
 
-def set_fps(new_rate):
+def update_frame_rate(value):
     global frame_rate
-    frame_rate = max(0.1, new_rate)  # prevent too fast
-    return frame_rate
-
-def loop_monitor():
-    while True:
-        yield from monitor_feed()
+    frame_rate = value
 
 def build_interface():
-    global paused
-
     with gr.Blocks() as app:
-        gr.Markdown("# Solar Surveillance Monitor")
-
+        gr.Markdown("# \ud83d\ude80 Surveillance Monitor Dashboard")
         with gr.Row():
-            video_output = gr.Image(label="Surveillance Video")
-            metrics_output = gr.JSON(label="Live Metrics")
+            video_output = gr.Image(label="Live Video Feed")
+            metrics_output = gr.JSON(label="Metrics")
 
         with gr.Row():
-            pause_resume_btn = gr.Button("⏸️ Pause")
-            fps_slider = gr.Slider(0.1, 5, value=frame_rate, label="Frame Update Interval (seconds)")
+            pause_button = gr.Button("\u23f8\ufe0f Pause / Resume")
+            frame_rate_slider = gr.Slider(minimum=0.1, maximum=5.0, value=1.0, label="Frame Rate (sec)")
 
-        # Events
-        pause_resume_btn.click(toggle_pause, outputs=pause_resume_btn)
-        fps_slider.change(set_fps, inputs=fps_slider, outputs=fps_slider)
+        pause_button.click(toggle_pause)
+        frame_rate_slider.change(update_frame_rate, inputs=[frame_rate_slider])
 
-        app.load(loop_monitor, outputs=[video_output, metrics_output])
+        app.load(fn=loop_monitor, outputs=[video_output, metrics_output], every=1)
 
     return app
 
 if __name__ == "__main__":
     demo = build_interface()
-    demo.launch(share=True)  # Automatically create public link if running on Spaces
+    demo.launch()