Update app.py

app.py

@@ -1,309 +1,45 @@
-from smolagents import CodeAgent,DuckDuckGoSearchTool, HfApiModel,load_tool,tool
-import datetime
-import requests
-import pytz
+from smolagents import CodeAgent, DuckDuckGoSearchTool, HfApiModel, load_tool
 import yaml
 import os
 from dotenv import load_dotenv
 from tools.final_answer import FinalAnswerTool
-import wikipediaapi
-from newsapi import NewsApiClient
-from forex_python.converter import CurrencyRates
-import sympy
-import random
-import string
+from tools.weather_tool import get_weather
+from tools.currency_tool import convert_currency
+from tools.news_tool import get_news_headlines
+from tools.wikipedia_tool import get_wikipedia_summary
+from tools.math_tool import solve_math_expression
+from tools.password_tool import generate_password
+from tools.time_tool import get_current_time_in_timezone
+from tools.web_search import DuckDuckGoSearchTool
+from tools.visit_webpage import VisitWebpageTool
 from Gradio_UI import GradioUI
 
 # Load environment variables
 load_dotenv()
 
-# Below is an example of a tool that does nothing. Amaze us with your creativity !
-@tool
-def my_custom_tool(arg1:str, arg2:int)-> str: #it's import to specify the return type
-    #Keep this format for the description / args / args description but feel free to modify the tool
-    """A tool that does nothing yet 
-    Args:
-        arg1: the first argument
-        arg2: the second argument
-    """
-    return "What magic will you build ?"
-
-@tool
-def get_current_time_in_timezone(timezone: str) -> str:
-    """A tool that fetches the current local time in a specified timezone.
-    Args:
-        timezone: A string representing a valid timezone (e.g., 'America/New_York').
-    """
-    try:
-        # Create timezone object
-        tz = pytz.timezone(timezone)
-        # Get current time in that timezone
-        local_time = datetime.datetime.now(tz).strftime("%Y-%m-%d %H:%M:%S")
-        return f"The current local time in {timezone} is: {local_time}"
-    except Exception as e:
-        return f"Error fetching time for timezone '{timezone}': {str(e)}"
-
-@tool
-def get_weather(city: str) -> str:
-    """Get current weather information for a specified city
-    Args:
-        city: Name of the city to get weather for
-    """
-    # Using OpenWeatherMap API
-    API_KEY = os.getenv("OPENWEATHERMAP_API_KEY")
-    if not API_KEY:
-        return "Error: OpenWeatherMap API key not found in environment variables"
-    
-    base_url = "http://api.openweathermap.org/data/2.5/weather"
-    
-    try:
-        params = {
-            'q': city,
-            'appid': API_KEY,
-            'units': 'metric'  # For Celsius
-        }
-        response = requests.get(base_url, params=params)
-        data = response.json()
-        
-        if response.status_code == 200:
-            temp = data['main']['temp']
-            humidity = data['main']['humidity']
-            description = data['weather'][0]['description']
-            return f"Weather in {city}: Temperature: {temp}°C, Humidity: {humidity}%, Conditions: {description}"
-        else:
-            return f"Error getting weather: {data.get('message', 'Unknown error')}"
-    except Exception as e:
-        return f"Error: {str(e)}"
-
-@tool
-def convert_currency(amount: float, from_currency: str, to_currency: str) -> str:
-    """Convert an amount from one currency to another
-    Args:
-        amount: Amount to convert
-        from_currency: Source currency code (e.g., USD)
-        to_currency: Target currency code (e.g., EUR)
-    """
-    try:
-        # Using ExchangeRate-API
-        base_url = "https://api.exchangerate-api.com/v4/latest"
-        
-        # Get exchange rates for the base currency
-        response = requests.get(f"{base_url}/{from_currency.upper()}")
-        data = response.json()
-        
-        if response.status_code == 200:
-            # Get the exchange rate for the target currency
-            if to_currency.upper() in data['rates']:
-                rate = data['rates'][to_currency.upper()]
-                converted_amount = amount * rate
-                return f"{amount} {from_currency.upper()} = {converted_amount:.2f} {to_currency.upper()} (Rate: 1 {from_currency.upper()} = {rate:.4f} {to_currency.upper()})"
-            else:
-                return f"Error: Target currency {to_currency.upper()} not found"
-        else:
-            return f"Error: {data.get('error', 'Failed to fetch exchange rates')}"
-    except Exception as e:
-        return f"Error converting currency: {str(e)}"
-
-@tool
-def get_news_headlines(topic: str, count: int = 5) -> str:
-    """Get latest news headlines for a specific topic
-    Args:
-        topic: Topic to search news for
-        count: Number of headlines to return (default: 5)
-    """
-    API_KEY = os.getenv("NEWSAPI_KEY")
-    if not API_KEY:
-        return "Error: NewsAPI key not found in environment variables"
-        
-    newsapi = NewsApiClient(api_key=API_KEY)
-    
-    try:
-        # Define search strategies with different parameters
-        search_strategies = [
-            {
-                'query': f'"{topic}"',  # Exact phrase match
-                'relevance': 'high'
-            },
-            {
-                'query': topic,  # Normal search
-                'relevance': 'high'
-            },
-            {
-                'query': f"{topic} latest",  # Latest news
-                'relevance': 'medium'
-            }
-        ]
-        
-        relevant_articles = []  # Store only relevant articles
-        seen_titles = set()
-        required_keywords = set(topic.lower().split())
-        
-        # Function to check article relevance
-        def is_relevant(article, required_words, relevance_level):
-            title = article['title'].lower()
-            description = (article.get('description') or '').lower()
-            content = (article.get('content') or '').lower()
-            
-            # Count how many required words appear in the article
-            title_matches = sum(1 for word in required_words if word in title)
-            desc_matches = sum(1 for word in required_words if word in description)
-            content_matches = sum(1 for word in required_words if word in content)
-            
-            # Calculate relevance score
-            total_score = (title_matches * 3) + (desc_matches * 2) + content_matches
-            
-            # For exact phrase matching
-            if relevance_level == 'high':
-                # Check if the exact topic phrase appears
-                if topic.lower() in title or topic.lower() in description:
-                    return True
-                return total_score >= len(required_words) * 2
-            else:
-                return total_score >= len(required_words)
-
-        for strategy in search_strategies:
-            if len(relevant_articles) >= count:
-                break
-                
-            # Calculate how many more articles we need
-            remaining_count = count - len(relevant_articles)
-            
-            try:
-                news = newsapi.get_everything(
-                    q=strategy['query'],
-                    language='en',
-                    sort_by='relevancy',  # Changed to relevancy sort
-                    page_size=min(50, remaining_count * 5)  # Request more articles to filter through
-                )
-                
-                if news['articles']:
-                    for article in news['articles']:
-                        # Skip if we've seen this title or have enough articles
-                        if article['title'] in seen_titles:
-                            continue
-                        
-                        # Check if article is relevant enough
-                        if is_relevant(article, required_keywords, strategy['relevance']):
-                            seen_titles.add(article['title'])
-                            pub_date = datetime.datetime.strptime(article['publishedAt'], '%Y-%m-%dT%H:%M:%SZ')
-                            relevant_articles.append({
-                                'title': article['title'],
-                                'source': article['source']['name'],
-                                'date': pub_date,
-                                'url': article['url'],
-                                'relevance': strategy['relevance']
-                            })
-                            
-                            # Break if we have enough relevant articles
-                            if len(relevant_articles) >= count:
-                                break
-            except Exception as e:
-                continue  # If one strategy fails, try the next one
-        
-        # Sort by date (newest first)
-        relevant_articles.sort(key=lambda x: x['date'], reverse=True)
-        
-        if relevant_articles:
-            headlines = []
-            for idx, article in enumerate(relevant_articles, 1):
-                date_str = article['date'].strftime('%Y-%m-%d %H:%M UTC')
-                relevance_indicator = "🎯" if article['relevance'] == 'high' else "✓"
-                headlines.append(f"{idx}. {relevance_indicator} [{date_str}] {article['title']} ({article['source']})")
-            
-            # Add a summary of how many relevant articles were found
-            found_count = len(relevant_articles)
-            summary = f"Found {found_count} relevant {'article' if found_count == 1 else 'articles'} out of {count} requested.\n\n"
-            return summary + "\n".join(headlines)
-            
-        return f"No relevant news found for topic: {topic}"
-    except Exception as e:
-        return f"Error fetching news: {str(e)}"
-
-@tool
-def get_wikipedia_summary(topic: str) -> str:
-    """Get a summary of a Wikipedia article
-    Args:
-        topic: Topic to get summary for
-    """
-    wiki = wikipediaapi.Wikipedia(
-        user_agent='HuggingFaceAgent/1.0 (https://huggingface.co/; contact@huggingface.co)',
-        language='en'
-    )
-    try:
-        page = wiki.page(topic)
-        if page.exists():
-            # Get first two sentences or first 500 characters, whichever is shorter
-            summary = page.summary[:500]
-            if len(summary) == 500:
-                summary = summary[:summary.rindex('.')] + '.'
-            return summary
-        return f"No Wikipedia article found for: {topic}"
-    except Exception as e:
-        return f"Error fetching Wikipedia summary: {str(e)}"
-
-@tool
-def solve_math_expression(expression: str) -> str:
-    """Solve a mathematical expression
-    Args:
-        expression: Mathematical expression as string
-    """
-    try:
-        # Convert string to sympy expression
-        expr = sympy.sympify(expression)
-        result = expr.evalf()
-        return f"Result: {result}"
-    except Exception as e:
-        return f"Error solving expression: {str(e)}"
-
-@tool
-def generate_password(length: int = 12, include_special: bool = True) -> str:
-    """Generate a secure random password
-    Args:
-        length: Length of password (default: 12)
-        include_special: Include special characters (default: True)
-    """
-    try:
-        if length < 8:
-            return "Password length must be at least 8 characters"
-        
-        chars = string.ascii_letters + string.digits
-        if include_special:
-            chars += string.punctuation
-            
-        password = ''.join(random.choice(chars) for _ in range(length))
-        
-        # Ensure password contains at least one of each required type
-        if not any(c.isupper() for c in password):
-            password = random.choice(string.ascii_uppercase) + password[1:]
-        if not any(c.islower() for c in password):
-            password = password[:-1] + random.choice(string.ascii_lowercase)
-        if not any(c.isdigit() for c in password):
-            pos = random.randint(1, len(password)-2)
-            password = password[:pos] + random.choice(string.digits) + password[pos+1:]
-            
-        return f"Generated password: {password}"
-    except Exception as e:
-        return f"Error generating password: {str(e)}"
-
-final_answer = FinalAnswerTool()
-
-# If the agent does not answer, the model is overloaded, please use another model or the following Hugging Face Endpoint that also contains qwen2.5 coder:
-# model_id='https://pflgm2locj2t89co.us-east-1.aws.endpoints.huggingface.cloud' 
-
+# Initialize the model
 model = HfApiModel(
-max_tokens=2096,
-temperature=0.5,
-model_id='https://pflgm2locj2t89co.us-east-1.aws.endpoints.huggingface.cloud',
-custom_role_conversions=None,
+    max_tokens=2096,
+    temperature=0.5,
+    model_id='https://pflgm2locj2t89co.us-east-1.aws.endpoints.huggingface.cloud',
+    custom_role_conversions=None,
 )
 
-
 # Import tool from Hub
 image_generation_tool = load_tool("agents-course/text-to-image", trust_remote_code=True)
 
+# Load prompt templates
 with open("prompts.yaml", 'r') as stream:
     prompt_templates = yaml.safe_load(stream)
+
+# Initialize final answer tool
+final_answer = FinalAnswerTool()
+
+# Initialize web tools
+web_search_tool = DuckDuckGoSearchTool(max_results=5)
+visit_webpage_tool = VisitWebpageTool()
     
+# Initialize the agent with all tools
 agent = CodeAgent(
     model=model,
     tools=[
@@ -314,7 +50,9 @@ agent = CodeAgent(
         get_wikipedia_summary,
         solve_math_expression,
         generate_password,
-        get_current_time_in_timezone
+        get_current_time_in_timezone,
+        web_search_tool,
+        visit_webpage_tool
     ],
     max_steps=6,
     verbosity_level=1,
@@ -325,5 +63,5 @@ agent = CodeAgent(
     prompt_templates=prompt_templates
 )
 
-
+# Launch the Gradio interface
 GradioUI(agent).launch()