Update app.py

app.py

@@ -7,18 +7,16 @@ This file integrates all components into a unified application.
 import os
 import gradio as gr
 import threading
-import queue
-from database_schema import init_db
+import time
+from database_schema import DynamicHighscoresDB
 from auth import HuggingFaceAuth, create_login_ui, setup_auth_handlers
 from benchmark_selection import BenchmarkSelector, create_benchmark_selection_ui
 from evaluation_queue import EvaluationQueue, create_model_submission_ui
 from leaderboard import Leaderboard, create_leaderboard_ui
 from sample_benchmarks import add_sample_benchmarks
 
-# Initialize database
-db = init_db()
-
-# Initialize components
+# Initialize components in main thread
+db = DynamicHighscoresDB()
 auth_manager = HuggingFaceAuth(db)
 benchmark_selector = BenchmarkSelector(db, auth_manager)
 evaluation_queue = EvaluationQueue(db, auth_manager)
@@ -28,8 +26,11 @@ leaderboard = Leaderboard(db)
 benchmarks = db.get_benchmarks()
 if not benchmarks or len(benchmarks) == 0:
     print("No benchmarks found. Adding sample benchmarks...")
-    num_added = add_sample_benchmarks()
-    print(f"Added {num_added} sample benchmarks.")
+    try:
+        num_added = add_sample_benchmarks()
+        print(f"Added {num_added} sample benchmarks.")
+    except Exception as e:
+        print(f"Error adding sample benchmarks: {e}")
 
 # Custom CSS
 css = """
@@ -59,6 +60,16 @@ css = """
 }
 """
 
+# Start evaluation queue worker
+def start_queue_worker():
+    # Wait a moment to ensure app is initialized
+    time.sleep(2)
+    try:
+        print("Starting evaluation queue worker...")
+        evaluation_queue.start_worker()
+    except Exception as e:
+        print(f"Error starting queue worker: {e}")
+
 # Create Gradio app
 with gr.Blocks(css=css, title="Dynamic Highscores") as app:
     gr.Markdown("# 🏆 Dynamic Highscores", elem_classes=["header"])
@@ -78,7 +89,6 @@ with gr.Blocks(css=css, title="Dynamic Highscores") as app:
     # Main tabs
     with gr.Tabs() as tabs:
         with gr.TabItem("📊 Leaderboard", id=0):
-            # Fix: Pass db_manager parameter to create_leaderboard_ui
             leaderboard_ui = create_leaderboard_ui(leaderboard, db)
         
         with gr.TabItem("🚀 Submit Model", id=1):
@@ -97,19 +107,11 @@ with gr.Blocks(css=css, title="Dynamic Highscores") as app:
     Created by Quazim0t0
     """, elem_classes=["footer"])
 
-# Start evaluation queue worker after app is defined
-# This prevents the worker from starting before the app is fully initialized
-def start_queue_worker():
-    # Wait a moment to ensure app is initialized
-    import time
-    time.sleep(2)
-    evaluation_queue.start_worker()
-
 # Launch the app
 if __name__ == "__main__":
-    # Start queue worker in a separate thread to avoid SQLite thread issues
+    # Start queue worker in a separate thread
     queue_thread = threading.Thread(target=start_queue_worker)
     queue_thread.daemon = True
     queue_thread.start()
     
-    app.launch()
+    app.launch()