Update app.py

app.py

@@ -26,6 +26,7 @@ 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.road_safety.pothole_crack_detection import detect_potholes_and_cracks
 # Plantation services
 from services.plantation.plant_count import process_plants
 from services.plantation.plant_health import process_plant_health
@@ -40,7 +41,7 @@ logging.basicConfig(
 
 # Globals
 paused = False
-frame_rate = 0.1  # Faster frame rate for real-time feel
+frame_rate = 0.1
 frame_count = 0
 log_entries = []
 crack_counts = []
@@ -48,10 +49,10 @@ crack_severity_all = []
 last_frame = None
 last_detections = {}
 last_timestamp = ""
-last_detected_images = []  # Store up to 100+ frames with detections
+last_detected_images = []
 gps_coordinates = []
 video_loaded = False
-active_service = None  # Track the active service category
+active_service = None
 
 # Constants
 DEFAULT_VIDEO_PATH = "sample.mp4"
@@ -62,9 +63,6 @@ os.makedirs(CAPTURED_FRAMES_DIR, exist_ok=True)
 os.makedirs(OUTPUT_DIR, exist_ok=True)
 
 def initialize_video(video_file=None):
-    """
-    Initialize the video with the provided file or default path.
-    """
     global video_loaded, log_entries
     release_video()
     video_path = DEFAULT_VIDEO_PATH
@@ -81,11 +79,7 @@ def initialize_video(video_file=None):
     return status
 
 def set_active_service(service_name, uc_val, om_val, rs_val, pl_val):
-    """
-    Set the active service category based on toggles.
-    Only one service category can be active at a time.
-    """
-    global active_service, service_toggles
+    global active_service
     toggles = {
         "under_construction": uc_val,
         "operations_maintenance": om_val,
@@ -93,14 +87,12 @@ def set_active_service(service_name, uc_val, om_val, rs_val, pl_val):
         "plantation": pl_val
     }
     
-    # Ensure only one toggle is active
     active_count = sum(toggles.values())
     if active_count > 1:
         log_entries.append("Error: Only one service category can be active at a time.")
         logging.error("Multiple service categories enabled simultaneously.")
         return None, "Error: Please enable only one service category at a time."
 
-    # Set active service
     for service, enabled in toggles.items():
         if enabled:
             active_service = service
@@ -114,16 +106,12 @@ def set_active_service(service_name, uc_val, om_val, rs_val, pl_val):
     return None, "No Service Category Enabled"
 
 def monitor_feed():
-    """
-    Main function to process video frames in real-time.
-    Only the active service category processes the frame.
-    """
     global paused, frame_count, last_frame, last_detections, last_timestamp, gps_coordinates, last_detected_images, video_loaded
 
     if not video_loaded:
         log_entries.append("Cannot start streaming: Video not loaded successfully.")
         logging.error("Video not loaded successfully.")
-        return None, json.dumps({"error": "Video not loaded. Please upload a video file."}, indent=2), "\n".join(log_entries[-10:]), None, None, last_detected_images
+        return None, json.dumps({"error": "Video not loaded. Please upload a video file."}, indent=2), "\n".join(log_entries[-10:]), None, None, None, last_detected_images
 
     if paused and last_frame is not None:
         frame = last_frame.copy()
@@ -136,12 +124,10 @@ def monitor_feed():
         except RuntimeError as e:
             log_entries.append(f"Error: {str(e)}")
             logging.error(f"Frame retrieval error: {str(e)}")
-            return None, json.dumps(last_detections, indent=2), "\n".join(log_entries[-10:]), None, None, last_detected_images
+            return None, json.dumps(last_detections, indent=2), "\n".join(log_entries[-10:]), None, None, None, last_detected_images
 
-        # Initialize detected items list
         all_detected_items = []
 
-        # Process only the active service category
         try:
             if active_service == "under_construction":
                 earthwork_dets, frame = process_earthwork(frame)
@@ -160,7 +146,8 @@ def monitor_feed():
                 barrier_dets, frame = process_barriers(frame)
                 lighting_dets, frame = process_lighting(frame)
                 accident_dets, frame = process_accident_spots(frame)
-                all_detected_items.extend(barrier_dets + lighting_dets + accident_dets)
+                pothole_crack_dets, frame = detect_potholes_and_cracks(frame)
+                all_detected_items.extend(barrier_dets + lighting_dets + accident_dets + pothole_crack_dets)
 
             elif active_service == "plantation":
                 plant_dets, frame = process_plants(frame)
@@ -169,18 +156,15 @@ def monitor_feed():
                 all_detected_items.extend(plant_dets + health_dets + missing_dets)
 
             else:
-                # Fallback: Run generic detection if no service is active
                 generic_dets, frame = process_generic(frame)
                 all_detected_items.extend(generic_dets)
 
-            # Optional: Run shadow detection (affects all modes for better accuracy)
             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)
+            if len(frame.shape) == 2:
                 thermal_results = process_thermal(frame)
                 thermal_dets = thermal_results["detections"]
                 frame = thermal_results["frame"]
@@ -191,7 +175,6 @@ def monitor_feed():
             logging.error(f"Processing error in {active_service}: {str(e)}")
             all_detected_items = []
 
-        # Save frame with overlays
         try:
             cv2.imwrite(TEMP_IMAGE_PATH, frame, [int(cv2.IMWRITE_JPEG_QUALITY), 95])
         except Exception as e:
@@ -200,11 +183,9 @@ def monitor_feed():
 
         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 there are detections (e.g., cracks, plants, etc.)
         detection_types = {item.get("type") for item in all_detected_items if "type" in item}
         if detection_types:
             try:
@@ -217,7 +198,6 @@ def monitor_feed():
                 log_entries.append(f"Error saving captured frame: {str(e)}")
                 logging.error(f"Error saving captured frame: {str(e)}")
 
-        # Combine detections for Salesforce
         all_detections = {
             "items": all_detected_items,
             "metrics": metrics,
@@ -226,14 +206,12 @@ def monitor_feed():
             "gps_coordinates": gps_coord
         }
 
-        # Dispatch to Salesforce
         try:
             dispatch_to_salesforce(all_detections, all_detections["timestamp"])
         except Exception as e:
             log_entries.append(f"Salesforce Dispatch Error: {str(e)}")
             logging.error(f"Salesforce dispatch error: {str(e)}")
 
-        # Save annotated frame
         try:
             frame_path = os.path.join(OUTPUT_DIR, f"frame_{frame_count:04d}.jpg")
             cv2.imwrite(frame_path, frame)
@@ -246,9 +224,8 @@ def monitor_feed():
         last_frame = frame.copy()
         last_detections = metrics
 
-        # Update logs and stats
-        crack_detected = len([item for item in all_detected_items if item.get("type") == "crack"]) if active_service == "operations_maintenance" else 0
-        if active_service == "operations_maintenance":
+        crack_detected = len([item for item in all_detected_items if item.get("type") == "crack"]) if active_service in ["operations_maintenance", "road_safety"] else 0
+        if active_service in ["operations_maintenance", "road_safety"]:
             crack_severity_all.extend([
                 item["severity"]
                 for item in all_detected_items
@@ -269,28 +246,25 @@ def monitor_feed():
         if len(crack_severity_all) > 500:
             crack_severity_all.pop(0)
 
-    # Add frame count and timestamp to display
     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)
 
-    # Generate charts (only for operations_maintenance)
     line_chart = None
     pie_chart = None
-    if active_service == "operations_maintenance":
+    bar_chart = None
+    if active_service in ["operations_maintenance", "road_safety"]:
         line_chart = generate_line_chart()
         pie_chart = generate_pie_chart()
+        bar_chart = generate_bar_chart()
 
-    return frame[:, :, ::-1], json.dumps(last_detections, indent=2), "\n".join(log_entries[-10:]), line_chart, pie_chart, last_detected_images
+    return frame[:, :, ::-1], json.dumps(last_detections, indent=2), "\n".join(log_entries[-10:]), line_chart, pie_chart, bar_chart, last_detected_images
 
 def generate_line_chart():
-    """
-    Generate a line chart for crack counts over time using Chart.js.
-    """
     if not crack_counts:
         return None
 
-    data = crack_counts[-50:]  # Last 50 frames
+    data = crack_counts[-50:]
     labels = list(range(len(data)))
 
     return {
@@ -300,7 +274,7 @@ def generate_line_chart():
             "datasets": [{
                 "label": "Cracks Over Time",
                 "data": data,
-                "borderColor": "#FF6347",  # Tomato
+                "borderColor": "#FF6347",
                 "backgroundColor": "rgba(255, 99, 71, 0.2)",
                 "fill": True,
                 "tension": 0.4
@@ -311,7 +285,7 @@ def generate_line_chart():
             "plugins": {
                 "title": {
                     "display": True,
-                    "text": "Cracks Over Time"
+                    "text": "Crack Trend"
                 }
             },
             "scales": {
@@ -333,13 +307,10 @@ def generate_line_chart():
     }
 
 def generate_pie_chart():
-    """
-    Generate a pie chart for crack severity distribution using Chart.js.
-    """
     if not crack_severity_all:
         return None
 
-    count = Counter(crack_severity_all[-200:])  # Last 200 cracks
+    count = Counter(crack_severity_all[-200:])
     labels = list(count.keys())
     sizes = list(count.values())
 
@@ -350,9 +321,9 @@ def generate_pie_chart():
             "datasets": [{
                 "data": sizes,
                 "backgroundColor": [
-                    "#FF6347",  # Tomato
-                    "#4682B4",  # SteelBlue
-                    "#FFD700"   # Gold
+                    "#FF6347",
+                    "#4682B4",
+                    "#FFD700"
                 ]
             }]
         },
@@ -361,7 +332,7 @@ def generate_pie_chart():
             "plugins": {
                 "title": {
                     "display": True,
-                    "text": "Crack Severity Distribution"
+                    "text": "Crack Severity"
                 },
                 "legend": {
                     "position": "top"
@@ -370,6 +341,57 @@ def generate_pie_chart():
         }
     }
 
+def generate_bar_chart():
+    if not crack_severity_all:
+        return None
+
+    count = Counter(crack_severity_all[-200:])
+    labels = list(count.keys())
+    sizes = list(count.values())
+
+    return {
+        "type": "bar",
+        "data": {
+            "labels": labels,
+            "datasets": [{
+                "label": "Severity Distribution",
+                "data": sizes,
+                "backgroundColor": [
+                    "#FF6347",
+                    "#4682B4",
+                    "#FFD700"
+                ]
+            }]
+        },
+        "options": {
+            "responsive": True,
+            "plugins": {
+                "title": {
+                    "display": True,
+                    "text": "Severity Distribution"
+                },
+                "legend": {
+                    "display": False
+                }
+            },
+            "scales": {
+                "y": {
+                    "beginAtZero": True,
+                    "title": {
+                        "display": True,
+                        "text": "Count"
+                    }
+                },
+                "x": {
+                    "title": {
+                        "display": True,
+                        "text": "Severity"
+                    }
+                }
+            }
+        }
+    }
+
 # Gradio UI
 with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="green")) as app:
     gr.Markdown(
@@ -379,7 +401,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="green"))
         """
     )
 
-    # Video upload section
     with gr.Row():
         with gr.Column(scale=3):
             video_input = gr.File(label="Upload Video File (e.g., sample.mp4)", file_types=["video"])
@@ -391,7 +412,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="green"))
                 interactive=False
             )
 
-    # Toggles for service categories with status indicators
     with gr.Row():
         with gr.Column():
             uc_toggle = gr.Checkbox(label="Enable Under Construction Services", value=False)
@@ -418,8 +438,9 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="green"))
         with gr.Column(scale=2):
             logs_output = gr.Textbox(label="Live Logs", lines=8, interactive=False)
         with gr.Column(scale=1):
-            chart_output = gr.Plot(label="Crack Trend (Operations Maintenance Only)")
-            pie_output = gr.Plot(label="Crack Severity (Operations Maintenance Only)")
+            chart_output = gr.Plot(label="Crack Trend (Operations Maintenance & Road Safety)")
+            pie_output = gr.Plot(label="Crack Severity (Operations Maintenance & Road Safety)")
+            bar_output = gr.Plot(label="Severity Distribution (Operations Maintenance & Road Safety)")
 
     with gr.Row():
         captured_images = gr.Gallery(label="Detected Frames (Last 100+)", columns=4, rows=25, height="auto")
@@ -429,7 +450,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="green"))
         resume_btn = gr.Button("▶️ Resume", variant="primary")
         frame_slider = gr.Slider(0.05, 1.0, value=0.1, label="Frame Interval (seconds)", step=0.05)
 
-    # Add some custom CSS for better UX
     gr.HTML("""
     <style>
         #live-feed {
@@ -459,7 +479,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="green"))
         global frame_rate
         frame_rate = val
 
-    # Initialize video on app load
     video_status.value = initialize_video()
 
     load_button.click(
@@ -468,7 +487,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="green"))
         outputs=[video_status]
     )
 
-    # Toggle change events
     def update_toggles(uc_val, om_val, rs_val, pl_val):
         active, status_message = set_active_service("toggle", uc_val, om_val, rs_val, pl_val)
         uc_status_val = "Enabled" if active == "under_construction" else "Disabled"
@@ -493,16 +511,16 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="green"))
     def streaming_loop():
         while True:
             if not video_loaded:
-                yield None, json.dumps({"error": "Video not loaded. Please upload a video file."}, indent=2), "\n".join(log_entries[-10:]), None, None, last_detected_images
+                yield None, json.dumps({"error": "Video not loaded. Please upload a video file."}, indent=2), "\n".join(log_entries[-10:]), None, None, None, last_detected_images
             else:
-                frame, detections, logs, line_chart, pie_chart, captured = monitor_feed()
+                frame, detections, logs, line_chart, pie_chart, bar_chart, captured = monitor_feed()
                 if frame is None:
-                    yield None, detections, logs, line_chart, pie_chart, captured
+                    yield None, detections, logs, line_chart, pie_chart, bar_chart, captured
                 else:
-                    yield frame, detections, logs, line_chart, pie_chart, captured
+                    yield frame, detections, logs, line_chart, pie_chart, bar_chart, captured
             time.sleep(frame_rate)
 
-    app.load(streaming_loop, outputs=[video_output, detections_output, logs_output, chart_output, pie_output, captured_images])
+    app.load(streaming_loop, outputs=[video_output, detections_output, logs_output, chart_output, pie_output, bar_output, captured_images])
 
 if __name__ == "__main__":
     app.launch(share=True)