Update app.py

app.py

@@ -1,69 +1,194 @@
-from smolagents import CodeAgent,DuckDuckGoSearchTool, HfApiModel,load_tool,tool
+# from smolagents import CodeAgent,DuckDuckGoSearchTool, HfApiModel,load_tool,tool
+# import datetime
+# import requests
+# import pytz
+# import yaml
+# from tools.final_answer import FinalAnswerTool
+
+# from Gradio_UI import GradioUI
+
+# # 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 countries_by_currency_and_language(currency: str, language: str) -> str:
+#     """
+#     Fetches countries that use a specified currency and speak a specified language via API.
+#     Uses targeted API calls to avoid fetching all countries unnecessarily.
+
+#     Args:
+#         currency: A 3-letter currency code (e.g., 'USD', 'EUR', 'NGN').
+#         language: A language name (e.g., 'English', 'French', 'Swahili').
+#     """
+#     import requests
+
+#     # Step 1: Fetch countries by currency
+#     try:
+#         currency_response = requests.get(f"https://restcountries.com/v3.1/currency/{currency.upper()}")
+#         currency_response.raise_for_status()
+#         currency_countries = currency_response.json()
+#     except requests.exceptions.RequestException as e:
+#         return f"Failed to fetch countries by currency: {str(e)}"
+
+#     # Step 2: Fetch countries by language
+#     try:
+#         language_response = requests.get(f"https://restcountries.com/v3.1/lang/{language.lower()}")
+#         language_response.raise_for_status()
+#         language_countries = language_response.json()
+#     except requests.exceptions.RequestException as e:
+#         return f"Failed to fetch countries by language: {str(e)}"
+
+#     # Step 3: Find intersection of countries (matches both currency and language)
+#     currency_set = {c["name"]["common"] for c in currency_countries}
+#     language_set = {c["name"]["common"] for c in language_countries}
+#     matches = list(currency_set & language_set)
+
+#     # Step 4: Return results
+#     if matches:
+#         return f"Countries using {currency.upper()} and speaking {language.capitalize()}: {', '.join(matches)}."
+#     else:
+#         return f"No countries found using {currency.upper()} and speaking {language.capitalize()}."
+
+# @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)}"
+
+
+# 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' 
+
+# model = HfApiModel(
+# max_tokens=2096,
+# temperature=0.5,
+# model_id='Qwen/Qwen2.5-Coder-32B-Instruct',# it is possible that this model may be overloaded
+# custom_role_conversions=None,
+# )
+
+
+# # Import tool from Hub
+# image_generation_tool = load_tool("agents-course/text-to-image", trust_remote_code=True)
+
+# with open("prompts.yaml", 'r') as stream:
+#     prompt_templates = yaml.safe_load(stream)
+    
+# agent = CodeAgent(
+#     model=model,
+#     tools=[final_answer], ## add your tools here (don't remove final answer)
+#     max_steps=6,
+#     verbosity_level=1,
+#     grammar=None,
+#     planning_interval=None,
+#     name=None,
+#     description=None,
+#     prompt_templates=prompt_templates
+# )
+
+
+# GradioUI(agent).launch()
+
+
+from smolagents import CodeAgent, DuckDuckGoSearchTool, HfApiModel, load_tool, tool
 import datetime
 import requests
 import pytz
 import yaml
 from tools.final_answer import FinalAnswerTool
-
 from Gradio_UI import GradioUI
 
-# Below is an example of a tool that does nothing. Amaze us with your creativity !
+# Custom Tools
 @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 ?"
+def countries_by_currency_and_language(currency: str, language: str) -> str:
+    """Fetches countries using specified currency and language."""
+    try:
+        # Fetch by currency
+        currency_response = requests.get(f"https://restcountries.com/v3.1/currency/{currency.upper()}")
+        currency_response.raise_for_status()
+        currency_countries = currency_response.json()
+        
+        # Fetch by language
+        language_response = requests.get(f"https://restcountries.com/v3.1/lang/{language.lower()}")
+        language_response.raise_for_status()
+        language_countries = language_response.json()
+        
+        # Find intersection
+        currency_set = {c["name"]["common"] for c in currency_countries}
+        language_set = {c["name"]["common"] for c in language_countries}
+        matches = list(currency_set & language_set)
+        
+        return f"Countries using {currency.upper()} and speaking {language.capitalize()}: {', '.join(matches)}." if matches else f"No matches found."
+    except Exception as e:
+        return f"Error: {str(e)}"
 
 @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').
-    """
+    """Returns current time in specified timezone."""
     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}"
+        return f"Current time in {timezone}: {local_time}"
     except Exception as e:
-        return f"Error fetching time for timezone '{timezone}': {str(e)}"
-
+        return f"Error: {str(e)}"
 
+# Initialize tools
 final_answer = FinalAnswerTool()
+image_generation_tool = load_tool("agents-course/text-to-image", trust_remote_code=True)
 
-# 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' 
-
-model = HfApiModel(
-max_tokens=2096,
-temperature=0.5,
-model_id='Qwen/Qwen2.5-Coder-32B-Instruct',# it is possible that this model may be overloaded
-custom_role_conversions=None,
-)
-
+# Model configuration with fallback
+try:
+    primary_model = HfApiModel(
+        max_tokens=2096,
+        temperature=0.5,
+        model_id='Qwen/Qwen2.5-Coder-32B-Instruct',
+        custom_role_conversions=None,
+    )
+except Exception:
+    primary_model = HfApiModel(
+        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 prompts
+try:
+    with open("prompts.yaml", 'r') as stream:
+        prompt_templates = yaml.safe_load(stream)
+except FileNotFoundError:
+    prompt_templates = None
+    print("Warning: prompts.yaml not found, using default prompts")
 
-with open("prompts.yaml", 'r') as stream:
-    prompt_templates = yaml.safe_load(stream)
-    
+# Create agent with all tools
 agent = CodeAgent(
-    model=model,
-    tools=[final_answer], ## add your tools here (don't remove final answer)
-    max_steps=6,
+    model=primary_model,
+    tools=[final_answer, countries_by_currency_and_language, 
+           get_current_time_in_timezone, image_generation_tool],
+    max_steps=10,  # Increased for more complex tasks
     verbosity_level=1,
-    grammar=None,
-    planning_interval=None,
-    name=None,
-    description=None,
     prompt_templates=prompt_templates
 )
 
-
+# Launch UI
 GradioUI(agent).launch()