Update app.py

app.py

@@ -6,6 +6,7 @@ import random
 import matplotlib.pyplot as plt
 import numpy as np
 from datetime import datetime
+from collections import Counter
 from services.video_service import get_next_video_frame, reset_video_index
 from services.thermal_service import detect_thermal_anomalies
 from services.overlay_service import overlay_boxes
@@ -17,6 +18,7 @@ frame_rate = 1
 frame_count = 0
 log_entries = []
 anomaly_counts = []
+anomaly_types_all = []
 last_frame = None
 last_metrics = {}
 last_timestamp = ""
@@ -54,25 +56,28 @@ def monitor_feed():
         last_frame = frame.copy()
         last_metrics = metrics.copy()
 
+        # Update persistent logs and stats
+        anomaly_detected = len(last_metrics.get('anomalies', []))
+        anomaly_types_all.extend([a['label'] for a in last_metrics.get('anomalies', [])])
+        log_entries.append(f"{last_timestamp} - Frame {frame_count} - Anomalies: {anomaly_detected}")
+        anomaly_counts.append(anomaly_detected)
+
+        if len(log_entries) > 100:
+            log_entries.pop(0)
+        if len(anomaly_counts) > 500:
+            anomaly_counts.pop(0)
+        if len(anomaly_types_all) > 500:
+            anomaly_types_all.pop(0)
+
     frame = cv2.resize(last_frame, (640, 480))
     cv2.putText(frame, f"Frame: {frame_count}", (10, 25), cv2.FONT_HERSHEY_SIMPLEX, 0.6, (0, 255, 0), 2)
     cv2.putText(frame, f"{last_timestamp}", (10, 50), cv2.FONT_HERSHEY_SIMPLEX, 0.6, (0, 255, 0), 2)
 
-    anomaly_detected = len(last_metrics.get('anomalies', []))
-    log_entries.append(f"{last_timestamp} - Frame {frame_count} - Anomalies: {anomaly_detected}")
-    anomaly_counts.append(anomaly_detected)
-
-    if len(log_entries) > 100:
-        log_entries.pop(0)
-   # if len(anomaly_counts) > 100:
-    #    anomaly_counts.pop(0)
-
-    metrics_str = "\n".join([f"{k}: {v}" for k, v in last_metrics.items()])
+    return frame[:, :, ::-1], last_metrics, "\n".join(log_entries[-10:]), generate_line_chart(), generate_pie_chart(), last_detected_images
 
-    return frame[:, :, ::-1], metrics_str, "\n".join(log_entries[-10:]), generate_chart(), last_detected_images
+# Line chart
 
-# Chart generator
-def generate_chart():
+def generate_line_chart():
     fig, ax = plt.subplots(figsize=(4, 2))
     ax.plot(anomaly_counts[-50:], marker='o')
     ax.set_title("Anomalies Over Time")
@@ -84,31 +89,45 @@ def generate_chart():
     plt.close(fig)
     return chart_path
 
+# Pie chart for anomaly types
+def generate_pie_chart():
+    if not anomaly_types_all:
+        return None
+    fig, ax = plt.subplots(figsize=(4, 2))
+    count = Counter(anomaly_types_all[-200:])
+    labels, sizes = zip(*count.items())
+    ax.pie(sizes, labels=labels, autopct='%1.1f%%', startangle=140)
+    ax.axis('equal')
+    fig.tight_layout()
+    pie_path = "pie_temp.png"
+    fig.savefig(pie_path)
+    plt.close(fig)
+    return pie_path
+
 # Gradio UI
 with gr.Blocks(theme=gr.themes.Soft()) as app:
-    gr.Markdown("# 🌐 Thermal Anomaly Monitoring Dashboard", elem_id="main-title")
+    gr.Markdown("# 🛡️ Command Room Dashboard: Thermal Anomaly Monitoring")
 
-    status_text = gr.Markdown("**Status:** 🟢 Running", elem_id="status-banner")
+    status_text = gr.Markdown("**Status:** 🟢 Running")
 
     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", width=640, height=480)
         with gr.Column(scale=1):
-            metrics_output = gr.Textbox(label="Live Metrics", lines=5)
+            metrics_output = gr.Textbox(label="Live Metrics", lines=4)
 
     with gr.Row():
-        with gr.Column():
-            logs_output = gr.Textbox(label="Live Logs", lines=10)
-        with gr.Column():
-            chart_output = gr.Image(label="Detection Trends")
+        logs_output = gr.Textbox(label="Live Logs", lines=8)
+        chart_output = gr.Image(label="Detection Trend")
+        pie_output = gr.Image(label="Anomaly Types")
 
     with gr.Row():
-        captured_images = gr.Gallery(label="Last 5 Captured Events", columns=1, height="auto")
+        captured_images = gr.Gallery(label="Captured Events (Last 5)")
 
     with gr.Row():
         pause_btn = gr.Button("⏸️ Pause")
         resume_btn = gr.Button("▶️ Resume")
-        frame_slider = gr.Slider(0.0005, 0.5, value=1, label="Frame Interval (seconds)")
+        frame_slider = gr.Slider(0.2, 5, value=1, label="Frame Interval (seconds)")
 
     def toggle_pause():
         global paused
@@ -130,11 +149,11 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
 
     def streaming_loop():
         while True:
-            frame, metrics, logs, chart, captured = monitor_feed()
-            yield frame, metrics, logs, chart, captured
+            frame, metrics, logs, chart, pie, captured = monitor_feed()
+            yield frame, str(metrics), logs, chart, pie, captured
             time.sleep(frame_rate)
 
-    app.load(streaming_loop, outputs=[video_output, metrics_output, logs_output, chart_output, captured_images])
+    app.load(streaming_loop, outputs=[video_output, metrics_output, logs_output, chart_output, pie_output, captured_images])
 
 if __name__ == "__main__":
     app.launch(share=True)