Update app.py

app.py

@@ -1,62 +1,74 @@
 import gradio as gr
 import cv2
-import numpy as np
+import os
 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.overlay_service import overlay_boxes
 from services.metrics_service import update_metrics
 
-# Control Variables
-frame_rate = 1
+# Globals
 paused = False
+frame_rate = 1
 
-# Temp image path (optional, depends if thermal needs)
+# Constants
 TEMP_IMAGE_PATH = "temp.jpg"
 
+# Core monitor function
 def monitor_feed():
     global paused
+
     if paused:
-        frame = np.zeros((480, 640, 3), dtype=np.uint8)
-        detected_boxes = []
+        frame = cv2.imread(TEMP_IMAGE_PATH)
+        if frame is None:
+            frame = get_random_video_frame()
     else:
         frame = get_random_video_frame()
-        cv2.imwrite(TEMP_IMAGE_PATH, frame)
-        detected_boxes = detect_thermal_anomalies(TEMP_IMAGE_PATH)
+        detected_boxes = detect_thermal_anomalies(frame)
         frame = overlay_boxes(frame, detected_boxes)
-    
-    metrics = update_metrics(detected_boxes)
-    return frame[:, :, ::-1], metrics
+        cv2.imwrite(TEMP_IMAGE_PATH, frame)
 
-def loop_monitor():
-    while True:
-        yield monitor_feed()
+    metrics = update_metrics()
+    return frame[:, :, ::-1], metrics  # Convert BGR to RGB for Gradio
 
-def toggle_pause():
-    global paused
-    paused = not paused
+# Gradio UI
+with gr.Blocks() as app:
+    gr.Markdown("# \ud83c\udf10 Thermal Anomaly Monitoring Dashboard")
+    
+    with gr.Row():
+        with gr.Column(scale=3):
+            video_output = gr.Image(label="Live Video Feed", elem_id="video-feed")
+        with gr.Column(scale=1):
+            metrics_output = gr.Label(label="Live Metrics", elem_id="metrics")
 
-def update_frame_rate(value):
-    global frame_rate
-    frame_rate = value
+    with gr.Row():
+        pause_btn = gr.Button("\u23F8\ufe0f Pause")
+        resume_btn = gr.Button("\u25b6\ufe0f Resume")
+        frame_slider = gr.Slider(0.2, 5, value=1, label="Frame Interval (seconds)")
 
-def build_interface():
-    with gr.Blocks() as app:
-        gr.Markdown("# \ud83d\ude80 Surveillance Monitor Dashboard")
-        with gr.Row():
-            video_output = gr.Image(label="Live Video Feed")
-            metrics_output = gr.JSON(label="Metrics")
+    def toggle_pause():
+        global paused
+        paused = True
+        return gr.update()
 
-        with gr.Row():
-            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)")
+    def toggle_resume():
+        global paused
+        paused = False
+        return gr.update()
 
-        pause_button.click(toggle_pause)
-        frame_rate_slider.change(update_frame_rate, inputs=[frame_rate_slider])
+    def set_frame_rate(val):
+        global frame_rate
+        frame_rate = val
+        return gr.update()
 
-        app.load(fn=loop_monitor, outputs=[video_output, metrics_output], every=1)
+    pause_btn.click(toggle_pause)
+    resume_btn.click(toggle_resume)
+    frame_slider.change(set_frame_rate, inputs=[frame_slider])
 
-    return app
+    app.stream(
+        monitor_feed,
+        outputs=[video_output, metrics_output],
+        every=lambda: frame_rate
+    )
 
 if __name__ == "__main__":
-    demo = build_interface()
-    demo.launch()
+    app.launch()