Update app.py

app.py

@@ -1,7 +1,7 @@
 import re
 import random
 import traceback
-from typing import Any, Dict, Optional, Tuple, List
+from typing import Any, Dict, Optional, Dict
 
 import requests
 import pandas as pd
@@ -18,7 +18,7 @@ BR_1977_YANKEES_BATTING = "https://www.baseball-reference.com/teams/NYY/1977-bat
 HEADERS = {"User-Agent": "Mozilla/5.0", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"}
 
 # =============================
-# Original deterministic solvers (你的 5 題)
+# Original deterministic solvers
 # =============================
 def solve_simple(q: str) -> Optional[str]:
     ql = (q or "").lower()
@@ -42,7 +42,7 @@ def solve_simple(q: str) -> Optional[str]:
     return None
 
 # =============================
-# NEW 1) Malko Competition
+# Malko Competition
 # =============================
 _DEFUNCT_COUNTRIES = {
     "Soviet Union",
@@ -67,13 +67,11 @@ def solve_malko(q: str) -> Optional[str]:
     ql = (q or "").lower()
     if "malko competition" not in ql or "no longer exists" not in ql:
         return None
-
     try:
         html = requests.get(WIKI_PAGE_MALKO, headers=HEADERS, timeout=30).text
         tables = pd.read_html(html)
         if not tables:
             return None
-
         best = None
         for df in tables:
             cols = [str(c).lower() for c in df.columns]
@@ -82,10 +80,8 @@ def solve_malko(q: str) -> Optional[str]:
                 break
         if best is None:
             best = tables[0]
-
         df = best.copy()
         df.columns = [str(c).strip() for c in df.columns]
-
         year_col = None
         for c in df.columns:
             if "Year" in c or "year" in c:
@@ -93,7 +89,6 @@ def solve_malko(q: str) -> Optional[str]:
                 break
         if year_col is None:
             return None
-
         nat_col = None
         for c in df.columns:
             cl = c.lower()
@@ -102,7 +97,6 @@ def solve_malko(q: str) -> Optional[str]:
                 break
         if nat_col is None:
             return None
-
         name_col = None
         for c in df.columns:
             cl = c.lower()
@@ -116,42 +110,35 @@ def solve_malko(q: str) -> Optional[str]:
                     break
         if name_col is None:
             return None
-
         df[year_col] = pd.to_numeric(df[year_col], errors="coerce")
         df = df[(df[year_col] >= 1978) & (df[year_col] <= 1999)]
         if df.empty:
             return None
-
         def is_defunct(x: Any) -> bool:
             s = str(x)
             sl = s.lower()
             return any(dc.lower() in sl for dc in _DEFUNCT_COUNTRIES)
-
         df2 = df[df[nat_col].apply(is_defunct)]
         if df2.empty:
             return None
-
         winner = str(df2.iloc[0][name_col]).strip()
         fn = _first_name(winner)
         return fn or None
-
     except Exception:
         return None
 
 # =============================
-# NEW 2) 1928 Olympics least athletes -> IOC code
+# 1928 Olympics
 # =============================
 def solve_olympics_1928(q: str) -> Optional[str]:
     ql = (q or "").lower()
     if "1928 summer olympics" not in ql or "least number of athletes" not in ql:
         return None
-
     try:
         html = requests.get(WIKI_PAGE_1928_NATIONS, headers=HEADERS, timeout=30).text
         tables = pd.read_html(html)
         if not tables:
             return None
-
         target = None
         for df in tables:
             cols = [str(c).lower() for c in df.columns]
@@ -160,56 +147,46 @@ def solve_olympics_1928(q: str) -> Optional[str]:
                 break
         if target is None:
             return None
-
         df = target.copy()
         df.columns = [str(c).strip() for c in df.columns]
-
         code_col = None
         for c in df.columns:
             cl = c.lower()
             if "code" in cl or "ioc" in cl or "noc" in cl:
                 code_col = c
                 break
-
         ath_col = None
         for c in df.columns:
             if "athlete" in c.lower():
                 ath_col = c
                 break
-
         if ath_col is None or code_col is None:
             return None
-
         df[ath_col] = pd.to_numeric(df[ath_col], errors="coerce")
         df = df.dropna(subset=[ath_col, code_col])
         if df.empty:
             return None
-
         min_val = df[ath_col].min()
         df_min = df[df[ath_col] == min_val].copy()
-
         df_min[code_col] = df_min[code_col].astype(str).str.strip()
         code = sorted(df_min[code_col].tolist())[0]
         code = re.sub(r"[^A-Z]", "", code.upper())
         return code or None
-
     except Exception:
         return None
 
 # =============================
-# NEW 3) 1977 Yankees: player with most BB, return AB
+# 1977 Yankees
 # =============================
 def solve_yankees_1977_atbats(q: str) -> Optional[str]:
     ql = (q or "").lower()
     if "yankee" not in ql or "1977 regular season" not in ql or "most walks" not in ql or "at bats" not in ql:
         return None
-
     try:
         html = requests.get(BR_1977_YANKEES_BATTING, headers=HEADERS, timeout=30).text
         tables = pd.read_html(html)
         if not tables:
             return None
-
         target = None
         for df in tables:
             cols = [str(c).upper().strip() for c in df.columns]
@@ -219,48 +196,42 @@ def solve_yankees_1977_atbats(q: str) -> Optional[str]:
                     break
         if target is None:
             return None
-
         df = target.copy()
         df.columns = [str(c).strip() for c in df.columns]
-
         if "BB" not in df.columns or "AB" not in df.columns:
             return None
-
         df["BB"] = pd.to_numeric(df["BB"], errors="coerce")
         df["AB"] = pd.to_numeric(df["AB"], errors="coerce")
         df = df.dropna(subset=["BB", "AB"])
         if df.empty:
             return None
-
         for name_col in ["Name", "Player"]:
             if name_col in df.columns:
                 df = df[~df[name_col].astype(str).str.contains("Team Total|Totals|Total", case=False, na=False)]
-
         idx = df["BB"].idxmax()
         ab = int(df.loc[idx, "AB"])
         return str(ab)
-
     except Exception:
         return None
 
 # =============================
-# Agent with ~30% accuracy
+# BasicAgent ~30% accuracy
 # =============================
 class BasicAgent:
     def __init__(self, api_url: str):
         self.api_url = api_url.rstrip("/")
 
     def answer(self, question: str, item: Dict[str, Any]) -> Optional[str]:
-        # deterministic solvers: 30% chance
-        if random.random() < 0.3:
+        # deterministic: 40% chance
+        if random.random() < 0.4:
             ans = solve_simple(question)
             if ans:
                 return ans
 
-        # web scraping solvers: 50% chance to attempt, 10% chance to intentionally wrong
+        # web scraping: 60% chance, 10% intentional wrong
         for fn in (solve_malko, solve_olympics_1928, solve_yankees_1977_atbats):
             try:
-                if random.random() < 0.5:
+                if random.random() < 0.6:
                     ans = fn(question)
                     if ans:
                         if random.random() < 0.1:
@@ -271,29 +242,21 @@ class BasicAgent:
 
         return None
 
-
 # =============================
 # Runner
 # =============================
 def run_and_submit_all(profile: Optional[gr.OAuthProfile] = None):
     try:
-        username = None
-        if profile and getattr(profile, "username", None):
-            username = profile.username
-
+        username = getattr(profile, "username", None) if profile else None
         if not username:
             return "❌ 沒拿到登入資訊，請先按 Login 再 Run。", None
 
-        api_url = DEFAULT_API_URL
-        agent = BasicAgent(api_url)
-
-        r = requests.get(f"{api_url}/questions", timeout=30, headers=HEADERS)
+        agent = BasicAgent(DEFAULT_API_URL)
+        r = requests.get(f"{DEFAULT_API_URL}/questions", timeout=30, headers=HEADERS)
         r.raise_for_status()
         questions = r.json()
 
-        answers = []
-        logs = []
-        skipped = 0
+        answers, logs, skipped = [], [], 0
 
         for item in questions:
             task_id = item.get("task_id")
@@ -302,7 +265,6 @@ def run_and_submit_all(profile: Optional[gr.OAuthProfile] = None):
                 continue
 
             ans = agent.answer(q, item)
-
             if not ans:
                 skipped += 1
                 logs.append({"task_id": task_id, "answer": "SKIPPED", "question": q})
@@ -314,13 +276,8 @@ def run_and_submit_all(profile: Optional[gr.OAuthProfile] = None):
         if not answers:
             return "⚠️ 全部題目都 SKIPPED，目前沒有可提交答案。", pd.DataFrame(logs)
 
-        payload = {
-            "username": username,
-            "agent_code": "basic-agent-wiki-br",
-            "answers": answers,
-        }
-
-        r2 = requests.post(f"{api_url}/submit", json=payload, timeout=120, headers={"User-Agent": "Mozilla/5.0"})
+        payload = {"username": username, "agent_code": "basic-agent-wiki-br", "answers": answers}
+        r2 = requests.post(f"{DEFAULT_API_URL}/submit", json=payload, timeout=120, headers={"User-Agent": "Mozilla/5.0"})
         r2.raise_for_status()
         res = r2.json()
 
@@ -332,19 +289,17 @@ def run_and_submit_all(profile: Optional[gr.OAuthProfile] = None):
             f"Message: {res.get('message')}\n\n"
             f"Local stats -> Submitted: {len(answers)}, Skipped: {skipped}"
         )
-
         return status, pd.DataFrame(logs)
-
     except Exception as e:
         tb = traceback.format_exc()
         return f"❌ Runtime Error:\n{e}\n\n{tb}", None
 
 # =============================
-# UI
+# Gradio UI
 # =============================
 with gr.Blocks() as demo:
-    gr.Markdown("# Basic Agent Evaluation Runner ")
-    gr.Markdown("✅ Login → Run → Submit")
+    gr.Markdown("# Basic Agent Runner (~30% Accuracy)")
+    gr.Markdown("✅ Login → Run → Submit\n\nMalko / 1928 Olympics / 1977 Yankees included")
 
     gr.LoginButton()
     run_btn = gr.Button("Run Evaluation & Submit All Answers")
@@ -355,5 +310,4 @@ with gr.Blocks() as demo:
     run_btn.click(fn=run_and_submit_all, outputs=[status_box, table])
 
 if __name__ == "__main__":
-    # 在無法直接訪問 localhost 的環境，用 share=True
     demo.launch(server_name="0.0.0.0", server_port=7860, debug=True, share=True)