template

app.py

@@ -2,6 +2,7 @@
     PetBull‑7B‑VL demo – ZeroGPU‑ready (Qwen2.5‑VL API)
 """
 import os
+import json
 import spaces
 import torch
 import gradio as gr
@@ -12,6 +13,37 @@ from peft import PeftModel
 from qwen_vl_utils import process_vision_info  # pip install qwen-vl-utils
 from tools.retriever import search as product_search
 
+# ---- Product JSON block markers ----
+PRODUCTS_START = "<DERMACARE_PRODUCTS_JSON>"
+PRODUCTS_END   = "</DERMACARE_PRODUCTS_JSON>"
+
+def append_products_json_to_text(text_answer: str, products: list[dict]) -> str:
+    """
+    Append a machine-readable JSON block to the end of the text.
+    The Flutter client will read between the PRODUCTS_START/END tags.
+    """
+    payload = {
+        "version": 1,
+        "products": products or [],
+    }
+    block = PRODUCTS_START + json.dumps(payload, ensure_ascii=False) + PRODUCTS_END
+    return text_answer.rstrip() + "\n\n" + block
+
+def to_product_card(meta):
+    return {
+        "id": meta.get("id"),
+        "brand": meta.get("brand_en") or meta.get("brand_zh"),
+        "name": meta.get("product_name_en") or meta.get("product_name_zh"),
+        "category": meta.get("category_en") or meta.get("category_zh"),
+        "price_value": meta.get("price_value"),
+        "price_currency": meta.get("price_currency"),
+        "why": "Matches your query by skin concern/ingredient.",
+        "how": "Use as directed on label; patch-test first.",
+        "url": meta.get("source_url"),
+        "image_url": meta.get("image_url"),
+        "score": round(float(meta.get("_score", 0.0)), 3),
+    }
+
 print("VERSIONS:", transformers.__version__, accelerate.__version__, torch.__version__, np.__version__)
 os.environ["ACCELERATE_USE_SLOW_RETRIEVAL"] = "true"
 
@@ -199,13 +231,26 @@ def pet_answer_with_recs(image, question, temperature=0.7, top_p=0.95, max_token
         "Safety notes: For broken/infected skin, pregnancy/lactation, infants, "
         "or if symptoms worsen—seek a qualified dermatologist. Patch-test first."
     )
-    # Final combined message
+    # Final combined message (human-readable)
     if suggestions.strip() != '':
         product_section = f"Suggested products:\n{suggestions}"
     else:
-        product_section = ""
-    
-    return f"{base}\n\n{product_section}\n\n{safety}"
+        product_section = "No relevant products."
+
+    human_text = f"{base}\n\n{product_section}\n\n{safety}"
+
+    # Build deterministic product cards (top-3) for client rendering.
+    # If retrieval/index fails, fall back to empty list so the client gracefully
+    # renders only the text.
+    products_json = []
+    try:
+        top3 = [to_product_card(c) for c in cands[:3]]
+        # Filter out items missing essential fields
+        products_json = [p for p in top3 if p.get("id") and p.get("brand") and p.get("name")]
+    except Exception:
+        products_json = []
+
+    return append_products_json_to_text(human_text, products_json)
 
 # ---- UI ----
 with gr.Blocks(title="DermalCare - Pet & Skincare Assistant") as demo: