Update app.py

app.py

@@ -1,164 +1,112 @@
-# ===========================
-# app.py
-# ===========================
 import os
 import gradio as gr
 import requests
 import pandas as pd
-import re
-import time
 
-# --- Constants ---
+# -------------------------
+# Constants
+# -------------------------
 DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
-# ===========================
-# GAIA Hybrid Agent
-# ===========================
-def strip_refs(text: str) -> str:
-    text = re.sub(r"<ref[^>]*>.*?</ref>", "", text, flags=re.DOTALL)
-    text = re.sub(r"<ref[^/>]*/>", "", text)
-    return text
-
-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"
-    return None
-
-def solve_not_commutative_subset(q: str) -> str | None:
-    if "table defining * on the set S" in q and "provide the 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" not in q or "Magda M" not in q:
-        return None
-    wt = fetch_wiki("Wszyscy kochają Romana")
-    if not wt:
-        return None
-    wt = strip_refs(wt)
-    actor = None
-    for line in wt.splitlines():
-        if line.strip().startswith(("*", "#")) and "[[" in line:
-            m = re.search(r"\[\[([^\|\]]+)", line)
-            if m and " " in m.group(1):
-                actor = m.group(1).strip()
-                break
-    if not actor:
-        return None
-    actor_wt = strip_refs(fetch_wiki(actor) or "")
-    role_line = next((line for line in actor_wt.splitlines() if "Magda M" in line), None)
-    if not role_line:
-        return None
-    m = re.search(r"(?:as|–|-)\s*([A-ZĄĆĘŁŃÓŚŹŻ][A-Za-zĄĆĘŁŃÓŚŹŻąćęłńóśźż\.\- ]+)", role_line)
-    if m:
-        return m.group(1).split()[0]
-    return None
-
-class HybridAgent:
+# -------------------------
+# Basic Agent Definition
+# -------------------------
+class BasicAgent:
+    """Your GAIA Agent logic can go here."""
     def __init__(self):
-        self.guaranteed_solvers = [
-            solve_reverse_left,
-            solve_not_commutative_subset,
-            solve_botany_vegetables,
-            solve_actor_ray_polish_to_magda_m,
-        ]
-    
+        print("BasicAgent initialized.")
+
     def __call__(self, question: str) -> str:
-        for solver in self.guaranteed_solvers:
-            try:
-                answer = solver(question)
-                if answer:
-                    return answer
-            except:
-                pass
-        return self._fallback_solver(question)
-    
-    def _fallback_solver(self, q: str) -> str:
-        q_lower = q.lower()
-        numbers = re.findall(r'\b\d+\b', q)
-        
-        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"
-        if numbers:
-            return numbers[0]
-        return "Unknown"
-
-# ===========================
-# Main Submission Function
-# ===========================
+        print(f"Agent received question (first 50 chars): {question[:50]}...")
+        # TODO: Replace with real agent logic
+        fixed_answer = "This is a default answer."
+        print(f"Agent returning fixed answer: {fixed_answer}")
+        return fixed_answer
+
+# -------------------------
+# Run & Submit Function
+# -------------------------
 def run_and_submit_all(profile: gr.OAuthProfile | None):
-    if not profile:
+    if profile is None:
         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"
-    
+    print(f"Logged in as: {username}")
+
+    space_id = os.getenv("SPACE_ID", "unknown-space")
+    agent_code = f"https://huggingface.co/spaces/{space_id}/tree/main"
+
+    # Instantiate Agent
+    agent = BasicAgent()
+
+    # Fetch questions
     try:
-        questions = requests.get(f"{DEFAULT_API_URL}/questions", timeout=15).json()
+        resp = requests.get(f"{DEFAULT_API_URL}/questions", timeout=15)
+        resp.raise_for_status()
+        questions = resp.json()
+        if not questions:
+            return "No questions fetched.", pd.DataFrame()
     except Exception as e:
-        return f"❌ Failed to fetch questions: {e}", None
-    
-    agent = HybridAgent()
-    answers_payload = []
+        return f"Error fetching questions: {e}", pd.DataFrame()
+
+    # Run Agent
     results_log = []
-    
-    for task in questions:
-        task_id = task.get("task_id")
-        q_text = task.get("question")
-        if not task_id or not q_text:
+    answers_payload = []
+    for q in questions:
+        task_id = q.get("task_id")
+        question_text = q.get("question")
+        if not task_id or question_text is None:
             continue
-        answer = agent(q_text)
+        try:
+            answer = agent(question_text)
+        except Exception as e:
+            answer = f"AGENT ERROR: {e}"
         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)
-    
-    submission_data = {"username": username, "agent_code": agent_code, "answers": answers_payload}
+        results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": answer})
+
+    # Submit answers
+    submission_data = {"username": username.strip(), "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')}"
+        resp = requests.post(f"{DEFAULT_API_URL}/submit", json=submission_data, timeout=60)
+        resp.raise_for_status()
+        result = resp.json()
+        status = (
+            f"✅ Submission Complete!\n"
+            f"User: {result.get('username')}\n"
+            f"Score: {result.get('score', 'N/A')}% "
+            f"({result.get('correct_count', '?')}/{result.get('total_attempted', '?')} correct)\n"
+            f"Message: {result.get('message', 'No message')}"
         )
-        return final_status, pd.DataFrame(results_log)
     except Exception as e:
-        return f"❌ Submission Failed: {e}", pd.DataFrame(results_log)
+        status = f"❌ Submission failed: {e}"
 
-# ===========================
+    return status, pd.DataFrame(results_log)
+
+# -------------------------
 # Gradio Interface
-# ===========================
+# -------------------------
 with gr.Blocks() as demo:
-    gr.Markdown("# 🎯 GAIA Hybrid Agent")
-    gr.Markdown("4 Guaranteed Solvers + Fallback\n\nPlease login and submit your answers.")
-    
+    gr.Markdown("# 🎯 GAIA Agent Evaluation")
+    gr.Markdown(
+        """
+        **Instructions:**
+        1. Log in with your Hugging Face account.
+        2. Click 'Run Evaluation & Submit All Answers' to fetch questions and submit your agent's answers.
+        """
+    )
+
+    user_state = gr.State()
     login_btn = gr.LoginButton()
     run_btn = gr.Button("🚀 Run Evaluation & Submit All Answers")
-    status_box = gr.Textbox(label="Run Status / Submission Result", lines=10)
+    status_box = gr.Textbox(label="Run Status / Submission Result", lines=5, interactive=False)
     results_table = gr.DataFrame(label="Questions and Agent Answers", wrap=True)
-    
-    run_btn.click(run_and_submit_all, inputs=login_btn, outputs=[status_box, results_table])
+
+    # Login event stores profile in user_state
+    login_btn.login(lambda profile: profile, outputs=user_state)
+
+    # Run button uses user_state as profile
+    run_btn.click(run_and_submit_all, inputs=user_state, outputs=[status_box, results_table])
 
 if __name__ == "__main__":
-    demo.launch()
+    print("Launching GAIA Agent Evaluation App...")
+    demo.launch(debug=True, share=False)