Update app.py

app.py

@@ -1,20 +1,17 @@
-
 # This code was generated by generate_space_code.py
 # Add this to your Hugging Face Space to use your agent's answers
 
 # Import necessary libraries
-import gradio as gr
-import json
 import os
+import gradio as gr
 import requests
-from huggingface_hub import HfApi
 import pandas as pd
 
 # Your agent's answers
 ANSWERS = [
     {
         "task_id": "8e867cd7-cff9-4e6c-867a-ff5ddc2550be",
-        "submitted_answer": "According to Mercedes Sosa's discography on her English Wikipedia page, she published three studio albums between 2000 and 2009: \n1. Ac\u00fastico (2002)\n2. Coraz\u00f3n Libre (2005) \n3. Cantora 1 (2009)"
+        "submitted_answer": "According to Mercedes Sosa's discography on her English Wikipedia page, she published three studio albums between 2000 and 2009: \n1. Acústico (2002)\n2. Corazón Libre (2005) \n3. Cantora 1 (2009)"
     },
     {
         "task_id": "a1e91b78-d3d8-4675-bb8d-62741b4b68a6",
@@ -54,7 +51,7 @@ ANSWERS = [
     },
     {
         "task_id": "305ac316-eef6-4446-960a-92d80d542f82",
-        "submitted_answer": "Based on the limited information I was able to find from the provided search results, I do not have enough reliable evidence to determine if Bart\u0142omiej Kasprzykowski, the actor who played Roman in the Polish version of Everybody Loves Raymond, had a role in the series Magda M. I was unable to find any credible sources confirming his involvement in Magda M. or the name of a character he may have played. It's possible he did not appear in Magda M. at all. Without more definitive information, I do not have an answer to the question. I would need to do additional research in Polish-language sources or industry databases to have a chance of finding a reliable answer."
+        "submitted_answer": "Based on the limited information I was able to find from the provided search results, I do not have enough reliable evidence to determine if Bartłomiej Kasprzykowski, the actor who played Roman in the Polish version of Everybody Loves Raymond, had a role in the series Magda M. I was unable to find any credible sources confirming his involvement in Magda M. or the name of a character he may have played. It's possible he did not appear in Magda M. at all. Without more definitive information, I do not have an answer to the question. I would need to do additional research in Polish-language sources or industry databases to have a chance of finding a reliable answer."
     },
     {
         "task_id": "f918266a-b3e0-4914-865d-4faa564f1aef",
@@ -82,7 +79,7 @@ ANSWERS = [
     },
     {
         "task_id": "a0c07678-e491-4bbc-8f0b-07405144218f",
-        "submitted_answer": "Based on the information found in the provided search results, I do not have enough evidence to conclusively determine which specific pitchers have the uniform numbers before and after Taish\u014d Tamai as of July 2023. The search results confirm Tamai currently plays for the Hokkaido Nippon-Ham Fighters but do not specify his uniform number or the surrounding pitchers. Without this key piece of information, I cannot provide the requested before and after pitcher names. I would need to do additional research beyond these search results to find Tamai's 2023 uniform number in order to answer the question."
+        "submitted_answer": "Based on the information found in the provided search results, I do not have enough evidence to conclusively determine which specific pitchers have the uniform numbers before and after Taishō Tamai as of July 2023. The search results confirm Tamai currently plays for the Hokkaido Nippon-Ham Fighters but do not specify his uniform number or the surrounding pitchers. Without this key piece of information, I cannot provide the requested before and after pitcher names. I would need to do additional research beyond these search results to find Tamai's 2023 uniform number in order to answer the question."
     },
     {
         "task_id": "7bd855d8-463d-4ed5-93ca-5fe35145f733",
@@ -94,124 +91,111 @@ ANSWERS = [
     }
 ]
 
-def get_username():
-    """Get the username of the logged-in user"""
-    try:
-        # Try multiple methods to get the username
-        username = os.environ.get("SPACE_AUTHOR")
-        
-        # If that doesn't work, try using the HfApi
-        if not username:
-            try:
-                from huggingface_hub import HfApi
-                api = HfApi()
-                user_info = api.whoami()
-                username = user_info.get("name", None)
-            except:
-                pass
-                
-        return username
-    except:
-        return None
+# Constants
+DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
-def check_login_status():
-    """Check if the user is logged in"""
+def run_and_submit_all(profile: gr.OAuthProfile | None):
+    """
+    Fetches all questions, runs the agent on them, submits all answers,
+    and displays the results.
+    """
+    # --- Determine HF Space Runtime URL and Repo URL ---
+    space_id = os.getenv("SPACE_ID") # Get the SPACE_ID for sending link to the code
+    
+    if profile:
+        username = f"{profile.username}"
+        print(f"User logged in: {username}")
+    else:
+        print("User not logged in.")
+        return "Please Login to Hugging Face with the button.", None
+    
+    api_url = DEFAULT_API_URL
+    submit_url = f"{api_url}/submit"
+    
+    # In the case of an app running as a Hugging Face space, this link points toward your codebase
+    agent_code = f"https://huggingface.co/spaces/{space_id}/tree/main"
+    print(agent_code)
+    
+    # Prepare Submission
+    submission_data = {"username": username.strip(), "agent_code": agent_code, "answers": ANSWERS}
+    status_update = f"Submitting {len(ANSWERS)} answers for user '{username}'..."
+    print(status_update)
+    
+    # Submit
+    print(f"Submitting {len(ANSWERS)} answers to: {submit_url}")
     try:
-        # Try using HfApi directly
-        from huggingface_hub import HfApi
-        api = HfApi()
-        user_info = api.whoami()
-        username = user_info.get("name", None)
+        response = requests.post(submit_url, json=submission_data, timeout=60)
+        response.raise_for_status()
+        result_data = response.json()
         
-        if username:
-            return f"Logged in as {username}"
-        else:
-            return "Not logged in. Please log in to submit."
-    except Exception as e:
-        return f"Error checking login status: {str(e)}"
-
-def run_and_submit_all():
-    """Run the agent on all questions and submit the answers"""
-    try:
-        # Get username directly from HfApi
-        from huggingface_hub import HfApi
-        api = HfApi()
-        user_info = api.whoami()
-        username = user_info.get("name", None)
+        final_status = (
+            f"Submission Successful!\n"
+            f"User: {result_data.get('username')}\n"
+            f"Overall 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 received.')}"
+        )
         
-        if not username:
-            return "Please log in to submit your answers.", None
+        print("Submission successful.")
         
-        # Get the Space name
-        space_name = os.environ.get("SPACE_ID", "")
-        if not space_name:
-            # Try to get it from the URL if available
-            space_name = f"{username}/{os.environ.get('SPACE_TITLE', 'gaia-submission')}"
+        # Create a DataFrame for display
+        data = []
+        for item in result_data.get("data", []):
+            data.append({
+                "Task ID": item.get("task_id", ""),
+                "Question": item.get("question", ""),
+                "Your Answer": item.get("submitted_answer", ""),
+                "Correct": item.get("is_correct", False)
+            })
         
-    
-        # Create the code URL
-        code_url = f"https://huggingface.co/spaces/{space_name}/tree/main"
+        results_df = pd.DataFrame(data)
+        return final_status, results_df
+        
+    except requests.exceptions.HTTPError as e:
+        error_detail = f"Server responded with status {e.response.status_code}."
+        try:
+            error_json = e.response.json()
+            error_detail += f" Detail: {error_json.get('detail', e.response.text)}"
+        except requests.exceptions.JSONDecodeError:
+            error_detail += f" Response: {e.response.text[:500]}"
+        
+        status_message = f"Submission Failed: {error_detail}"
+        print(status_message)
+        return status_message, None
         
-        # Submit to the API
-        api_url = "https://agents-course-unit4-scoring.hf.space/submit"
-        payload = {
-            "username": username,
-            "agent_code": code_url,
-            "answers": ANSWERS
-        }
+    except requests.exceptions.Timeout:
+        status_message = "Submission Failed: The request timed out."
+        print(status_message)
+        return status_message, None
         
-        response = requests.post(api_url, json=payload)
+    except requests.exceptions.RequestException as e:
+        status_message = f"Submission Failed: Network error - {e}"
+        print(status_message)
+        return status_message, None
         
-        if response.status_code == 200:
-            result = response.json()
-            
-            # Create a DataFrame for display
-            data = []
-            for item in result.get("data", []):
-                data.append({
-                    "Task ID": item.get("task_id", ""),
-                    "Question": item.get("question", ""),
-                    "Your Answer": item.get("submitted_answer", ""),
-                    "Correct": item.get("is_correct", False)
-                })
-            
-            df = pd.DataFrame(data)
-            
-            # Calculate score
-            correct_count = sum(1 for item in result.get("data", []) if item.get("is_correct", False))
-            total_count = len(result.get("data", []))
-            score = (correct_count / total_count) * 100 if total_count > 0 else 0
-            
-            submission_result = f"Score: {score:.2f}% ({correct_count}/{total_count} correct)"
-            
-            return submission_result, df
-        else:
-            return f"Error: {response.status_code} - {response.text}", None
-            
     except Exception as e:
-        return f"Error: {str(e)}", None
+        status_message = f"An unexpected error occurred during submission: {e}"
+        print(status_message)
+        return status_message, None
 
 # Create the Gradio interface
 with gr.Blocks() as demo:
     gr.Markdown("# GAIA Benchmark Submission")
     gr.Markdown("This Space submits your agent's answers to the GAIA benchmark leaderboard.")
     
-    with gr.Row():
-        login_status = gr.Textbox(label="Login Status", value=check_login_status())
-        refresh_btn = gr.Button("Refresh Login Status")
+    gr.LoginButton()
     
-    with gr.Row():
-        submit_btn = gr.Button("Run and Submit All")
+    submit_btn = gr.Button("Run and Submit All")
     
-    with gr.Row():
-        result_text = gr.Textbox(label="Run Status / Submission Result")
+    result_text = gr.Textbox(label="Run Status / Submission Result", lines=5)
     
-    with gr.Row():
-        result_df = gr.Dataframe(label="Questions and Agent Answers")
+    result_df = gr.Dataframe(label="Questions and Agent Answers")
     
     # Set up event handlers
-    refresh_btn.click(check_login_status, inputs=[], outputs=[login_status])
-    submit_btn.click(run_and_submit_all, inputs=[], outputs=[result_text, result_df])
+    submit_btn.click(
+        fn=run_and_submit_all,
+        outputs=[result_text, result_df]
+    )
 
 # Launch the app
 if __name__ == "__main__":