Update leaderboard.py

leaderboard.py

@@ -1,24 +1,22 @@
 from nc_py_api import Nextcloud
 import json
 from typing import Dict, Any
-import os
 import time
 from datetime import datetime
 import threading
-import arena_config
-import sys
+import config
 import math
 import plotly.graph_objects as go
 
 # Initialize Nextcloud client
-nc = Nextcloud(nextcloud_url=arena_config.NEXTCLOUD_URL, nc_auth_user=arena_config.NEXTCLOUD_USERNAME, nc_auth_pass=arena_config.NEXTCLOUD_PASSWORD)
+nc = Nextcloud(nextcloud_url=config.NEXTCLOUD_URL, nc_auth_user=config.NEXTCLOUD_USERNAME, nc_auth_pass=config.NEXTCLOUD_PASSWORD)
 
 # Dictionary to store ELO ratings
 elo_ratings = {}
 
 def load_leaderboard() -> Dict[str, Any]:
     try:
-        file_content = nc.files.download(arena_config.NEXTCLOUD_LEADERBOARD_PATH)
+        file_content = nc.files.download(config.NEXTCLOUD_LEADERBOARD_PATH)
         return json.loads(file_content.decode('utf-8'))
     except Exception as e:
         print(f"Error loading leaderboard: {str(e)}")
@@ -27,14 +25,14 @@ def load_leaderboard() -> Dict[str, Any]:
 def save_leaderboard(leaderboard_data: Dict[str, Any]) -> bool:
     try:
         json_data = json.dumps(leaderboard_data, indent=2)
-        nc.files.upload(arena_config.NEXTCLOUD_LEADERBOARD_PATH, json_data.encode('utf-8'))
+        nc.files.upload(config.NEXTCLOUD_LEADERBOARD_PATH, json_data.encode('utf-8'))
         return True
     except Exception as e:
         print(f"Error saving leaderboard: {str(e)}")
         return False
 
 def get_model_size(model_name):
-    for model, human_readable in arena_config.APPROVED_MODELS:
+    for model, human_readable in config.get_approved_models():
         if model == model_name:
             size = float(human_readable.split('(')[1].split('B')[0])
             return size
@@ -55,7 +53,7 @@ def update_elo_ratings(winner, loser):
     
     winner_size = get_model_size(winner)
     loser_size = get_model_size(loser)
-    max_size = max(get_model_size(model) for model, _ in arena_config.APPROVED_MODELS)
+    max_size = max(get_model_size(model) for model, _ in config.get_approved_models())
     
     k_factor = min(64, 32 * (1 + (loser_size - winner_size) / max_size))
     
@@ -64,7 +62,7 @@ def update_elo_ratings(winner, loser):
 
 def initialize_elo_ratings():
     leaderboard = load_leaderboard()
-    for model, _ in arena_config.APPROVED_MODELS:
+    for model, _ in config.get_approved_models():
         size = get_model_size(model)
         elo_ratings[model] = 1000 + (size * 100)
     
@@ -108,7 +106,7 @@ def get_current_leaderboard() -> Dict[str, Any]:
     return load_leaderboard()
 
 def get_human_readable_name(model_name: str) -> str:
-    model_dict = dict(arena_config.APPROVED_MODELS)
+    model_dict = dict(config.get_approved_models())
     return model_dict.get(model_name, model_name)
 
 def get_leaderboard():
@@ -220,7 +218,7 @@ def calculate_elo_impact(model):
         for opponent, results in leaderboard[model]['opponents'].items():
             model_size = get_model_size(model)
             opponent_size = get_model_size(opponent)
-            max_size = max(get_model_size(m) for m, _ in arena_config.APPROVED_MODELS)
+            max_size = max(get_model_size(m) for m, _ in config.get_approved_models())
             
             size_difference = (opponent_size - model_size) / max_size
             
@@ -237,7 +235,7 @@ def get_elo_leaderboard():
     leaderboard = load_leaderboard()
     
     # Create a list of all models, including those from APPROVED_MODELS that might not be in the leaderboard yet
-    all_models = set(dict(arena_config.APPROVED_MODELS).keys()) | set(leaderboard.keys())
+    all_models = set(dict(config.get_approved_models()).keys()) | set(leaderboard.keys())
     
     elo_data = []
     for model in all_models:
@@ -336,7 +334,7 @@ def create_backup():
             leaderboard_data = load_leaderboard()
             timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
             backup_file_name = f"leaderboard_backup_{timestamp}.json"
-            backup_path = f"{arena_config.NEXTCLOUD_BACKUP_FOLDER}/{backup_file_name}"
+            backup_path = f"{config.NEXTCLOUD_BACKUP_FOLDER}/{backup_file_name}"
             json_data = json.dumps(leaderboard_data, indent=2)
             nc.files.upload(backup_path, json_data.encode('utf-8'))
             print(f"Backup created on Nextcloud: {backup_path}")
@@ -419,4 +417,4 @@ def get_leaderboard_chart():
         )
     )
 
-    return fig
+    return fig