Update app.py

app.py

@@ -1,120 +1,42 @@
-import re
-import time
+import os
+import gradio as gr
 import requests
 import pandas as pd
-import gradio as gr
+from your_agent_code import HybridAgent  # <- 把 agent 先定義好
 
 DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
-# ===========================
-# Guaranteed Correct Solvers
-# ===========================
-def solve_reverse_left(q: str) -> str | None:
-    if "tfel" in q:
-        return "right"
-    return None
-
-def solve_not_commutative_subset(q: str) -> str | None:
-    if "table defining * on the set S" in q and "subset of S" in q:
-        return "b, e"
-    return None
-
-def solve_botany_vegetables(q: str) -> str | None:
-    if "professor of botany" in q and "botanical fruits" in q and "vegetables" in q:
-        return "broccoli, celery, fresh basil, lettuce, sweet potatoes"
-    return None
-
-def solve_actor_ray_polish_to_magda_m(q: str) -> str | None:
-    if "Polish-language version of Everybody Loves Raymond" in q and "Magda M" in q:
-        return "Ray"
-    return None
-
-# ===========================
-# Hybrid Agent
-# ===========================
-class HybridAgent:
-    def __init__(self):
-        self.guaranteed_solvers = [
-            solve_reverse_left,
-            solve_not_commutative_subset,
-            solve_botany_vegetables,
-            solve_actor_ray_polish_to_magda_m,
-        ]
-
-    def __call__(self, question: str) -> str:
-        # Try guaranteed solvers first
-        for solver in self.guaranteed_solvers:
-            answer = solver(question)
-            if answer:
-                return answer
-
-        # Fallback: simple rule-based
-        q_lower = question.lower()
-        if "how many" in q_lower:
-            numbers = re.findall(r'\b\d+\b', question)
-            return numbers[-1] if numbers else "2"
-        if question.strip().endswith("?"):
-            return "Yes" if "not" not in q_lower else "No"
-        return "Unknown"
-
-# ===========================
-# Main evaluation function
-# ===========================
-def run_and_submit(dummy_input=None):
-    try:
-        username = "local_user"
-        agent = HybridAgent()
-
-        # Fetch questions
-        try:
-            questions = requests.get(f"{DEFAULT_API_URL}/questions", timeout=15).json()
-        except Exception as e:
-            return f"❌ Failed to fetch questions: {e}", pd.DataFrame()
-
-        submission_answers = []
-        results_log = []
-
-        for task in questions:
-            task_id = task.get("task_id")
-            q_text = task.get("question", "")
-            answer = agent(q_text)
-            submission_answers.append({"task_id": task_id, "submitted_answer": answer})
-            results_log.append({
-                "ID": task_id,
-                "Question": q_text[:80] + ("..." if len(q_text) > 80 else ""),
-                "Answer": answer
-            })
-            time.sleep(0.2)  # 避免過快
-
-        # Submit answers
-        try:
-            data = {"username": username, "agent_code": "local_agent", "answers": submission_answers}
-            resp = requests.post(f"{DEFAULT_API_URL}/submit", json=data, timeout=60).json()
-            score = resp.get("score", 0)
-            correct = resp.get("correct_count", 0)
-            total = resp.get("total_attempted", 0)
-            status = f"👤 User: {username}\n📊 Score: {score}% ({correct}/{total} correct)"
-            return status, pd.DataFrame(results_log)
-        except Exception as e:
-            return f"❌ Submission failed: {e}", pd.DataFrame(results_log)
-
-    except Exception as e:
-        return f"❌ Unexpected error: {e}", pd.DataFrame()
-
-# ===========================
-# Gradio UI
-# ===========================
-with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("""
-    # 🎯 Hybrid GAIA Agent
-    4 Guaranteed Solvers + Fallback
-    """)
-
-    run_btn = gr.Button("🚀 Run Evaluation", variant="primary", size="lg")
-    status_box = gr.Textbox(label="📊 Results", lines=8, interactive=False)
-    results_table = gr.DataFrame(label="Questions & Answers", wrap=True)
-
-    run_btn.click(fn=run_and_submit, inputs=[], outputs=[status_box, results_table])
-
-if __name__ == "__main__":
-    demo.launch(debug=True)
+def run_and_submit_all(profile: gr.OAuthProfile | None):
+    if not profile or not profile.username:
+        return "❌ Please login first.", None
+    
+    agent = HybridAgent()
+    questions = requests.get(f"{DEFAULT_API_URL}/questions").json()
+    results_log = []
+    answers_payload = []
+
+    for task in questions:
+        task_id = task["task_id"]
+        q = task["question"]
+        answer = agent(q)
+        answers_payload.append({"task_id": task_id, "submitted_answer": answer})
+        results_log.append({"Task ID": task_id, "Question": q, "Answer": answer})
+
+    submission_data = {
+        "username": profile.username,
+        "agent_code": "https://huggingface.co/spaces/your-space/tree/main",
+        "answers": answers_payload,
+    }
+    resp = requests.post(f"{DEFAULT_API_URL}/submit", json=submission_data).json()
+    status = f"👤 {profile.username} Score: {resp.get('score')}%"
+    return status, pd.DataFrame(results_log)
+
+with gr.Blocks() as demo:
+    gr.Markdown("# Hybrid Agent Runner")
+    gr.LoginButton()
+    run_btn = gr.Button("Run Evaluation & Submit All Answers")
+    status = gr.Textbox()
+    table = gr.DataFrame()
+    run_btn.click(run_and_submit_all, outputs=[status, table])
+
+demo.launch()