better tool handling

app.py

@@ -22,14 +22,10 @@ from tools import (
     math_calculation_tool,
     wiki_search_tool,
     python_repl_tool,
-    save_and_read_file_tool,
-    download_file_from_url_tool,
     extract_text_from_image_tool,
     analyze_csv_file_tool,
     analyze_excel_file_tool,
-    handle_file_tool,
-    download_gaia_file_tool,
-    download_file,
+    download_file_tool,
 )
 import re
 
@@ -52,13 +48,10 @@ tools = [
     code_execution_tool,
     math_calculation_tool,
     python_repl_tool,
-    save_and_read_file_tool,
-    download_file_from_url_tool,
+    download_file_tool,
     extract_text_from_image_tool,
     analyze_csv_file_tool,
     analyze_excel_file_tool,
-    handle_file_tool,
-    download_gaia_file_tool,
 ]
 chat_with_tools = llm.bind_tools(tools)
 
@@ -149,8 +142,10 @@ def assistant(state: MyAgent):
 You are a helpful assistant tasked with answering questions using a set of tools. 
 
 IMPORTANT: When a question mentions an attached file, follow this process:
-1. For GAIA files: Use download_gaia_file_tool with the task_id to download the file
-   (Alternative: use download_file_from_url_tool for other URLs, or handle_file_tool for flexible handling)
+1. Use download_file_tool with the task_id or URL to download the file
+   - For GAIA files: pass the task_id directly
+   - For other URLs: pass the full URL
+   - For content: pass the content to save as a file
 2. Use the appropriate analysis tool based on file type:
    - For images: use image_recognition_tool or extract_text_from_image_tool
    - For audio: use audio_processing_tool
@@ -158,8 +153,6 @@ IMPORTANT: When a question mentions an attached file, follow this process:
    - For text files: use read_file_tool
    - For code files: use python_execution_tool or code_execution_tool
 
-For intermediate steps, you can use save_and_read_file_tool to save content and then process it.
-
 Think step by step and report your answer with the following template: 
 FINAL ANSWER: [YOUR FINAL ANSWER]. 
 

tools.py

@@ -561,51 +561,6 @@ python_repl_tool = Tool(
 # --- New Tools ---
 
 
-def save_and_read_file(content: str, filename: str = "") -> str:
-    temp_dir = tempfile.gettempdir()
-    if filename == "":
-        temp_file = tempfile.NamedTemporaryFile(delete=False, dir=temp_dir)
-        filepath = temp_file.name
-    else:
-        filepath = os.path.join(temp_dir, filename)
-    with open(filepath, "w") as f:
-        f.write(content)
-    return f"File saved to {filepath}. You can read this file to process its contents."
-
-
-save_and_read_file_tool = Tool(
-    name="save_and_read_file_tool",
-    func=save_and_read_file,
-    description="Save content to a file and return the path. Optionally specify a filename."
-)
-
-
-def download_file_from_url(url: str, filename: str = "") -> str:
-    try:
-        if filename == "":
-            path = urlparse(url).path
-            filename = os.path.basename(path)
-            if not filename:
-                filename = f"downloaded_{uuid.uuid4().hex[:8]}"
-        temp_dir = tempfile.gettempdir()
-        filepath = os.path.join(temp_dir, filename)
-        response = requests.get(url, stream=True)
-        response.raise_for_status()
-        with open(filepath, "wb") as f:
-            for chunk in response.iter_content(chunk_size=8192):
-                f.write(chunk)
-        return f"File downloaded to {filepath}. You can read this file to process its contents."
-    except Exception as e:
-        return f"Error downloading file: {str(e)}"
-
-
-download_file_from_url_tool = Tool(
-    name="download_file_from_url_tool",
-    func=download_file_from_url,
-    description="Download a file from a URL and save it to a temporary location. Optionally specify a filename."
-)
-
-
 def extract_text_from_image(image_path: str) -> str:
     try:
         image = Image.open(image_path)
@@ -660,83 +615,83 @@ analyze_excel_file_tool = Tool(
 )
 
 # =========================
-# GAIA-Specific File Download Tool
+# Smart File Download Tool (Consolidated)
 # =========================
 
 
-def download_gaia_file(task_id: str, filename: str = None) -> str:
+def download_file_smart(file_source: str, filename: str = "") -> str:
     """
-    Download a file from the GAIA API using the task_id.
+    Smart file download tool that handles:
+    - GAIA files (using task_id)
+    - Regular URLs
+    - Content saving
 
     Args:
-        task_id: The task ID from the GAIA API
-        filename: Optional filename to save as (defaults to task_id)
+        file_source: task_id, URL, or content to save
+        filename: Optional filename (auto-generated if not provided)
     """
     try:
-        if not filename:
-            filename = f"gaia_file_{task_id}"
+        # Auto-detect the type of file_source
+        if file_source.startswith(('http://', 'https://')):
+            # Regular URL download
+            if filename == "":
+                path = urlparse(file_source).path
+                filename = os.path.basename(path)
+                if not filename:
+                    filename = f"downloaded_{uuid.uuid4().hex[:8]}"
 
-        # Use the correct GAIA API endpoint
-        api_url = "https://agents-course-unit4-scoring.hf.space"
-        file_url = f"{api_url}/files/{task_id}"
+            temp_dir = tempfile.gettempdir()
+            filepath = os.path.join(temp_dir, filename)
 
-        temp_dir = tempfile.gettempdir()
-        filepath = os.path.join(temp_dir, filename)
+            response = requests.get(file_source, stream=True, timeout=15)
+            response.raise_for_status()
 
-        response = requests.get(file_url, stream=True, timeout=15)
-        response.raise_for_status()
+            with open(filepath, "wb") as f:
+                for chunk in response.iter_content(chunk_size=8192):
+                    f.write(chunk)
 
-        with open(filepath, "wb") as f:
-            for chunk in response.iter_content(chunk_size=8192):
-                f.write(chunk)
+            return f"File downloaded to {filepath}. You can read this file to process its contents."
 
-        return f"GAIA file downloaded to {filepath}. You can read this file to process its contents."
-    except Exception as e:
-        return f"Error downloading GAIA file: {str(e)}"
+        elif len(file_source) == 36 and '-' in file_source:
+            # Likely a GAIA task_id (UUID format)
+            if filename == "":
+                filename = f"gaia_file_{file_source}"
 
+            api_url = "https://agents-course-unit4-scoring.hf.space"
+            file_url = f"{api_url}/files/{file_source}"
 
-download_gaia_file_tool = Tool(
-    name="download_gaia_file_tool",
-    func=download_gaia_file,
-    description="Download a file from the GAIA API using task_id. Use this specifically for GAIA benchmark files."
-)
+            temp_dir = tempfile.gettempdir()
+            filepath = os.path.join(temp_dir, filename)
 
-# =========================
-# Comprehensive File Handling Tool
-# =========================
+            response = requests.get(file_url, stream=True, timeout=15)
+            response.raise_for_status()
 
+            with open(filepath, "wb") as f:
+                for chunk in response.iter_content(chunk_size=8192):
+                    f.write(chunk)
 
-def handle_file(file_source: str, file_type: str = "auto") -> str:
-    """
-    Comprehensive file handling tool that can download from URL or save content.
+            return f"GAIA file downloaded to {filepath}. You can read this file to process its contents."
 
-    Args:
-        file_source: Either a URL to download from or content to save
-        file_type: "url" for downloading, "content" for saving, "auto" to detect
-    """
-    try:
-        if file_type == "auto":
-            # Auto-detect if it's a URL or content
-            if file_source.startswith(('http://', 'https://')):
-                file_type = "url"
-            else:
-                file_type = "content"
-
-        if file_type == "url":
-            # Download from URL
-            return download_file_from_url(file_source)
-        elif file_type == "content":
-            # Save content to file
-            return save_and_read_file(file_source)
         else:
-            return f"Invalid file_type: {file_type}. Use 'url', 'content', or 'auto'."
+            # Treat as content to save
+            if filename == "":
+                temp_file = tempfile.NamedTemporaryFile(
+                    delete=False, dir=tempfile.gettempdir())
+                filepath = temp_file.name
+            else:
+                filepath = os.path.join(tempfile.gettempdir(), filename)
+
+            with open(filepath, "w") as f:
+                f.write(file_source)
+
+            return f"Content saved to {filepath}. You can read this file to process its contents."
 
     except Exception as e:
         return f"Error handling file: {str(e)}"
 
 
-handle_file_tool = Tool(
-    name="handle_file_tool",
-    func=handle_file,
-    description="Comprehensive file handling: downloads from URL or saves content to file. Use 'url' for downloading, 'content' for saving, or 'auto' to detect."
+download_file_tool = Tool(
+    name="download_file_tool",
+    func=download_file_smart,
+    description="Smart file download tool: automatically detects if input is a GAIA task_id, URL, or content and handles accordingly. Use this for all file operations."
 )