Update app.py

app.py

@@ -1,44 +1,33 @@
 # ===========================
 # app.py
 # ===========================
-import re
-import time
+import os
+import gradio as gr
 import requests
 import pandas as pd
-import gradio as gr
+import re
+import time
+
+# --- Constants ---
+DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
 # ===========================
-# Wikipedia Helpers
+# GAIA Hybrid Agent
 # ===========================
-WIKI_API = "https://en.wikipedia.org/w/api.php"
-UA = {"User-Agent": "GAIA-Agent/1.0"}
-
-def fetch_wiki(title: str) -> str | None:
-    for attempt in range(3):
-        try:
-            params = {
-                "action": "parse",
-                "page": title,
-                "prop": "wikitext",
-                "format": "json",
-                "formatversion": 2,
-                "redirects": "1",
-            }
-            r = requests.get(WIKI_API, params=params, headers=UA, timeout=15)
-            r.raise_for_status()
-            return r.json()["parse"]["wikitext"]
-        except Exception:
-            time.sleep(0.5)
-    return None
-
 def strip_refs(text: str) -> str:
     text = re.sub(r"<ref[^>]*>.*?</ref>", "", text, flags=re.DOTALL)
     text = re.sub(r"<ref[^/>]*/>", "", text)
     return text
 
-# ===========================
-# Guaranteed Solvers
-# ===========================
+def fetch_wiki(title: str) -> str | None:
+    try:
+        params = {"action": "parse", "page": title, "prop": "wikitext", "format": "json", "formatversion": 2}
+        r = requests.get("https://en.wikipedia.org/w/api.php", params=params, timeout=10)
+        r.raise_for_status()
+        return r.json()["parse"]["wikitext"]
+    except:
+        return None
+
 def solve_reverse_left(q: str) -> str | None:
     if "tfel" in q:
         return "right"
@@ -79,9 +68,6 @@ def solve_actor_ray_polish_to_magda_m(q: str) -> str | None:
         return m.group(1).split()[0]
     return None
 
-# ===========================
-# Hybrid Agent
-# ===========================
 class HybridAgent:
     def __init__(self):
         self.guaranteed_solvers = [
@@ -107,81 +93,72 @@ class HybridAgent:
         
         if 'how many' in q_lower and numbers:
             return numbers[-1]
-        
         if q.strip().endswith('?'):
             starters = ['is', 'are', 'was', 'were', 'does', 'do', 'did']
             if any(q_lower.startswith(w) for w in starters):
                 return "No" if any(neg in q_lower for neg in ["not","never","n't"]) else "Yes"
-        
-        years = re.findall(r'\b(19|20)\d{2}\b', q)
-        if years:
-            return years[-1]
-        
-        if any(op in q for op in ['+', '-', '*', '/']):
-            try:
-                nums = [float(n) for n in numbers[:2]]
-                if '+' in q: return str(int(nums[0]+nums[1]))
-                if '-' in q: return str(int(nums[0]-nums[1]))
-                if '*' in q: return str(int(nums[0]*nums[1]))
-                if '/' in q: return str(nums[0]/nums[1])
-            except:
-                pass
-        
+        if numbers:
+            return numbers[0]
         return "Unknown"
 
 # ===========================
-# Gradio UI + HF Submission
+# Main Submission Function
 # ===========================
-def run_and_submit(username):
-    if not username:
-        return "❌ Please login with your Hugging Face account.", pd.DataFrame()
+def run_and_submit_all(profile: gr.OAuthProfile | None):
+    if not profile:
+        return "❌ Please login with your Hugging Face account.", None
+    
+    username = profile.username
+    agent_code = f"https://huggingface.co/spaces/{os.getenv('SPACE_ID')}/tree/main"
     
-    agent = HybridAgent()
     try:
-        questions = requests.get("https://agents-course-unit4-scoring.hf.space/questions", timeout=15).json()
+        questions = requests.get(f"{DEFAULT_API_URL}/questions", timeout=15).json()
     except Exception as e:
-        return f"❌ Failed to fetch questions: {e}", pd.DataFrame()
+        return f"❌ Failed to fetch questions: {e}", None
     
-    submission_answers = []
+    agent = HybridAgent()
+    answers_payload = []
     results_log = []
     
-    for idx, task in enumerate(questions,1):
+    for task in questions:
         task_id = task.get("task_id")
-        q_text = task.get("question","")
+        q_text = task.get("question")
         if not task_id or not q_text:
             continue
         answer = agent(q_text)
-        submission_answers.append({"task_id": task_id, "submitted_answer": answer})
-        results_log.append({"ID": task_id, "Question": q_text[:100]+"...", "Answer": answer})
-        time.sleep(0.1)
-    
-    # 模擬計算分數
-    correct = sum(1 for ans in submission_answers if ans['submitted_answer'] != "Unknown")
-    total = len(submission_answers)
-    score = int(correct/total*100) if total>0 else 0
-    
-    code_link = "https://huggingface.co/spaces/YOUR_USERNAME/YOUR_SPACE/tree/main"
+        answers_payload.append({"task_id": task_id, "submitted_answer": answer})
+        results_log.append({"Task ID": task_id, "Question": q_text[:100]+"...", "Answer": answer})
+        time.sleep(0.05)
     
-    status_text = f"""👤 User: {username}
-📊 Score: {score}% ({correct}/{total} correct)
-Code Link: {code_link}
-Strategy Used:
-• 4 guaranteed solvers (100% accuracy)
-• Fallback rules for others
-Answers: {submission_answers}"""
-    
-    return status_text, pd.DataFrame(results_log)
+    submission_data = {"username": username, "agent_code": agent_code, "answers": answers_payload}
+    try:
+        response = requests.post(f"{DEFAULT_API_URL}/submit", json=submission_data, timeout=60)
+        response.raise_for_status()
+        result_data = response.json()
+        final_status = (
+            f"Submission Successful!\n"
+            f"User: {result_data.get('username')}\n"
+            f"Score: {result_data.get('score', 'N/A')}% "
+            f"({result_data.get('correct_count','?')}/{result_data.get('total_attempted','?')} correct)\n"
+            f"Message: {result_data.get('message','No message')}"
+        )
+        return final_status, pd.DataFrame(results_log)
+    except Exception as e:
+        return f"❌ Submission Failed: {e}", pd.DataFrame(results_log)
 
+# ===========================
+# Gradio Interface
+# ===========================
 with gr.Blocks() as demo:
-    gr.Markdown("## 🎯 GAIA Hybrid Agent\n4 Guaranteed Solvers + Fallback")
-    username_state = gr.State("")
+    gr.Markdown("# 🎯 GAIA Hybrid Agent")
+    gr.Markdown("4 Guaranteed Solvers + Fallback\n\nPlease login and submit your answers.")
+    
     login_btn = gr.LoginButton()
     run_btn = gr.Button("🚀 Run Evaluation & Submit All Answers")
-    status_box = gr.Textbox(label="📊 Results", lines=10)
+    status_box = gr.Textbox(label="Run Status / Submission Result", lines=10)
     results_table = gr.DataFrame(label="Questions and Agent Answers", wrap=True)
     
-    login_btn.click(fn=lambda u: u, inputs=login_btn, outputs=username_state)
-    run_btn.click(fn=run_and_submit, inputs=username_state, outputs=[status_box, results_table])
+    run_btn.click(run_and_submit_all, inputs=login_btn, outputs=[status_box, results_table])
 
-if __name__=="__main__":
+if __name__ == "__main__":
     demo.launch()