Update app.py

app.py

@@ -1,4 +1,3 @@
-# server_single_suggest.py
 """
 Single-endpoint suggestion server.
 
@@ -15,6 +14,7 @@ import logging
 import uuid
 import time
 import difflib
+import base64
 from typing import List, Dict, Any, Set, Optional
 
 from flask import Flask, request, jsonify
@@ -127,12 +127,52 @@ def _safe_item_brand(itm: Dict[str, Any]) -> str:
     return str(brand).strip()
 
 
+# ---------- Normalization helpers ----------
+def normalize_wardrobe_item(itm: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    Accepts various incoming key naming schemes (camelCase or snake_case) and returns a normalized dict
+    with keys: id, label, title, thumbnail_url, analysis, confidence, brand, etc.
+    """
+    if not isinstance(itm, dict):
+        return {}
+
+    # Prefer explicit thumbnail_url, then camelCase thumbnailUrl, then thumbnail, then thumbnailPath
+    thumb = itm.get("thumbnail_url") or itm.get("thumbnailUrl") or itm.get("thumbnail") or itm.get("thumbnailPath") or None
+
+    title = itm.get("title") or itm.get("label") or (itm.get("analysis") or {}).get("type") or ""
+    label = itm.get("label") or itm.get("title") or title or ""
+    confidence = itm.get("confidence")
+    if confidence is None:
+        confidence = itm.get("score") or itm.get("prob") or 0.8
+
+    normalized = {
+        "id": itm.get("id") or itm.get("doc_id") or "",
+        "label": label,
+        "title": title,
+        "thumbnail_url": thumb,
+        "analysis": itm.get("analysis") or {},
+        "confidence": float(confidence) if confidence is not None else 0.8,
+        # keep original payload for debugging if needed
+        "_raw": itm,
+    }
+    # try to include brand/top-level fields if present
+    if itm.get("brand"):
+        try:
+            normalized["analysis"]["brand"] = itm.get("brand")
+        except Exception:
+            pass
+    return normalized
+
+
 # ---------- Simple local candidate generator ----------
 def naive_generate_candidates(wardrobe_items: List[Dict[str, Any]],
                               user_inputs: Dict[str, Any],
                               user_profile: Dict[str, Any],
                               past_week_items: List[Dict[str, Any]],
                               max_candidates: int = 6) -> List[Dict[str, Any]]:
+    # ensure items are normalized (safe guard)
+    wardrobe_items = [normalize_wardrobe_item(it) for it in (wardrobe_items or [])]
+
     grouped = {}
     for itm in wardrobe_items:
         title = (itm.get("title") or (itm.get("analysis") or {}).get("type") or itm.get("label") or "")
@@ -177,7 +217,15 @@ def naive_generate_candidates(wardrobe_items: List[Dict[str, Any]],
                 score = max(0, min(1, score + (0.02 * ((hash(ids) % 100) / 100.0))))
                 candidate = {
                     "id": str(uuid.uuid4()),
-                    "items": [{"id": x.get("id"), "label": x.get("label"), "title": x.get("title"), "thumbnail_url": x.get("thumbnail_url"), "analysis": x.get("analysis", {})} for x in items],
+                    "items": [
+                        {
+                            "id": x.get("id"),
+                            "label": x.get("label"),
+                            "title": x.get("title"),
+                            "thumbnail_url": x.get("thumbnail_url"),
+                            "analysis": x.get("analysis", {})
+                        } for x in items
+                    ],
                     "score": round(float(score), 3),
                     "reason": "Auto combo",
                     "notes": "",
@@ -435,16 +483,19 @@ def fetch_wardrobe_from_firestore(uid: str) -> List[Dict[str, Any]]:
         items = []
         for d in docs:
             dd = d.to_dict() or {}
+            # accept both snake_case and camelCase thumbnail fields
+            thumb = dd.get("thumbnail_url") or dd.get("thumbnailUrl") or dd.get("thumbnail") or dd.get("thumbnailPath") or None
             items.append({
                 "id": dd.get("id") or d.id,
                 "label": dd.get("label") or dd.get("title") or "item",
                 "title": dd.get("title") or dd.get("label") or "",
-                "thumbnail_url": dd.get("thumbnail_url"),
+                "thumbnail_url": thumb,
                 "analysis": dd.get("analysis", {}),
                 "confidence": dd.get("confidence", 0.8),
             })
         if items:
-            return items
+            # normalize and return
+            return [normalize_wardrobe_item(it) for it in items]
     except Exception as e:
         log.warning("users/{uid}/wardrobe subcollection read failed: %s", e)
 
@@ -455,15 +506,16 @@ def fetch_wardrobe_from_firestore(uid: str) -> List[Dict[str, Any]]:
         items = []
         for d in docs:
             dd = d.to_dict() or {}
+            thumb = dd.get("thumbnail_url") or dd.get("thumbnailUrl") or dd.get("thumbnail") or dd.get("thumbnailPath") or None
             items.append({
                 "id": dd.get("id") or d.id,
                 "label": dd.get("label") or dd.get("title") or "item",
                 "title": dd.get("title") or dd.get("label") or "",
-                "thumbnail_url": dd.get("thumbnail_url"),
+                "thumbnail_url": thumb,
                 "analysis": dd.get("analysis", {}),
                 "confidence": dd.get("confidence", 0.8),
             })
-        return items
+        return [normalize_wardrobe_item(it) for it in items]
     except Exception as e:
         log.warning("wardrobe collection query failed: %s", e)
         return []
@@ -505,6 +557,8 @@ def suggest_all():
     """
     is_multipart = request.content_type and request.content_type.startswith("multipart/form-data")
     try:
+        wardrobe_items = []
+        audio_b64 = None
         if is_multipart:
             # access form fields and files
             form = request.form
@@ -516,21 +570,20 @@ def suggest_all():
                 if ui_raw:
                     user_inputs = json.loads(ui_raw)
                 else:
-                    # collect obvious form fields into user_inputs if given
                     user_inputs = {}
             except Exception:
                 user_inputs = {}
             max_c = int(form.get("max_candidates") or 6)
-            wardrobe_items = []
+
             w_raw = form.get("wardrobe_items")
             if w_raw:
                 try:
                     wardrobe_items = json.loads(w_raw)
                 except Exception:
                     wardrobe_items = []
+
             # audio file
             audio_file = files.get("audio")
-            audio_b64 = None
             if audio_file:
                 try:
                     audio_bytes = audio_file.read()
@@ -548,6 +601,12 @@ def suggest_all():
         log.exception("Invalid request payload: %s", e)
         return jsonify({"error": "invalid request payload"}), 400
 
+    # normalize any incoming wardrobe_items (accept camelCase/snake_case)
+    try:
+        wardrobe_items = [normalize_wardrobe_item(it) for it in (wardrobe_items or [])]
+    except Exception:
+        wardrobe_items = []
+
     # if wardrobe_items empty, attempt to fetch from Firestore for uid
     if not wardrobe_items:
         try: