Update app.py

app.py

@@ -10,16 +10,20 @@ from Gradio_UI import GradioUI
 
 @tool
 def my_cutom_tool(arg1: str, arg2: int) -> str:
-    """A tool that does nothing yet 
+    """A tool that does nothing yet.
+    
     Args:
-        arg1: the first argument
-        arg2: the second argument
+        arg1: the first argument.
+        arg2: the second argument.
+        
+    Returns:
+        A placeholder string.
     """
     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.
+    """Fetches the current local time in a specified timezone.
     
     Args:
         timezone: A string representing a valid timezone (e.g., 'America/New_York').
@@ -34,9 +38,15 @@ def get_current_time_in_timezone(timezone: str) -> str:
     except Exception as e:
         return f"Error fetching time for timezone '{timezone}': {str(e)}"
 
-# --- Helper functions for Spotify and environmental data ---
+# --- Helper function to fetch Spotify access token ---
 
-def fetch_spotify_access_token():
+def fetch_spotify_access_token() -> str:
+    """
+    Retrieves an access token from Spotify using the Client Credentials Flow.
+    
+    Returns:
+        A string containing the access token, or None if the request fails.
+    """
     url = "https://accounts.spotify.com/api/token"
     headers = {"Content-Type": "application/x-www-form-urlencoded"}
     data = {
@@ -45,115 +55,49 @@ def fetch_spotify_access_token():
         "client_secret": os.getenv("SPOTIFY_CLIENT_SECRET")
     }
     response = requests.post(url, headers=headers, data=data)
-    return response.json().get("access_token")
-
-def fetch_user_location_data():
-    url = "http://ip-api.com/json/"
-    response = requests.get(url)
     if response.status_code == 200:
-        data = response.json()
-        return data.get("city"), data.get("country"), data.get("timezone")
-    return None, None, None
-
-def fetch_weather_for_city(city: str):
-    WEATHER_API_KEY = os.getenv("WEATHER_API_KEY")
-    url = f"https://api.openweathermap.org/data/2.5/weather?q={city}&appid={WEATHER_API_KEY}&units=metric"
-    response = requests.get(url)
-    if response.status_code == 200:
-        data = response.json()
-        return data["weather"][0]["main"]
+        return response.json().get("access_token")
     return None
 
-def map_mood_to_params(mood: str, weather_condition: str = None) -> dict:
-    # Base mapping of mood words to Spotify's target parameters and seed genre
-    default_mappings = {
-        "happy": {"target_valence": 0.9, "target_energy": 0.8, "seed_genre": "pop"},
-        "sad": {"target_valence": 0.2, "target_energy": 0.3, "seed_genre": "acoustic"},
-        "energetic": {"target_valence": 0.7, "target_energy": 0.9, "seed_genre": "work-out"},
-        "chill": {"target_valence": 0.6, "target_energy": 0.4, "seed_genre": "chill"}
-    }
-    mapping = default_mappings.get(mood.lower(), {"target_valence": 0.5, "target_energy": 0.5, "seed_genre": "pop"})
-    
-    # Adjust parameters based on weather conditions if provided
-    if weather_condition:
-        weather = weather_condition.lower()
-        if weather in ["rain", "thunderstorm"]:
-            mapping["target_energy"] = max(mapping["target_energy"] - 0.2, 0.0)
-        elif weather in ["clear"]:
-            mapping["target_energy"] = min(mapping["target_energy"] + 0.1, 1.0)
-    return mapping
-
-# --- Environmental Tools ---
+# --- Mood Mapping Dictionary ---
+# This dictionary maps mood words to Spotify recommendation parameters.
+MOOD_MAPPING = {
+    "happy": {"target_valence": 0.9, "target_energy": 0.8, "seed_genres": ["pop"]},
+    "sad": {"target_valence": 0.2, "target_energy": 0.3, "seed_genres": ["acoustic"]},
+    "energetic": {"target_valence": 0.7, "target_energy": 0.9, "seed_genres": ["work-out"]},
+    "chill": {"target_valence": 0.6, "target_energy": 0.4, "seed_genres": ["chill"]}
+}
 
 @tool
-def get_user_location() -> str:
-    """Fetches the user's location using ip-api.com.
-    
-    Returns:
-        A string containing the city, country, and timezone, or an error message.
-    """
-    city, country, timezone = fetch_user_location_data()
-    if city and country and timezone:
-        return f"City: {city}, Country: {country}, Timezone: {timezone}"
-    return "Error fetching location."
-
-@tool
-def get_weather(city: str) -> str:
-    """Fetches weather data for a given city using OpenWeatherMap API.
-    
-    Args:
-        city: The name of the city.
-    
-    Returns:
-        A string describing the current weather in the specified city, or an error message.
-    """
-    weather = fetch_weather_for_city(city)
-    if weather:
-        return f"Current weather in {city} is {weather}."
-    return "Error fetching weather data."
-
-@tool
-def get_songs_by_mood(mood: str, local: bool = False) -> str:
-    """Fetches a playlist of songs that fits the user's mood using Spotify's Recommendations API.
+def get_songs_by_mood(mood: str) -> str:
+    """Fetches a playlist of songs based on a given mood using Spotify's Recommendations API.
     
     Args:
         mood: A string representing the desired mood (e.g., "happy", "sad", "energetic", "chill").
-        local: A boolean flag. If True, the tool fetches the user's location and current weather 
-               to adjust the mood mapping accordingly.
     
     Returns:
-        A string containing a playlist of songs (each on a new line) that matches the mood parameters.
+        A string containing a list of recommended songs, each on a new line in the format:
+        'Track Name - Artist Name'.
     
-    Additional Details:
-        Mood is expressed in terms of target_valence and target_energy (energy replaces arousal).
-        The tool internally maps mood words to corresponding Spotify parameters. For example:
-          - "happy": target_valence ~ 0.9, target_energy ~ 0.8, seed_genre "pop"
-          - "sad": target_valence ~ 0.2, target_energy ~ 0.3, seed_genre "acoustic"
-          - "energetic": target_valence ~ 0.7, target_energy ~ 0.9, seed_genre "work-out"
-          - "chill": target_valence ~ 0.6, target_energy ~ 0.4, seed_genre "chill"
-          
-        If 'local' is True, the tool uses the user's location and weather to adjust the mapping
-        (e.g., reducing energy on rainy days).
+    The function uses an internal mapping to convert the mood word into target parameters
+    (valence, energy) and a seed genre, then calls the Spotify Recommendations endpoint.
     """
-    weather_condition = None
-    if local:
-        city, country, timezone = fetch_user_location_data()
-        if not city:
-            return "Error: Unable to determine user location."
-        weather_condition = fetch_weather_for_city(city)
-    
-    mapping = map_mood_to_params(mood, weather_condition)
-    
+    # Retrieve Spotify access token
     access_token = fetch_spotify_access_token()
     if not access_token:
         return "Error: Unable to retrieve Spotify access token."
     
+    # Get mapping for the specified mood; use default if not found
+    mapping = MOOD_MAPPING.get(mood.lower(), {"target_valence": 0.5, "target_energy": 0.5, "seed_genres": ["pop"]})
+    
+    # Build parameters for the Spotify Recommendations API request
     params = {
-        "seed_genres": mapping["seed_genre"],
+        "seed_genres": ",".join(mapping["seed_genres"]),
         "target_valence": mapping["target_valence"],
         "target_energy": mapping["target_energy"],
         "limit": 10
     }
+    
     url = "https://api.spotify.com/v1/recommendations"
     headers = {"Authorization": f"Bearer {access_token}"}
     response = requests.get(url, headers=headers, params=params)
@@ -162,9 +106,14 @@ def get_songs_by_mood(mood: str, local: bool = False) -> str:
         tracks = response.json().get("tracks", [])
         if not tracks:
             return "No tracks found for the specified mood."
-        playlist = [f"{track['name']} - {track['artists'][0]['name']}" for track in tracks]
+        playlist = []
+        for track in tracks:
+            track_name = track.get("name")
+            artist_name = track.get("artists", [{}])[0].get("name", "Unknown")
+            playlist.append(f"{track_name} - {artist_name}")
         return "\n".join(playlist)
-    return f"Error: {response.json()}"
+    else:
+        return f"Error: {response.json()}"
 
 final_answer = FinalAnswerTool()
 model = HfApiModel(
@@ -174,10 +123,6 @@ model = HfApiModel(
     custom_role_conversions=None,
 )
 
-# Patch: Ensure last_input_token_count is initialized to 0 if not already set.
-if model.last_input_token_count is None:
-    model.last_input_token_count = 0
-
 # Import tool from Hub
 image_generation_tool = load_tool("agents-course/text-to-image", trust_remote_code=True)
 
@@ -190,8 +135,6 @@ agent = CodeAgent(
         final_answer,
         my_cutom_tool,
         get_current_time_in_timezone,
-        get_user_location,
-        get_weather,
         get_songs_by_mood
     ],
     max_steps=6,
@@ -203,4 +146,4 @@ agent = CodeAgent(
     prompt_templates=prompt_templates
 )
 
-GradioUI(agent).launch()
+GradioUI(agent).launch()