Final for report section

app.py

@@ -32,8 +32,6 @@ if not SUPABASE_URL or not SUPABASE_KEY:
     raise ValueError("Supabase credentials not found.")
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
 
-# --- Helper functions (convert_to_decimal, get_gps_location, etc.) remain the same ---
-
 def convert_to_decimal(coord):
     if coord and len(coord.values) >= 3:
         deg = float(coord.values[0])
@@ -97,31 +95,24 @@ async def root():
 @app.get("/latest_reports")
 async def get_latest_reports():
     try:
-        # Fetch latest 30 videos
         videos_response = supabase.table("videos").select("guid, video_name, created_at, status").order("created_at", desc=True).limit(30).execute()
         videos = videos_response.data
         for video in videos:
             video['type'] = 'video'
-            # Fetch a thumbnail for each video
             first_frame_response = supabase.table("detected_frames").select("frame_image_url").eq("video_guid", video["guid"]).order("frame_number").limit(1).execute()
             video["thumbnail_url"] = first_frame_response.data[0]["frame_image_url"] if first_frame_response.data else None
 
-        # Fetch latest 30 images (from 'potholes' table)
         images_response = supabase.table("potholes").select("guid, image_name, image_url, created_at, status").order("created_at", desc=True).limit(30).execute()
         images = images_response.data
         for image in images:
             image['type'] = 'image'
             image['thumbnail_url'] = image.get('image_url') 
 
-        # Combine, sort, and slice the results
         combined_reports = sorted(videos + images, key=lambda x: datetime.fromisoformat(x['created_at']), reverse=True)
-        
         return combined_reports[:30]
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
 
-# --- Other endpoints remain the same ---
-
 @app.patch("/report/{guid}/status")
 async def update_report_status(guid: str, payload: dict = Body(...)):
     new_status = payload.get("status")
@@ -163,28 +154,18 @@ async def upload_video(background_tasks: BackgroundTasks, file: UploadFile = Fil
 async def get_video_report(guid: str):
     try:
         video_response = supabase.table("videos").select("*").eq("guid", guid).single().execute()
-        if not video_response.data:
-            raise HTTPException(status_code=404, detail="Video report not found")
-        
+        if not video_response.data: raise HTTPException(status_code=404, detail="Video report not found")
         frames_response = supabase.table("detected_frames").select("*").eq("video_guid", guid).order("frame_number", desc=True).limit(15).execute()
-        
-        return {
-            "video_info": video_response.data,
-            "detected_frames": frames_response.data
-        }
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
-
+        return { "video_info": video_response.data, "detected_frames": frames_response.data }
+    except Exception as e: raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
 
 @app.get("/frame/{frame_id}")
 async def get_frame(frame_id: int):
     try:
         response = supabase.table("detected_frames").select("*, videos(*), status").eq("id", frame_id).single().execute()
-        if not response.data:
-            raise HTTPException(status_code=404, detail="Frame not found")
+        if not response.data: raise HTTPException(status_code=404, detail="Frame not found")
         return response.data
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
+    except Exception as e: raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
 
 @app.get("/videos")
 async def get_videos():
@@ -195,27 +176,22 @@ async def get_videos():
             first_frame_response = supabase.table("detected_frames").select("frame_image_url").eq("video_guid", video["guid"]).order("frame_number").limit(1).execute()
             video["thumbnail_url"] = first_frame_response.data[0]["frame_image_url"] if first_frame_response.data else None
         return videos
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
+    except Exception as e: raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
 
 @app.get("/reports")
 async def get_reports():
     try:
         response = supabase.table("potholes").select("id, guid, image_name, image_url, created_at, status").order("created_at", desc=True).limit(30).execute()
         return response.data
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
+    except Exception as e: raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
 
 @app.get("/report/{guid}")
 async def get_report(guid: str):
     try:
         response = supabase.table("potholes").select("guid, image_name, image_url, location, created_at, location_text, status").eq("guid", guid).single().execute()
-        if response.data:
-            return response.data
-        else:
-            raise HTTPException(status_code=404, detail=f"Report with guid {guid} not found.")
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
+        if not response.data: raise HTTPException(status_code=404, detail=f"Report with guid {guid} not found.")
+        return response.data
+    except Exception as e: raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
 
 @app.post("/upload")
 async def upload_image(file: UploadFile = File(...), location: str = Form(None)):
@@ -227,16 +203,14 @@ async def upload_image(file: UploadFile = File(...), location: str = Form(None))
     annotated_image_array = results[0].plot()
     os.remove(temp_path)
     is_success, buffer = cv2.imencode(".jpg", annotated_image_array)
-    if not is_success:
-        raise HTTPException(status_code=500, detail="Failed to encode annotated image.")
+    if not is_success: raise HTTPException(status_code=500, detail="Failed to encode annotated image.")
     annotated_image_bytes = buffer.tobytes()
     bucket_name = 'pothole-images'
     uuid_path = f"annotated_{uuid.uuid4()}.jpg"
     try:
         supabase.storage.from_(bucket_name).upload(path=uuid_path, file=annotated_image_bytes, file_options={"content-type": "image/jpeg"})
         url = supabase.storage.from_(bucket_name).get_public_url(uuid_path)
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Storage Error: {str(e)}")
+    except Exception as e: raise HTTPException(status_code=500, detail=f"Storage Error: {str(e)}")
     await file.seek(0)
     lat, lon = get_gps_location(file.file)
     location_point = f"Point({lon:.6f} {lat:.6f})" if lat and lon else None
@@ -244,8 +218,7 @@ async def upload_image(file: UploadFile = File(...), location: str = Form(None))
     try:
         insert_data = {"guid": guid, "image_name": file.filename, "image_url": url, "location": location_point, "location_text": location if not location_point and location else None, "status": "In Progress"}
         response = supabase.table("potholes").insert(insert_data).execute()
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
+    except Exception as e: raise HTTPException(status_code=500, detail=f"Database Error: {str(e)}")
     return {"message": "Upload successful", "guid": guid, "image_url": url, "db_response": response.data}
 
 if __name__ == "__main__":