Update pages/4_Diet_Plan.py

pages/4_Diet_Plan.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import streamlit as st
-import os, sys
+import os, sys, json as _json, re as _re
 from datetime import date
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from auth_token import logout
@@ -54,6 +54,95 @@ def cuisine_instruction():
     instr += " Use NO red meat (no beef, pork, lamb, mutton). Only chicken, eggs or fish are allowed as proteins."
     return instr
 
+# ── TASK 4: Helper to convert AI JSON response → clean readable text ──────────
+def _clean_swap_response(raw: str) -> str:
+    """
+    Converts any AI response (JSON array/object or plain text) into
+    a clean human-readable meal description string.
+    Never returns raw JSON brackets or quotes in the UI.
+    """
+    if not raw:
+        return ""
+    raw = raw.strip()
+
+    # Try to parse as JSON first
+    # Strip code fences if present
+    raw_stripped = _re.sub(r"```[a-z]*", "", raw).strip().rstrip("```").strip()
+
+    parsed = None
+    if raw_stripped.startswith("[") or raw_stripped.startswith("{"):
+        try:
+            parsed = _json.loads(raw_stripped)
+        except Exception:
+            # Try to fix common issues: trailing commas, single quotes
+            try:
+                fixed = raw_stripped.replace("'", '"')
+                parsed = _json.loads(fixed)
+            except Exception:
+                parsed = None
+
+    if parsed is not None:
+        # Handle array of objects: [{"Avocado Toast": {"bread": "2 slices", ...}}, ...]
+        # or [{"name": "...", "ingredients": {...}}, ...]
+        # or a flat dict: {"name": "...", "ingredients": "..."}
+        parts = []
+
+        def _flatten_dict(d):
+            """Flatten a dict of ingredient:amount pairs into a readable string."""
+            if isinstance(d, dict):
+                items = []
+                for k, v in d.items():
+                    if isinstance(v, (dict, list)):
+                        items.append(f"{k}: {_flatten_dict(v)}")
+                    else:
+                        items.append(f"{v} {k}".strip())
+                return ", ".join(items)
+            elif isinstance(d, list):
+                return ", ".join(str(x) for x in d)
+            else:
+                return str(d)
+
+        items_to_process = parsed if isinstance(parsed, list) else [parsed]
+        for item in items_to_process:
+            if isinstance(item, dict):
+                # Check for standard keys first
+                name = item.get("name") or item.get("meal") or item.get("dish") or ""
+                ingredients = item.get("ingredients") or item.get("items") or item.get("components") or {}
+                if name and ingredients:
+                    if isinstance(ingredients, dict):
+                        ing_str = _flatten_dict(ingredients)
+                    elif isinstance(ingredients, list):
+                        ing_str = ", ".join(str(x) for x in ingredients)
+                    else:
+                        ing_str = str(ingredients)
+                    parts.append(f"{name} ({ing_str})")
+                elif name:
+                    parts.append(name)
+                else:
+                    # The dict key IS the meal name, value is the ingredients dict
+                    for meal_name, meal_details in item.items():
+                        if isinstance(meal_details, dict):
+                            ing_str = _flatten_dict(meal_details)
+                            parts.append(f"{meal_name} ({ing_str})")
+                        elif isinstance(meal_details, str):
+                            parts.append(f"{meal_name}: {meal_details}")
+                        else:
+                            parts.append(str(meal_name))
+            elif isinstance(item, str):
+                parts.append(item)
+
+        if parts:
+            return "; ".join(parts)
+
+    # If not JSON or parsing failed, return cleaned plain text
+    # Remove any remaining JSON artifacts
+    clean = _re.sub(r'[\[\]\{\}"]', '', raw_stripped)
+    clean = _re.sub(r'\s+', ' ', clean).strip()
+    # Remove leading/trailing punctuation artifacts
+    clean = clean.strip(",;: ")
+    return clean if clean else raw.strip()
+
+
 # Pick background based on dietary type
 if dietary_type == "nonveg":
     bg_url = "https://images.unsplash.com/photo-1544025162-d76538b2a681?w=1800&q=80&auto=format&fit=crop"
@@ -330,7 +419,6 @@ with wc2:
         st.rerun()
 
 # FEATURE CARDS — collapsible expanders
-import re as _re, json as _json
 st.markdown("<div style='height:12px'></div>", unsafe_allow_html=True)
 fe1, fe2, fe3 = st.columns(3)
 
@@ -494,106 +582,85 @@ for tab, day_data in zip(tabs, sdays):
                     icon = MEAL_ICONS.get(meal, "&#127869;&#65039;")
                     ck   = "meal_d" + str(dn) + "_" + meal
                     done = st.session_state.get(ck, False)
+
+                    # ── TASK 5: Determine which meal content to show ──────────────
+                    # If user selected "Use AI Swap", show that content in the same card
+                    chosen_key   = "meal_choice_" + str(dn) + "_" + meal
+                    swap_res_key = "swap_result_" + str(dn) + "_" + meal
+                    swap_res     = st.session_state.get(swap_res_key, "")
+                    chosen       = st.session_state.get(chosen_key, "original")
+
+                    # The displayed meal content: original or swapped
+                    display_desc = swap_res if (chosen == "swap" and swap_res) else desc
+                    is_swapped   = chosen == "swap" and bool(swap_res)
+
                     strike = "text-decoration:line-through;opacity:0.40;" if done else ""
 
+                    # ── TASK 5: Single meal card that shows either original or swapped content ──
+                    swap_badge = ""
+                    if is_swapped:
+                        swap_badge = "<span style='font-size:0.62rem;font-weight:700;letter-spacing:1px;text-transform:uppercase;background:rgba(34,197,94,0.18);border:1px solid rgba(34,197,94,0.40);border-radius:100px;padding:2px 8px;color:rgba(34,197,94,0.90);margin-left:6px'>🤖 AI Swap</span>"
+
                     mc_top, mc_btn = st.columns([4,1])
                     with mc_top:
                         st.markdown(
                             "<div class='meal-card'>"
                             "<div class='meal-label'>"
                             "<span style='color:" + accent + "'>" + icon + " " + meal.upper() + "</span>"
+                            + swap_badge
                             + (" <span style='color:" + accent + ";font-size:0.75rem'>&#10003; Done</span>" if done else "") +
                             "</div>"
-                            "<div class='meal-text' style='" + strike + "'>" + str(desc) + "</div>"
+                            "<div class='meal-text' style='" + strike + "'>" + str(display_desc) + "</div>"
                             "</div>",
                             unsafe_allow_html=True
                         )
                     with mc_btn:
                         st.markdown("<div style='height:14px'></div>", unsafe_allow_html=True)
                         st.markdown("<div class='swap-mini'>", unsafe_allow_html=True)
-                        if st.button("&#129302; Swap", key="swap_" + str(dn) + "_" + meal, use_container_width=True):
-                            with st.spinner("Getting swap..."):
-                                try:
-                                    from model_api import query_model
-                                    d_label = {"veg":"Vegetarian","nonveg":"Non-Vegetarian","both":"Flexible"}.get(dietary_type,"")
-
-                                    # ── CUISINE-AWARE SWAP PROMPT ─────────────────────────────
-                                    # Base prompt includes the user's cuisine style so the AI
-                                    # always suggests a meal from the correct cuisine menu
-                                    prompt = (
-                                        "Suggest 1 alternative " + meal + " meal for a "
-                                        + d_label + " person (goal: " + data.get("goal","Fitness") + ")."
-                                        + cuisine_instruction()
-                                        + " Current meal: " + str(desc)
-                                        + ". Give only the meal name and ingredients in 1-2 lines. No JSON."
-                                    )
-                                    result = query_model(prompt, max_tokens=80)
-                                    st.session_state["swap_result_" + str(dn) + "_" + meal] = result.strip()
-                                    st.rerun()
-                                except Exception as e:
-                                    st.error(str(e))
+
+                        # If currently showing swapped, allow reverting to original
+                        if is_swapped:
+                            if st.button("↩ Revert", key="revert_" + str(dn) + "_" + meal, use_container_width=True):
+                                st.session_state[chosen_key] = "original"
+                                st.rerun()
+                        else:
+                            if st.button("🤖 Swap", key="swap_" + str(dn) + "_" + meal, use_container_width=True):
+                                with st.spinner("Getting swap..."):
+                                    try:
+                                        from model_api import query_model
+                                        d_label = {"veg":"Vegetarian","nonveg":"Non-Vegetarian","both":"Flexible"}.get(dietary_type,"")
+
+                                        # ── TASK 3 & 4: Cuisine-aware swap prompt ──────────────
+                                        # Force plain text response — explicitly forbid JSON
+                                        prompt = (
+                                            "Suggest 1 alternative " + meal + " meal for a "
+                                            + d_label + " person (goal: " + data.get("goal","Fitness") + ")."
+                                            + cuisine_instruction()
+                                            + " Current meal: " + str(desc)
+                                            + " Respond with ONLY a plain text description like: "
+                                            + "MealName (ingredient1 quantity, ingredient2 quantity). "
+                                            + "Do NOT use JSON, brackets, or lists. One sentence only."
+                                        )
+                                        raw_result = query_model(prompt, max_tokens=100)
+                                        # ── TASK 4: Always clean the response ──
+                                        clean_result = _clean_swap_response(raw_result)
+                                        st.session_state[swap_res_key] = clean_result
+                                        # ── TASK 5: Immediately set choice to "swap" so it replaces in-place ──
+                                        st.session_state[chosen_key] = "swap"
+                                        st.rerun()
+                                    except Exception as e:
+                                        st.error(str(e))
                         st.markdown("</div>", unsafe_allow_html=True)
 
-                    # Show swap options: original vs AI alternative
-                    swap_res  = st.session_state.get("swap_result_" + str(dn) + "_" + meal)
-                    chosen_key = "meal_choice_" + str(dn) + "_" + meal
-                    if swap_res:
-                        chosen = st.session_state.get(chosen_key, "original")
+                    # ── TASK 5: No separate "Choose Your Breakfast" panel needed ──
+                    # The swap replaces directly in the card above.
+                    # Only show a subtle undo confirmation if recently swapped.
+                    if is_swapped:
                         st.markdown(
-                            "<div style='background:rgba(0,0,0,0.70);border:1px solid rgba(255,255,255,0.18);"
-                            "border-radius:12px;padding:12px 14px;margin-bottom:8px;backdrop-filter:blur(10px)'>"
-                            "<div style='font-size:0.72rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
-                            "color:rgba(229,9,20,0.85);margin-bottom:8px'>&#129302; Choose Your " + meal.title() + "</div>"
-                            "<div style='display:flex;gap:8px;flex-wrap:wrap'>"
-                            "<div style='flex:1;min-width:140px;background:" + ("rgba(229,9,20,0.25);border:2px solid #E50914" if chosen=="original" else "rgba(255,255,255,0.07);border:1.5px solid rgba(255,255,255,0.15)") + ";"
-                            "border-radius:10px;padding:10px 12px;cursor:pointer'>"
-                            "<div style='font-size:0.72rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
-                            "color:" + ("rgba(229,9,20,0.90)" if chosen=="original" else "rgba(255,255,255,0.45)") + ";margin-bottom:4px'>&#127775; Original</div>"
-                            "<div style='font-size:0.80rem;color:#fff;line-height:1.5'>" + str(desc) + "</div>"
-                            "</div>"
-                            "<div style='flex:1;min-width:140px;background:" + ("rgba(34,197,94,0.20);border:2px solid #22c55e" if chosen=="swap" else "rgba(255,255,255,0.07);border:1.5px solid rgba(255,255,255,0.15)") + ";"
-                            "border-radius:10px;padding:10px 12px;cursor:pointer'>"
-                            "<div style='font-size:0.72rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
-                            "color:" + ("rgba(34,197,94,0.90)" if chosen=="swap" else "rgba(255,255,255,0.45)") + ";margin-bottom:4px'>&#129302; AI Alternative</div>"
-                            "<div style='font-size:0.80rem;color:#fff;line-height:1.5'>" + swap_res + "</div>"
-                            "</div>"
-                            "</div></div>",
+                            "<div style='font-size:0.72rem;color:rgba(34,197,94,0.85);font-weight:600;"
+                            "padding:2px 0 6px 2px'>🤖 AI Alternative active — click ↩ Revert to restore original</div>",
                             unsafe_allow_html=True
                         )
-                        pick1, pick2, pick3 = st.columns([2,2,1])
-                        with pick1:
-                            if st.button(
-                                ("&#10003; Original" if chosen=="original" else "Keep Original"),
-                                key="pick_orig_" + str(dn) + "_" + meal,
-                                use_container_width=True
-                            ):
-                                st.session_state[chosen_key] = "original"
-                                st.rerun()
-                        with pick2:
-                            if st.button(
-                                ("&#10003; AI Swap" if chosen=="swap" else "Use AI Swap"),
-                                key="pick_swap_" + str(dn) + "_" + meal,
-                                use_container_width=True
-                            ):
-                                st.session_state[chosen_key] = "swap"
-                                st.rerun()
-                        with pick3:
-                            if st.button("&#10005;", key="dismiss_swap_" + str(dn) + "_" + meal, use_container_width=True):
-                                st.session_state.pop("swap_result_" + str(dn) + "_" + meal, None)
-                                st.session_state.pop(chosen_key, None)
-                                st.rerun()
-                        if chosen == "swap":
-                            st.markdown(
-                                "<div style='font-size:0.72rem;color:rgba(34,197,94,0.85);font-weight:600;"
-                                "padding:4px 0'>&#129302; AI Alternative selected for today</div>",
-                                unsafe_allow_html=True
-                            )
-                        else:
-                            st.markdown(
-                                "<div style='font-size:0.72rem;color:rgba(229,9,20,0.75);padding:4px 0'>"
-                                "&#127775; Original meal selected</div>",
-                                unsafe_allow_html=True
-                            )
 
                     # Checkbox
                     if st.checkbox("Mark as done", value=done, key=ck+"_cb"):