Update app.py

app.py

@@ -537,9 +537,9 @@ def _try_gemini_ground(q: str):
                 f"Input: {q!r}"
             )
             resp = GENAI_CLIENT.models.generate_content(
-                model="gemini-1.5-flash",
+                model="gemini-2.5-flash",
                 contents=prompt,
-                generation_config=cfg,
+                config=cfg,
             )
             txt = (resp.text or "").strip()
             if txt.startswith("```"):
@@ -570,8 +570,8 @@ def _try_gemini_ground(q: str):
     if GENAI_LEGACY:
         try:
             model = GENAI_LEGACY.GenerativeModel(
-                "gemini-1.5-flash",
-                tools=[GENAI_LEGACY.Tool.from_google_search_retrieval(GENAI_LEGACY.GoogleSearch())]
+                "gemini-2.5-flash",
+                tools={"google_search": {}}
             )
             prompt = (
                 "Resolve a Clash Royale card string (typos possible). "
@@ -1483,7 +1483,7 @@ def _gemini_generate_text(prompt: str) -> str | None:
     if GENAI_CLIENT:
         try:
             resp = GENAI_CLIENT.models.generate_content(
-                model="gemini-1.5-flash",
+                model="gemini-2.5-flash",
                 contents=prompt
             )
             return (resp.text or "").strip()
@@ -1492,46 +1492,12 @@ def _gemini_generate_text(prompt: str) -> str | None:
     # legacy
     if GENAI_LEGACY:
         try:
-            out = GENAI_LEGACY.GenerativeModel("gemini-1.5-flash").generate_content(prompt)
+            out = GENAI_LEGACY.GenerativeModel("gemini-2.5-flash").generate_content(prompt)
             return (out.text or "").strip()
         except Exception as e:
             _set_last_error(f"Gemini error (legacy): {e}")
     return None
 
-# =========== NEW: Gemini helper for chat with Google Search enabled ===========
-def _gemini_generate_with_search(prompt: str) -> str | None:
-    """Helper that enables Google Search tool for grounded, factual answers."""
-    # new SDK
-    if GENAI_CLIENT and GENAI_TYPES:
-        try:
-            Tool = GENAI_TYPES.Tool
-            GoogleSearch = GENAI_TYPES.GoogleSearch
-            generation_config = GENAI_TYPES.GenerationConfig(tools=[Tool(google_search=GoogleSearch())])
-
-            resp = GENAI_CLIENT.models.generate_content(
-                model="gemini-1.5-flash",
-                contents=prompt,
-                generation_config=generation_config,
-            )
-            return (resp.text or "").strip()
-        except Exception as e:
-            _set_last_error(f"Gemini error (new SDK with search): {e}")
-            return "Sorry, I encountered an error while searching for an answer."
-    # legacy SDK
-    if GENAI_LEGACY:
-        try:
-            model = GENAI_LEGACY.GenerativeModel(
-                "gemini-1.5-flash",
-                tools=[GENAI_LEGACY.Tool.from_google_search_retrieval(GENAI_LEGACY.GoogleSearch())]
-            )
-            out = model.generate_content(prompt)
-            return (out.text or "").strip()
-        except Exception as e:
-            _set_last_error(f"Gemini error (legacy with search): {e}")
-            return "Sorry, I encountered an error while searching for an answer."
-    return "Gemini with search is not configured."
-
-
 def gem_coach(pack: dict, history=None, question=None):
     """
     Coach-style, trophy-range–aware analysis. ONLY uses data in pack.
@@ -1569,8 +1535,10 @@ def gem_coach(pack: dict, history=None, question=None):
             "CRITICAL: Use ONLY the cards/decks present in the JSON. Do NOT invent cards or stats. "
             "Respect owned_only/min_level constraints and keep suggested average elixir reasonable.\n\n"
             
+            # ========= START: PROMPT MODIFICATION (UPDATED CODE) ========= #
             "**IMPORTANT: Use the `deck_card_details` section to understand the function of each card in the user's deck. This is your primary source of truth for what each card does.**\n\n"
-            
+            # ========= END: PROMPT MODIFICATION (UPDATED CODE) ========= #
+
             "Context you MUST use:\n"
             "- player.trophies and bracket.\n"
             "- trophy_range_meta.* are what the user is actually facing now.\n"
@@ -1604,31 +1572,21 @@ def gem_coach(pack: dict, history=None, question=None):
             _set_last_error(f"Gemini parse error: {e}")
             return None
     else: # Follow-up question (compose a single prompt with context + short history)
-        # ========= START: MODIFIED FOLLOW-UP LOGIC ===========
-        convo_lines = [
-            "You are a helpful Clash Royale coach. Concisely answer the user's follow-up question.",
-            "Use the provided JSON data for context about the user's deck, performance, and the initial meta analysis.",
-            "If the user asks a factual question about the game (e.g., card stats, damage, interactions) that is not in the provided JSON, you MUST use the search tool to find the most accurate and up-to-date information.",
-            "Always prioritize factual accuracy."
-        ]
-        # Seed with initial analysis if available
+        convo_lines = []
+        # seed with initial analysis if available
         if history and history[0] and history[0][1]:
-            # Keep the initial analysis out of the prompt to save tokens, just use the JSON pack
-            pass
-        # Add last 4 user/model turns for context
+            convo_lines.append("Initial analysis from coach:\n" + history[0][1])
+        # add last 4 user/model turns for context
         for user_msg, model_msg in history[-4:]:
             if user_msg:
                 convo_lines.append("User: " + user_msg)
-            if model_msg and model_msg != "Analysis complete. Ask me anything about this deck!":
+            if model_msg:
                 convo_lines.append("Coach: " + model_msg)
+        convo_lines.append("\nUse ONLY data in this JSON pack for facts:\n" + json.dumps(pack, separators=(',',':')))
+        convo_lines.append("\nUser question: " + (question or ""))
 
-        convo_lines.append("\nThis is the JSON data context for the user's deck and our initial analysis. Use it for context, but use search for new factual questions not contained within:\n" + json.dumps(pack, separators=(',',':')))
-        convo_lines.append("\nUser's new question: " + (question or ""))
-
-        txt = _gemini_generate_with_search("\n\n".join(convo_lines))
+        txt = _gemini_generate_text("\n\n".join(convo_lines))
         return txt or "Sorry, I couldn't generate a response."
-        # ========= END: MODIFIED FOLLOW-UP LOGIC ===========
-
 
 # =========================
 # Smart Builder (numeric core; semantics via Gemini)
@@ -1647,15 +1605,14 @@ def smart_builder(
     player_info_for_pack=None,
     micro_weight=0.7,
     include_top=True,
-    recent_matches_for_pack=None,
-    inv=None # Accept inventory object
+    recent_matches_for_pack=None # New parameter
 ):
     deck = canonicalize_card_list(list(deck_cards or []))
     if not deck:
         return "Pick at least one card first.", None
 
     # ================================================================= #
-    # ========= START: NEW CODE TO FETCH AND INJECT DETAILS ========= #
+    # ========= START: NEW CODE TO FETCH AND INJECT DETAILS (UPDATED CODE) ========= #
     # ================================================================= #
     
     deck_card_details = []
@@ -1671,7 +1628,7 @@ def smart_builder(
             })
 
     # =============================================================== #
-    # ========= END: NEW CODE TO FETCH AND INJECT DETAILS =========== #
+    # ========= END: NEW CODE TO FETCH AND INJECT DETAILS (UPDATED CODE) ========= #
     # =============================================================== #
 
 
@@ -1739,8 +1696,7 @@ def smart_builder(
     existing = set(deck)
     base_avg = avg_elixir(deck)
     elixir_low, elixir_high = 3.0, 4.5
-    # Use the passed inventory object for filtering candidates
-    pool = candidate_cards(inv or STATE.inv, min_level=min_level, owned_only=owned_only)
+    pool = candidate_cards(STATE.inv, min_level=min_level, owned_only=owned_only)
     suggestions_seed = []
 
     for c in pool:
@@ -1770,9 +1726,9 @@ def smart_builder(
 
     # Build LLM pack (facts only) with priority policy + local meta + hard counters
     priority_policy = {"micro_weight": float(micro_weight), "include_top": bool(include_top)}
-    pack = build_llm_pack(deck, df, ctx_notes, top_seed, inv or STATE.inv, min_level, owned_only, coo, player_info_for_pack or {}, priority_policy, recent_matches=recent_matches_for_pack)
+    pack = build_llm_pack(deck, df, ctx_notes, top_seed, STATE.inv, min_level, owned_only, coo, player_info_for_pack or {}, priority_policy, recent_matches=recent_matches_for_pack)
     
-    # Inject the details into the final pack object
+    # Inject the details into the final pack object (UPDATED CODE)
     pack["deck_card_details"] = deck_card_details
     
     lines = []
@@ -1853,7 +1809,7 @@ def smart_builder(
             for r in ranked[:10]:
                 badges = " ".join(f"`{b}`" for b in (r.get("badges") or []))
                 reason = r.get('reason') or ""
-                lines.append(f"- **{r.get('card')}**: {reason} {badges}")
+                lines.append(f"- {r.get('card')}: {reason} {badges}")
         edits = result.get("edits_for_meta") or []
         if edits:
             lines.append("\n**Edits to beat your local meta**")
@@ -1864,12 +1820,12 @@ def smart_builder(
         if tech:
             lines.append("\n**Tech choices**")
             for r in tech[:6]:
-                lines.append(f"- **{r.get('card')}**: {r.get('why')}")
+                lines.append(f"- {r.get('card')}: {r.get('why')}")
         qf = result.get("quick_fixes") or []
         if qf:
             lines.append("\n**Quick +1 fixes**")
             for r in qf[:6]:
-                lines.append(f"- **{r.get('card')}**: {r.get('reason')}")
+                lines.append(f"- {r.get('card')}: {r.get('reason')}")
         if result.get("warnings"):
             for w in result["warnings"]:
                 lines.append("⚠️ " + w)
@@ -2029,7 +1985,7 @@ def player_snapshot_lines(p, tag):
             for k in ("targetType","hitSpeed","dmgType"):
                 if k in ext: ext_bits.append(f"{k}={ext[k]}")
             extra = (" | " + ", ".join(ext_bits)) if ext_bits else ""
-            lines.append(f"- **{nm}**: roles=`{('/'.join(r) or '—')}` | tags=`{('/'.join(sr) or '—')}`{extra}")
+            lines.append(f"- {nm}: roles={('/'.join(r) or '—')} | tags={('/'.join(sr) or '—')}{extra}")
         if champs>1: lines.append(f"⚠️ Champions in deck: {champs} (most formats allow only 1)")
         if evos>0: lines.append(f"Evolution-ready in deck: {evos}")
     else:
@@ -2446,8 +2402,6 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
                         "Tip: run **Fetch & Analyze** first to seed meta/co-occurrence for stronger suggestions."
                     )
                     use_gemini = gr.Checkbox(label="Explain & rank with Gemini", value=True)
-                    # =========== NEW: Unlocked cards checkbox ===========
-                    recommend_owned_only_chk = gr.Checkbox(label="Only recommend cards I have unlocked", value=False)
                     with gr.Row():
                         micro_w_slider = gr.Slider(0.0, 1.0, value=0.7, step=0.05, label="Weight on trophy-range micro-meta")
                         include_top_chk = gr.Checkbox(label="Blend in top-players meta", value=True)
@@ -2455,9 +2409,8 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
                     builder_md = gr.Markdown()
 
                     with gr.Column(visible=False) as chat_interface:
-                        chatbot = gr.Chatbot(label="Follow-up Coach Chat (with Google Search)", height=400)
-                        chat_input = gr.Textbox(label="Ask a follow-up question", placeholder="e.g., How much damage does a level 11 Mega Knight do?")
-
+                        chatbot = gr.Chatbot(label="Follow-up Coach Chat", height=400, type="messages")
+                        chat_input = gr.Textbox(label="Ask a follow-up question", placeholder="e.g., What's a good replacement for my Knight?")
 
                 # ================= Rankings =================
                 with gr.Tab("Rankings & Top Decks", id=1):
@@ -2511,11 +2464,11 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
                     wr_plot2  = gr.Plot()
 
                     gr.Markdown("---")
-                    gr.Markdown("### Card Lookup (handles typos + learns unknown cards)")
+                    gr.Markdown("### Card Lookup (handles typos + learns unknown cards)")  # NEW
                     with gr.Row():
-                        lookup_tb = gr.Textbox(label="Card lookup", placeholder="e.g., suspious bush")
-                        lookup_btn = gr.Button("Lookup Card Info")
-                    lookup_md = gr.Markdown()
+                        lookup_tb = gr.Textbox(label="Card lookup", placeholder="e.g., suspious bush")  # NEW
+                        lookup_btn = gr.Button("Lookup Card Info")  # NEW
+                    lookup_md = gr.Markdown()  # NEW
 
                 # ================= Player & Forecast =================
                 with gr.Tab("Player & Forecast", id=4):
@@ -2598,8 +2551,7 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
     gem_tb.change(_set_gem, [gem_tb], [gem_info])
 
     # --- DECK BUILDER TAB ---
-    # =========== MODIFIED: Added owned_only parameter ===========
-    def _from_tag_rich(tag, use_gem, micro_w, include_top, owned_only):
+    def _from_tag_rich(tag, use_gem, micro_w, include_top):
         if not tag:
             return "Enter a player tag in the sidebar.", None, None, gr.update(visible=False), None
         if not STATE.api_token:
@@ -2611,23 +2563,8 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
             p = api.player(t)
         except Exception as e:
             return f"Error: {e}", None, None, gr.update(visible=False), None
-            
-        # =========== NEW: Fetch and store player's card inventory ===========
-        try:
-            STATE.inv = Inventory()
-            for card_data in p.get("cards", []):
-                cname = jname(card_data.get("name"))
-                if cname:
-                    STATE.inv.card[cname] = {
-                        "owned": True,
-                        "level": card_data.get("level", 0)
-                    }
-        except Exception as e:
-            # Non-critical error, can proceed without inventory
-            _set_last_error(f"Could not parse player inventory: {e}")
 
-
-        # Collect recent matches for LLM analysis
+        # NEW: Collect recent matches
         recent_matches = collect_recent_matches_for_llm(api, t)
 
         header_lines = player_snapshot_lines(p, t)
@@ -2666,35 +2603,39 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
             use_bracket=True, bracket_center=p.get("trophies"),
             player_info_for_pack=player_info_for_pack,
             micro_weight=float(micro_w), include_top=bool(include_top),
-            recent_matches_for_pack=recent_matches,
-            owned_only=bool(owned_only), # Pass the new parameter
-            inv=STATE.inv # Pass the fetched inventory
+            recent_matches_for_pack=recent_matches # Pass new data
         )
         final_md = "\n".join(header_lines + ["", *perf_lines, "", coach_block])
 
-        initial_history_pairs = [("", "Analysis complete. Ask me anything about this deck!")]
+        initial_messages = [
+            {"role": "assistant", "content": "Analysis complete. Ask me anything about this deck!"}
+        ]
+        initial_pairs = [("", "Analysis complete. Ask me anything about this deck!")]
 
-        return final_md, pack, initial_history_pairs, gr.update(visible=True), initial_history_pairs
+        return final_md, pack, initial_messages, gr.update(visible=True), initial_pairs
 
-    def chat_response(message, history, pack_state, coach_hist_state):
+    def chat_response(message, messages, pack_state, coach_hist):
+        # messages: [{"role":"user"|"assistant","content":"..."}]
         if not pack_state:
-            history.append((message, "Please analyze a deck first."))
-            return history, coach_hist_state
+            return messages + [{"role":"assistant","content":"Please analyze a deck first."}], coach_hist
 
-        # Call coach with the pair-style history
-        reply = gem_coach(pack_state, history=coach_hist_state, question=message)
+        # Call your coach with the pair-style history it expects
+        reply = gem_coach(pack_state, history=coach_hist, question=message)
+
+        # Update UI messages
+        new_messages = messages + [
+            {"role":"user", "content": message},
+            {"role":"assistant", "content": reply}
+        ]
 
-        # Update chatbot UI history
-        history.append((message, reply))
-        # Update internal state history
-        new_coach_hist = coach_hist_state + [(message, reply)]
+        # Update your pair history
+        new_pairs = coach_hist + [(message, reply)]
 
-        return history, new_coach_hist
+        return new_messages, new_pairs
 
-    # =========== MODIFIED: Pass new checkbox state to handler ===========
     build_from_tag_btn.click(
         _from_tag_rich,
-        [player_tag_state, use_gemini, micro_w_slider, include_top_chk, recommend_owned_only_chk],
+        [player_tag_state, use_gemini, micro_w_slider, include_top_chk],
         [builder_md, builder_pack_state, chatbot, chat_interface, coach_history_state]
     )
 
@@ -2736,6 +2677,7 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
     # --- CARD STATS TAB ---
     meta_btn.click(recompute_meta, [], [meta_df, meta_plot, wr_plot2])
 
+    # NEW: Card Lookup handler (grounded search + caching)
     def _lookup_card_handler(q):
         q = (q or "").strip()
         if not q:
@@ -2745,7 +2687,7 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
         info = lookup_card_details(q)
         if not info:
             return f"Sorry, I couldn't find info for **{q}**."
-        lines = [f"### {info['name']}"]
+        lines = [f"**{info['name']}**"]
         if info.get("summary"):
             lines.append(info["summary"])
         # show basics if we have them
@@ -2756,7 +2698,7 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
         mel = info.get("maxEvolutionLevel", 0)
         if mel: bits.append(f"Max Evolution Level: {mel}")
         if bits:
-            lines.append("\n_" + " • ".join(bits) + "_")
+            lines.append("_" + " • ".join(bits) + "_")
         # citations
         srcs = info.get("sources") or []
         if srcs:
@@ -2813,4 +2755,4 @@ with gr.Blocks(css=LIGHT_CSS, theme=gr.themes.Soft()) as demo:
 
 
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch()