Update app.py

app.py

@@ -14,9 +14,18 @@ def run_and_submit_all(profile):
     Fetch all questions, run the agent on them, submit all answers,
     and return the status and results table.
     """
-    if profile is None:
+    # Check login
+    if not profile:
         return "Please login to Hugging Face with the login button.", None
-    username = profile.username
+
+    # Extract username (support both .username and .name)
+    username = getattr(profile, "username", None) or getattr(profile, "name", None)
+    if not username:
+        return "Login error: username not found.", None
+
+    # Build URLs
+    questions_url = f"{DEFAULT_API_URL}/questions"
+    submit_url = f"{DEFAULT_API_URL}/submit"
 
     # Instantiate agent
     try:
@@ -24,40 +33,49 @@ def run_and_submit_all(profile):
     except Exception as e:
         return f"Error initializing agent: {e}", None
 
-    agent_code = f"https://huggingface.co/spaces/{os.getenv('SPACE_ID')}/tree/main"
-
     # Fetch questions
     try:
-        resp = requests.get(f"{DEFAULT_API_URL}/questions", timeout=15)
+        resp = requests.get(questions_url, timeout=15)
         resp.raise_for_status()
         questions = resp.json()
     except Exception as e:
         return f"Error fetching questions: {e}", None
 
-    if not questions:
-        return "No questions fetched.", None
-
-    # Run agent on each question
+    # Run agent
     results = []
-    payload = []
-    for item in questions:
-        task_id = item.get("task_id")
-        question_text = item.get("question")
-        if not task_id or question_text is None:
+    answers_payload = []
+    for q in questions:
+        tid = q.get("task_id")
+        text = q.get("question")
+        if not tid or not text:
             continue
         try:
-            ans = agent.run(question=question_text)
+            ans = agent.run(question=text)
         except Exception as e:
             ans = f"ERROR: {e}"
-        results.append({"Task ID": task_id, "Question": question_text, "Answer": ans})
-        payload.append({"task_id": task_id, "submitted_answer": ans})
+        results.append({
+            "Task ID": tid,
+            "Question": text,
+            "Answer": ans
+        })
+        answers_payload.append({
+            "task_id": tid,
+            "submitted_answer": ans
+        })
+
+    if not answers_payload:
+        return "Agent returned no answers.", pd.DataFrame(results)
 
     # Submit answers
-    submission = {"username": username, "agent_code": agent_code, "answers": payload}
+    payload = {
+        "username": username,
+        "agent_code": f"https://huggingface.co/spaces/{os.getenv('SPACE_ID')}/tree/main",
+        "answers": answers_payload
+    }
     try:
-        r = requests.post(f"{DEFAULT_API_URL}/submit", json=submission, timeout=60)
-        r.raise_for_status()
-        data = r.json()
+        resp = requests.post(submit_url, json=payload, timeout=60)
+        resp.raise_for_status()
+        data = resp.json()
         status = (
             f"Submission Successful!\n"
             f"User: {data.get('username')}\n"
@@ -72,17 +90,21 @@ def run_and_submit_all(profile):
 
 def test_random_question(profile):
     """
-    Fetch a random question and return the question and agent's answer.
+    Fetch a random GAIA question and return the agent's answer.
     """
-    if profile is None:
+    if not profile:
         return "Please login to Hugging Face with the login button.", ""
+
+    # Get question and run agent
     try:
         q = fetch_random_question()
+        question = q.get("question", "")
         agent = create_agent()
-        ans = agent.run(question=q.get("question", ""))
-        return q.get("question", ""), ans
+        answer = agent.run(question=question)
+        return question, answer
     except Exception as e:
-        return f"Error: {e}", ""
+        return f"Error during test: {e}", ""
+
 
 # --- Gradio Interface ---
 with gr.Blocks() as demo:
@@ -90,28 +112,25 @@ with gr.Blocks() as demo:
     gr.Markdown(
         """
         **Instructions:**
-        1. Clone this space and implement your agent logic in agent.py.
+        1. Clone this space and define your agent logic in `agent.py`.
         2. Log in with your Hugging Face account using the login button below.
-        3. Use the buttons to run evaluation or test a random question.
+        3. Use **Run Evaluation & Submit All Answers** or **Test Random Question**.
         """
     )
 
     login = gr.LoginButton()
-    state = gr.State(value=None)
-    # Store OAuthProfile in state when user logs in
-    login.click(fn=lambda profile: profile, inputs=[], outputs=[state])
 
-    run_all_btn = gr.Button("Run Evaluation & Submit All Answers")
-    test_btn = gr.Button("Test Random Question")
+    run_button = gr.Button("Run Evaluation & Submit All Answers")
+    test_button = gr.Button("Test Random Question")
 
     status_output = gr.Textbox(label="Status / Result", lines=5, interactive=False)
-    results_table = gr.DataFrame(label="Results Table", wrap=True)
+    results_table = gr.DataFrame(label="Full Results Table", wrap=True)
     question_box = gr.Textbox(label="Random Question", lines=3, interactive=False)
     answer_box = gr.Textbox(label="Agent Answer", lines=3, interactive=False)
 
-    run_all_btn.click(fn=run_and_submit_all, inputs=[state], outputs=[status_output, results_table])
-    test_btn.click(fn=test_random_question, inputs=[state], outputs=[question_box, answer_box])
+    # Wire the login component directly into the callbacks
+    run_button.click(fn=run_and_submit_all, inputs=[login], outputs=[status_output, results_table])
+    test_button.click(fn=test_random_question, inputs=[login], outputs=[question_box, answer_box])
 
 if __name__ == "__main__":
     demo.launch(debug=True, share=False)
-