Update app.py

app.py

@@ -52,10 +52,12 @@ def update_elo_rating(collection, updated_ratings, winner, loser):
     collection.update_one({"bot_name": winner}, {"$set": {"elo_rating": updated_ratings[winner]['elo_rating'], "games_played": updated_ratings[winner]['games_played']}}, upsert=True)
     collection.update_one({"bot_name": loser}, {"$set": {"elo_rating": updated_ratings[loser]['elo_rating'], "games_played": updated_ratings[loser]['games_played']}}, upsert=True)
 
-# Load chatbot URLs and model names from a JSON file
-# Load chatbot model adapter names from a text file
+import json
+
 with open('chatbots.txt', 'r') as file:
-    chatbots = file.read().splitlines()
+    chatbots_data = json.load(file)
+    chatbots = [entry['adapter'] for entry in chatbots_data]
+    
 def clear_chat(state):
     # Reset state including the chatbot order
     state = {} if state is not None else state
@@ -64,7 +66,7 @@ def clear_chat(state):
     collection = init_database()
     
     # Get the list of chatbot names
-    bot_names = list(get_user_elo_ratings(collection).keys())
+    bot_names = [entry['original_model'] for entry in chatbots_data]
     
     # Randomly select two new Loras
     selected_bots = random.sample(bot_names, 2)
@@ -147,12 +149,15 @@ async def chat_with_bots(user_input, state):
     return bot1_response, bot2_response
 def update_ratings(state, winner_index, collection):
     elo_ratings = get_user_elo_ratings(collection)
-    winner = state['last_bots'][winner_index]
-    loser = state['last_bots'][1 - winner_index]
+    winner_adapter = state['last_bots'][winner_index]
+    loser_adapter = state['last_bots'][1 - winner_index]
     
-    elo_ratings = update_elo_ratings(elo_ratings, winner, loser)
-    update_elo_rating(collection, elo_ratings, winner, loser)
-    return [('Winner: ', winner.replace('rwitz/','').replace('-lora','')), ('Loser: ', loser.replace('rwitz/','').replace('-lora',''))]
+    winner = next(entry['original_model'] for entry in chatbots_data if entry['adapter'] == winner_adapter)
+    loser = next(entry['original_model'] for entry in chatbots_data if entry['adapter'] == loser_adapter)
+    
+    elo_ratings = update_elo_ratings(elo_ratings, winner_adapter, loser_adapter)
+    update_elo_rating(collection, elo_ratings, winner_adapter, loser_adapter)
+    return [('Winner: ', winner), ('Loser: ', loser)]
     
 def vote_up_model(state, chatbot, chatbot2):
     collection = init_database()
@@ -209,24 +214,27 @@ import pandas as pd
 def generate_leaderboard(collection):
     rows = list(collection.find())
     leaderboard_data = pd.DataFrame(rows, columns=['bot_name', 'elo_rating', 'games_played'])
+    leaderboard_data['original_model'] = leaderboard_data['bot_name'].apply(lambda x: next(entry['original_model'] for entry in chatbots_data if entry['adapter'] == x))
+    leaderboard_data = leaderboard_data[['original_model', 'elo_rating', 'games_played']]
     leaderboard_data.columns = ['Chatbot', 'ELO Score', 'Games Played']
     leaderboard_data['ELO Score'] = leaderboard_data['ELO Score'].round().astype(int)
     leaderboard_data = leaderboard_data.sort_values('ELO Score', ascending=False)
     return leaderboard_data
+    
 def refresh_leaderboard():
     collection = init_database()
     return generate_leaderboard(collection)
 async def direct_chat(model, user_input, chatbot):
+    adapter = next(entry['adapter'] for entry in chatbots_data if entry['original_model'] == model)
     temp_state = {
         "history": [
             [{"role": "user", "content": user_input}],
             [{"role": "user", "content": user_input}]
         ]
     }
-    response = await get_bot_response(model, user_input, temp_state, 0)
+    response = await get_bot_response(adapter, user_input, temp_state, 0)
     chatbot.append((user_input, response))
     return "", chatbot
-# ...
 def reset_direct_chat():
     return "", [], gr.Dropdown.update(value=model_dropdown.value)
 refresh_leaderboard()
@@ -272,7 +280,7 @@ with gr.Blocks() as demo:
         gr.Markdown("## 🗣️ Chat directly with a model!")
         
         with gr.Row():
-            model_dropdown = gr.Dropdown(choices=chatbots, value="rwitz/go-bruins-v2-lora", label="🤖 Select a model")
+            model_dropdown = gr.Dropdown(choices=[entry['original_model'] for entry in chatbots_data], value=chatbots_data[0]['original_model'], label="🤖 Select a model")
         with gr.Row():
             direct_chatbot = gr.Chatbot(label="💬 Direct Chat").style(height=500)