Update app.py

app.py

@@ -11,180 +11,180 @@ def update_scores(winner, loser, k_factor=100):
   loser -= score_difference
   return winner, loser
 
-def vote_startup(songs_df):
+def vote_startup(opponents_df):
   try:
-    songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
+    opponents_df = opponents_df[["elo_score",	"descriptor",	"opponent"]]
   except:
-    songs_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
-  if len(songs_df)>0:
-      if len(songs_df)>10:
+    opponents_df = pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])
+  if len(opponents_df)>0:
+      if len(opponents_df)>10:
           slice_size = 4
-          slice = int(len(songs_df)/slice_size)
-          sample = songs_df[slice:(slice_size-1)*slice].sample(frac=1).iloc[0]
-          song_title, artist = sample["song_title"], sample["artist"]
+          slice = int(len(opponents_df)/slice_size)
+          sample = opponents_df[slice:(slice_size-1)*slice].sample(frac=1).iloc[0]
+          opponent, descriptor = sample["opponent"], sample["descriptor"]
       else:
-          sample = songs_df.sample(frac=1).iloc[0]
-          song_title, artist = sample["song_title"], sample["artist"]
-  if len(songs_df) > 1:
-      # Randomly select a song to compare with
-      sample = songs_df.sample(frac=1)
-      comparison_song = sample.iloc[0]
-      if comparison_song['song_title'] == song_title and comparison_song['artist'] == artist:
-        comparison_song = sample.iloc[1]
-      first_df = songs_df[songs_df["song_title"]==song_title][songs_df["artist"]==artist]
-      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)
+          sample = opponents_df.sample(frac=1).iloc[0]
+          opponent, descriptor = sample["opponent"], sample["descriptor"]
+  if len(opponents_df) > 1:
+      # Randomly select a opponent to compare with
+      sample = opponents_df.sample(frac=1)
+      comparison_opponent = sample.iloc[0]
+      if comparison_opponent['opponent'] == opponent and comparison_opponent['descriptor'] == descriptor:
+        comparison_opponent = sample.iloc[1]
+      first_df = opponents_df[opponents_df["opponent"]==opponent][opponents_df["descriptor"]==descriptor]
+      first_string = first_df["opponent"].tolist()[0]+" - "+first_df["descriptor"].tolist()[0]
+      second_df = comparison_opponent
+      second_string = second_df["opponent"]+" - "+second_df["descriptor"]
+      return f"Do you like '{descriptor} - {opponent}' better than '{comparison_opponent['descriptor']} - {comparison_opponent['opponent']}'?", first_string, second_string, display_rankings(opponents_df)
   else:
-      return "Add some songs to start voting!", "", "", display_rankings(songs_df)
+      return "Add some opponents to start voting!", "", "", display_rankings(opponents_df)
 
 def clean_string(string):
   string = string.strip().replace("  "," ").lower()
   string = " ".join([x[0].upper()+x[1:] for x in string.split()])
   return string
 
-def add_and_compare(artist, song_title, songs_df):
+def add_and_compare(descriptor, opponent, opponents_df):
     try:
-      songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
+      opponents_df = opponents_df[["elo_score",	"descriptor",	"opponent"]]
     except:
-      songs_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
-    if artist != "" and song_title != "":
-        artist = clean_string(artist)
-        song_title = clean_string(song_title)
-        new_song = pd.DataFrame({'artist': [artist], 'song_title': [song_title], 'elo_score': [1000]})
-        songs_df = pd.concat([songs_df, new_song], ignore_index=True)
-        songs_df.to_csv("songs_df.csv")
-    songs_df = songs_df[["elo_score", "artist", "song_title"]]
-    return "", "", display_rankings(songs_df)
+      opponents_df = pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])
+    if descriptor != "" and opponent != "":
+        descriptor = clean_string(descriptor)
+        opponent = clean_string(opponent)
+        new_opponent = pd.DataFrame({'descriptor': [descriptor], 'opponent': [opponent], 'elo_score': [1000]})
+        opponents_df = pd.concat([opponents_df, new_opponent], ignore_index=True)
+        opponents_df.to_csv("opponents_df.csv")
+    opponents_df = opponents_df[["elo_score", "descriptor", "opponent"]]
+    return "", "", display_rankings(opponents_df)
 
 # Function to update Elo ratings based on user's choice
-def update_ratings_pos(first_string, second_string, songs_df):
+def update_ratings_pos(first_string, second_string, opponents_df):
     try:
-      songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
+      opponents_df = opponents_df[["elo_score",	"descriptor",	"opponent"]]
     except:
-      songs_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
-    if len(songs_df)==0:
-      return "Add some songs to start voting!", "", "", display_rankings(songs_df)
+      opponents_df = pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])
+    if len(opponents_df)==0:
+      return "Add some opponents to start voting!", "", "", display_rankings(opponents_df)
     if first_string != "":
-      songs_df["combined"] = songs_df["song_title"] + " - " + songs_df["artist"]
-      loser = songs_df[songs_df["combined"] == second_string]
-      winner = songs_df[songs_df["combined"] == first_string]
+      opponents_df["combined"] = opponents_df["opponent"] + " - " + opponents_df["descriptor"]
+      loser = opponents_df[opponents_df["combined"] == second_string]
+      winner = opponents_df[opponents_df["combined"] == first_string]
       # Update Elo scores
       winner_score, loser_score = update_scores(winner['elo_score'].values[0], loser['elo_score'].values[0])
-      songs_df.at[winner.index[0], 'elo_score'] = winner_score
-      songs_df.at[loser.index[0], 'elo_score'] = loser_score
+      opponents_df.at[winner.index[0], 'elo_score'] = winner_score
+      opponents_df.at[loser.index[0], 'elo_score'] = loser_score
 
-    songs_df = songs_df.sort_values(by='elo_score', ascending=False)
-    songs_df.to_csv("songs_df.csv")
+    opponents_df = opponents_df.sort_values(by='elo_score', ascending=False)
+    opponents_df.to_csv("opponents_df.csv")
 
-    if len(songs_df)>10:
+    if len(opponents_df)>10:
           slice_size = 4
-          slice = int(len(songs_df)/slice_size)
-          sample = songs_df[slice:(slice_size-1)*slice].sample(frac=1).iloc[0]
-          song_title, artist = sample["song_title"], sample["artist"]
+          slice = int(len(opponents_df)/slice_size)
+          sample = opponents_df[slice:(slice_size-1)*slice].sample(frac=1).iloc[0]
+          opponent, descriptor = sample["opponent"], sample["descriptor"]
     else:
-          sample = songs_df.sample(frac=1).iloc[0]
-          song_title, artist = sample["song_title"], sample["artist"]
-    if len(songs_df) > 1:
-        # Randomly select a song to compare with
-        sample = songs_df.sample(frac=1)
-        comparison_song = sample.iloc[0]
-        if comparison_song['song_title'] == song_title and comparison_song['artist'] == artist:
-          comparison_song = sample.iloc[1]
-        first_df = songs_df[songs_df["song_title"]==song_title][songs_df["artist"]==artist]
-        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)
+          sample = opponents_df.sample(frac=1).iloc[0]
+          opponent, descriptor = sample["opponent"], sample["descriptor"]
+    if len(opponents_df) > 1:
+        # Randomly select a opponent to compare with
+        sample = opponents_df.sample(frac=1)
+        comparison_opponent = sample.iloc[0]
+        if comparison_opponent['opponent'] == opponent and comparison_opponent['descriptor'] == descriptor:
+          comparison_opponent = sample.iloc[1]
+        first_df = opponents_df[opponents_df["opponent"]==opponent][opponents_df["descriptor"]==descriptor]
+        first_string = first_df["opponent"].tolist()[0]+" - "+first_df["descriptor"].tolist()[0]
+        second_df = comparison_opponent
+        second_string = second_df["opponent"]+" - "+second_df["descriptor"]
+        return f"Do you like '{descriptor} - {opponent}' better than '{comparison_opponent['descriptor']} - {comparison_opponent['opponent']}'?", first_string, second_string, display_rankings(opponents_df)
     else:
-        return "Add some songs to start voting!", "", "", display_rankings(songs_df)
+        return "Add some opponents to start voting!", "", "", display_rankings(opponents_df)
 
 # Function to update Elo ratings based on user's choice
-def update_ratings_neg(first_string, second_string, songs_df):
+def update_ratings_neg(first_string, second_string, opponents_df):
     try:
-      songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
+      opponents_df = opponents_df[["elo_score",	"descriptor",	"opponent"]]
     except:
-      songs_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
-    if len(songs_df)==0:
-      return "Add some songs to start voting!", "", "", display_rankings(songs_df)
+      opponents_df = pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])
+    if len(opponents_df)==0:
+      return "Add some opponents to start voting!", "", "", display_rankings(opponents_df)
     if first_string != "":
-      songs_df["combined"] = songs_df["song_title"] + " - " + songs_df["artist"]
-      loser = songs_df[songs_df["combined"] == first_string]
-      winner = songs_df[songs_df["combined"] == second_string]
+      opponents_df["combined"] = opponents_df["opponent"] + " - " + opponents_df["descriptor"]
+      loser = opponents_df[opponents_df["combined"] == first_string]
+      winner = opponents_df[opponents_df["combined"] == second_string]
 
       # Update Elo scores
       winner_score, loser_score = update_scores(winner['elo_score'].values[0], loser['elo_score'].values[0])
-      songs_df.at[winner.index[0], 'elo_score'] = winner_score
-      songs_df.at[loser.index[0], 'elo_score'] = loser_score
+      opponents_df.at[winner.index[0], 'elo_score'] = winner_score
+      opponents_df.at[loser.index[0], 'elo_score'] = loser_score
 
-    songs_df = songs_df.sort_values(by='elo_score', ascending=False)
-    songs_df.to_csv("songs_df.csv")
-    if len(songs_df)>10:
+    opponents_df = opponents_df.sort_values(by='elo_score', ascending=False)
+    opponents_df.to_csv("opponents_df.csv")
+    if len(opponents_df)>10:
           slice_size = 4
-          slice = int(len(songs_df)/slice_size)
-          sample = songs_df[slice:(slice_size-1)*slice].sample(frac=1).iloc[0]
-          song_title, artist = sample["song_title"], sample["artist"]
+          slice = int(len(opponents_df)/slice_size)
+          sample = opponents_df[slice:(slice_size-1)*slice].sample(frac=1).iloc[0]
+          opponent, descriptor = sample["opponent"], sample["descriptor"]
     else:
-          sample = songs_df.sample(frac=1).iloc[0]
-          song_title, artist = sample["song_title"], sample["artist"]
-    if len(songs_df) > 1:
-        # Randomly select a song to compare with
-        sample = songs_df.sample(frac=1)
-        comparison_song = sample.iloc[0]
-        if comparison_song['song_title'] == song_title and comparison_song['artist'] == artist:
-          comparison_song = sample.iloc[1]
-        first_df = songs_df[songs_df["song_title"]==song_title][songs_df["artist"]==artist]
-        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)
+          sample = opponents_df.sample(frac=1).iloc[0]
+          opponent, descriptor = sample["opponent"], sample["descriptor"]
+    if len(opponents_df) > 1:
+        # Randomly select a opponent to compare with
+        sample = opponents_df.sample(frac=1)
+        comparison_opponent = sample.iloc[0]
+        if comparison_opponent['opponent'] == opponent and comparison_opponent['descriptor'] == descriptor:
+          comparison_opponent = sample.iloc[1]
+        first_df = opponents_df[opponents_df["opponent"]==opponent][opponents_df["descriptor"]==descriptor]
+        first_string = first_df["opponent"].tolist()[0]+" - "+first_df["descriptor"].tolist()[0]
+        second_df = comparison_opponent
+        second_string = second_df["opponent"]+" - "+second_df["descriptor"]
+        return f"Do you like '{descriptor} - {opponent}' better than '{comparison_opponent['descriptor']} - {comparison_opponent['opponent']}'?", first_string, second_string, display_rankings(opponents_df)
     else:
-        return "Add some songs to start voting!", "", "", display_rankings(songs_df)
+        return "Add some opponents to start voting!", "", "", display_rankings(opponents_df)
         
-def display_rankings(songs_df=pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])):
-  songs_df = songs_df.sort_values(by='elo_score', ascending=False)
-  songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
-  songs_df.to_csv("songs_df.csv")
-  return songs_df
+def display_rankings(opponents_df=pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])):
+  opponents_df = opponents_df.sort_values(by='elo_score', ascending=False)
+  opponents_df = opponents_df[["elo_score",	"descriptor",	"opponent"]]
+  opponents_df.to_csv("opponents_df.csv")
+  return opponents_df
 
-def export_csv(songs_df):
+def export_csv(opponents_df):
     # Function to export DataFrame to CSV
-    save_df = songs_df
-    save_df.to_csv("songs_df.csv")
-    return "songs_df.csv"
+    save_df = opponents_df
+    save_df.to_csv("opponents_df.csv")
+    return "opponents_df.csv"
 
-def import_csv(file, songs_df):
+def import_csv(file, opponents_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"]]
+            opponents_df = opponents_df[["elo_score",	"descriptor",	"opponent"]]
         except:
-            songs_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
-        new_df = new_df[["elo_score",	"artist",	"song_title"]]
-        songs_df = pd.concat([songs_df,new_df])
+            opponents_df = pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])
+        new_df = new_df[["elo_score",	"descriptor",	"opponent"]]
+        opponents_df = pd.concat([opponents_df,new_df])
 
-    songs_df = songs_df.drop_duplicates(subset=['artist', 'song_title'])
-    return songs_df
+    opponents_df = opponents_df.drop_duplicates(subset=['descriptor', 'opponent'])
+    return opponents_df
 
     
-# Function to remove a song
-def remove_song(artist, song_title, songs_df):
-    # Find and remove the song from the DataFrame
-    artist = clean_string(artist)
-    song_title = clean_string(song_title)
-    songs_df = songs_df[~((songs_df["artist"] == artist) & (songs_df["song_title"] == song_title))]
-    return songs_df[["elo_score", "artist", "song_title"]]
+# Function to remove a opponent
+def remove_opponent(descriptor, opponent, opponents_df):
+    # Find and remove the opponent from the DataFrame
+    descriptor = clean_string(descriptor)
+    opponent = clean_string(opponent)
+    opponents_df = opponents_df[~((opponents_df["descriptor"] == descriptor) & (opponents_df["opponent"] == opponent))]
+    return opponents_df[["elo_score", "descriptor", "opponent"]]
 
-def reset_rankings(songs_df):
-    songs_df["elo_score"] = [1000]*len(songs_df)
-    songs_df = songs_df[["elo_score",	"artist",	"song_title"]]
-    return display_rankings(songs_df)
+def reset_rankings(opponents_df):
+    opponents_df["elo_score"] = [1000]*len(opponents_df)
+    opponents_df = opponents_df[["elo_score",	"descriptor",	"opponent"]]
+    return display_rankings(opponents_df)
 
-def clear_rankings(songs_df):
-    songs_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
-    return display_rankings(songs_df)
+def clear_rankings(opponents_df):
+    opponents_df = pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])
+    return display_rankings(opponents_df)
     
 
 # theme='Taithrah/Minimal'
@@ -204,7 +204,7 @@ with gr.Blocks(theme=theme) as app:
     )
 
     with gr.Row():
-        previews_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
+        previews_df = pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])
         previews = gr.DataFrame(value=previews_df, interactive=False, visible=False)
         with gr.Column():
             gr.Markdown(
@@ -229,27 +229,27 @@ with gr.Blocks(theme=theme) as app:
                 """
             )
     
-            songs_df = pd.DataFrame(columns=['elo_score', 'artist', 'song_title'])
-            rankings = gr.DataFrame(value=songs_df, interactive=False, headers=["Score","Artist", "Song"])
+            opponents_df = pd.DataFrame(columns=['elo_score', 'descriptor', 'opponent'])
+            rankings = gr.DataFrame(value=opponents_df, interactive=False, headers=["Score","descriptor", "opponent"])
             
     gr.Markdown(
         """### Add Opponents
         """
     )
     with gr.Row():
-        artist_input = gr.Textbox(label="Type")
-        song_title_input = gr.Textbox(label="Opponent")
+        descriptor_input = gr.Textbox(label="Type")
+        opponent_input = gr.Textbox(label="Opponent")
         add_button = gr.Button("Add Opponent")
-    add_button.click(add_and_compare, inputs=[artist_input, song_title_input, rankings], outputs=[artist_input, song_title_input, rankings])
+    add_button.click(add_and_compare, inputs=[descriptor_input, opponent_input, rankings], outputs=[descriptor_input, opponent_input, rankings])
     gr.Markdown(
         """### Remove Opponents
         """
     )
     with gr.Row():
-        remove_artist_input = gr.Textbox(label="Type")
-        remove_song_title_input = gr.Textbox(label="Opponent")
-        remove_button = gr.Button("Remove Song")
-    remove_button.click(remove_song, inputs=[remove_artist_input, remove_song_title_input, rankings], outputs=rankings)
+        remove_descriptor_input = gr.Textbox(label="Type")
+        remove_opponent_input = gr.Textbox(label="Opponent")
+        remove_button = gr.Button("Remove opponent")
+    remove_button.click(remove_opponent, inputs=[remove_descriptor_input, remove_opponent_input, rankings], outputs=rankings)
     
     gr.Markdown(
         """### Import and Export Rankings
@@ -274,7 +274,7 @@ with gr.Blocks(theme=theme) as app:
       clear_button = gr.Button("Clear Table", variant="primary")
       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])
+    # add_button.click(add_and_compare, inputs=[descriptor_input, opponent_input, rankings], outputs=[descriptor_input, opponent_input, rankings])
     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],outputs=[compare_output, compare_index_1, compare_index_2, rankings])