products

app.py

@@ -47,20 +47,30 @@ model = PeftModel.from_pretrained(
 _model_on_gpu = False  # once-per-session move
 
 def format_candidates_for_llm(cands, budget_twd=None):
-    lines = []
-    rank = 1
+    filtered = []
     for c in cands:
-        price = f"{c.get('price_value')} {c.get('price_currency')}" if c.get("price_value") else "N/A"
-        if budget_twd and c.get("price_currency") == "TWD" and c.get("price_value") and c["price_value"] > budget_twd:
+        if (
+            budget_twd
+            and c.get("price_currency") == "TWD"
+            and c.get("price_value")
+            and c["price_value"] > budget_twd
+        ):
             continue
-        lines.append(
-            f"{rank}. {c.get('brand_en','')}/{c.get('brand_zh','')} — {c.get('product_name_en') or c.get('product_name_zh')}\n"
-            f"   • Category: {c.get('category_en') or c.get('category_zh')}\n"
-            f"   • Price: {price}\n"
-            f"   • Link: {c.get('source_url')}\n"
-        )
-        rank += 1
-    return "\n".join(lines) if lines else "No products matched."
+        filtered.append({
+            "id": c.get("id"),
+            "brand_en": c.get("brand_en"),
+            "brand_zh": c.get("brand_zh"),
+            "product_name_en": c.get("product_name_en"),
+            "product_name_zh": c.get("product_name_zh"),
+            "category_en": c.get("category_en"),
+            "category_zh": c.get("category_zh"),
+            "price_value": c.get("price_value"),
+            "price_currency": c.get("price_currency"),
+            "source_url": c.get("source_url"),
+            "image_url": c.get("image_url"),
+            "score": c.get("score"),
+        })
+    return json.dumps(filtered, ensure_ascii=False, indent=2)
 
 DERMA_SAFETY = (
     "Safety notes: For broken/infected skin, pregnancy/lactation, infants, "
@@ -80,7 +90,7 @@ def recommend_products(query_text: str, budget_twd: int | None = None, k: int =
         "from the provided list. Include a one-line why-it-helps and a brief how-to-use. "
         "Respect budget and do not invent products."
     )
-    user = f"User need: {query_text}\nCandidate products:\n{context}\n{DERMA_SAFETY}"
+    user = f"User need: {query_text}\nCandidate products (JSON array):\n{context}\n{DERMA_SAFETY}"
 
     # --- if you already have Qwen2-VL loaded as text generator, reuse it.
     # Example skeleton (pseudo—replace with your app’s generate() function):
@@ -200,16 +210,22 @@ def pet_answer_with_recs(image, question, temperature=0.7, top_p=0.95, max_token
         "content": [
             {"type": "text", "text":
              "You are DermalCare's assistant.\n"
-             "Task: Given a user message and a list of candidate skincare products, "
-             "return a section titled 'Suggested products' with up to 3 items ONLY IF they are relevant to the user's issue. "
-             "Each item must be strictly chosen from the candidate list; include one-line 'why it helps' and a short 'how to use'. "
-             "If none are relevant (e.g., purely veterinary emergencies, non-skin issues), output exactly: 'No relevant products.'"}
+             "You will receive (1) a user question and (2) a JSON array named candidate_products containing skincare products.\n"
+             "If one or more products genuinely help the user, respond with: \n"
+             "### Suggested Products\n"
+             "1. **Product name**\n- **Why it helps:** ...\n- **How to use:** ...\n"
+             "(repeat up to 3 items)\n"
+             "\n<DERMACARE_PRODUCTS_JSON>{\"version\": 1, \"products\": [...]}</DERMACARE_PRODUCTS_JSON>\n"
+             "The JSON must list exactly the recommended products with keys: id, brand, name, category, price_value, price_currency, why, how, url, image_url.\n"
+             "Use values from candidate_products: use brand_en/brand_zh to compose 'brand', prefer English names but fall back to Chinese when absent.\n"
+             "If a field is missing, set it to null. Do NOT invent ids or products outside the provided list.\n"
+             "If no products are relevant, output exactly 'No relevant products.' with nothing else."}
         ]
     },{
         "role": "user",
         "content": [
             {"type": "text", "text": f"User message:\n{question}"},
-            {"type": "text", "text": f"Candidates (do not invent beyond this list):\n{cand_block}"}
+            {"type": "text", "text": f"candidate_products = {cand_block}"}
         ]
     }]