Update app.py

app.py

@@ -5,7 +5,7 @@ import spaces
 import requests
 import gradio as gr
 from huggingface_hub import HfApi, list_models
-from threading import Thread
+from threading import Thread, Lock
 
 HF_TOKEN = os.environ.get("HF_TOKEN", None)
 
@@ -73,8 +73,8 @@ SCHIZO_WORDS = [
 MARKDOWN_SYMBOLS = ["#", "*", "_", "`", ">", "-", "+", "[", "]", "(", ")", "!", "\\", "|", "~", "<", ">", "=", ":"]
 
 CACHE = {
-    "llm": {"html": None, "timestamp": None},
-    "all": {"html": None, "timestamp": None}
+    "llm": {"html": None, "timestamp": 0, "lock": Lock()},
+    "all": {"html": None, "timestamp": 0, "lock": Lock()}
 }
 
 def count_schizo_words(text):
@@ -189,7 +189,58 @@ def create_leaderboard_html(leaderboard_data):
     </div>
     <script>
     function sortTable(n, isNumeric = false) {
-        // Existing sortTable implementation remains unchanged
+        var table, rows, switching, i, x, y, shouldSwitch, dir, switchcount = 0;
+        table = document.getElementById("leaderboard");
+        switching = true;
+        dir = "asc";
+        
+        while (switching) {
+            switching = false;
+            rows = table.rows;
+            
+            for (i = 1; i < (rows.length - 1); i++) {
+                shouldSwitch = false;
+                x = rows[i].getElementsByTagName("TD")[n];
+                y = rows[i + 1].getElementsByTagName("TD")[n];
+                
+                if (dir == "asc") {
+                    if (isNumeric) {
+                        if (parseFloat(x.innerHTML) > parseFloat(y.innerHTML)) {
+                            shouldSwitch = true;
+                            break;
+                        }
+                    } else {
+                        if (x.innerHTML.toLowerCase() > y.innerHTML.toLowerCase()) {
+                            shouldSwitch = true;
+                            break;
+                        }
+                    }
+                } else if (dir == "desc") {
+                    if (isNumeric) {
+                        if (parseFloat(x.innerHTML) < parseFloat(y.innerHTML)) {
+                            shouldSwitch = true;
+                            break;
+                        }
+                    } else {
+                        if (x.innerHTML.toLowerCase() < y.innerHTML.toLowerCase()) {
+                            shouldSwitch = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            
+            if (shouldSwitch) {
+                rows[i].parentNode.insertBefore(rows[i + 1], rows[i]);
+                switching = true;
+                switchcount++;
+            } else {
+                if (switchcount == 0 && dir == "asc") {
+                    dir = "desc";
+                    switching = true;
+                }
+            }
+        }
     }
     </script>
     """
@@ -199,28 +250,31 @@ def background_cache_updater():
     while True:
         try:
             for model_type in ["llm", "all"]:
-                leaderboard_data = generate_leaderboard_data(model_type)
-                CACHE[model_type]["html"] = create_leaderboard_html(leaderboard_data)
-                CACHE[model_type]["timestamp"] = time.time()
+                with CACHE[model_type]["lock"]:
+                    leaderboard_data = generate_leaderboard_data(model_type)
+                    CACHE[model_type]["html"] = create_leaderboard_html(leaderboard_data)
+                    CACHE[model_type]["timestamp"] = time.time()
         except Exception as e:
             print(f"Background update error: {e}")
         time.sleep(600)
 
 def load_leaderboard(model_type):
-    if cached := CACHE[model_type]["html"]:
-        return cached
-    return '<div class="loading">Leaderboard is being generated. Please wait...</div>'
+    with CACHE[model_type]["lock"]:
+        if CACHE[model_type]["html"]:
+            return CACHE[model_type]["html"]
+        return f'<div class="loading">{model_type.upper()} leaderboard loading...</div>'
 
 def trigger_refresh(model_type):
     def refresh_task():
         try:
-            leaderboard_data = generate_leaderboard_data(model_type)
-            CACHE[model_type]["html"] = create_leaderboard_html(leaderboard_data)
-            CACHE[model_type]["timestamp"] = time.time()
+            with CACHE[model_type]["lock"]:
+                leaderboard_data = generate_leaderboard_data(model_type)
+                CACHE[model_type]["html"] = create_leaderboard_html(leaderboard_data)
+                CACHE[model_type]["timestamp"] = time.time()
         except Exception as e:
             print(f"Refresh error: {e}")
     Thread(target=refresh_task, daemon=True).start()
-    return '<div class="loading">Refreshing leaderboard in the background...</div>'
+    return f'<div class="loading">{model_type.upper()} refresh started...</div>'
 
 @spaces.GPU()
 def init_leaderboard():
@@ -237,10 +291,16 @@ with gr.Blocks(css=CSS, theme="soft") as demo:
                 value="llm",
                 label="Model Type Filter",
             )
-            refresh_button = gr.Button("Refresh Leaderboard")
+            refresh_button = gr.Button("Force Refresh Current View")
         
     leaderboard_html = gr.HTML(init_leaderboard())
     
+    model_type_dropdown.change(
+        fn=load_leaderboard,
+        inputs=[model_type_dropdown],
+        outputs=[leaderboard_html]
+    )
+    
     demo.load(
         fn=load_leaderboard,
         inputs=[model_type_dropdown],