Update tools to use @tool decorator format

app.py

@@ -1,14 +1,9 @@
 from smolagents import CodeAgent, HfApiModel
 import yaml
-from tools import FinalAnswerTool, WeatherTool, DuckDuckGoSearchTool
+from tools import final_answer, get_weather, duck_duck_go_search
 from Gradio_UI import GradioUI
 import os
 
-# Initialize our tools
-final_answer = FinalAnswerTool()
-weather_tool = WeatherTool()
-search_tool = DuckDuckGoSearchTool()
-
 # Get the Hugging Face token from environment variable
 hf_token = os.getenv('HUGGINGFACE_TOKEN')
 if not hf_token:
@@ -30,8 +25,8 @@ agent = CodeAgent(
     model=model,
     tools=[
         final_answer,
-        search_tool,
-        weather_tool
+        duck_duck_go_search,
+        get_weather
     ],
     max_steps=6,
     verbosity_level=1,

tools/__init__.py

@@ -1,7 +1,7 @@
 """Tools for the agent."""
 
-from .final_answer import FinalAnswerTool
-from .weather import WeatherTool
-from .search import DuckDuckGoSearchTool
+from .final_answer import final_answer
+from .weather import get_weather
+from .search import duck_duck_go_search
 
-__all__ = ["FinalAnswerTool", "WeatherTool", "DuckDuckGoSearchTool"] 
+__all__ = ["final_answer", "get_weather", "duck_duck_go_search"] 

tools/final_answer.py

@@ -1,41 +1,9 @@
-from smolagents.tools import Tool
-from typing import Any, Optional
+from smolagents.tools import tool
 
-class FinalAnswerTool(Tool):
-    """Tool for providing a final answer to the user's query."""
-    
-    name = "final_answer"
-    description = "Use this tool to provide your final answer to the user's question."
-    output_type = "string"
-    inputs = {
-        "answer": {
-            "type": "string",
-            "description": "The final answer to provide to the user."
-        }
-    }
-    
-    def __call__(self, answer: str) -> str:
-        """
-        Provide a final answer to the user's query.
-        
-        Args:
-            answer: The final answer to provide to the user.
-            
-        Returns:
-            A confirmation message.
-        """
-        return answer
-
-    forward = __call__
-
-    def __str__(self) -> str:
-        return "final_answer"
-    
-    @property
-    def signature(self) -> str:
-        return "final_answer(answer: str) -> str"
-    
-    def argument_descriptions(self) -> dict:
-        return {
-            "answer": "The final answer to provide to the user."
-        }
+@tool
+def final_answer(answer: str) -> str:
+    """Use this tool to provide your final answer to the user's question.
+    Args:
+        answer: The final answer to provide to the user.
+    """
+    return answer

tools/search.py

@@ -1,61 +1,42 @@
-from smolagents.tools import Tool
+from smolagents.tools import tool
 import requests
 from typing import Any, List, Dict, Optional
 import json
 
-class DuckDuckGoSearchTool(Tool):
-    """Tool for searching the web using DuckDuckGo."""
-    
-    name = "duck_duck_go_search"
-    description = "Search the web for information using DuckDuckGo."
-    output_type = "string"
-    inputs = {
-        "query": {
-            "type": "string",
-            "description": "A string representing the search query."
+@tool
+def duck_duck_go_search(query: str) -> str:
+    """Search the web for information using DuckDuckGo.
+    Args:
+        query: A string representing the search query.
+    """
+    try:
+        # Using the DuckDuckGo API
+        url = "https://api.duckduckgo.com/"
+        params = {
+            'q': query,
+            'format': 'json',
+            'no_html': 1,
+            'skip_disambig': 1
         }
-    }
-    
-    def __call__(self, query: str) -> str:
-        """
-        Search the web for information using DuckDuckGo.
         
-        Args:
-            query: A string representing the search query.
-            
-        Returns:
-            A string with the search results.
-        """
-        try:
-            # Using the DuckDuckGo API
-            url = "https://api.duckduckgo.com/"
-            params = {
-                'q': query,
-                'format': 'json',
-                'no_html': 1,
-                'skip_disambig': 1
-            }
-            
-            response = requests.get(url, params=params)
-            data = response.json()
-            
-            results = []
-            
-            # Add the abstract if available
-            if data.get('Abstract'):
-                results.append(f"Abstract: {data['Abstract']}")
-            
-            # Add related topics
-            if data.get('RelatedTopics'):
-                for i, topic in enumerate(data['RelatedTopics'][:5]):  # Limit to 5 topics
-                    if 'Text' in topic:
-                        results.append(f"Result {i+1}: {topic['Text']}")
-            
-            if not results:
-                return f"No results found for query: {query}"
-            
-            return "\n\n".join(results)
-        except Exception as e:
-            return f"Error searching for {query}: {str(e)}" 
-
-    forward = __call__ 
+        response = requests.get(url, params=params)
+        data = response.json()
+        
+        results = []
+        
+        # Add the abstract if available
+        if data.get('Abstract'):
+            results.append(f"Abstract: {data['Abstract']}")
+        
+        # Add related topics
+        if data.get('RelatedTopics'):
+            for i, topic in enumerate(data['RelatedTopics'][:5]):  # Limit to 5 topics
+                if 'Text' in topic:
+                    results.append(f"Result {i+1}: {topic['Text']}")
+        
+        if not results:
+            return f"No results found for query: {query}"
+        
+        return "\n\n".join(results)
+    except Exception as e:
+        return f"Error searching for {query}: {str(e)}" 

tools/weather.py

@@ -1,151 +1,48 @@
-from smolagents.tools import Tool
+from smolagents.tools import tool
 import requests
 from typing import Any, Optional
 import os  # Added for accessing environment variables
 import re
 
-class WeatherTool(Tool):
-    """Tool for getting weather information for a location."""
-    
-    name = "get_weather"
-    description = "Get the current weather for a specified location."
-    output_type = "string"
-    inputs = {
-        "location": {
-            "type": "string",
-            "description": "A string representing a city (e.g., 'New York', 'Paris')."
-        }
-    }
-    
-    def __call__(self, location: str) -> str:
-        """
-        Get the current weather for a specified location.
-        
-        Args:
-            location: A string representing a city (e.g., 'New York', 'Paris').
-            
-        Returns:
-            A JSON blob with the current weather information in imperial units. The JSON blob should be formatted as a string. The response should be in the following format:                                      
-            {
-            "coord": {
-                "lon": 7.367,
-                "lat": 45.133
-            },
-            "weather": [
-                {
-                    "id": 501,
-                    "main": "Rain",
-                    "description": "moderate rain",
-                    "icon": "10d"
-                }
-            ],
-            "base": "stations",
-            "main": {
-                "temp": 284.2,
-                "feels_like": 282.93,
-                "temp_min": 283.06,
-                "temp_max": 286.82,
-                "pressure": 1021,
-                "humidity": 60,
-                "sea_level": 1021,
-                "grnd_level": 910
-            },
-            "visibility": 10000,
-            "wind": {
-                "speed": 4.09,
-                "deg": 121,
-                "gust": 3.47
-            },
-            "rain": {
-                "1h": 2.73
-            },
-            "clouds": {
-                "all": 83
-            },
-            "dt": 1726660758,
-            "sys": {
-                "type": 1,
-                "id": 6736,
-                "country": "IT",
-                "sunrise": 1726636384,
-                "sunset": 1726680975
-            },
-            "timezone": 7200,
-            "id": 3165523,
-            "name": "Province of Turin",
-            "cod": 200
-            }
+@tool
+def get_weather(location: str) -> str:
+    """Get the current weather for a specified location.
+    Args:
+        location: A string representing a city (e.g., 'New York', 'Paris').
+    """
+    # Validate that location contains only allowed characters: letters, digits, spaces, and hyphens
+    if not re.fullmatch(r'[A-Za-z0-9\s-]+', location):
+        return "Error: Location contains invalid characters. Only letters, digits, spaces, and hyphens are allowed. I cannot disambiguate between cities with the same name."
+    try:
+        # Get the API key from environment variables
+        api_key = os.getenv('OPENWEATHERMAP_API_KEY')
+        if not api_key:
+            return "Error: OPENWEATHERMAP_API_KEY not set in environment variables."
 
-            The definitions of the JSON keys are:
-                coord.lon Longitude of the location
-                coord.lat Latitude of the location
-                weather.id Weather condition id
-                weather.main Group of weather parameters (Rain, Snow, Clouds etc.)
-                weather.description Weather condition within the group. Please find more here. You can get the output in your language. Learn more
-                weather.icon Weather icon id
-                base Internal parameter
-                main.temp Temperature. Unit Default: Kelvin, Metric: Celsius, Imperial: Fahrenheit
-                main.feels_like Temperature. This temperature parameter accounts for the human perception of weather. Unit Default: Kelvin, Metric: Celsius, Imperial: Fahrenheit
-                main.pressure Atmospheric pressure on the sea level, hPa
-                main.humidity Humidity, %
-                main.temp_min Minimum temperature at the moment. This is minimal currently observed temperature (within large megalopolises and urban areas). Please find more info here. Unit Default: Kelvin, Metric: Celsius, Imperial: Fahrenheit
-                main.temp_max Maximum temperature at the moment. This is maximal currently observed temperature (within large megalopolises and urban areas). Please find more info here. Unit Default: Kelvin, Metric: Celsius, Imperial: Fahrenheit
-                main.sea_level Atmospheric pressure on the sea level, hPa
-                main.grnd_level Atmospheric pressure on the ground level, hPa
-                visibility Visibility, meter. The maximum value of the visibility is 10 km
-                wind.speed Wind speed. Unit Default: meter/sec, Metric: meter/sec, Imperial: miles/hour
-                wind.deg Wind direction, degrees (meteorological)
-                wind.gust Wind gust. Unit Default: meter/sec, Metric: meter/sec, Imperial: miles/hour
-                clouds.all Cloudiness, %
-                rain.1h(where available)Precipitation, mm/h. Please note that only mm/h as units of measurement are available for this parameter
-                snow.1h(where available) Precipitation, mm/h. Please note that only mm/h as units of measurement are available for this parameter
-                dt Time of data calculation, unix, UTC
-                sys.type Internal parameter
-                sys.id Internal parameter
-                sys.message Internal parameter
-                sys.country Country code (GB, JP etc.)
-                sys.sunrise Sunrise time, unix, UTC
-                sys.sunset Sunset time, unix, UTC
-                timezone Shift in seconds from UTC
-                id City ID. Please note that built-in geocoder functionality has been deprecated. Learn more here
-                name City name. Please note that built-in geocoder functionality has been deprecated. Learn more here
-                cod Internal parameter
-        """
-        # Validate that location contains only allowed characters: letters, digits, spaces, and hyphens
-        if not re.fullmatch(r'[A-Za-z0-9\s-]+', location):
-            return "Error: Location contains invalid characters. Only letters, digits, spaces, and hyphens are allowed. I cannot disambiguate between cities with the same name."
-        try:
-            # Get the API key from environment variables
-            api_key = os.getenv('OPENWEATHERMAP_API_KEY')
-            if not api_key:
-                return "Error: OPENWEATHERMAP_API_KEY not set in environment variables."
+        # First, geocode the location to get latitude and longitude
+        geo_url = f"http://api.openweathermap.org/geo/1.0/direct?q={location}&limit=1&appid={api_key}"
+        geo_response = requests.get(geo_url)
+        geo_data = geo_response.json()
+        if not geo_data:
+            return f"Error: Could not geocode location '{location}'."
+        lat = geo_data[0].get('lat')
+        lon = geo_data[0].get('lon')
+        if lat is None or lon is None:
+            return f"Error: Latitude or longitude not found for location '{location}'."
 
-            # First, geocode the location to get latitude and longitude
-            geo_url = f"http://api.openweathermap.org/geo/1.0/direct?q={location}&limit=1&appid={api_key}"
-            geo_response = requests.get(geo_url)
-            geo_data = geo_response.json()
-            if not geo_data:
-                return f"Error: Could not geocode location '{location}'."
-            lat = geo_data[0].get('lat')
-            lon = geo_data[0].get('lon')
-            if lat is None or lon is None:
-                return f"Error: Latitude or longitude not found for location '{location}'."
+        # Call the OpenWeatherMap weather API 2.5 endpoint
+        weather_url = f"https://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&appid={api_key}&units=imperial"
+        weather_response = requests.get(weather_url)
+        weather_data = weather_response.json()
 
-            # Call the OpenWeatherMap weather API 2.5 endpoint
-            weather_url = f"https://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&appid={api_key}&units=imperial"
-            weather_response = requests.get(weather_url)
-            weather_data = weather_response.json()
-
-            if weather_response.status_code == 200:
-                current = weather_data.get('current', {})
-                temp = current.get('temp', 'N/A')
-                weather_desc = current.get('weather', [{}])[0].get('description', 'N/A')
-                humidity = current.get('humidity', 'N/A')
-                wind_speed = current.get('wind_speed', 'N/A')
-                return f"The current weather in {location} is {temp}°C with {weather_desc}. Humidity: {humidity}%, Wind speed: {wind_speed} m/s."
-            else:
-                return f"Error fetching weather for {location}: {weather_data.get('message', 'Unknown error')}"
-        except Exception as e:
-            return f"Error fetching weather for {location}: {str(e)}"
-
-    forward = __call__ 
+        if weather_response.status_code == 200:
+            current = weather_data.get('current', {})
+            temp = current.get('temp', 'N/A')
+            weather_desc = current.get('weather', [{}])[0].get('description', 'N/A')
+            humidity = current.get('humidity', 'N/A')
+            wind_speed = current.get('wind_speed', 'N/A')
+            return f"The current weather in {location} is {temp}°C with {weather_desc}. Humidity: {humidity}%, Wind speed: {wind_speed} m/s."
+        else:
+            return f"Error fetching weather for {location}: {weather_data.get('message', 'Unknown error')}"
+    except Exception as e:
+        return f"Error fetching weather for {location}: {str(e)}"