Update main.py

main.py

@@ -1,4 +1,3 @@
-# main.py
 import asyncio
 import os
 import shutil
@@ -112,7 +111,13 @@ async def verify_keys(pinecone_key: str = Form(""), cloudinary_url: str = Form("
             if tasks:
                 await asyncio.gather(*tasks)
         except Exception as e:
-            raise HTTPException(400, f"Pinecone Error: {e}")
+            err_str = str(e).lower()
+            if "401" in err_str or "unauthorized" in err_str or "invalid api key" in err_str:
+                raise HTTPException(400, "Invalid Pinecone API Key. Please check your key and try again.")
+            elif "403" in err_str or "forbidden" in err_str:
+                raise HTTPException(400, "Pinecone API Key does not have sufficient permissions.")
+            else:
+                raise HTTPException(400, f"Pinecone connection failed. Please check your API key.")
     return {"message": "Keys verified and indexes ready!"}
 
 
@@ -162,9 +167,16 @@ async def upload_new_images(files: List[UploadFile] = File(...), folder_name: st
             if face_upserts: upsert_tasks.append(asyncio.to_thread(idx_face.upsert, vectors=face_upserts))
             if object_upserts: upsert_tasks.append(asyncio.to_thread(idx_obj.upsert, vectors=object_upserts))
             if upsert_tasks: await asyncio.gather(*upsert_tasks)
+        except HTTPException:
+            raise
         except Exception as e:
-            print(f"❌ Upload error: {e}")
-            raise HTTPException(500, f"Upload processing failed: {str(e)}")
+            err_str = str(e)
+            print(f"❌ Upload error: {err_str}")
+            if "not found" in err_str.lower() or "404" in err_str or "does not exist" in err_str.lower():
+                raise HTTPException(404, "Pinecone index not found. Please go to Settings and click 'Verify & Save' to recreate your indexes.")
+            elif "401" in err_str or "unauthorized" in err_str.lower():
+                raise HTTPException(401, "Invalid Pinecone API Key. Please check your key in Settings.")
+            raise HTTPException(500, f"Upload processing failed: {err_str}")
         finally:
             if os.path.exists(tmp_path): os.remove(tmp_path)
             
@@ -465,13 +477,33 @@ async def reset_database(
     if not creds.get("cloud_name"):
         raise HTTPException(400, "Invalid Cloudinary URL.")
 
-    # Wipe all Cloudinary resources
+    # FIX #8: Wipe all Cloudinary resources AND delete folder objects
     try:
         await asyncio.to_thread(
             lambda: cloudinary.api.delete_all_resources(
                 api_key=creds["api_key"], api_secret=creds["api_secret"], cloud_name=creds["cloud_name"],
             )
         )
+        # Now delete the folder objects themselves
+        try:
+            folders_resp = await asyncio.to_thread(
+                lambda: cloudinary.api.root_folders(
+                    api_key=creds["api_key"], api_secret=creds["api_secret"], cloud_name=creds["cloud_name"]
+                )
+            )
+            folder_names = [f["path"] for f in folders_resp.get("folders", [])]
+            for folder_path in folder_names:
+                try:
+                    await asyncio.to_thread(
+                        lambda fp=folder_path: cloudinary.api.delete_folder(
+                            fp,
+                            api_key=creds["api_key"], api_secret=creds["api_secret"], cloud_name=creds["cloud_name"]
+                        )
+                    )
+                except Exception as fe:
+                    print(f"Folder delete warning ({folder_path}): {fe}")
+        except Exception as fe:
+            print(f"Cloudinary folder list warning: {fe}")
     except Exception as e:
         print(f"Cloudinary wipe warning: {e}")
 
@@ -509,7 +541,7 @@ async def delete_account(
     if _is_default_key(user_pinecone_key, DEFAULT_PC_KEY) or _is_default_key(user_cloudinary_url, DEFAULT_CLD_URL):
         raise HTTPException(403, "Account deletion is not allowed on the shared demo database.")
 
-    # Full wipe (same as reset)
+    # FIX #4: Full wipe — resources AND folder objects from Cloudinary
     creds = get_cloudinary_creds(user_cloudinary_url)
     try:
         await asyncio.to_thread(
@@ -517,6 +549,25 @@ async def delete_account(
                 api_key=creds["api_key"], api_secret=creds["api_secret"], cloud_name=creds["cloud_name"],
             )
         )
+        # Delete folder objects
+        try:
+            folders_resp = await asyncio.to_thread(
+                lambda: cloudinary.api.root_folders(
+                    api_key=creds["api_key"], api_secret=creds["api_secret"], cloud_name=creds["cloud_name"]
+                )
+            )
+            for f in folders_resp.get("folders", []):
+                try:
+                    await asyncio.to_thread(
+                        lambda fp=f["path"]: cloudinary.api.delete_folder(
+                            fp,
+                            api_key=creds["api_key"], api_secret=creds["api_secret"], cloud_name=creds["cloud_name"]
+                        )
+                    )
+                except Exception as fe:
+                    print(f"Folder delete warning: {fe}")
+        except Exception as fe:
+            print(f"Cloudinary folder list warning: {fe}")
     except Exception as e:
         print(f"Account delete Cloudinary warning: {e}")