fix : Lazy Loading issues

main.py

@@ -169,8 +169,6 @@ DEFAULT_PC_KEY  = os.getenv("DEFAULT_PINECONE_KEY",  "")
 DEFAULT_CLD_URL = os.getenv("DEFAULT_CLOUDINARY_URL", "")
 
 def _is_default_key(key: str, default: str) -> bool:
-    if not key or not key.strip():   # empty key never matches — prevents blocking users with no keys
-        return False
     return bool(default) and key.strip() == default.strip()
 
 
@@ -739,34 +737,72 @@ async def health():
 # ════════════════════════════════════════════════════════════════
 #  5. LIST FOLDER IMAGES
 # ════════════════════════════════════════════════════════════════
-def _cld_list_folder_images(folder: str, creds: dict, next_cursor: str = None):
-    kwargs = dict(type="upload", prefix=f"{folder}/", max_results=500,
+def _cld_list_folder_images(folder: str, creds: dict, next_cursor: str = None, max_results: int = 100):
+    kwargs = dict(type="upload", prefix=f"{folder}/", max_results=max_results,
         api_key=creds["api_key"], api_secret=creds["api_secret"], cloud_name=creds["cloud_name"])
     if next_cursor: kwargs["next_cursor"] = next_cursor
     return cloudinary.api.resources(**kwargs)
 
+
+def _cld_thumb_url(secure_url: str, cloud_name: str) -> str:
+    """
+    Convert full-resolution Cloudinary URL to a small thumbnail URL.
+    Inserts Cloudinary transformation: 400×400 fill, auto quality, auto format.
+    Example:
+      https://res.cloudinary.com/demo/image/upload/v123/folder/img.jpg
+      →
+      https://res.cloudinary.com/demo/image/upload/w_400,h_400,c_fill,q_auto,f_auto/v123/folder/img.jpg
+    """
+    try:
+        marker = f"/image/upload/"
+        idx    = secure_url.find(marker)
+        if idx == -1:
+            return secure_url  # can't transform — return original
+        base   = secure_url[:idx + len(marker)]
+        rest   = secure_url[idx + len(marker):]
+        # Skip existing transformation block if present
+        if rest.startswith("w_") or rest.startswith("h_") or rest.startswith("c_") or rest.startswith("q_"):
+            return secure_url  # already transformed
+        return f"{base}w_400,h_400,c_fill,q_auto,f_auto/{rest}"
+    except Exception:
+        return secure_url
+
+
 @app.post("/api/cloudinary/folder-images")
 async def list_folder_images(
     request:             Request,
     user_cloudinary_url: str = Form(""),
     folder_name:         str = Form(...),
     user_id:             str = Form(""),
+    next_cursor:         str = Form(""),
+    page_size:           int = Form(100),
 ):
     ip         = get_ip(request)
     actual_url = user_cloudinary_url or os.getenv("DEFAULT_CLOUDINARY_URL", "")
     creds      = get_cloudinary_creds(actual_url)
     if not creds.get("cloud_name"): raise HTTPException(400, "Invalid Cloudinary URL.")
-    images, next_cursor = [], None
-    while True:
-        result      = await asyncio.to_thread(_cld_list_folder_images, folder_name, creds, next_cursor)
-        for r in result.get("resources", []):
-            images.append({"url": r["secure_url"], "public_id": r["public_id"]})
-        next_cursor = result.get("next_cursor")
-        if not next_cursor: break
+
+    # Single page fetch — frontend drives pagination via next_cursor
+    result      = await asyncio.to_thread(
+        _cld_list_folder_images, folder_name, creds,
+        next_cursor or None, min(page_size, 100)
+    )
+    images = []
+    for r in result.get("resources", []):
+        full_url  = r["secure_url"]
+        thumb_url = _cld_thumb_url(full_url, creds["cloud_name"])
+        images.append({
+            "url":       full_url,   # full-res for lightbox / download
+            "thumb_url": thumb_url,  # 400×400 thumbnail for grid display
+            "public_id": r["public_id"],
+        })
+
+    response_cursor = result.get("next_cursor") or ""
     log("INFO", "explorer.folder_opened",
         user_id=user_id or "anonymous", ip=ip,
-        folder_name=folder_name, image_count=len(images))
-    return {"images": images, "count": len(images)}
+        folder_name=folder_name, image_count=len(images),
+        has_more=bool(response_cursor))
+    return {"images": images, "count": len(images), "next_cursor": response_cursor}
 
 
 # ════════════════════════════════════════════════════════════════
@@ -993,39 +1029,34 @@ async def delete_account(
 
     creds = get_cloudinary_creds(user_cloudinary_url)
 
-    # ── Cloudinary: skip gracefully if user has no credentials ───
-    if creds.get("cloud_name"):
-        try:
-            deleted = await asyncio.to_thread(_cld_delete_all_paginated, creds)
-            _log_fn("INFO", f"Account delete Cloudinary: {deleted} resources removed")
-        except Exception as e:
-            _log_fn("WARNING", f"Account delete Cloudinary: {e}")
-        try:
-            folders_res = await asyncio.to_thread(_cld_root_folders, creds)
-            folder_tasks = [
-                asyncio.to_thread(_cld_remove_folder, f["name"], creds)
-                for f in folders_res.get("folders", [])
-            ]
-            if folder_tasks:
-                await asyncio.gather(*folder_tasks, return_exceptions=True)
-        except Exception as e:
-            _log_fn("WARNING", f"Account delete Cloudinary folders: {e}")
-    else:
-        _log_fn("INFO", "Account delete: no Cloudinary credentials — skipping CDN wipe")
+    # ── Cloudinary: paginated delete ALL resources then folders ────
+    try:
+        deleted = await asyncio.to_thread(_cld_delete_all_paginated, creds)
+        _log_fn("INFO", f"Account delete Cloudinary: {deleted} resources removed")
+    except Exception as e:
+        _log_fn("WARNING", f"Account delete Cloudinary: {e}")
 
-    # ── Pinecone: skip gracefully if user has no key ─────────────
-    if user_pinecone_key and user_pinecone_key.strip():
-        try:
-            pc       = _get_pinecone(user_pinecone_key)
-            existing = {idx.name for idx in await asyncio.to_thread(pc.list_indexes)}
-            tasks    = []
-            if IDX_OBJECTS in existing: tasks.append(asyncio.to_thread(pc.delete_index, IDX_OBJECTS))
-            if IDX_FACES   in existing: tasks.append(asyncio.to_thread(pc.delete_index, IDX_FACES))
-            if tasks: await asyncio.gather(*tasks)
-        except Exception as e:
-            _log_fn("WARNING", f"Account delete Pinecone: {e}")
-    else:
-        _log_fn("INFO", "Account delete: no Pinecone key — skipping vector wipe")
+    try:
+        folders_res = await asyncio.to_thread(_cld_root_folders, creds)
+        folder_tasks = [
+            asyncio.to_thread(_cld_remove_folder, f["name"], creds)
+            for f in folders_res.get("folders", [])
+        ]
+        if folder_tasks:
+            await asyncio.gather(*folder_tasks, return_exceptions=True)
+    except Exception as e:
+        _log_fn("WARNING", f"Account delete Cloudinary folders: {e}")
+
+    # ── Pinecone: delete both indexes ────────────────────────────
+    try:
+        pc       = _get_pinecone(user_pinecone_key)
+        existing = {idx.name for idx in await asyncio.to_thread(pc.list_indexes)}
+        tasks    = []
+        if IDX_OBJECTS in existing: tasks.append(asyncio.to_thread(pc.delete_index, IDX_OBJECTS))
+        if IDX_FACES   in existing: tasks.append(asyncio.to_thread(pc.delete_index, IDX_FACES))
+        if tasks: await asyncio.gather(*tasks)
+    except Exception as e:
+        _log_fn("WARNING", f"Account delete Pinecone: {e}")
 
     log("WARNING", "danger.delete_account.complete",
         user_id=user_id or "anonymous", ip=ip,