Update main.py

main.py

@@ -25,6 +25,7 @@ MAX_CONCURRENT_INFERENCES = int(os.getenv("MAX_CONCURRENT_INFERENCES", "6"))
 _inference_sem: asyncio.Semaphore
 
 _pinecone_pool = OrderedDict()
+_cloudinary_pool = {}
 _POOL_MAX = 64
 
 IDX_FACES = "enterprise-faces"
@@ -38,10 +39,16 @@ def _get_pinecone(api_key: str) -> Pinecone:
     _pinecone_pool.move_to_end(api_key)
     return _pinecone_pool[api_key]
 
-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}
+def _configure_cloudinary(creds: dict):
+    key = creds.get("cloud_name")
+    if not key: return
+    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
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -67,6 +74,11 @@ 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:
+    if not env_url:
+        return {}
+    parsed = urlparse(env_url)
+    return {"api_key": parsed.username, "api_secret": parsed.password, "cloud_name": parsed.hostname}
 
 # ══════════════════════════════════════════════════════════════════
 # 1. VERIFY KEYS & AUTO-BUILD INDEXES
@@ -75,9 +87,8 @@ def sanitize_filename(filename: str) -> str:
 async def verify_keys(pinecone_key: str = Form(""), cloudinary_url: str = Form("")):
     if cloudinary_url:
         try:
-            # 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)
+            _configure_cloudinary(get_cloudinary_creds(cloudinary_url))
+            await asyncio.to_thread(cloudinary.api.ping)
         except Exception:
             raise HTTPException(400, "Invalid Cloudinary Environment URL.")
     if pinecone_key:
@@ -97,20 +108,25 @@ async def verify_keys(pinecone_key: str = Form(""), cloudinary_url: str = Form("
 
 
 # ══════════════════════════════════════════════════════════════════
-# 2. UPLOAD (Stateless + Auto-Catch 404s)
+# 2. UPLOAD 
 # ══════════════════════════════════════════════════════════════════
 @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("")):
-    actual_pc_key = user_pinecone_key or os.getenv("DEFAULT_PINECONE_KEY")
-    actual_cld_url = user_cloudinary_url or os.getenv("DEFAULT_CLOUDINARY_URL")
+    # DEFENSIVE FIX: The 'or ""' ensures it never becomes None, preventing 500 crashes
+    actual_pc_key = user_pinecone_key or os.getenv("DEFAULT_PINECONE_KEY", "")
+    actual_cld_url = user_cloudinary_url or os.getenv("DEFAULT_CLOUDINARY_URL", "")
     
     if not actual_pc_key or not actual_cld_url:
-        raise HTTPException(400, "API Keys are required. Set defaults in HF Secrets.")
+        raise HTTPException(400, "API Keys are missing. If you are a guest, the server is missing its DEFAULT_ secrets in Hugging Face.")
 
     folder = standardize_category_name(folder_name)
     uploaded_urls = []
-    cld_kwargs = get_cld_kwargs(actual_cld_url)
     
+    creds = get_cloudinary_creds(actual_cld_url)
+    if not creds.get("cloud_name"):
+        raise HTTPException(400, "Invalid Cloudinary URL format.")
+        
+    _configure_cloudinary(creds)
     pc = _get_pinecone(actual_pc_key)
     idx_obj = pc.Index(IDX_OBJECTS)
     idx_face = pc.Index(IDX_FACES)
@@ -121,7 +137,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, **cld_kwargs)
+            res = await asyncio.to_thread(cloudinary.uploader.upload, tmp_path, folder=folder)
             image_url = res["secure_url"]
             uploaded_urls.append(image_url)
 
@@ -138,12 +154,9 @@ 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}")
+            raise HTTPException(500, f"Upload processing failed: {str(e)}")
         finally:
             if os.path.exists(tmp_path): os.remove(tmp_path)
             
@@ -151,13 +164,13 @@ async def upload_new_images(files: List[UploadFile] = File(...), folder_name: st
 
 
 # ══════════════════════════════════════════════════════════════════
-# 3. SEARCH (Stateless + Auto-Catch 404s)
+# 3. SEARCH 
 # ══════════════════════════════════════════════════════════════════
 @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("")):
-    actual_pc_key = user_pinecone_key or os.getenv("DEFAULT_PINECONE_KEY")
+    actual_pc_key = user_pinecone_key or os.getenv("DEFAULT_PINECONE_KEY", "")
     if not actual_pc_key:
-        raise HTTPException(400, "Pinecone Key is required.")
+        raise HTTPException(400, "Pinecone Key is missing. If you are a guest, the server is missing its DEFAULT_PINECONE_KEY in Hugging Face.")
 
     tmp_path = f"temp_uploads/query_{uuid.uuid4().hex}_{sanitize_filename(file.filename)}"
     try:
@@ -175,7 +188,13 @@ 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
             
-            res = await asyncio.to_thread(target_idx.query, vector=vec_list, top_k=10, include_metadata=True)
+            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):
+                    raise HTTPException(404, f"Pinecone Index not found. Please log in and click 'Verify Keys' in Settings to build the indexes.")
+                raise e
+                
             out = []
             for match in res.get("matches", []):
                 caption = "👤 Verified Identity" if vec_dict["type"] == "face" else match["metadata"].get("folder", "🎯 Object Match")
@@ -192,12 +211,9 @@ 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:
@@ -205,17 +221,21 @@ async def search_database(file: UploadFile = File(...), detect_faces: bool = For
 
 
 # ══════════════════════════════════════════════════════════════════
-# 4. CATEGORIES (Stateless Isolation)
+# 4. CATEGORIES
 # ══════════════════════════════════════════════════════════════════
 @app.post("/api/categories")
 async def get_categories(user_cloudinary_url: str = Form("")):
-    actual_cld_url = user_cloudinary_url or os.getenv("DEFAULT_CLOUDINARY_URL")
+    actual_cld_url = user_cloudinary_url or os.getenv("DEFAULT_CLOUDINARY_URL", "")
     if not actual_cld_url:
         return {"categories": []}
         
     try:
-        cld_kwargs = get_cld_kwargs(actual_cld_url)
-        result = await asyncio.to_thread(cloudinary.api.root_folders, **cld_kwargs)
+        creds = get_cloudinary_creds(actual_cld_url)
+        if not creds.get("cloud_name"):
+            return {"categories": []}
+            
+        _configure_cloudinary(creds)
+        result = await asyncio.to_thread(cloudinary.api.root_folders)
         return {"categories": [f["name"] for f in result.get("folders", [])]}
     except Exception as e:
         print(f"Category fetch error: {e}")