added json cards

app.py

@@ -137,6 +137,73 @@ def _has_valid_suggestions(raw_suggestions: str) -> bool:
 
     return True
 
+# ---- JSON block helpers ----
+def _extract_products_json_block(text: str) -> str | None:
+    start_tag = "<DERMACARE_PRODUCTS_JSON>"
+    end_tag = "</DERMACARE_PRODUCTS_JSON>"
+    start = text.find(start_tag)
+    end = text.find(end_tag)
+    if start == -1 or end == -1 or end <= start:
+        return None
+    json_str = text[start + len(start_tag):end]
+    try:
+        payload = json.loads(json_str)
+        products = payload.get("products", [])
+        if isinstance(products, list) and len(products) > 0:
+            return f"{start_tag}{json.dumps(payload, ensure_ascii=False)}{end_tag}"
+    except Exception:
+        return None
+    return None
+
+
+def _filter_candidates_by_budget(cands: list[dict], budget_twd: int | None) -> list[dict]:
+    if not budget_twd:
+        return cands
+    filtered: list[dict] = []
+    for c in cands:
+        currency = c.get("price_currency")
+        value = c.get("price_value")
+        if currency == "TWD" and isinstance(value, (int, float)) and value is not None:
+            if value <= budget_twd:
+                filtered.append(c)
+        else:
+            filtered.append(c)
+    return filtered
+
+
+def _build_products_json_block_from_candidates(cands: list[dict], max_items: int = 3) -> str | None:
+    if not cands:
+        return None
+    ranked = sorted(cands, key=lambda x: x.get("_score", 0.0), reverse=True)
+    picked = ranked[:max_items]
+    products = []
+    for c in picked:
+        products.append({
+            "id": c.get("id"),
+            "brand": c.get("brand_en") or c.get("brand_zh"),
+            "name": c.get("product_name_en") or c.get("product_name_zh"),
+            "category": c.get("category_en") or c.get("category_zh"),
+            "price_value": c.get("price_value"),
+            "price_currency": c.get("price_currency"),
+            "why": None,
+            "how": None,
+            "url": c.get("source_url"),
+            "image_url": c.get("image_url"),
+        })
+    valid_count = sum(1 for p in products if p.get("name"))
+    if valid_count == 0:
+        return None
+    payload = {"version": 1, "products": products}
+    return f"<DERMACARE_PRODUCTS_JSON>{json.dumps(payload, ensure_ascii=False)}</DERMACARE_PRODUCTS_JSON>"
+
+
+def _ensure_products_json_block(suggestions: str, cands: list[dict], budget_twd: int | None) -> str | None:
+    existing = _extract_products_json_block(suggestions)
+    if existing:
+        return existing
+    filtered = _filter_candidates_by_budget(cands, budget_twd)
+    return _build_products_json_block_from_candidates(filtered)
+
 # ---- Inference on GPU (ZeroGPU pattern) ----
 @spaces.GPU(duration=120)
 def generate_answer(image, question, temperature=0.7, top_p=0.95, max_tokens=256):
@@ -257,6 +324,10 @@ def pet_answer_with_recs(image, question, temperature=0.7, top_p=0.95, max_token
     sections = [base.strip()]
     if include_products:
         sections.append(f"Suggested products:\n{suggestions}")
+        if "<DERMACARE_PRODUCTS_JSON>" not in suggestions:
+            json_block = _ensure_products_json_block(suggestions, cands, budget_twd)
+            if json_block:
+                sections.append(json_block)
         sections.append(safety)
     
     return "\n\n".join([s for s in sections if s])