Update app.py

app.py

@@ -223,61 +223,23 @@ class BasicAgent:
             # as a last resort, strip everything before the first colon
             return raw.split(':', 1)[-1].strip()
 
-    def __call__(self, question: str, task_id: str = "unknown") -> str:
-        # Parse question to get both text and file_url
-        try:
-            # First try to parse as JSON
-            if isinstance(question, str) and question.strip().startswith('{'):
-                question_data = json.loads(question)
-                state: AgentState = {
-                    "question": question_data.get("question", ""),
-                    "current_step": "answer",
-                    "final_answer": "",
-                    "history": [],
-                    "needs_search": False,
-                    "search_query": "",
-                    "task_id": task_id,
-                    "logs": {},
-                    "file_url": question_data.get("file_url", ""),
-                    "code_blocks": question_data.get("code_blocks", [])
-                }
-            else:
-                # If not JSON, treat as plain text question
-                state: AgentState = {
-                    "question": question,
-                    "current_step": "answer",
-                    "final_answer": "",
-                    "history": [],
-                    "needs_search": False,
-                    "search_query": "",
-                    "task_id": task_id,
-                    "logs": {},
-                    "file_url": "",
-                    "code_blocks": []
-                }
-            
-            print(f"\nProcessing task {task_id}")
-            print(f"Question: {state['question']}")
-            print(f"File URL: {state['file_url']}")
-            if state['file_url']:
-                print(f"Raw question data: {question}")
-            
-        except (json.JSONDecodeError, KeyError) as e:
-            print(f"Error parsing question data: {e}")
-            print(f"Raw question data: {question}")
-            # Fall back to treating as plain text
-            state: AgentState = {
-                "question": question,
-                "current_step": "answer",
-                "final_answer": "",
-                "history": [],
-                "needs_search": False,
-                "search_query": "",
-                "task_id": task_id,
-                "logs": {},
-                "file_url": "",
-                "code_blocks": []
-            }
+    def __call__(self, question: str, task_id: str = "unknown", file_url: str = "") -> str:
+        state: AgentState = {
+            "question": question,
+            "current_step": "answer",
+            "final_answer": "",
+            "history": [],
+            "needs_search": False,
+            "search_query": "",
+            "task_id": task_id,
+            "logs": {},
+            "file_url": file_url,
+            "code_blocks": []
+        }
+        
+        print(f"\nProcessing task {task_id}")
+        print(f"Question: {state['question']}")
+        print(f"File URL: {state['file_url']}")
         
         final_state = self.workflow.invoke(state)
         return final_state["final_answer"]
@@ -379,6 +341,7 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
     api_url = DEFAULT_API_URL
     questions_url = f"{api_url}/questions"
     submit_url = f"{api_url}/submit"
+    file_base_url = f"{api_url}/file"  # Base URL for file downloads
 
     # 1. Instantiate Agent
     try:
@@ -414,12 +377,22 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
 
         try:
             print(f"\nProcessing question {task_id}...")
-            answer = agent(item.get("question", ""), task_id)
+            
+            # Build file URL if file_name is present
+            file_name = item.get("file_name", "")
+            file_url = f"{file_base_url}/{file_name}" if file_name else ""
+            
+            # Call agent with question, task_id, and file_url
+            answer = agent(
+                question=item.get("question", ""),
+                task_id=task_id,
+                file_url=file_url
+            )
             
             # Add to results
             answers_payload.append({
                 "task_id": task_id,
-                "submitted_answer": answer  # Plain string, not JSON encoded
+                "submitted_answer": answer
             })
             results_log.append({
                 "Task ID": task_id,