Update app.py

app.py

@@ -3,7 +3,7 @@ from functools import lru_cache
 import random
 import requests
 import logging
-import arena_config
+import config
 import plotly.graph_objects as go
 from typing import Dict
 from leaderboard import (
@@ -15,7 +15,7 @@ from leaderboard import (
     ensure_elo_ratings_initialized
 )
 import sys
-from fun_stats import get_fun_stats
+import openai
 import threading
 import time
 from collections import Counter
@@ -31,7 +31,7 @@ start_backup_thread()
 
 # Function to get available models (using predefined list)
 def get_available_models():
-    return [model[0] for model in arena_config.APPROVED_MODELS]
+    return [model[0] for model in config.get_approved_models()]
 
 # Function to get recent opponents for a model
 recent_opponents = {}
@@ -46,30 +46,28 @@ def update_recent_opponents(model_a, model_b):
 # Function to call Ollama API with caching
 @lru_cache(maxsize=100)
 def call_ollama_api(model, prompt):
-    payload = {
-        "model": model,
-        "messages": [
-            {
-                "role": "system",
-                "content": "You are a helpful assistant. At no point should you reveal your name, identity or team affiliation to the user, especially if asked directly!"
-            },
-            {
-                "role": "user",
-                "content": prompt
-            }
-        ]
-    }
+    client = openai.OpenAI(
+        api_key=config.API_KEY,
+        base_url=config.API_URL
+    )
+    
     try:
-        response = requests.post(
-            f"{arena_config.API_URL}/chat/completions",
-            headers=arena_config.HEADERS,
-            json=payload,
+        response = client.chat.completions.create(
+            model=model,
+            messages=[
+                {
+                    "role": "system",
+                    "content": "You are a helpful assistant. At no point should you reveal your name, identity or team affiliation to the user, especially if asked directly!"
+                },
+                {
+                    "role": "user",
+                    "content": prompt
+                }
+            ],
             timeout=100
         )
-        response.raise_for_status()
-        data = response.json()
-        return data["choices"][0]["message"]["content"]
-    except requests.exceptions.RequestException as e:
+        return response.choices[0].message.content
+    except Exception as e:
         logger.error(f"Error calling Ollama API for model {model}: {e}")
         return f"Error: Unable to get response from the model."
 
@@ -132,8 +130,8 @@ def battle_arena(prompt):
             gr.update(value="Error: Unable to get response from the model", visible=True)
         )
     
-    nickname_a = random.choice(arena_config.model_nicknames)
-    nickname_b = random.choice(arena_config.model_nicknames)
+    nickname_a = random.choice(config.model_nicknames)
+    nickname_b = random.choice(config.model_nicknames)
     
     # Format responses for gr.Chatbot, including the user's prompt
     response_a_formatted = [
@@ -283,8 +281,8 @@ def get_leaderboard_chart():
     return fig
 
 def new_battle():
-    nickname_a = random.choice(arena_config.model_nicknames)
-    nickname_b = random.choice(arena_config.model_nicknames)
+    nickname_a = random.choice(config.model_nicknames)
+    nickname_b = random.choice(config.model_nicknames)
     return (
         "", # Reset prompt_input
         gr.update(value=[], label=nickname_a),  # Reset left Chatbot
@@ -303,18 +301,18 @@ def new_battle():
 
 # Add this new function
 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)
 
 # Add this new function to randomly select a prompt
 def random_prompt():
-    return random.choice(arena_config.example_prompts)
+    return random.choice(config.example_prompts)
 
 # Modify the continue_conversation function
 def continue_conversation(prompt, left_chat, right_chat, left_model, right_model, previous_prompt, tie_count):
     # Check if the prompt is empty or the same as the previous one
     if not prompt or prompt == previous_prompt:
-        prompt = random.choice(arena_config.example_prompts)
+        prompt = random.choice(config.example_prompts)
     
     left_response = call_ollama_api(left_model, prompt)
     right_response = call_ollama_api(right_model, prompt)
@@ -337,84 +335,6 @@ def continue_conversation(prompt, left_chat, right_chat, left_model, right_model
         tie_count
     )
 
-def get_fun_stats_html():
-    stats = get_fun_stats()
-    
-    html = f"""
-    <style>
-        .fun-stats {{
-            font-family: Arial, sans-serif;
-            font-size: 18px;
-            line-height: 1.6;
-            max-width: 800px;
-            margin: 0 auto;
-            padding: 20px;
-        }}
-        .fun-stats h2 {{
-            font-size: 36px;
-            color: inherit;
-            text-align: center;
-            margin-bottom: 20px;
-        }}
-        .fun-stats h3 {{
-            font-size: 28px;
-            color: inherit;
-            margin-top: 30px;
-            margin-bottom: 15px;
-            border-bottom: 2px solid currentColor;
-            padding-bottom: 10px;
-        }}
-        .fun-stats ul {{
-            list-style-type: none;
-            padding-left: 0;
-        }}
-        .fun-stats li {{
-            margin-bottom: 15px;
-            padding: 15px;
-            border-radius: 5px;
-            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
-        }}
-        .fun-stats .timestamp {{
-            font-style: italic;
-            text-align: center;
-            margin-bottom: 20px;
-        }}
-        .fun-stats .highlight {{
-            font-weight: bold;
-            color: #e74c3c;
-        }}
-    </style>
-    <div class="fun-stats">
-        <h2>🎭 Fun Arena Stats 🎭</h2>
-        <p class="timestamp">Last updated: {stats['timestamp']}</p>
-        
-        <h3>🏟️ Arena Overview</h3>
-        <p>Total Battles Fought: <span class="highlight">{stats['total_battles']}</span></p>
-        <p>Active Gladiators (Models): <span class="highlight">{stats['active_models']}</span></p>
-        
-        <h3>🏆 Hall of Fame</h3>
-        <p>🥇 Battle Veteran: <span class="highlight">{stats['most_battles']['model']}</span> ({stats['most_battles']['battles']} battles)</p>
-        <p>🏹 Sharpshooter: <span class="highlight">{stats['highest_win_rate']['model']}</span> (Win Rate: {stats['highest_win_rate']['win_rate']})</p>
-        <p>🌈 Jack of All Trades: <span class="highlight">{stats['most_diverse_opponent']['model']}</span> (Faced {stats['most_diverse_opponent']['unique_opponents']} unique opponents)</p>
-        <p>🐕 Underdog Champion: <span class="highlight">{stats['underdog_champion']['model']}</span> ({stats['underdog_champion']['size']} model with {stats['underdog_champion']['win_rate']} win rate)</p>
-        <p>⚖️ Mr. Consistent: <span class="highlight">{stats['most_consistent']['model']}</span> (Closest to 50% win rate, difference of {stats['most_consistent']['win_loss_difference']} wins/losses)</p>
-        
-        <h3>🤼 Epic Battles</h3>
-        <p>🤼 Biggest Rivalry: <span class="highlight">{stats['biggest_rivalry']['model1']}</span> vs <span class="highlight">{stats['biggest_rivalry']['model2']}</span> ({stats['biggest_rivalry']['total_battles']} fierce battles!)</p>
-        <p>🏋️ David vs Goliath: <span class="highlight">{stats['david_vs_goliath']['david']}</span> (David) vs <span class="highlight">{stats['david_vs_goliath']['goliath']}</span> (Goliath)<br>
-            David won {stats['david_vs_goliath']['wins']} times despite being {stats['david_vs_goliath']['size_difference']} smaller!</p>
-        <p>🔄 Comeback King: <span class="highlight">{stats['comeback_king']['model']}</span> (Overcame a {stats['comeback_king']['comeback_margin']}-battle deficit)</p>
-        <p>🏆 Pyrrhic Victor: <span class="highlight">{stats['pyrrhic_victor']['model']}</span> (Lowest win rate among models with more wins than losses: {stats['pyrrhic_victor']['win_rate']})</p>
-    </div>
-    """
-    
-    return html
-
-def update_fun_stats_periodically(interval):
-    while True:
-        time.sleep(interval)
-        fun_stats_html.update(value=get_fun_stats_html())
-
 # Initialize Gradio Blocks
 with gr.Blocks(css="""
     #dice-button {
@@ -422,8 +342,8 @@ with gr.Blocks(css="""
         font-size: 35px;
     }
 """) as demo:
-    gr.Markdown(arena_config.ARENA_NAME)
-    gr.Markdown(arena_config.ARENA_DESCRIPTION)
+    gr.Markdown(config.ARENA_NAME)
+    gr.Markdown(config.ARENA_DESCRIPTION)
     
     # Leaderboard Tab (now first)
     with gr.Tab("Leaderboard"):
@@ -450,8 +370,8 @@ with gr.Blocks(css="""
         submit_btn = gr.Button("Generate Responses", variant="primary")
         
         with gr.Row():
-            left_output = gr.Chatbot(label=random.choice(arena_config.model_nicknames), type="messages")
-            right_output = gr.Chatbot(label=random.choice(arena_config.model_nicknames), type="messages")
+            left_output = gr.Chatbot(label=random.choice(config.model_nicknames), type="messages")
+            right_output = gr.Chatbot(label=random.choice(config.model_nicknames), type="messages")
         
         with gr.Row():
             left_vote_btn = gr.Button(f"Vote for {left_output.label}", interactive=False)
@@ -482,11 +402,6 @@ with gr.Blocks(css="""
     with gr.Tab("ELO Leaderboard"):
         elo_leaderboard = gr.HTML(label="ELO Leaderboard")
     
-    # Add this new tab
-    with gr.Tab("Fun Stats"):
-        refresh_btn = gr.Button("Refresh Stats")
-        fun_stats_html = gr.HTML(label="Fun Arena Stats")
-    
     # Add this new tab
     with gr.Tab("Suggest Models"):
         with gr.Row():
@@ -564,16 +479,10 @@ with gr.Blocks(css="""
     demo.load(get_leaderboard, outputs=leaderboard)
     demo.load(get_elo_leaderboard, outputs=elo_leaderboard)
     demo.load(get_leaderboard_chart, outputs=leaderboard_chart)
-    demo.load(get_fun_stats_html, outputs=fun_stats_html)
-
-    # Add this event handler for the refresh button
-    refresh_btn.click(get_fun_stats_html, outputs=fun_stats_html)
-
-    # Start the background task to update stats every hour
-    update_thread = threading.Thread(target=update_fun_stats_periodically, args=(3600,), daemon=True)
-    update_thread.start()
 
 if __name__ == "__main__":
     # Initialize ELO ratings before launching the app
     ensure_elo_ratings_initialized()
+    # Start the model refresh thread
+    config.start_model_refresh_thread()
     demo.launch(show_api=False)