Update app.py

app.py

@@ -16,6 +16,7 @@ import piexif
 import zipfile
 from reportlab.lib.pagesizes import letter
 from reportlab.pdfgen import canvas
+from reportlab.lib.units import inch
 
 os.environ["YOLO_CONFIG_DIR"] = "/tmp/Ultralytics"
 logging.basicConfig(filename="app.log", level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
@@ -44,58 +45,137 @@ model = YOLO('./data/best.pt').to(device)
 if device == "cuda":
     model.half()
 
-# Function to generate the PDF report with images and data, each section on a new page
-def generate_pdf_report(summary: str, screenshots: List[str], log_results: List[str], chart_path: str, map_path: str, pdf_path: str):
+def generate_pdf_report(summary: str, screenshots: List[str], log_results: List[str], chart_path: str, map_path: str, pdf_path: str, additional_results: List[str] = None):
     c = canvas.Canvas(pdf_path, pagesize=letter)
     width, height = letter
-
-    # Set starting position for content
-    margin_left = 72
-    margin_top = height - 72
-    line_height = 14  # Height of each line of text
-    y_position = margin_top
+    margin_left = 0.75 * inch
+    margin_right = 0.75 * inch
+    margin_top = height - 0.75 * inch
+    margin_bottom = 0.75 * inch
+    line_height = 14
+    max_text_width = width - margin_left - margin_right
+    image_width = 5 * inch
+    image_height = 3.5 * inch
+
+    def new_page():
+        nonlocal y_position
+        c.showPage()
+        y_position = margin_top
+        c.setFont("Helvetica", 12)
+
+    def draw_wrapped_text(text, x, y, max_width):
+        nonlocal y_position
+        words = text.split()
+        line = ""
+        for word in words:
+            test_line = f"{line} {word}".strip()
+            if c.stringWidth(test_line, "Helvetica", 12) <= max_width:
+                line = test_line
+            else:
+                if line:
+                    c.drawString(x, y, line)
+                    y -= line_height
+                    if y < margin_bottom:
+                        new_page()
+                        y = y_position
+                    line = word
+                else:
+                    c.drawString(x, y, word)
+                    y -= line_height
+                    if y < margin_bottom:
+                        new_page()
+                        y = y_position
+        if line:
+            c.drawString(x, y, line)
+            y -= line_height
+        return y
 
     # Title Page
-    c.setFont("Helvetica", 16)
+    y_position = margin_top
+    c.setFont("Helvetica-Bold", 16)
     c.drawString(margin_left, y_position, "Drone Survey Analysis Report")
-    y_position -= 30  # Space below the title
-    c.showPage()  # Create a new page
+    c.setFont("Helvetica", 12)
+    y_position -= 30
+    c.drawString(margin_left, y_position, f"Generated on: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
+    new_page()
+
+    # Summary Page
+    c.setFont("Helvetica-Bold", 14)
+    c.drawString(margin_left, y_position, "Summary")
+    y_position -= line_height * 1.5
+    c.setFont("Helvetica", 12)
+    y_position = draw_wrapped_text(summary, margin_left, y_position, max_text_width)
+    y_position -= 20
+    new_page()
+
+    # Log Results Page
+    c.setFont("Helvetica-Bold", 14)
+    c.drawString(margin_left, y_position, "Log Results for Top 5 Images")
+    y_position -= line_height * 1.5
+    c.setFont("Helvetica", 12)
+    for log in log_results[:5]:
+        y_position = draw_wrapped_text(log, margin_left, y_position, max_text_width)
+        y_position -= line_height
+        if y_position < margin_bottom:
+            new_page()
+    y_position -= 20
+    new_page()
+
+    # Screenshots Page
+    c.setFont("Helvetica-Bold", 14)
+    c.drawString(margin_left, y_position, "Incident Screenshots")
+    y_position -= line_height * 1.5
+    c.setFont("Helvetica", 12)
+    for screenshot in screenshots[:5]:
+        if os.path.exists(screenshot):
+            c.drawImage(screenshot, margin_left, y_position - image_height, width=image_width, height=image_height, preserveAspectRatio=True)
+            y_position -= image_height + 20
+            if y_position < margin_bottom:
+                new_page()
+        else:
+            y_position = draw_wrapped_text(f"Image not found: {screenshot}", margin_left, y_position, max_text_width)
+            y_position -= line_height
+            if y_position < margin_bottom:
+                new_page()
+    new_page()
+
+    # Chart Page
+    c.setFont("Helvetica-Bold", 14)
+    c.drawString(margin_left, y_position, "Detection Trend Chart")
+    y_position -= line_height * 1.5
+    c.setFont("Helvetica", 12)
+    if os.path.exists(chart_path):
+        c.drawImage(chart_path, margin_left, y_position - 4 * inch, width=4 * inch, height=3 * inch, preserveAspectRatio=True)
+        y_position -= 4 * inch + 20
+    else:
+        y_position = draw_wrapped_text("Chart not found", margin_left, y_position, max_text_width)
+        y_position -= line_height
+    new_page()
 
-    # Add Summary Text (New Page)
+    # Map Page
+    c.setFont("Helvetica-Bold", 14)
+    c.drawString(margin_left, y_position, "Issue Locations Map")
+    y_position -= line_height * 1.5
     c.setFont("Helvetica", 12)
-    c.drawString(margin_left, y_position, "Summary:")
-    y_position -= line_height
-    c.drawString(margin_left, y_position, summary)
-    y_position -= 20  # Space after summary
-    c.showPage()  # Create a new page
-
-    # Add Logs for Top 5 Images (New Page)
-    c.drawString(margin_left, y_position, "Log Results for Top 5 Images:")
-    y_position -= line_height
-    for log in log_results[:5]:  # Display top 5 logs
-        c.drawString(margin_left, y_position, log)
+    if os.path.exists(map_path):
+        c.drawImage(map_path, margin_left, y_position - 4 * inch, width=4 * inch, height=3 * inch, preserveAspectRatio=True)
+        y_position -= 4 * inch + 20
+    else:
+        y_position = draw_wrapped_text("Map not found", margin_left, y_position, max_text_width)
         y_position -= line_height
-    y_position -= 20  # Space after logs
-    c.showPage()  # Create a new page
-
-    # Add Screenshots (Top 5 Images) (New Page)
-    c.drawString(margin_left, y_position, "Incident Screenshots:")
-    y_position -= line_height
-    for screenshot in screenshots[:5]:  # Limit to the top 5 images
-        c.drawImage(screenshot, margin_left, y_position, width=500, height=350)  # Adjusted size of images
-        y_position -= 370  # Space after each image
-    y_position -= 20  # Space after images
-    c.showPage()  # Create a new page
-
-    # Add Chart Image (New Page)
-    c.drawString(margin_left, y_position, "Detection Trend Chart:")
-    c.drawImage(chart_path, margin_left, y_position - 100, width=400, height=300)
-    y_position -= 300  # Space after chart
-    c.showPage()  # Create a new page
-
-    # Add Map Image (New Page)
-    c.drawString(margin_left, y_position, "Issue Locations Map:")
-    c.drawImage(map_path, margin_left, y_position - 100, width=400, height=300)
+    new_page()
+
+    # Additional Results Page
+    if additional_results:
+        c.setFont("Helvetica-Bold", 14)
+        c.drawString(margin_left, y_position, "Additional Analysis Results")
+        y_position -= line_height * 1.5
+        c.setFont("Helvetica", 12)
+        for result in additional_results:
+            y_position = draw_wrapped_text(result, margin_left, y_position, max_text_width)
+            y_position -= line_height
+            if y_position < margin_bottom:
+                new_page()
 
     c.save()
 
@@ -126,7 +206,7 @@ def zip_all_outputs(report_path: str, video_path: str, chart_path: str, map_path
 
 def generate_map(gps_coords: List[List[float]], items: List[Dict[str, Any]]) -> str:
     map_path = os.path.join(OUTPUT_DIR, f"map_{datetime.now().strftime('%Y%m%d_%H%M%S')}.png")
-    plt.figure(figsize=(5, 5))  # Adjusted figure size
+    plt.figure(figsize=(5, 5))
     plt.scatter([x[1] for x in gps_coords], [x[0] for x in gps_coords], c='blue', label='GPS Points')
     plt.title("Issue Locations Map")
     plt.xlabel("Longitude")
@@ -189,7 +269,7 @@ def update_metrics(detections: List[Dict[str, Any]]) -> Dict[str, Any]:
 def generate_line_chart(detections: List[Dict[str, Any]]) -> Optional[str]:
     if not detections:
         return None
-    plt.figure(figsize=(5, 3))  # Adjusted figure size
+    plt.figure(figsize=(5, 3))
     detection_times = [det["frame"] for det in detections]
     detection_counts = [det["conf"] for det in detections]
     plt.plot(detection_times, detection_counts, marker='o', color='#FF8C00')
@@ -203,10 +283,6 @@ def generate_line_chart(detections: List[Dict[str, Any]]) -> Optional[str]:
     plt.close()
     return chart_path
 
-# The rest of the process_video function remains the same as before
-
-
-
 def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
     global frame_count, last_metrics, detected_counts, detected_issues, gps_coordinates, log_entries
     frame_count = 0
@@ -251,6 +327,7 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
     detection_frame_count = 0
     output_frame_count = 0
     last_annotated_frame = None
+    additional_results = []
 
     while True:
         ret, frame = cap.read()
@@ -297,6 +374,8 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
                     "path": os.path.join(CAPTURED_FRAMES_DIR, f"detected_{frame_count:06d}.jpg")
                 })
                 log_entries.append(f"Frame {frame_count} at {timestamp_str}: Detected {label} with confidence {conf:.2f}")
+                if label == "Pothole":
+                    additional_results.append(f"Pothole detected with quality score: {conf:.2f}")
 
         if frame_detections:
             detection_frame_count += 1
@@ -305,7 +384,7 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
                 if cv2.imwrite(captured_frame_path, annotated_frame):
                     if write_geotag(captured_frame_path, gps_coord):
                         detected_issues.append(captured_frame_path)
-                        if len(detected_issues) > 5:  # Limit to top 5 images
+                        if len(detected_issues) > 5:
                             detected_issues.pop(0)
                     else:
                         log_entries.append(f"Frame {frame_count}: Geotagging failed")
@@ -352,20 +431,28 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
     chart_path = generate_line_chart(all_detections)
     map_path = generate_map(gps_coordinates[-5:], all_detections)
 
-    # Generate the report
+    # Generate the report with additional results
     pdf_path = f"{OUTPUT_DIR}/drone_analysis_report_{datetime.now().strftime('%Y%m%d_%H%M%S')}.pdf"
-    generate_pdf_report("Drone analysis completed. Top 5 detections included.", detected_issues, log_entries, chart_path, map_path, pdf_path)
+    generate_pdf_report(
+        "Drone analysis completed. Top 5 detections included.",
+        detected_issues,
+        log_entries,
+        chart_path,
+        map_path,
+        pdf_path,
+        additional_results
+    )
 
     log_entries.append(f"Processing completed in {total_time:.2f} seconds")
 
     return (
-        output_path,  # Video
-        json.dumps(last_metrics, indent=2),  # Metrics
-        "\n".join(log_entries[-10:]),  # Logs
-        detected_issues,  # Issue gallery
-        chart_path,  # Chart image
-        map_path,  # Map image
-        pdf_path  # PDF file
+        output_path,
+        json.dumps(last_metrics, indent=2),
+        "\n".join(log_entries[-10:]),
+        detected_issues,
+        chart_path,
+        map_path,
+        pdf_path
     )
 
 with gr.Blocks(theme=gr.themes.Soft(primary_hue="orange")) as iface: