Update app.py

app.py

@@ -1,8 +1,9 @@
+# app.py
 """
-app.py
 This script provides the Gradio web interface to run the evaluation.
-This version is simplified to work with the new agent architecture and has
-the correct Gradio wiring for the Hugging Face login functionality.
+## MODIFICATION: This version is simplified to work with the new agent architecture.
+It no longer performs file-type detection or prompt enhancement, as that responsibility
+has been moved into the agent's 'multimodal_router'.
 """
 
 import os
@@ -10,14 +11,16 @@ import re
 import gradio as gr
 import requests
 import pandas as pd
-from urllib.parse import urlparse
+# --- Import HumanMessage ---
+from langchain_core.messages import HumanMessage
 
 from agent import create_agent_executor
 
 # --- Constants ---
+# Ensure the URL is correctly formatted (remove trailing spaces)
 DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
-# --- Helper function to parse the agent's output ---
+# --- Helper function to parse the agent's output (remains the same) ---
 def parse_final_answer(agent_response: str) -> str:
     match = re.search(r"FINAL ANSWER:\s*(.*)", agent_response, re.IGNORECASE | re.DOTALL)
     if match: return match.group(1).strip()
@@ -25,6 +28,13 @@ def parse_final_answer(agent_response: str) -> str:
     if lines: return lines[-1].strip()
     return "Could not parse a final answer."
 
+## MODIFICATION: The `detect_file_type` function has been removed.
+## It is now redundant as this logic is handled inside the agent.
+
+## MODIFICATION: The `create_enhanced_prompt` function has been removed.
+## It was causing errors by trying to instruct the agent to use tools that no longer exist.
+## The agent is now responsible for handling the raw input itself.
+
 def run_and_submit_all(profile: gr.OAuthProfile | None):
     """
     Fetches all questions, runs the agent on them, submits all answers,
@@ -36,7 +46,17 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
     username = profile.username
     print(f"User logged in: {username}")
     
+    # --- Fix SPACE_ID retrieval and URL construction ---
+    # Ensure SPACE_ID environment variable is set correctly in your Hugging Face Space.
     space_id = os.getenv("SPACE_ID")
+    if not space_id:
+         # Fallback or error handling if SPACE_ID is not set
+         # You might need to adjust this based on how your space is configured
+         # For example, if running locally, you might not have SPACE_ID.
+         # This is a placeholder; adjust as needed.
+         # Consider using a default or making it configurable.
+         space_id = "your-username/your-space-name" # Example placeholder
+         print(f"Warning: SPACE_ID environment variable not found. Using placeholder: {space_id}")
     agent_code = f"https://huggingface.co/spaces/{space_id}/tree/main"
     questions_url = f"{DEFAULT_API_URL}/questions"
     submit_url = f"{DEFAULT_API_URL}/submit"
@@ -72,7 +92,8 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
         
         file_url = item.get("file_url")
         
-        # We simply combine the question and the URL into one string.
+        ## MODIFICATION: Prompt creation is now much simpler.
+        # We just combine the question and the URL into one string.
         # The agent's multimodal_router will handle the rest.
         if file_url:
             full_question_text = f"{question_text}\n\nHere is the relevant file: {file_url}"
@@ -83,7 +104,11 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
         print(f"Raw Prompt for Agent:\n{full_question_text}")
 
         try:
-            result = agent_executor.invoke({"messages": [("user", full_question_text)]})
+            # --- FIX: Pass a list of HumanMessage objects ---
+            # The agent expects MessagesState["messages"] to be a list of BaseMessage objects.
+            input_state = {"messages": [HumanMessage(content=full_question_text)]}
+            result = agent_executor.invoke(input_state)
+            
             raw_answer = result['messages'][-1].content
             submitted_answer = parse_final_answer(raw_answer)
             
@@ -91,7 +116,6 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
             print(f"PARSED FINAL ANSWER: '{submitted_answer}'")
 
             answers_payload.append({"task_id": task_id, "submitted_answer": submitted_answer})
-            # The log for the DataFrame no longer includes a 'File Type' column
             results_log.append({
                 "Task ID": task_id, 
                 "Question": question_text, 
@@ -113,7 +137,7 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
     if not answers_payload:
         return "Agent did not produce any answers to submit.", pd.DataFrame(results_log)
 
-    # 4. Prepare and 5. Submit
+    # 4. Prepare and 5. Submit (remains the same)
     submission_data = {"username": username, "agent_code": agent_code, "answers": answers_payload}
     print(f"\nSubmitting {len(answers_payload)} answers for user '{username}'...")
     try:
@@ -129,31 +153,34 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
         print(status_message)
         return status_message, pd.DataFrame(results_log)
 
-# --- Gradio UI ---
+# --- Gradio UI (remains largely the same) ---
 with gr.Blocks(title="Multimodal Agent Evaluation") as demo:
     gr.Markdown("# Multimodal Agent Evaluation Runner")
     gr.Markdown("This agent can process images, YouTube videos, audio files, and perform web searches.")
     
-    ## MODIFICATION: Assign the LoginButton to a variable so we can use it as an input.
-    login_button = gr.LoginButton()
-    
+    gr.LoginButton()
     run_button = gr.Button("Run Evaluation & Submit All Answers", variant="primary")
     status_output = gr.Textbox(label="Run Status / Submission Result", lines=6, interactive=False)
     results_table = gr.DataFrame(
         label="Questions and Agent Answers", 
         wrap=True, 
         row_count=10,
-        column_widths=[80, 250, 200, 250]
+        # MODIFICATION: Removed the 'File Type' column as it's no longer detected here.
+        # Adjust column widths if necessary based on actual content/columns
+        # column_widths=[80, 250, 200, 250] 
     )
     
-    ## MODIFICATION: Wire the login_button as an input to the click event.
-    # This correctly passes the OAuth profile to the run_and_submit_all function.
-    run_button.click(
-        fn=run_and_submit_all, 
-        inputs=login_button, 
-        outputs=[status_output, results_table]
-    )
+    # We also remove "File Type" from the results_log being displayed
+    # (Though it's not in the log anymore, this is a safe check)
+    def display_wrapper(profile):
+        status, df = run_and_submit_all(profile)
+        # Ensure df is a DataFrame before attempting operations
+        if isinstance(df, pd.DataFrame) and "File Type" in df.columns:
+            df = df.drop(columns=["File Type"])
+        return status, df
+
+    run_button.click(fn=display_wrapper, outputs=[status_output, results_table])
 
 if __name__ == "__main__":
     print("\n" + "-"*30 + " Multimodal App Starting " + "-"*30)
-    demo.launch()
+    demo.launch()