Update app.py

app.py

@@ -27,15 +27,9 @@ logging.basicConfig(
 )
 
 # Directories
-CAPTURED_FRAMES_DIR = "captured_frames"
-OUTPUT_DIR = "outputs"
-FLIGHT_LOG_DIR = "flight_logs"
-os.makedirs(CAPTURED_FRAMES_DIR, exist_ok=True)
-os.makedirs(OUTPUT_DIR, exist_ok=True)
-os.makedirs(FLIGHT_LOG_DIR, exist_ok=True)
-os.chmod(CAPTURED_FRAMES_DIR, 0o777)
-os.chmod(OUTPUT_DIR, 0o777)
-os.chmod(FLIGHT_LOG_DIR, 0o777)
+UNIFIED_OUTPUT_DIR = "unified_output"
+os.makedirs(UNIFIED_OUTPUT_DIR, exist_ok=True)
+os.chmod(UNIFIED_OUTPUT_DIR, 0o777)
 
 # Global variables
 log_entries: List[str] = []
@@ -79,7 +73,7 @@ def zip_directory(folder_path: str, zip_path: str) -> str:
         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")
+    map_path = os.path.join(UNIFIED_OUTPUT_DIR, "map_temp.png")
     plt.figure(figsize=(4, 4))
     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")
@@ -111,7 +105,7 @@ def write_geotag(image_path: str, gps_coord: List[float]) -> bool:
         return False
 
 def write_flight_log(frame_count: int, gps_coord: List[float], timestamp: str) -> str:
-    log_path = os.path.join(FLIGHT_LOG_DIR, f"flight_log_{frame_count:06d}.csv")
+    log_path = os.path.join(UNIFIED_OUTPUT_DIR, f"flight_log_{frame_count:06d}.csv")
     try:
         with open(log_path, 'w', newline='') as csvfile:
             writer = csv.writer(csvfile)
@@ -151,7 +145,7 @@ def generate_line_chart() -> Optional[str]:
     plt.ylabel("Count")
     plt.grid(True)
     plt.tight_layout()
-    chart_path = os.path.join(OUTPUT_DIR, "chart_temp.png")
+    chart_path = os.path.join(UNIFIED_OUTPUT_DIR, "chart_temp.png")
     plt.savefig(chart_path)
     plt.close()
     return chart_path
@@ -188,7 +182,7 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
     print(f"Input video: {frame_width}x{frame_height} ({input_resolution/1e6:.2f}MP), {fps} FPS, {total_frames} frames, {expected_duration:.2f} seconds, Frame skip: {frame_skip}")
 
     out_width, out_height = resize_width, resize_height
-    output_path = os.path.join(OUTPUT_DIR, "processed_output.mp4")
+    output_path = os.path.join(UNIFIED_OUTPUT_DIR, "processed_output.mp4")
     out = cv2.VideoWriter(output_path, cv2.VideoWriter_fourcc(*'mp4v'), fps, (out_width, out_height))
     if not out.isOpened():
         log_entries.append("Error: Failed to initialize mp4v codec")
@@ -265,7 +259,7 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
         if frame_detections:
             detection_frame_count += 1
             if detection_frame_count % SAVE_IMAGE_INTERVAL == 0:
-                captured_frame_path = os.path.join(CAPTURED_FRAMES_DIR, f"detected_{frame_count:06d}.jpg")
+                captured_frame_path = os.path.join(UNIFIED_OUTPUT_DIR, f"detected_{frame_count:06d}.jpg")
                 if cv2.imwrite(captured_frame_path, annotated_frame):
                     if write_geotag(captured_frame_path, gps_coord):
                         detected_issues.append(captured_frame_path)
@@ -323,7 +317,7 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
     data_lake_submission["frame_count"] = frame_count
     data_lake_submission["gps_coordinates"] = gps_coordinates[-1] if gps_coordinates else [0, 0]
 
-    submission_json_path = os.path.join(OUTPUT_DIR, "data_lake_submission.json")
+    submission_json_path = os.path.join(UNIFIED_OUTPUT_DIR, "data_lake_submission.json")
     try:
         with open(submission_json_path, 'w') as f:
             json.dump(data_lake_submission, f, indent=2)
@@ -357,9 +351,8 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
     chart_path = generate_line_chart()
     map_path = generate_map(gps_coordinates[-5:], all_detections)
 
-    # Zip images and logs
-    images_zip = zip_directory(CAPTURED_FRAMES_DIR, os.path.join(OUTPUT_DIR, "captured_frames.zip"))
-    logs_zip = zip_directory(FLIGHT_LOG_DIR, os.path.join(OUTPUT_DIR, "flight_logs.zip"))
+    # Zip all contents from the unified folder
+    zip_path = zip_directory(UNIFIED_OUTPUT_DIR, os.path.join(UNIFIED_OUTPUT_DIR, "all_files.zip"))
 
     return (
         output_path,
@@ -369,8 +362,8 @@ def process_video(video, resize_width=4000, resize_height=3000, frame_skip=5):
         chart_path,
         map_path,
         submission_json_path,
-        images_zip,
-        logs_zip,
+        zip_path,  # Single zip file for all files
+        zip_path,  # Same for logs and images as they are now in one folder
         output_path  # For video download
     )
 
@@ -398,9 +391,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="orange")) as iface:
         gr.Markdown("## Download Results")
     with gr.Row():
         json_download = gr.File(label="Download Data Lake JSON")
-        images_zip_download = gr.File(label="Download Geotagged Images (ZIP)")
-        logs_zip_download = gr.File(label="Download Flight Logs (ZIP)")
-        video_download = gr.File(label="Download Processed Video")
+        zip_download = gr.File(label="Download All Files (ZIP)")
 
     process_btn.click(
         fn=process_video,
@@ -413,11 +404,11 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="orange")) as iface:
             chart_output,
             map_output,
             json_download,
-            images_zip_download,
-            logs_zip_download,
+            zip_download,
+            zip_download,  # Same zip for logs, images
             video_download
         ]
     )
 
 if __name__ == "__main__":
-    iface.launch()
+    iface.launch()