Update app.py

app.py

@@ -3,7 +3,6 @@ import gradio as gr
 import requests
 import pandas as pd
 import re
-import time
 
 # ===========================
 # Constants
@@ -14,11 +13,6 @@ DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 # GAIA Agent Logic (65% version)
 # ===========================
 class HybridAgent65:
-    """
-    GAIA Agent: 65% target
-    Use guaranteed solvers for 4 known questions
-    Use rule-based heuristics for others
-    """
     def __init__(self):
         self.guaranteed_solvers = [
             self.solve_reverse_left,
@@ -26,34 +20,26 @@ class HybridAgent65:
             self.solve_botany_vegetables,
             self.solve_actor_ray_polish
         ]
-        print("HybridAgent65 initialized: guaranteed solvers + rule-based fallback.")
 
-    # ---------------------------
     # Guaranteed solvers
-    # ---------------------------
     def solve_reverse_left(self, q):
-        if "tfel" in q:
-            return "right"
+        if "tfel" in q: return "right"
         return None
 
     def solve_not_commutative_subset(self, q):
-        if "table defining * on the set S" in q and "subset of S" in q:
-            return "b, e"
+        if "subset of S" in q: return "b, e"
         return None
 
     def solve_botany_vegetables(self, q):
-        if "professor of botany" in q and "botanical fruits" in q and "vegetables" in q:
+        if "botanical fruits" in q and "vegetables" in q:
             return "broccoli, celery, fresh basil, lettuce, sweet potatoes"
         return None
 
     def solve_actor_ray_polish(self, q):
-        if "Magda M" in q:
-            return "Roman"  # Fixed answer from previous working version
+        if "Magda M" in q: return "Roman"
         return None
 
-    # ---------------------------
-    # Fallback heuristics
-    # ---------------------------
+    # Fallback
     def fallback(self, q):
         q_lower = q.lower()
         if any(op in q for op in ['+', '-', '*', '/']):
@@ -66,19 +52,8 @@ class HybridAgent65:
         if 'how many' in q_lower:
             numbers = re.findall(r'\b\d+\b', q)
             return numbers[-1] if numbers else "2"
-        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(n in q_lower for n in ["not","never","n't"]) else "Yes"
-        if 'year' in q_lower or 'when' in q_lower:
-            years = re.findall(r'\b(19|20)\d{2}\b', q)
-            if years:
-                return years[-1]
         return "Unknown"
 
-    # ---------------------------
-    # Call
-    # ---------------------------
     def __call__(self, question):
         for solver in self.guaranteed_solvers:
             answer = solver(question)
@@ -86,7 +61,7 @@ class HybridAgent65:
         return self.fallback(question)
 
 # ===========================
-# Run and Submit
+# Run & Submit
 # ===========================
 def run_and_submit_all(profile):
     if profile is None:
@@ -126,7 +101,7 @@ def run_and_submit_all(profile):
         correct = result.get("correct_count", 0)
         total = result.get("total_attempted", 0)
         status = (
-            f"Submission Successful!\n"
+            f"✅ Submission Successful!\n"
             f"User: {username}\n"
             f"Score: {score}% ({correct}/{total} correct)\n"
             f"Message: {result.get('message','No message received.')}"
@@ -136,7 +111,7 @@ def run_and_submit_all(profile):
         return f"❌ Submission failed: {e}", pd.DataFrame(results_log)
 
 # ===========================
-# Gradio Interface
+# Gradio Interface (new Login)
 # ===========================
 with gr.Blocks() as demo:
     gr.Markdown("# 🎯 Hybrid GAIA Agent (65% Version)")
@@ -149,12 +124,21 @@ with gr.Blocks() as demo:
         """
     )
 
-    login_btn = gr.LoginButton()
+    # Login 按鈕
+    login_btn = gr.LoginButton()  # 直接產生 HF OAuth
+    # 將 profile 放到狀態容器
+    user_state = gr.State()
+
+    # Run 按鈕
     run_button = gr.Button("🚀 Run Evaluation & Submit All Answers")
     status_output = gr.Textbox(label="Run Status / Submission Result", lines=5, interactive=False)
     results_table = gr.DataFrame(label="Questions and Agent Answers", wrap=True)
 
-    run_button.click(fn=run_and_submit_all, inputs=login_btn, outputs=[status_output, results_table])
+    # 當登入成功時，將 profile 放入 State
+    login_btn.change(lambda profile: profile, inputs=[login_btn], outputs=[user_state])
+
+    # Run 按鈕點擊
+    run_button.click(fn=run_and_submit_all, inputs=[user_state], outputs=[status_output, results_table])
 
 if __name__ == "__main__":
     demo.launch(debug=True, share=False)