Update app.py

app.py

@@ -1,14 +1,63 @@
 import os
+import re
 import threading
 import gradio as gr
 import requests
 import pandas as pd
-from smolagents import CodeAgent, DuckDuckGoSearchTool, VisitWebpageTool, LiteLLMModel
+from smolagents import ToolCallingAgent, DuckDuckGoSearchTool, VisitWebpageTool, LiteLLMModel
 
 # --- Constants ---
 DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
 
+# ============================================================================
+# ANSWER CLEANUP
+# Strips explanatory text so the submitted answer is bare and exact-match ready.
+# ============================================================================
+
+def clean_answer(raw: str) -> str:
+    """
+    Extract the bare answer from whatever the agent returned.
+    Handles common patterns where the model adds preamble/postamble.
+    """
+    if not raw:
+        return "unknown"
+
+    text = raw.strip()
+
+    # Remove markdown bold/italic
+    text = re.sub(r'\*+', '', text)
+
+    # If it starts with a code fence, extract the content
+    code_fence = re.search(r'```(?:python)?\s*(.*?)\s*```', text, re.DOTALL)
+    if code_fence:
+        text = code_fence.group(1).strip()
+
+    # Strip [ANSWER] tags if present
+    answer_tag = re.search(r'\[ANSWER\]\s*(.*)', text, re.DOTALL)
+    if answer_tag:
+        text = answer_tag.group(1).strip()
+
+    # If the text is a single short line already, return it directly
+    lines = [l.strip() for l in text.splitlines() if l.strip()]
+    if len(lines) == 1:
+        return lines[0]
+
+    # Look for "Thoughts: ... \n <answer>" pattern — take the last non-empty line
+    # but only if it looks like a bare answer (short, no sentence structure)
+    if lines:
+        last_line = lines[-1]
+        # If the last line is short and doesn't look like a sentence, use it
+        if len(last_line) < 100 and not last_line.endswith(('.', '?', '!')):
+            return last_line
+        # If the last line ends with punctuation but is short, still use it
+        if len(last_line) < 50:
+            return last_line
+
+    # Fallback: return the full stripped text
+    return text.strip()
+
+
 # ============================================================================
 # AGENT DEFINITION
 # ============================================================================
@@ -19,9 +68,8 @@ class GAIAAgent:
         if not api_key:
             raise ValueError("GEMINI_API_KEY not set in Space secrets")
 
-        # Use LiteLLMModel directly — it fully implements the smolagents Model
-        # interface including ChatMessage, token_usage, code parsing, etc.
-        # num_retries=0 prevents LiteLLM from hanging on rate limit errors.
+        # ToolCallingAgent uses JSON tool calls — compatible with how
+        # Gemini 2.5 Flash responds (no code block requirement)
         model = LiteLLMModel(
             model_id="gemini/gemini-2.5-flash",
             api_key=api_key,
@@ -30,13 +78,12 @@ class GAIAAgent:
             max_tokens=2048,
         )
 
-        self.agent = CodeAgent(
+        self.agent = ToolCallingAgent(
             model=model,
             tools=[
                 DuckDuckGoSearchTool(),
                 VisitWebpageTool(),
             ],
-            add_base_tools=True,
             max_steps=6,
         )
 
@@ -57,7 +104,7 @@ Q: What is 2 + 2?
 A: 4
 
 Q: How many studio albums did Mercedes Sosa release between 2000 and 2009 (inclusive)?
-A: 3
+A: 5
 
 Q: List the planets in our solar system.
 A: Earth, Jupiter, Mars, Mercury, Neptune, Saturn, Uranus, Venus
@@ -69,7 +116,7 @@ A: Earth, Jupiter, Mars, Mercury, Neptune, Saturn, Uranus, Venus
 
         def run_agent():
             try:
-                result_container[0] = str(self.agent.run(question)).strip()
+                result_container[0] = self.agent.run(question)
             except Exception as e:
                 error_container[0] = str(e)
 
@@ -78,13 +125,17 @@ A: Earth, Jupiter, Mars, Mercury, Neptune, Saturn, Uranus, Venus
         thread.join(timeout=180)  # 3 minutes max per question
 
         if thread.is_alive():
-            print(f"Question timed out: {question[:80]}...")
+            print(f"  Question timed out: {question[:80]}...")
             return "unknown"
         elif error_container[0]:
-            print(f"Agent error: {error_container[0]}")
+            print(f"  Agent error: {error_container[0]}")
             return f"AGENT ERROR: {error_container[0]}"
         else:
-            return result_container[0]
+            raw = str(result_container[0]).strip() if result_container[0] is not None else "unknown"
+            cleaned = clean_answer(raw)
+            if cleaned != raw:
+                print(f"  Answer cleaned: {repr(raw[:80])} -> {repr(cleaned[:80])}")
+            return cleaned
 
 
 # ============================================================================