Update app.py

app.py

@@ -75,71 +75,71 @@ def find_the_song(arg1: str) -> str:
         search_tool = DuckDuckGoSearchTool()
         search_results = search_tool.use({"query": search_term})
 
-        return search_results
-    #     if search_results:
-    #         #Try extracting information from Genius or AZLyrics (prioritized)
-    #         if "genius.com" in search_results.lower():
-    #           try:
-    #               url = re.search(r'(https?://[^\s]+)', search_results).group(0) # Get the genius URL
-    #               response = requests.get(url)
-    #               soup = BeautifulSoup(response.content, 'html.parser') #html parser
-    #               song_title = soup.find("h1", class_="song_title").text.strip() if soup.find("h1", class_="song_title") else None #search song's name from specific h1 tag
-    #               artist = soup.find("a", class_="artist_name").text.strip() if soup.find("a", class_="artist_name") else None #same but for artist name
-    #               lyrics_div = soup.find("div", class_="lyrics") if soup.find("div", class_="lyrics") else soup.find("div", class_="Lyrics__Container") #finding lyrics tags (check them both if one is not available)
-    #               if lyrics_div:
-    #                 lyrics = lyrics_div.get_text(separator="\n").strip()
-    #               else:
-    #                   lyrics = None
-
-    #           except Exception as e:
-    #               return f"Error scraping Genius: {e}. Raw results: {search_results}"
-    #         elif "azlyrics.com" in search_results.lower():
-    #             try:
-    #                 url = re.search(r'(https?://[^\s]+)', search_results).group(0)  # Get the azlyrics URL
-    #                 response = requests.get(url)
-    #                 soup = BeautifulSoup(response.content, 'html.parser')
-    #                 lyrics_div = soup.find("div", class_="ringtone")  # Lyrics are inside a specific div
-    #                 if lyrics_div:
-    #                     lyrics = lyrics_div.find_next("div").get_text().strip() # Get the lyrics that are in the next div
-    #                     artist_element = soup.find('div', class_='lyricsh') # Find the tag of the lyrics
-    #                     artist = artist_element.find_next('b').text.split('lyrics')[0].strip() #parse the artist's name out
-    #                     song_title = soup.find('title').text.split(' - ')[0].strip() #same for name
-
-
-
-    #                 else:
-    #                     lyrics = None
-    #             except Exception as e:
-    #               return f"Error scraping AZLyrics: {e}. Raw results: {search_results}"
-
-    #         else:
-    #             return f"Could not find Genius or AZLyrics page, so couldn't extract lyrics. Raw results: {search_results}"
+        
+        if search_results:
+            #Try extracting information from Genius or AZLyrics (prioritized)
+            if "genius.com" in search_results.lower():
+              try:
+                  url = re.search(r'(https?://[^\s]+)', search_results).group(0) # Get the genius URL
+                  response = requests.get(url)
+                  soup = BeautifulSoup(response.content, 'html.parser') #html parser
+                  song_title = soup.find("h1", class_="song_title").text.strip() if soup.find("h1", class_="song_title") else None #search song's name from specific h1 tag
+                  artist = soup.find("a", class_="artist_name").text.strip() if soup.find("a", class_="artist_name") else None #same but for artist name
+                  lyrics_div = soup.find("div", class_="lyrics") if soup.find("div", class_="lyrics") else soup.find("div", class_="Lyrics__Container") #finding lyrics tags (check them both if one is not available)
+                  if lyrics_div:
+                    lyrics = lyrics_div.get_text(separator="\n").strip()
+                  else:
+                      lyrics = None
+
+              except Exception as e:
+                  return f"Error scraping Genius: {e}. Raw results: {search_results}"
+            elif "azlyrics.com" in search_results.lower():
+                try:
+                    url = re.search(r'(https?://[^\s]+)', search_results).group(0)  # Get the azlyrics URL
+                    response = requests.get(url)
+                    soup = BeautifulSoup(response.content, 'html.parser')
+                    lyrics_div = soup.find("div", class_="ringtone")  # Lyrics are inside a specific div
+                    if lyrics_div:
+                        lyrics = lyrics_div.find_next("div").get_text().strip() # Get the lyrics that are in the next div
+                        artist_element = soup.find('div', class_='lyricsh') # Find the tag of the lyrics
+                        artist = artist_element.find_next('b').text.split('lyrics')[0].strip() #parse the artist's name out
+                        song_title = soup.find('title').text.split(' - ')[0].strip() #same for name
+
+
+
+                    else:
+                        lyrics = None
+                except Exception as e:
+                  return f"Error scraping AZLyrics: {e}. Raw results: {search_results}"
+
+            else:
+                return f"Could not find Genius or AZLyrics page, so couldn't extract lyrics. Raw results: {search_results}"
 
             
-    #         if song_title is None or artist is None:
-    #             title_match = re.search(r"Title:\s*(.*)", search_results, re.IGNORECASE)
-    #             artist_match = re.search(r"Artist:\s*(.*)", search_results, re.IGNORECASE)
+            if song_title is None or artist is None:
+                title_match = re.search(r"Title:\s*(.*)", search_results, re.IGNORECASE)
+                artist_match = re.search(r"Artist:\s*(.*)", search_results, re.IGNORECASE)
 
-    #             song_title = title_match.group(1).strip() if title_match else None
-    #             artist = artist_match.group(1).strip() if artist_match else None
+                song_title = title_match.group(1).strip() if title_match else None
+                artist = artist_match.group(1).strip() if artist_match else None
 
             
 
             
-    #         if song_title and artist and lyrics and spotify_url:
-    #             return f"song name: {song_title} , by {artist} . the spotify url is : {spotify_url} \nthe lyrics are : {lyrics}" # return the song + lyrics
+            if song_title and artist and lyrics and spotify_url:
+                return f"song name: {song_title} , by {artist} . the spotify url is : {spotify_url} \nthe lyrics are : {lyrics}" # return the song + lyrics
 
 
             
-    #         if song_title and artist:
-    #             spotify_message = f"\n(Could not reliably extract Spotify URL)" if spotify_url is None else ""
-    #             lyrics_message =  f"\n(Could not reliably extract Lyrics)" if lyrics is None else ""
-    #             return f"Found song: {song_title} by {artist} . {spotify_message}{lyrics_message}. Raw results: {search_results}"
-    #         return f"Could not extract full information, check the search results:\n {search_results}" #in case it fails return the search result
+            if song_title and artist:
+                spotify_message = f"\n(Could not reliably extract Spotify URL)" if spotify_url is None else ""
+                lyrics_message =  f"\n(Could not reliably extract Lyrics)" if lyrics is None else ""
+                return f"Found song: {song_title} by {artist} . {spotify_message}{lyrics_message}. Raw results: {search_results}"
+            return f"Could not extract full information, check the search results:\n {search_results}" #in case it fails return the search result
 
 
-    #     else:
-    #         return "Could not find any songs matching the verse."
+        else:
+            return "Could not find any songs matching the verse."
 
     except Exception as e:
         return f"An error occurred: {e}"