Update app.py

app.py

@@ -49,13 +49,39 @@ def zip_directory(folder_path: str, zip_path: str) -> str:
                 for file in files:
                     file_path = os.path.join(root, file)
                     arcname = os.path.relpath(file_path, folder_path)
-                    zipf.write(file_path, arcname)
+                    zipf.write(file_path, os.path.join(os.path.basename(folder_path), arcname))
         return zip_path
     except Exception as e:
         logging.error(f"Failed to zip {folder_path}: {str(e)}")
         log_entries.append(f"Error: Failed to zip {folder_path}: {str(e)}")
         return ""
 
+def zip_all_outputs(report_path: str, video_path: str, chart_path: str, map_path: str) -> str:
+    zip_path = os.path.join(OUTPUT_DIR, f"drone_analysis_outputs_{datetime.now().strftime('%Y%m%d_%H%M%S')}.zip")
+    try:
+        with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
+            if os.path.exists(report_path):
+                zipf.write(report_path, os.path.basename(report_path))
+            if os.path.exists(video_path):
+                zipf.write(video_path, os.path.basename(video_path))
+            if os.path.exists(chart_path):
+                zipf.write(chart_path, os.path.basename(chart_path))
+            if os.path.exists(map_path):
+                zipf.write(map_path, os.path.basename(map_path))
+            for root, _, files in os.walk(CAPTURED_FRAMES_DIR):
+                for file in files:
+                    file_path = os.path.join(root, file)
+                    zipf.write(file_path, os.path.join("captured_frames", file))
+            for root, _, files in os.walk(FLIGHT_LOG_DIR):
+                for file in files:
+                    file_path = os.path.join(root, file)
+                    zipf.write(file_path, os.path.join("flight_logs", file))
+        return zip_path
+    except Exception as e:
+        logging.error(f"Failed to create output ZIP: {str(e)}")
+        log_entries.append(f"Error: Failed to create output ZIP: {str(e)}")
+        return ""
+
 def generate_map(gps_coords: List[List[float]], items: List[Dict[str, Any]]) -> str:
     map_path = os.path.join(OUTPUT_DIR, "map_temp.png")
     plt.figure(figsize=(4, 4))
@@ -147,7 +173,11 @@ def generate_report(
     output_duration: float,
     detection_frame_count: int,
     chart_path: str,
-    map_path: str
+    map_path: str,
+    frame_times: List[float],
+    resize_times: List[float],
+    inference_times: List[float],
+    io_times: List[float]
 ) -> str:
     report_path = os.path.join(OUTPUT_DIR, f"drone_analysis_report_{datetime.now().strftime('%Y%m%d_%H%M%S')}.md")
     report_content = [
@@ -199,50 +229,74 @@ def generate_report(
         report_content.append(f"    - {item['type']}: {item['count']} ({percentage:.2f}%)")
     report_content.extend([
         f"- Processing Time: {total_time:.2f} seconds",
+        f"- Average Frame Time: {sum(frame_times)/len(frame_times):.2f} ms",
+        f"- Average Resize Time: {sum(resize_times)/len(resize_times):.2f} ms",
+        f"- Average Inference Time: {sum(inference_times)/len(inference_times):.2f} ms",
+        f"- Average I/O Time: {sum(io_times)/len(io_times):.2f} ms",
         f"- Timestamp: {metrics.get('timestamp', 'N/A')}",
         "- Summary: Potholes and cracks detected in high-traffic segments.",
         "",
-        "## 5. Geotagged Data Summary",
+        "## 5. Geotagged Images",
         f"- Total Images: {len(detected_issues)}",
-        f"- Storage: Data Lake `/project_xyz/images/{datetime.now().strftime('%Y-%m-%d')}`"
+        f"- Storage: Data Lake `/project_xyz/images/{datetime.now().strftime('%Y-%m-%d')}`",
+        "",
+        "| Frame | Issue Type | GPS (Lat, Lon) | Timestamp | Confidence | Image Path |",
+        "|-------|------------|----------------|-----------|------------|------------|"
     ])
 
-    if detected_issues:
-        report_content.extend([
-            "| Frame | Issue Type | GPS (Lat, Lon) | Timestamp | Image Path |",
-            "|-------|------------|----------------|-----------|------------|"
-        ])
-        for i, detection in enumerate(all_detections[:5]):
-            report_content.append(
-                f"| {detection['frame']:06d} | {detection['label']} | ({detection['gps'][0]}, {detection['gps'][1]}) | {detection['timestamp']} | {detection['path']} |"
-            )
+    for detection in all_detections:
+        report_content.append(
+            f"| {detection['frame']:06d} | {detection['label']} | ({detection['gps'][0]:.6f}, {detection['gps'][1]:.6f}) | {detection['timestamp']} | {detection['conf']:.2f} | {detection['path']} |"
+        )
 
     report_content.extend([
         "",
-        "## 6. Flight Log Summary",
+        "## 6. Flight Logs",
         f"- Total Logs: {len(detected_issues)}",
-        "- Parameters: Frame, Timestamp, Latitude, Longitude, Speed (5 m/s), Satellites (12), Altitude (60 m)",
-        "- Sample Log:",
-        "```csv",
-        f"Frame,Timestamp,Latitude,Longitude,Speed_ms,Satellites,Altitude_m",
-        f"{all_detections[0]['frame'] if all_detections else 0},{all_detections[0]['timestamp'] if all_detections else 'N/A'},{all_detections[0]['gps'][0] if all_detections else 0},{all_detections[0]['gps'][1] if all_detections else 0},5.0,12,60",
-        "```",
         f"- Storage: Data Lake `/project_xyz/flight_logs/{datetime.now().strftime('%Y-%m-%d')}`",
         "",
-        "## 7. Visualizations",
+        "| Frame | Timestamp | Latitude | Longitude | Speed (m/s) | Satellites | Altitude (m) | Log Path |",
+        "|-------|-----------|----------|-----------|-------------|------------|--------------|----------|"
+    ])
+
+    for detection in all_detections:
+        log_path = os.path.join(FLIGHT_LOG_DIR, f"flight_log_{detection['frame']:06d}.csv")
+        report_content.append(
+            f"| {detection['frame']:06d} | {detection['timestamp']} | {detection['gps'][0]:.6f} | {detection['gps'][1]:.6f} | 5.0 | 12 | 60 | {log_path} |"
+        )
+
+    report_content.extend([
+        "",
+        "## 7. Processed Video",
+        f"- Path: `/project_xyz/videos/processed_output_{datetime.now().strftime('%Y%m%d')}.mp4`",
+        f"- Frames: {output_frames}",
+        f"- FPS: {output_fps:.2f}",
+        f"- Duration: {output_duration:.2f} seconds",
+        "",
+        "## 8. Visualizations",
         f"- Detection Trend Chart: `/project_xyz/charts/chart_temp_{datetime.now().strftime('%Y%m%d')}.png`",
         f"- Issue Locations Map: `/project_xyz/maps/map_temp_{datetime.now().strftime('%Y%m%d')}.png`",
         "",
-        "## 8. Stakeholder Validation",
+        "## 9. Processing Timestamps",
+        f"- Total Processing Time: {total_time:.2f} seconds",
+        f"- Log Entries (Last 10):"
+    ])
+
+    for entry in log_entries[-10:]:
+        report_content.append(f"  - {entry}")
+
+    report_content.extend([
+        "",
+        "## 10. Stakeholder Validation",
         "- AE/IE Comments: [Pending]",
         "- PD/RO Comments: [Pending]",
         "",
-        "## 9. Recommendations",
+        "## 11. Recommendations",
         "- Repair potholes in high-traffic segments.",
         "- Seal cracks to prevent degradation.",
         "- Schedule follow-up survey.",
         "",
-        "## 10. Data Lake References",
+        "## 12. Data Lake References",
         f"- Images: `/project_xyz/images/{datetime.now().strftime('%Y-%m-%d')}`",
         f"- Flight Logs: `/project_xyz/flight_logs/{datetime.now().strftime('%Y-%m-%d')}`",
         f"- Video: `/project_xyz/videos/processed_output_{datetime.now().strftime('%Y%m%d')}.mp4`",
@@ -424,9 +478,15 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
         output_duration,
         detection_frame_count,
         chart_path,
-        map_path
+        map_path,
+        frame_times,
+        resize_times,
+        inference_times,
+        io_times
     )
 
+    output_zip_path = zip_all_outputs(report_path, output_path, chart_path, map_path)
+
     return (
         output_path,
         json.dumps(last_metrics, indent=2),
@@ -434,7 +494,7 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
         detected_issues,
         chart_path,
         map_path,
-        report_path
+        output_zip_path
     )
 
 with gr.Blocks(theme=gr.themes.Soft(primary_hue="orange")) as iface:
@@ -459,7 +519,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="orange")) as iface:
     with gr.Row():
         gr.Markdown("## Download Results")
     with gr.Row():
-        report_download = gr.File(label="Download Analysis Report (Markdown)")
+        output_zip_download = gr.File(label="Download All Outputs (ZIP)")
 
     process_btn.click(
         fn=process_video,
@@ -471,7 +531,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="orange")) as iface:
             issue_gallery,
             chart_output,
             map_output,
-            report_download
+            output_zip_download
         ]
     )