camera edit fixed

api/camera.py

@@ -1,20 +1,34 @@
-from fastapi import APIRouter, HTTPException, Query, Body
+from fastapi import APIRouter, HTTPException, Query
 from pydantic import BaseModel, Field, validator
 from typing import List, Optional
-from .utils import save_cameras, load_cameras, get_user_file, user_exists
-from .config import UPLOAD_DIR
+
+from .utils import (
+    save_cameras,
+    load_cameras,
+    user_exists,
+    _bucket_key,
+    _list_prefix,
+    _read_bucket_json,
+    _write_bucket_json,
+    BUCKET_ID,
+)
+
+from huggingface_hub import batch_bucket_files, download_bucket_files
+import tempfile
 import os
-import shutil
 
 print(" CAMERA API LOADED ")
 
 router = APIRouter(prefix="/camera", tags=["Camera"])
 
+
 # ================= MODELS =================
+
 class CameraData(BaseModel):
     user_id: str = Field(..., min_length=1)
     camera_name: str = Field(..., min_length=1)
     camera_loc: Optional[List[float]] = None
+
     @validator("camera_loc")
     def validate_loc(cls, loc):
         if loc is None:
@@ -33,9 +47,12 @@ class EditCameraData(BaseModel):
     user_id: str
     old_camera_name: str
     new_camera_name: str
-    new_camera_loc: List[float]
+    new_camera_loc: Optional[List[float]] = None   # ← optional, won't error if missing
+
     @validator("new_camera_loc")
     def validate_loc(cls, loc):
+        if loc is None:
+            return loc
         if len(loc) != 2:
             raise ValueError("new_camera_loc must be [lat, lon]")
         lat, lon = loc
@@ -47,6 +64,7 @@ class EditCameraData(BaseModel):
 
 
 # ================= ROUTES =================
+
 @router.get("/")
 def home():
     return {
@@ -59,6 +77,7 @@ def home():
         ]
     }
 
+
 # ---------- GET CAMERAS ----------
 @router.get("/get_cameras")
 def get_cameras(user_id: str = Query(...)):
@@ -81,58 +100,126 @@ def add_camera(data: CameraData):
     save_cameras(data.user_id, cameras)
     return {"success": True, "camera": data.camera_name}
 
+
+# ---------- EDIT CAMERA ----------
 @router.put("/edit_camera")
 def edit_camera(data: EditCameraData):
     if not user_exists(data.user_id):
         raise HTTPException(status_code=404, detail="User not found")
+
     cameras = load_cameras(data.user_id)
-    # Check if new camera name already exists (case-insensitive)
-    if any(cam["camera_name"].lower() == data.new_camera_name.lower() for cam in cameras):
-        raise HTTPException(status_code=400, detail=f"Camera name '{data.new_camera_name}' already exists")
+
+    # Only block duplicate name if name is actually changing
+    name_changing = data.new_camera_name.lower() != data.old_camera_name.lower()
+    if name_changing:
+        if any(cam["camera_name"].lower() == data.new_camera_name.lower() for cam in cameras):
+            raise HTTPException(
+                status_code=400,
+                detail=f"Camera name '{data.new_camera_name}' already exists"
+            )
+
     camera_found = False
     for cam in cameras:
         if cam["camera_name"].lower() == data.old_camera_name.lower():
             old_name = cam["camera_name"]
+
+            # Apply updates
             cam["camera_name"] = data.new_camera_name
-            cam["camera_loc"] = data.new_camera_loc
+            if data.new_camera_loc is not None:       # only update if provided
+                cam["camera_loc"] = data.new_camera_loc
+
             camera_found = True
-            # Rename camera folder
-            old_folder = os.path.join(UPLOAD_DIR, data.user_id, old_name)
-            new_folder = os.path.join(UPLOAD_DIR, data.user_id, data.new_camera_name)
-            if os.path.exists(old_folder) and os.path.isdir(old_folder):
-                try:
-                    os.rename(old_folder, new_folder)
-                except Exception as e:
-                    raise HTTPException(status_code=500, detail=f"Failed to rename camera folder: {str(e)}")
-                # Rename detection JSON
-                for f in os.listdir(new_folder):
-                    if f.endswith("_detections.json") and f.lower().startswith(old_name.lower()):
-                        old_json = os.path.join(new_folder, f)
-                        new_json_name = f.replace(old_name, data.new_camera_name)
-                        new_json = os.path.join(new_folder, new_json_name)
-                        try:
-                            os.rename(old_json, new_json)
-                        except Exception as e:
-                            raise HTTPException(status_code=500, detail=f"Failed to rename detection JSON: {str(e)}")
-                        break  # Only one detection JSON per camera
+
+            # ── Rename bucket files only if name changed ──────────
+            if name_changing:
+                old_prefix = _bucket_key(data.user_id, old_name)
+                new_prefix = _bucket_key(data.user_id, data.new_camera_name)
+
+                old_files = _list_prefix(old_prefix)
+
+                for item in old_files:
+                    old_key = item.path
+                    new_key = old_key.replace(old_prefix, new_prefix, 1)
+
+                    # Rename detection JSON filename inside the key
+                    if f"{old_name}_detections.json" in new_key:
+                        new_key = new_key.replace(
+                            f"{old_name}_detections.json",
+                            f"{data.new_camera_name}_detections.json"
+                        )
+
+                    try:
+                        if old_key.endswith(".json"):
+                            # JSON: read and re-write
+                            content = _read_bucket_json(old_key)
+                            if content is not None:
+                                _write_bucket_json(new_key, content)
+                        else:
+                            # Binary (images): download → re-upload
+                            with tempfile.NamedTemporaryFile(delete=False) as tf:
+                                tmp_path = tf.name
+                            download_bucket_files(
+                                BUCKET_ID,
+                                files=[(old_key, tmp_path)],
+                                
+                            )
+                            with open(tmp_path, "rb") as f:
+                                raw = f.read()
+                            os.unlink(tmp_path)
+                            batch_bucket_files(
+                                BUCKET_ID,
+                                add=[(raw, new_key)],
+                                
+                            )
+
+                        # Delete old key after successful copy
+                        batch_bucket_files(
+                            BUCKET_ID,
+                            delete=[old_key],
+                            
+                        )
+
+                    except Exception as e:
+                        raise HTTPException(
+                            status_code=500,
+                            detail=f"Failed to move bucket file '{old_key}': {str(e)}"
+                        )
+
             save_cameras(data.user_id, cameras)
             return {"success": True, "updated": cam}
+
     if not camera_found:
         raise HTTPException(status_code=404, detail="Camera not found")
 
+
+# ---------- DELETE CAMERA ----------
 @router.delete("/delete_camera")
 def delete_camera(user_id: str = Query(...), camera_name: str = Query(...)):
     if not user_exists(user_id):
         raise HTTPException(status_code=404, detail="User not found")
+
     cameras = load_cameras(user_id)
     new_list = [c for c in cameras if c["camera_name"].lower() != camera_name.lower()]
     if len(new_list) == len(cameras):
         raise HTTPException(status_code=404, detail="Camera not found")
-    save_cameras(user_id, new_list)
-    camera_folder = os.path.join(UPLOAD_DIR, user_id, camera_name)
-    if os.path.exists(camera_folder) and os.path.isdir(camera_folder):
+
+    # Delete all bucket files under this camera prefix
+    cam_prefix = _bucket_key(user_id, camera_name)
+    cam_files  = _list_prefix(cam_prefix)
+
+    if cam_files:
+        keys_to_delete = [item.path for item in cam_files]
         try:
-            shutil.rmtree(camera_folder)
+            batch_bucket_files(
+                BUCKET_ID,
+                delete=keys_to_delete,
+                
+            )
         except Exception as e:
-            raise HTTPException(status_code=500, detail=f"Failed to delete camera folder: {str(e)}")
-    return {"success": True, "deleted": camera_name}
+            raise HTTPException(
+                status_code=500,
+                detail=f"Failed to delete camera files from bucket: {str(e)}"
+            )
+
+    save_cameras(user_id, new_list)
+    return {"success": True, "deleted": camera_name}