Update app.py

app.py

@@ -11,6 +11,14 @@ from services.crack_detection_service import detect_cracks_and_objects
 from services.overlay_service import overlay_boxes
 from services.metrics_service import update_metrics
 from services.salesforce_dispatcher import dispatch_to_salesforce
+# 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
+# Original services
+from services.detection_service import process_frame as process_generic
+from services.shadow_detection import detect_shadows
+from services.thermal_service import process_thermal
 
 # Globals
 paused = False
@@ -25,6 +33,7 @@ last_timestamp = ""
 last_detected_images = []  # Store up to 100+ crack images
 gps_coordinates = []
 video_loaded = False
+enable_under_construction = False  # Toggle for under_construction services
 
 # Constants
 DEFAULT_VIDEO_PATH = "sample.mp4"
@@ -51,6 +60,15 @@ def initialize_video(video_file=None):
     log_entries.append(status)
     return status
 
+def toggle_under_construction(value):
+    """
+    Toggle the under_construction services.
+    """
+    global enable_under_construction
+    enable_under_construction = value
+    log_entries.append(f"Under Construction Services {'Enabled' if value else 'Disabled'}")
+    return f"Under Construction Services: {'Enabled' if value else 'Disabled'}"
+
 def monitor_feed():
     """
     Main function to process video frames in real-time.
@@ -71,18 +89,49 @@ def monitor_feed():
             log_entries.append(f"Error: {str(e)}")
             return None, json.dumps(last_detections, indent=2), "\n".join(log_entries[-10:]), None, None, last_detected_images
 
-        # Detect cracks and objects
-        detected_items = detect_cracks_and_objects(frame)
-        frame = overlay_boxes(frame, detected_items)
+        # Initialize detected items list
+        all_detected_items = []
+
+        # Always run crack detection (primary focus)
+        crack_items = detect_cracks_and_objects(frame)
+        frame = overlay_boxes(frame, crack_items)
+        all_detected_items.extend(crack_items)
+
+        # Run Under Construction services if enabled
+        if enable_under_construction:
+            earthwork_dets, frame = process_earthwork(frame)
+            culvert_dets, frame = process_culverts(frame)
+            bridge_pier_dets, frame = process_bridge_piers(frame)
+            all_detected_items.extend(earthwork_dets + culvert_dets + bridge_pier_dets)
+
+        # Fallback: Run generic detection if no items detected
+        if not all_detected_items:
+            generic_dets, frame = process_generic(frame)
+            all_detected_items.extend(generic_dets)
+
+        # Optional: Run shadow detection (only log results for now)
+        shadow_results = detect_shadows(frame)
+        shadow_dets = shadow_results["detections"]
+        frame = shadow_results["frame"]
+        all_detected_items.extend(shadow_dets)
+
+        # Optional: Run thermal processing if frame is grayscale (simulated check)
+        if len(frame.shape) == 2:  # Grayscale frame (simulating thermal input)
+            thermal_results = process_thermal(frame)
+            thermal_dets = thermal_results["detections"]
+            frame = thermal_results["frame"]
+            all_detected_items.extend(thermal_dets)
+
+        # Save frame with overlays
         cv2.imwrite(TEMP_IMAGE_PATH, frame, [int(cv2.IMWRITE_JPEG_QUALITY), 95])
-        metrics = update_metrics(detected_items)
+        metrics = update_metrics(all_detected_items)
 
         # Simulate GPS coordinates
         gps_coord = [17.385044 + random.uniform(-0.001, 0.001), 78.486671 + frame_count * 0.0001]
         gps_coordinates.append(gps_coord)
 
         # Save frame if cracks are detected
-        if any(item['type'] == 'crack' for item in detected_items):
+        if any(item['type'] == 'crack' for item in crack_items):
             captured_frame_path = os.path.join(CAPTURED_FRAMES_DIR, f"crack_{frame_count}.jpg")
             cv2.imwrite(captured_frame_path, frame)
             last_detected_images.append(captured_frame_path)
@@ -91,7 +140,7 @@ def monitor_feed():
 
         # Combine detections for Salesforce
         all_detections = {
-            "items": detected_items,
+            "items": all_detected_items,
             "metrics": metrics,
             "timestamp": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
             "frame_count": frame_count,
@@ -111,14 +160,14 @@ def monitor_feed():
         last_detections = metrics
 
         # Update logs and stats
-        crack_detected = len([item for item in last_detections.get('items', []) if item['type'] == 'crack'])
+        crack_detected = len([item for item in crack_items if item['type'] == 'crack'])
         crack_severity_all.extend([
             item['severity']
-            for item in last_detections.get('items', [])
+            for item in crack_items
             if item['type'] == 'crack' and 'severity' in item
         ])
 
-        log_entries.append(f"{last_timestamp} - Frame {frame_count} - Cracks: {crack_detected} - GPS: {gps_coord} - Avg Conf: {metrics['avg_confidence']:.2f}")
+        log_entries.append(f"{last_timestamp} - Frame {frame_count} - Cracks: {crack_detected} - Total Detections: {len(all_detected_items)} - GPS: {gps_coord} - Avg Conf: {metrics['avg_confidence']:.2f}")
         crack_counts.append(crack_detected)
 
         if len(log_entries) > 100:
@@ -236,13 +285,18 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
         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.")
 
+    # Toggle for Under Construction services
+    with gr.Row():
+        under_construction_toggle = gr.Checkbox(label="Enable Under Construction Services", value=False)
+        toggle_status = gr.Textbox(label="Toggle Status", value="Under Construction Services: Disabled")
+
     status_text = gr.Markdown("**Status:** 🟢 Ready (Upload a video to start)")
 
     with gr.Row():
         with gr.Column(scale=3):
             video_output = gr.Image(label="Live Drone Feed", width=640, height=480)
         with gr.Column(scale=1):
-            detections_output = gr.Textbox(label="Crack Metrics", lines=4)
+            detections_output = gr.Textbox(label="Detection Metrics", lines=4)
 
     with gr.Row():
         logs_output = gr.Textbox(label="Live Logs", lines=8)
@@ -281,6 +335,12 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
         outputs=[video_status]
     )
 
+    under_construction_toggle.change(
+        toggle_under_construction,
+        inputs=[under_construction_toggle],
+        outputs=[toggle_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])