Update app.py

app.py

@@ -11,7 +11,7 @@ def update_scores(winner, loser, k_factor=100):
   loser -= score_difference
   return winner, loser
 
-def vote_startup(songs_df, previews_df):
+def vote_startup(songs_df):
   try:
     songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
   except:
@@ -31,7 +31,7 @@ def vote_startup(songs_df, previews_df):
       first_string = first_df["song_title"].tolist()[0]+" - "+first_df["artist"].tolist()[0]
       second_df = comparison_song
       second_string = second_df["song_title"]+" - "+second_df["artist"]
-      return f"Do you like '{artist} - {song_title}' better than '{comparison_song['artist']} - {comparison_song['song_title']}'?", first_string, second_string, display_rankings(songs_df), previews_df[previews_df["song_title"]==song_title].iloc[0]["preview_url"],previews_df[previews_df["song_title"]==comparison_song['song_title']].iloc[0]["preview_url"]
+      return f"Do you like '{artist} - {song_title}' better than '{comparison_song['artist']} - {comparison_song['song_title']}'?", first_string, second_string, display_rankings(songs_df)
   else:
       return "Add some songs to start voting!", "", "", display_rankings(songs_df)
 
@@ -55,7 +55,7 @@ def add_and_compare(artist, song_title, songs_df):
     return "", "", display_rankings(songs_df)
 
 # Function to update Elo ratings based on user's choice
-def update_ratings_pos(first_string, second_string, songs_df, previews_df):
+def update_ratings_pos(first_string, second_string, songs_df):
     try:
       songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
     except:
@@ -87,12 +87,12 @@ def update_ratings_pos(first_string, second_string, songs_df, previews_df):
         first_string = first_df["song_title"].tolist()[0]+" - "+first_df["artist"].tolist()[0]
         second_df = comparison_song
         second_string = second_df["song_title"]+" - "+second_df["artist"]
-        return f"Do you like '{artist} - {song_title}' better than '{comparison_song['artist']} - {comparison_song['song_title']}'?", first_string, second_string, display_rankings(songs_df), previews_df[previews_df["song_title"]==song_title].iloc[0]["preview_url"],previews_df[previews_df["song_title"]==comparison_song['song_title']].iloc[0]["preview_url"]
+        return f"Do you like '{artist} - {song_title}' better than '{comparison_song['artist']} - {comparison_song['song_title']}'?", first_string, second_string, display_rankings(songs_df)
     else:
         return "Add some songs to start voting!", "", "", display_rankings(songs_df)
 
 # Function to update Elo ratings based on user's choice
-def update_ratings_neg(first_string, second_string, songs_df, previews_df):
+def update_ratings_neg(first_string, second_string, songs_df):
     try:
       songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
     except:
@@ -125,7 +125,7 @@ def update_ratings_neg(first_string, second_string, songs_df, previews_df):
         first_string = first_df["song_title"].tolist()[0]+" - "+first_df["artist"].tolist()[0]
         second_df = comparison_song
         second_string = second_df["song_title"]+" - "+second_df["artist"]
-        return f"Do you like '{artist} - {song_title}' better than '{comparison_song['artist']} - {comparison_song['song_title']}'?", first_string, second_string, display_rankings(songs_df), previews_df[previews_df["song_title"]==song_title].iloc[0]["preview_url"],previews_df[previews_df["song_title"]==comparison_song['song_title']].iloc[0]["preview_url"]
+        return f"Do you like '{artist} - {song_title}' better than '{comparison_song['artist']} - {comparison_song['song_title']}'?", first_string, second_string, display_rankings(songs_df)
     else:
         return "Add some songs to start voting!", "", "", display_rankings(songs_df)
         
@@ -135,31 +135,25 @@ def display_rankings(songs_df=pd.DataFrame(columns=['elo_score', 'artist', 'song
   songs_df.to_csv("songs_df.csv")
   return songs_df
 
-def export_csv(songs_df, previews_df):
+def export_csv(songs_df):
     # Function to export DataFrame to CSV
     save_df = songs_df
-    save_df["preview_url"] = [previews_df[previews_df["artist"]==artist][previews_df["song_title"]==song_title].iloc[0]["preview_url"] for artist, song_title in zip(songs_df["artist"].tolist(),songs_df["song_title"].tolist())]
     save_df.to_csv("songs_df.csv")
     return "songs_df.csv"
 
-def import_csv(file, songs_df, previews_df):
+def import_csv(file, songs_df):
     if file is not None:
         #file_content = file.decode('utf-8')
         new_df = pd.read_csv(file)
         try:
             songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
-            previews_df = previews_df[["elo_score",	"artist",	"song_title", "preview_url"]]
         except:
             songs_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
-            previews_df = pd.DataFrame(columns=["elo_score",	"artist",	"song_title", "preview_url"])
-        new_df = new_df[["elo_score",	"artist",	"song_title", "preview_url"]]
-        previews_df = pd.concat([previews_df,new_df])
         new_df = new_df[["elo_score",	"artist",	"song_title"]]
         songs_df = pd.concat([songs_df,new_df])
 
     songs_df = songs_df.drop_duplicates(subset=['artist', 'song_title'])
-    previews_df = previews_df.drop_duplicates(subset=['artist', 'song_title'])
-    return songs_df, previews_df
+    return songs_df
 
     
 # Function to remove a song
@@ -250,13 +244,13 @@ with gr.Blocks(theme=theme) as app:
         
         # Import CSV file to replace the existing DataFrame
         import_button = gr.File(label="Import CSV", file_count="single")
-        import_button.change(fn=import_csv, inputs=[import_button, rankings, previews], outputs=[rankings, previews])
+        import_button.change(fn=import_csv, inputs=[import_button, rankings], outputs=[rankings])
 
         with gr.Column():
             # Export button to download the DataFrame as CSV
             export_link = gr.File(label="Download CSV", file_count="single")
             export_button = gr.Button("Export as CSV")
-            export_button.click(fn=export_csv, inputs=[rankings,previews], outputs=export_link)
+            export_button.click(fn=export_csv, inputs=[rankings], outputs=export_link)
         
     gr.Markdown("### Reset Data")
     with gr.Row():
@@ -266,8 +260,8 @@ with gr.Blocks(theme=theme) as app:
       clear_button.click(clear_rankings, inputs=[rankings], outputs=rankings)
         
     # add_button.click(add_and_compare, inputs=[artist_input, song_title_input, rankings], outputs=[artist_input, song_title_input, rankings])
-    yes_button.click(update_ratings_pos, inputs=[compare_index_1, compare_index_2, rankings, previews], outputs=[compare_output, compare_index_1, compare_index_2, rankings, first_song_audio, second_song_audio])
-    no_button.click(update_ratings_neg, inputs=[compare_index_1, compare_index_2, rankings, previews], outputs=[compare_output, compare_index_1, compare_index_2, rankings, first_song_audio, second_song_audio])
-    new_vote.click(vote_startup, inputs=[rankings, previews],outputs=[compare_output, compare_index_1, compare_index_2, rankings, first_song_audio, second_song_audio])
+    yes_button.click(update_ratings_pos, inputs=[compare_index_1, compare_index_2, rankings], outputs=[compare_output, compare_index_1, compare_index_2, rankings])
+    no_button.click(update_ratings_neg, inputs=[compare_index_1, compare_index_2, rankings], outputs=[compare_output, compare_index_1, compare_index_2, rankings])
+    new_vote.click(vote_startup, inputs=[rankings, previews],outputs=[compare_output, compare_index_1, compare_index_2, rankings])
 
 app.launch(share=False)