Update app.py

app.py

@@ -4,22 +4,12 @@ import time
 import os
 import json
 from datetime import datetime
-from services.video_service import get_next_video_frame, reset_video_index, preload_video
+from services.video_service import get_next_video_frame, reset_video_index, preload_video, release_video
 # Under Construction services
 from services.under_construction.earthwork_detection import process_earthwork
 from services.under_construction.culvert_check import process_culverts
 from services.under_construction.bridge_pier_check import process_bridge_piers
-# Comment out other services
-# from services.operations_maintenance.pothole_detection import process_potholes
-# from services.operations_maintenance.crack_detection import process_cracks
-# from services.operations_maintenance.signage_check import process_signages
-# from services.road_safety.barrier_check import process_barriers
-# from services.road_safety.lighting_check import process_lighting
-# from services.road_safety.accident_spot_check import process_accident_spots
-# from services.plantation.plant_count import process_plants
-# from services.plantation.plant_health import process_plant_health
-# from services.plantation.missing_patch_check import process_missing_patches
-# Original services (not used in this mode but imported for potential future use)
+# Original services
 from services.detection_service import process_frame as process_generic
 from services.metrics_service import compute_metrics
 from services.overlay_service import add_overlay
@@ -27,12 +17,6 @@ from services.salesforce_dispatcher import dispatch_to_salesforce
 from services.shadow_detection import detect_shadows
 from services.thermal_service import process_thermal
 
-# Preload video
-try:
-    preload_video()
-except Exception as e:
-    print(f"Error preloading video: {str(e)}")
-
 # Globals
 paused = False
 frame_rate = 0.5  # Process every 0.5 seconds for real-time feel
@@ -41,17 +25,44 @@ log_entries = []
 last_frame = None
 last_detections = {}
 last_timestamp = ""
+video_loaded = False
 
 # Constants
+DEFAULT_VIDEO_PATH = "sample.mp4"
 TEMP_IMAGE_PATH = "temp.jpg"
 OUTPUT_DIR = "outputs"
 os.makedirs(OUTPUT_DIR, exist_ok=True)
 
+def initialize_video(video_file=None):
+    """
+    Initialize the video with the provided file or default path.
+    Args:
+        video_file: Uploaded video file (Gradio File object) or None.
+    Returns:
+        str: Status message
+    """
+    global video_loaded, log_entries
+    release_video()  # Release any existing video capture
+    video_path = DEFAULT_VIDEO_PATH
+
+    if video_file is not None:
+        video_path = video_file.name  # Gradio File object has a 'name' attribute with the temp path
+        log_entries.append(f"Using uploaded video: {video_path}")
+    
+    status = preload_video(video_path)
+    video_loaded = "Error" not in status
+    log_entries.append(status)
+    return status
+
 def monitor_feed():
     """
     Main function to process video frames in real-time.
     """
-    global paused, frame_count, last_frame, last_detections, last_timestamp
+    global paused, frame_count, last_frame, last_detections, last_timestamp, video_loaded
+
+    if not video_loaded:
+        log_entries.append("Cannot start streaming: Video not loaded successfully.")
+        return None, json.dumps({"error": "Video not loaded. Please upload a video file."}, indent=2), "\n".join(log_entries[-10:])
 
     if paused and last_frame is not None:
         frame = last_frame.copy()
@@ -110,7 +121,13 @@ def monitor_feed():
 with gr.Blocks(theme=gr.themes.Soft()) as app:
     gr.Markdown("# 🛡️ NHAI Drone Analytics Monitoring System - Under Construction")
 
-    status_text = gr.Markdown("**Status:** 🟢 Running")
+    # Video upload section
+    with gr.Row():
+        video_input = gr.File(label="Upload Video File (e.g., sample.mp4)", file_types=["video"])
+        load_button = gr.Button("Load Video")
+    video_status = gr.Textbox(label="Video Load Status", value="Please upload a video file or ensure 'sample.mp4' exists in the root directory.")
+
+    status_text = gr.Markdown("**Status:** 🟢 Ready (Upload a video to start)")
 
     with gr.Row():
         with gr.Column(scale=3):
@@ -134,23 +151,37 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
     def toggle_resume():
         global paused
         paused = False
-        return "**Status:** 🟢 Running"
+        return "**Status:** 🟢 Streaming"
 
     def set_frame_rate(val):
         global frame_rate
         frame_rate = val
 
+    # Initialize video on app load (try default path)
+    video_status.value = initialize_video()
+
+    # Load video when user uploads a file
+    load_button.click(
+        initialize_video,
+        inputs=[video_input],
+        outputs=[video_status]
+    )
+
     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():
+        global video_loaded
         while True:
-            frame, detections, logs = monitor_feed()
-            if frame is None:
-                yield None, detections, logs
+            if not video_loaded:
+                yield None, json.dumps({"error": "Video not loaded. Please upload a video file."}, indent=2), "\n".join(log_entries[-10:])
             else:
-                yield frame, detections, logs
+                frame, detections, logs = monitor_feed()
+                if frame is None:
+                    yield None, detections, logs
+                else:
+                    yield frame, detections, logs
             time.sleep(frame_rate)
 
     app.load(streaming_loop, outputs=[video_output, detections_output, logs_output])