Update app.py

app.py

@@ -1,84 +1,73 @@
 import gradio as gr
 import cv2
-import numpy as np
+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
 
 # Constants
-TEMP_IMAGE_PATH = "temp.jpg"
+TEMP_IMAGE_PATH = "temp_frame.jpg"
+VIDEOS_FOLDER = "videos"
 
-# Global Variables
-paused = False
-frame_rate = 1  # default frame rate in seconds
+# App states
+app_state = {"paused": False}
 
-# Helper functions
-def monitor_feed():
-    frame, anomaly_type = get_random_video_frame()
-    if frame is None:
-        return None, "Error loading video frame"
+# Live metrics
+live_metrics = {
+    "Frames Processed": 0,
+    "Current FPS": 1,
+    "Detections": 0,
+}
 
-    cv2.imwrite(TEMP_IMAGE_PATH, frame)
-
-    detections = detect_objects(TEMP_IMAGE_PATH)
-    thermal_detections = detect_thermal_anomalies(TEMP_IMAGE_PATH)
-
-    # Merge all detections
-    combined_detections = detections + thermal_detections
-
-    # Overlay the detections
-    annotated_frame = overlay_boxes(frame.copy(), combined_detections)
-
-    # Update status text
-    status_text = f"Active Anomaly: {anomaly_type} | Objects Detected: {len(detections)} | Thermal Alerts: {len(thermal_detections)}"
-
-    return annotated_frame, status_text
-
-def loop_monitor():
-    global paused
+def monitor_feed(frame_rate=1):
     while True:
-        if not paused:
-            yield monitor_feed()
-        else:
-            yield None, "Paused"
-        import time
-        time.sleep(frame_rate)
+        if not app_state["paused"]:
+            frame, label = get_random_video_frame()
+            if frame is not None:
+                frame_with_overlay = overlay_boxes(frame, label)
+                cv2.imwrite(TEMP_IMAGE_PATH, frame_with_overlay)
+                live_metrics["Frames Processed"] += 1
+                live_metrics["Current FPS"] = frame_rate
+            else:
+                continue  # Skip if frame is None
+        time.sleep(1.0 / frame_rate)
+        yield TEMP_IMAGE_PATH, format_metrics()
+
+def format_metrics():
+    return (f"Frames Processed: {live_metrics['Frames Processed']}\n"
+            f"Current FPS: {live_metrics['Current FPS']}\n"
+            f"Detections: {live_metrics['Detections']}")
 
-# Pause/Resume control
 def toggle_pause():
-    global paused
-    paused = not paused
-    return "Resume" if paused else "Pause"
+    app_state["paused"] = not app_state["paused"]
+    return "▶️ Resume" if app_state["paused"] else "⏸️ Pause"
 
-# Frame Rate control
-def update_frame_rate(new_rate):
-    global frame_rate
-    frame_rate = new_rate
-    return f"Frame Rate set to {new_rate} sec"
-
-# Build Gradio Interface
 def build_interface():
     with gr.Blocks() as app:
+        gr.Markdown("# Solar Surveillance System \ud83c\udf0c")
+
         with gr.Row():
-            video_output = gr.Image(label="Surveillance Feed", interactive=False)
-            metrics_output = gr.Textbox(label="Live Metrics", interactive=False)
-        with gr.Row():
-            pause_button = gr.Button("Pause")
-            frame_rate_slider = gr.Slider(minimum=0.5, maximum=5, value=1, step=0.5, label="Frame Update Interval (seconds)")
+            video_output = gr.Image(label="Live Feed", elem_id="video-stream")
+            metrics_output = gr.Textbox(label="Live Metrics")
 
-        # Live update feed
-        app.load(loop_monitor, outputs=[video_output, metrics_output], every=frame_rate)
+        with gr.Row():
+            with gr.Column():
+                pause_button = gr.Button("⏸️ Pause")
+                frame_slider = gr.Slider(1, 10, value=1, step=1, label="Frame Rate (FPS)")
+
+        runner = gr.Interface(
+            fn=monitor_feed,
+            inputs=frame_slider,
+            outputs=[video_output, metrics_output],
+            live=True,
+            concurrency_limit=1
+        )
 
-        # Pause/Resume button logic
         pause_button.click(toggle_pause, outputs=pause_button)
 
-        # Frame Rate Slider logic
-        frame_rate_slider.change(update_frame_rate, inputs=frame_rate_slider, outputs=None)
-
     return app
 
-# Launch the app
-demo = build_interface()
-demo.launch()
+if __name__ == "__main__":
+    demo = build_interface()
+    demo.launch()