Update app.py

app.py

@@ -1,94 +1,65 @@
-import gradio as gr
 import cv2
 import time
 import os
-from datetime import datetime
-from services.video_service import get_next_video_frame
+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.metrics_service import update_metrics
 
-# Globals
+
 paused = False
-frame_rate = 1
-frame_count = 0
+frame_rate = 1.0  # seconds
+
+
+
 
-# Constants
-TEMP_IMAGE_PATH = "temp.jpg"
 
-# Core monitor function
 def monitor_feed():
     global paused
-    global frame_count
 
-    frame = None
+
 
     if paused:
-        if os.path.exists(TEMP_IMAGE_PATH):
-            frame = cv2.imread(TEMP_IMAGE_PATH)
+        frame = get_random_video_frame()  # Still fetch to keep system active
+    else:
+        frame = get_random_video_frame()
+
+
 
-    if frame is None:
-        frame = get_next_video_frame()
 
-    if not paused:
         detected_boxes = detect_thermal_anomalies(frame)
         frame = overlay_boxes(frame, detected_boxes)
-        cv2.imwrite(TEMP_IMAGE_PATH, frame, [int(cv2.IMWRITE_JPEG_QUALITY), 95])
+
         metrics = update_metrics(detected_boxes)
-    else:
-        metrics = update_metrics([])
+        return frame[:, :, ::-1], metrics  # BGR → RGB
 
-    frame = cv2.resize(frame, (640, 480))  # Resize frame to fixed window size
 
-    # Add frame count and timestamp on frame
-    frame_count += 1
-    timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    cv2.putText(frame, f"Frame: {frame_count}", (10, 25), cv2.FONT_HERSHEY_SIMPLEX, 0.6, (0, 255, 0), 2)
-    cv2.putText(frame, f"{timestamp}", (10, 50), cv2.FONT_HERSHEY_SIMPLEX, 0.6, (0, 255, 0), 2)
 
-    return frame[:, :, ::-1], metrics  # BGR to RGB
 
-# Gradio UI
-with gr.Blocks(theme=gr.themes.Soft()) as app:
-    gr.Markdown("# 🌐 Thermal Anomaly Monitoring Dashboard", elem_id="main-title")
+    return frame[:, :, ::-1], {"Detections": 0}
 
-    status_text = gr.Markdown("**Status:** 🟢 Running", elem_id="status-banner")
+
+with gr.Blocks() as app:
+    gr.Markdown("# 🌡️ Solar Surveillance Thermal Monitoring")
 
     with gr.Row():
         with gr.Column(scale=3):
-            video_output = gr.Image(label="Live Video Feed", elem_id="video-feed", width=640, height=480)
+            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")
+            metrics_output = gr.Label(label="Detection Metrics")
 
     with gr.Row():
         pause_btn = gr.Button("⏸️ Pause")
         resume_btn = gr.Button("▶️ Resume")
-        frame_slider = gr.Slider(0.2, 5, value=1, label="Frame Interval (seconds)")
+        frame_slider = gr.Slider(0.5, 5.0, step=0.1, value=1.0, label="Frame Interval (seconds)")
 
     def toggle_pause():
         global paused
-        paused = True
-        return "**Status:** ⏸️ Paused"
-
-    def toggle_resume():
-        global paused
-        paused = False
-        return "**Status:** 🟢 Running"
-
-    def set_frame_rate(val):
-        global frame_rate
-        frame_rate = val
-
-    pause_btn.click(toggle_pause, outputs=status_text)
-    resume_btn.click(toggle_resume, outputs=status_text)
-    frame_slider.change(set_frame_rate, inputs=[frame_slider])
 
     def streaming_loop():
         while True:
-            yield monitor_feed()
+            frame, metrics = monitor_feed()
+            yield frame, metrics
             time.sleep(frame_rate)
 
-    app.load(streaming_loop, outputs=[video_output, metrics_output])
-
-if __name__ == "__main__":
-    app.launch()
+    app.load(streaming_loop, outputs=[video_output, metrics_output])