Helpers

src/streamlit_app.py

@@ -1,23 +1,20 @@
 """
 MTG Draft Assistant Streamlit App
 ---------------------------------
-A booster-draft helper written with Streamlit and deployable on Hugging Face Spaces.
-
-Changes in this revision
-~~~~~~~~~~~~~~~~~~~~~~~~
-* **supported_sets.txt** – one set code per line.
-* Sidebar now shows a **single-choice list** (radio buttons) sourced from that
-  file instead of a free-text box, so users can only draft sets you actually
-  support.
-* Fallback to the old text input if the text-file is missing or empty.
-
-Replace the three stub functions (`load_model`, `suggest_pick`,
-`generate_booster`) with your real model-/API-calls when you are ready.
+Booster‑draft helper for Magic: The Gathering, built with Streamlit and ready
+for Hugging Face Spaces deployment.
+
+🆕 UI tweaks in this revision
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* **Set selection is now hidden** in an *expander* inside the sidebar—keeps the
+  layout clean.
+* Added a **second tab – “Card rankings”**. When you pick a set, the tab shows a
+  (stub) ranked list of cards from that set. Replace the `rank_cards()` stub
+  with real logic later.
 """
 
 from __future__ import annotations
 
-import os
 import random
 from pathlib import Path
 from typing import Dict, List
@@ -26,59 +23,83 @@ import requests
 import streamlit as st
 
 # -----------------------------------------------------------------------------
-# 0. Constants & helpers
+# Disable telemetry write‑outs (avoids PermissionError: /.streamlit on Spaces)
 # -----------------------------------------------------------------------------
+try:
+    from streamlit.runtime.metrics_util import disable_gather_usage_stats
 
-SUPPORTED_SETS_PATH = Path("src/helper_files/supported_sets.txt")
+    disable_gather_usage_stats()
+except Exception:
+    st.set_option("browser.gatherUsageStats", False)
 
-@st.cache_data(show_spinner="Reading supported sets …")
-def get_supported_sets(path: Path = SUPPORTED_SETS_PATH) -> List[str]:
-    """Return a list of legal set codes read from *supported_sets.txt*.
+# -----------------------------------------------------------------------------
+# 0. Constants & helpers
+# -----------------------------------------------------------------------------
 
-    The file should contain **one set tag per line**, e.g.::
+SUPPORTED_SETS_PATH = Path("supported_sets.txt")
 
-        WOE
-        LCI
-        MKM
 
-    If the file is missing we fall back to an empty list so the UI
-    degrades gracefully.
-    """
+@st.cache_data(show_spinner="Reading supported sets …")
+def get_supported_sets(path: Path = SUPPORTED_SETS_PATH) -> List[str]:
+    """Return a list of legal set codes read from *supported_sets.txt*."""
+
     if path.is_file():
         return [ln.strip() for ln in path.read_text().splitlines() if ln.strip()]
     return []
 
+
 # -----------------------------------------------------------------------------
-# 1. Model loading (stub)
+# 1. Model & ranking stubs
 # -----------------------------------------------------------------------------
 
 @st.cache_resource(show_spinner="Loading draft model …")
 def load_model():
-    """Load and return the trained drafting model.
+    # 🔄 Replace with your own pipeline or `hf_hub_download` call
+    return None
+
+
+@st.cache_data(show_spinner="Calculating card rankings …")
+def rank_cards(set_code: str) -> List[Dict]:
+    """Return a stubbed ranking list for *set_code*.
 
-    Adapt to your own pipeline; see previous revision for an example that pulls
-    an artefact from *huggingface_hub*.  Returning *None* leaves us in demo
-    mode and will pick random cards.
+    Replace with your real evaluation logic. For now we just pull 30 random
+    commons from the set and assign a dummy score.
     """
-    return None
+
+    url = f"https://api.scryfall.com/cards/search?q=set%3A{set_code}+unique%3Aprints+is%3Acommon"
+    cards: List[Dict] = []
+    while url and len(cards) < 60:  # cap network use
+        r = requests.get(url)
+        r.raise_for_status()
+        payload = r.json()
+        cards += payload["data"]
+        url = payload.get("next_page") if payload.get("has_more") else None
+
+    sample = random.sample(cards, k=min(30, len(cards))) if cards else []
+    ranked = [
+        {"name": c["name"], "score": round(random.random(), 2)} for c in sample
+    ]
+    ranked.sort(key=lambda x: x["score"], reverse=True)
+    return ranked
+
 
 model = load_model()
 
+
 # -----------------------------------------------------------------------------
-# 2. Draft-logic helpers (stubs)
+# 2. Draft‑logic helpers (stubs)
 # -----------------------------------------------------------------------------
 
 def suggest_pick(pack: List[Dict], picks: List[Dict]) -> Dict:
-    """Return the card the model recommends from *pack*."""
     if model is None:
         return random.choice(pack)
     return model.predict(pack=pack, picks=picks)  # type: ignore[attr-defined]
 
 
 def fetch_card_image(card_name: str) -> str:
-    """Fetch card art URL from Scryfall (normal size)."""
     r = requests.get(
-        "https://api.scryfall.com/cards/named", params={"exact": card_name, "format": "json"}
+        "https://api.scryfall.com/cards/named",
+        params={"exact": card_name, "format": "json"},
     )
     r.raise_for_status()
     data = r.json()
@@ -88,7 +109,6 @@ def fetch_card_image(card_name: str) -> str:
 
 
 def generate_booster(set_code: str) -> List[Dict]:
-    """Return a pseudo-random 15-card booster using Scryfall search."""
     url = f"https://api.scryfall.com/cards/search?q=set%3A{set_code}+is%3Abooster+unique%3Aprints"
     cards: List[Dict] = []
     while url:
@@ -99,6 +119,7 @@ def generate_booster(set_code: str) -> List[Dict]:
         url = payload.get("next_page") if payload.get("has_more") else None
     return random.sample(cards, 15)
 
+
 # -----------------------------------------------------------------------------
 # 3. Streamlit UI
 # -----------------------------------------------------------------------------
@@ -107,54 +128,75 @@ st.set_page_config(page_title="MTG Draft Assistant", page_icon="🃏")
 
 st.title("🃏 MTG Draft Assistant")
 
-# ---------------- Sidebar -----------------------------------------------------
+# -------- Sidebar ------------------------------------------------------------
 
 with st.sidebar:
     st.header("Draft setup")
 
     supported_sets = get_supported_sets()
 
-    if supported_sets:
-        set_code = st.radio("Choose a set to draft", supported_sets, index=0)
-    else:
-        st.warning(
-            "*supported_sets.txt* not found or empty. Using free-text input instead.",
-            icon="⚠️",
-        )
-        set_code = st.text_input("Set code", value="WOE")
-
-    if st.button("Start new draft", type="primary"):
-        st.session_state["pack"] = generate_booster(set_code)
-        st.session_state["picks"] = []
+    # Hide control in an expander (collapsed by default)
+    with st.expander("Set selection", expanded=False):
+        if supported_sets:
+            set_code = st.radio("Choose a set to draft", supported_sets, index=0)
+        else:
+            st.warning(
+                "*supported_sets.txt* not found or empty. Using free‑text input instead.",
+                icon="⚠️",
+            )
+            set_code = st.text_input("Set code", value="WOE")
+
+        if st.button("Start new draft", type="primary"):
+            st.session_state["pack"] = generate_booster(set_code)
+            st.session_state["picks"] = []
 
-# ---------------- Session state guards ---------------------------------------
+# -------- Session state ------------------------------------------------------
 
 st.session_state.setdefault("pack", [])
 st.session_state.setdefault("picks", [])
 
-if not st.session_state["pack"]:
-    st.info("Choose **Start new draft** in the sidebar to open pack 1.")
-    st.stop()
+# -------- Main content organised in tabs ------------------------------------
 
-pack: List[Dict] = st.session_state["pack"]
-picks: List[Dict] = st.session_state["picks"]
+tabs = st.tabs(["Draft", "Card rankings"])
 
-st.subheader(f"Pack {len(picks) // 15 + 1} — Pick {len(picks) % 15 + 1}")
-suggested = suggest_pick(pack, picks)
+# --- Tab 1: Draft ------------------------------------------------------------
 
-st.success(f"**Model suggests:** {suggested['name']}")
-
-# Display current pack as a 5-column grid of card images
-cols = st.columns(5)
-for idx, card in enumerate(pack):
-    col = cols[idx % 5]
-    col.image(fetch_card_image(card["name"]), use_column_width=True)
-    if col.button(f"Pick {card['name']}", key=f"pick-{idx}"):
-        picks.append(card)
-        pack.remove(card)
-        if not pack:  # end of pack ⇒ open a fresh booster
-            st.session_state["pack"] = generate_booster(set_code)
-        st.experimental_rerun()
-
-with st.expander("Current picks", expanded=False):
-    st.write("\n".join([c["name"] for c in picks]))
+with tabs[0]:
+    if not st.session_state["pack"]:
+        st.info("Choose **Start new draft** in the sidebar to open pack 1.")
+    else:
+        pack: List[Dict] = st.session_state["pack"]
+        picks: List[Dict] = st.session_state["picks"]
+
+        st.subheader(f"Pack {len(picks) // 15 + 1} — Pick {len(picks) % 15 + 1}")
+        suggested = suggest_pick(pack, picks)
+        st.success(f"**Model suggests:** {suggested['name']}")
+
+        cols = st.columns(5)
+        for idx, card in enumerate(pack):
+            col = cols[idx % 5]
+            col.image(fetch_card_image(card["name"]), use_column_width=True)
+            if col.button(f"Pick {card['name']}", key=f"pick-{idx}"):
+                picks.append(card)
+                pack.remove(card)
+                if not pack:  # end of pack ⇒ open a fresh booster
+                    st.session_state["pack"] = generate_booster(set_code)
+                st.experimental_rerun()
+
+        with st.expander("Current picks", expanded=False):
+            st.write("\n".join([c["name"] for c in picks]))
+
+# --- Tab 2: Card rankings ----------------------------------------------------
+
+with tabs[1]:
+    st.header("Card rankings for set " + set_code)
+
+    if set_code:
+        ranking = rank_cards(set_code)
+        if ranking:
+            for idx, card in enumerate(ranking, start=1):
+                st.write(f"{idx}. {card['name']} — **{card['score']:.2f}**")
+        else:
+            st.info("No cards found for this set (or Scryfall unavailable).")
+    else:
+        st.info("Select a set in the sidebar to view rankings.")