Update main.py

main.py

@@ -25,10 +25,8 @@ MAX_CONCURRENT_INFERENCES = int(os.getenv("MAX_CONCURRENT_INFERENCES", "6"))
 _inference_sem: asyncio.Semaphore
 
 _pinecone_pool = OrderedDict()
-_cloudinary_pool = {}
 _POOL_MAX = 64
 
-# FIX 1: Restored your original Pinecone Index names!
 IDX_FACES = "enterprise-faces"
 IDX_OBJECTS = "enterprise-objects"
 
@@ -40,15 +38,10 @@ def _get_pinecone(api_key: str) -> Pinecone:
     _pinecone_pool.move_to_end(api_key)
     return _pinecone_pool[api_key]
 
-def _configure_cloudinary(creds: dict):
-    key = creds["cloud_name"]
-    if key not in _cloudinary_pool:
-        cloudinary.config(
-            cloud_name=creds["cloud_name"], 
-            api_key=creds["api_key"], 
-            api_secret=creds["api_secret"]
-        )
-        _cloudinary_pool[key] = True
+def get_cld_kwargs(env_url: str) -> dict:
+    """Extracts credentials to be passed state-lessly to prevent cross-user data bleed."""
+    parsed = urlparse(env_url)
+    return {"api_key": parsed.username, "api_secret": parsed.password, "cloud_name": parsed.hostname}
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -74,9 +67,6 @@ def standardize_category_name(name: str) -> str:
 def sanitize_filename(filename: str) -> str:
     return re.sub(r'[^\w.\-]', '', re.sub(r'\s+', '_', filename))
 
-def get_cloudinary_creds(env_url: str) -> dict:
-    parsed = urlparse(env_url)
-    return {"api_key": parsed.username, "api_secret": parsed.password, "cloud_name": parsed.hostname}
 
 # ══════════════════════════════════════════════════════════════════
 # 1. VERIFY KEYS & AUTO-BUILD INDEXES
@@ -85,8 +75,9 @@ def get_cloudinary_creds(env_url: str) -> dict:
 async def verify_keys(pinecone_key: str = Form(""), cloudinary_url: str = Form("")):
     if cloudinary_url:
         try:
-            _configure_cloudinary(get_cloudinary_creds(cloudinary_url))
-            await asyncio.to_thread(cloudinary.api.ping)
+            # Stateless ping to check credentials
+            cld_kwargs = get_cld_kwargs(cloudinary_url)
+            await asyncio.to_thread(cloudinary.api.root_folders, max_results=1, **cld_kwargs)
         except Exception:
             raise HTTPException(400, "Invalid Cloudinary Environment URL.")
     if pinecone_key:
@@ -106,11 +97,10 @@ async def verify_keys(pinecone_key: str = Form(""), cloudinary_url: str = Form("
 
 
 # ══════════════════════════════════════════════════════════════════
-# 2. UPLOAD (Strictly Cloud-Native + Freemium Default)
+# 2. UPLOAD (Stateless + Auto-Catch 404s)
 # ══════════════════════════════════════════════════════════════════
 @app.post("/api/upload")
 async def upload_new_images(files: List[UploadFile] = File(...), folder_name: str = Form(...), detect_faces: bool = Form(True), user_pinecone_key: str = Form(""), user_cloudinary_url: str = Form("")):
-    # FIX 2: Uses user keys if provided, otherwise falls back to HF Secrets
     actual_pc_key = user_pinecone_key or os.getenv("DEFAULT_PINECONE_KEY")
     actual_cld_url = user_cloudinary_url or os.getenv("DEFAULT_CLOUDINARY_URL")
     
@@ -119,7 +109,8 @@ async def upload_new_images(files: List[UploadFile] = File(...), folder_name: st
 
     folder = standardize_category_name(folder_name)
     uploaded_urls = []
-    _configure_cloudinary(get_cloudinary_creds(actual_cld_url))
+    cld_kwargs = get_cld_kwargs(actual_cld_url)
+    
     pc = _get_pinecone(actual_pc_key)
     idx_obj = pc.Index(IDX_OBJECTS)
     idx_face = pc.Index(IDX_FACES)
@@ -130,7 +121,7 @@ async def upload_new_images(files: List[UploadFile] = File(...), folder_name: st
             with open(tmp_path, "wb") as buf:
                 shutil.copyfileobj(file.file, buf)
                 
-            res = await asyncio.to_thread(cloudinary.uploader.upload, tmp_path, folder=folder)
+            res = await asyncio.to_thread(cloudinary.uploader.upload, tmp_path, folder=folder, **cld_kwargs)
             image_url = res["secure_url"]
             uploaded_urls.append(image_url)
 
@@ -147,8 +138,12 @@ 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 Exception as e:
+            if "404" in str(e) or "NOT_FOUND" in str(e):
+                raise HTTPException(400, "Pinecone indexes missing. Please go to Settings and click 'Verify & Save' to build them.")
             print(f"❌ Upload error: {e}")
+            raise HTTPException(500, f"Upload error: {e}")
         finally:
             if os.path.exists(tmp_path): os.remove(tmp_path)
             
@@ -156,7 +151,7 @@ async def upload_new_images(files: List[UploadFile] = File(...), folder_name: st
 
 
 # ══════════════════════════════════════════════════════════════════
-# 3. SEARCH (Strictly Cloud-Native + Freemium Default)
+# 3. SEARCH (Stateless + Auto-Catch 404s)
 # ══════════════════════════════════════════════════════════════════
 @app.post("/api/search")
 async def search_database(file: UploadFile = File(...), detect_faces: bool = Form(True), user_pinecone_key: str = Form(""), user_cloudinary_url: str = Form("")):
@@ -180,14 +175,7 @@ async def search_database(file: UploadFile = File(...), detect_faces: bool = For
             vec_list = vec_dict["vector"].tolist() if hasattr(vec_dict["vector"], "tolist") else vec_dict["vector"]
             target_idx = idx_face if vec_dict["type"] == "face" else idx_obj
             
-            try:
-                res = await asyncio.to_thread(target_idx.query, vector=vec_list, top_k=10, include_metadata=True)
-            except Exception as e:
-                if "404" in str(e):
-                    # Graceful error if index truly doesn't exist
-                    raise HTTPException(404, f"Pinecone Index not found. Please log in and click 'Verify Keys' in Settings to build the indexes.")
-                raise e
-                
+            res = await asyncio.to_thread(target_idx.query, vector=vec_list, top_k=10, include_metadata=True)
             out = []
             for match in res.get("matches", []):
                 caption = "👤 Verified Identity" if vec_dict["type"] == "face" else match["metadata"].get("folder", "🎯 Object Match")
@@ -204,9 +192,12 @@ async def search_database(file: UploadFile = File(...), detect_faces: bool = For
                 seen[url] = r
 
         return {"results": sorted(seen.values(), key=lambda x: x["score"], reverse=True)[:10]}
+        
     except HTTPException:
         raise
     except Exception as e:
+        if "404" in str(e) or "NOT_FOUND" in str(e):
+            raise HTTPException(400, "Pinecone indexes missing. Please go to Settings and click 'Verify & Save' to build them.")
         print(f"❌ Search error: {e}")
         raise HTTPException(500, str(e))
     finally:
@@ -214,7 +205,7 @@ async def search_database(file: UploadFile = File(...), detect_faces: bool = For
 
 
 # ══════════════════════════════════════════════════════════════════
-# 4. CATEGORIES (Strictly Cloud-Native + Freemium Default)
+# 4. CATEGORIES (Stateless Isolation)
 # ══════════════════════════════════════════════════════════════════
 @app.post("/api/categories")
 async def get_categories(user_cloudinary_url: str = Form("")):
@@ -223,9 +214,8 @@ async def get_categories(user_cloudinary_url: str = Form("")):
         return {"categories": []}
         
     try:
-        # FIX 3: Removed local folder scanning logic. Guests now strictly see Cloudinary folders.
-        _configure_cloudinary(get_cloudinary_creds(actual_cld_url))
-        result = await asyncio.to_thread(cloudinary.api.root_folders)
+        cld_kwargs = get_cld_kwargs(actual_cld_url)
+        result = await asyncio.to_thread(cloudinary.api.root_folders, **cld_kwargs)
         return {"categories": [f["name"] for f in result.get("folders", [])]}
     except Exception as e:
         print(f"Category fetch error: {e}")