Update app.py

app.py

@@ -8,7 +8,6 @@ from smolagents.models import OpenAIServerModel
 
 from tools import WikipediaTool, WikipediaSearchTool
 
-
 # Define the system prompt
 SYSTEM_PROMPT = """You are a general AI assistant. I will ask you a question.
 Report your thoughts, and finish your answer with the following template:
@@ -26,16 +25,27 @@ class PatchedOpenAIServerModel(OpenAIServerModel):
                 messages = [{"role": "system", "content": SYSTEM_PROMPT}] + messages
         else:
             raise TypeError("Expected 'messages' to be a list of message dicts")
-
         return super().generate(messages=messages, stop_sequences=stop_sequences, **kwargs)
 
 class MyAgent:
     def __init__(self):
-        self.model = PatchedOpenAIServerModel(model_id="gpt-4-turbo") #to be changed gpt-4
-        self.agent = CodeAgent(tools=[DuckDuckGoSearchTool(), WikipediaSearchTool(), WikipediaTool()], model=self.model)  #add a new tool 
-
-    def __call__(self, question: str) -> str:
-        return self.agent.run(question)
+        self.model = PatchedOpenAIServerModel(model_id="gpt-4-turbo")
+        self.agent = CodeAgent(tools=[
+            DuckDuckGoSearchTool(),
+            WikipediaSearchTool(),
+            WikipediaTool()
+        ], model=self.model)
+
+    def __call__(self, task: dict) -> str:
+        question_text = task.get("question", "")
+        
+        # Merge any code or attachment content if available
+        if "code" in task:
+            question_text += f"\n\nAttached code:\n{task['code']}"
+        elif "attachment" in task:
+            question_text += f"\n\nAttached content:\n{task['attachment']}"
+
+        return self.agent.run(question_text)
 
 def run_and_submit_all(profile: gr.OAuthProfile | None):
     space_id = os.getenv("SPACE_ID")
@@ -76,21 +86,32 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
     print(f"Running agent on {len(questions_data)} questions...")
     for item in questions_data:
         task_id = item.get("task_id")
-        question_text = item.get("question")
-        if not task_id or question_text is None:
+        if not task_id:
             continue
         try:
-            submitted_answer = agent(question_text)
+            submitted_answer = agent(item)
             answers_payload.append({"task_id": task_id, "submitted_answer": submitted_answer})
-            results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
+            results_log.append({
+                "Task ID": task_id,
+                "Question": item.get("question", ""),
+                "Submitted Answer": submitted_answer
+            })
         except Exception as e:
             error_msg = f"AGENT ERROR: {e}"
-            results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": error_msg})
+            results_log.append({
+                "Task ID": task_id,
+                "Question": item.get("question", ""),
+                "Submitted Answer": error_msg
+            })
 
     if not answers_payload:
         return "Agent did not produce any answers to submit.", pd.DataFrame(results_log)
 
-    submission_data = {"username": username.strip(), "agent_code": agent_code, "answers": answers_payload}
+    submission_data = {
+        "username": username.strip(),
+        "agent_code": agent_code,
+        "answers": answers_payload
+    }
     print(f"Submitting {len(answers_payload)} answers to: {submit_url}")
     try:
         response = requests.post(submit_url, json=submission_data, timeout=60)