Update app.py

app.py

@@ -2,20 +2,22 @@ import gradio as gr
 import pandas as pd
 from apscheduler.schedulers.background import BackgroundScheduler
 # Removed Hugging Face Hub imports as they are not needed for the simplified leaderboard
-from src.about import ( # Assuming these still exist and are relevant for other tabs
+# Assuming these are correctly defined in your src.about module
+from src.about import (
     CITATION_BUTTON_LABEL,
     CITATION_BUTTON_TEXT,
-    EVALUATION_QUEUE_TEXT,
+    EVALUATION_QUEUE_TEXT, # Keep if used by commented-out submit tab
     INTRODUCTION_TEXT,
     LLM_BENCHMARKS_TEXT,
     TITLE,
 )
-from src.display.css_html_js import custom_css # Keep custom CSS
-# Removed utils imports related to the old leaderboard
+# Assuming this is correctly defined in your src.display.css_html_js module
+from src.display.css_html_js import custom_css
+# Assuming this is correctly defined in your src.envs module
 from src.envs import REPO_ID # Keep if needed for restart_space or other functions
-# Removed constants related to old data paths and repos if not needed elsewhere
-# Removed old data processing functions
-from src.submission.submit import add_new_eval # Keep submission logic
+# Assuming this is correctly defined in your src.submission.submit module
+from src.submission.submit import add_new_eval # Keep if using the submit tab
+
 
 # --- Elo Leaderboard Configuration ---
 # Enhanced data with Rank (placeholder), Organizer, License, and URL
@@ -33,6 +35,7 @@ data = [
 ]
 
 # Create a master DataFrame
+# Note: Columns 'organizer' and 'license' are created in lowercase here.
 master_df = pd.DataFrame(data)
 
 # Define categories for selection (user-facing)
@@ -60,15 +63,17 @@ def update_leaderboard(category):
         score_column = category_to_column[DEFAULT_CATEGORY]
         if score_column not in master_df.columns: # Check fallback column too
              # Return empty df with correct columns if still invalid
+             # *** FIX APPLIED HERE: Use lowercase keys consistent with DataFrame ***
             return pd.DataFrame({
                 "Rank": [],
                 "Model": [],
-                "Organizer": [],
-                "License": [],
+                "organizer": [], # lowercase
+                "license": [],   # lowercase
                 "Elo Score": []
             })
 
     # Select base columns + the score column for sorting
+    # Ensure 'organizer' and 'license' are selected correctly (lowercase)
     cols_to_select = ['model_name', 'url', 'organizer', 'license', score_column]
     df = master_df[cols_to_select].copy()
 
@@ -79,27 +84,30 @@ def update_leaderboard(category):
     df.reset_index(drop=True, inplace=True)
     df.insert(0, 'Rank', df.index + 1)
 
-    # Format Model Name as Markdown Hyperlink
-    # Ensure URL is a string; use '#' as fallback if URL is missing/NaN
+    # Format Model Name as HTML Hyperlink
+    # The resulting column name will be 'Model' (capitalized)
     df['Model'] = df.apply(
         lambda row: f"<a href='{row['url'] if pd.notna(row['url']) else '#'}' target='_blank' style='color: #007bff; text-decoration: none;'>{row['model_name']}</a>",
         axis=1
     )
-    # Alternative simpler Markdown format (might render differently in gr.Dataframe):
-    # df['Model'] = df.apply(lambda row: f"[{row['model_name']}]({row['url'] if pd.notna(row['url']) else '#'})", axis=1)
-
 
     # Rename the score column to 'Elo Score' for consistent display
     df.rename(columns={score_column: 'Elo Score'}, inplace=True)
 
-    # Select and reorder columns for final display
-    final_columns = ["Rank", "Model", "Organizer", "License", "Elo Score"]
+    # --- FIX APPLIED HERE ---
+    # Select and reorder columns for final display using the ACTUAL column names in df
+    # Use lowercase 'organizer' and 'license' here because they haven't been renamed.
+    final_columns = ["Rank", "Model", "organizer", "license", "Elo Score"]
     df = df[final_columns]
+    # -----------------------
+
+    # Note: The DataFrame returned now has columns:
+    # 'Rank', 'Model', 'organizer', 'license', 'Elo Score'
 
     return df
 
 # --- Mock/Placeholder functions/data for other tabs ---
-# (Same as previous version - providing empty data)
+# (If the Submit tab is used, ensure these variables are appropriately populated or handled)
 print("Warning: Evaluation queue data fetching is disabled/mocked due to leaderboard changes.")
 finished_eval_queue_df = pd.DataFrame(columns=["Model", "Status", "Requested", "Started"])
 running_eval_queue_df = pd.DataFrame(columns=["Model", "Status", "Requested", "Started"])
@@ -118,42 +126,45 @@ def restart_space():
 # Example CSS (add to your custom_css or inline):
 # table { width: 100%; border-collapse: collapse; }
 # th, td { padding: 8px 12px; border: 1px solid #ddd; text-align: left; }
-# th { background-color: #f2f2f2; }
+# th { background-color: #f2f2f2; font-weight: bold; } /* Added bold */
 # tr:nth-child(even) { background-color: #f9f9f9; }
 # tr:hover { background-color: #e9e9e9; }
+# td a { color: #007bff; text-decoration: none; } /* Style links in table */
+# td a:hover { text-decoration: underline; }
 
-demo = gr.Blocks(css=custom_css, theme=gr.themes.Soft()) # Using a soft theme
+# Use a theme for better default styling
+demo = gr.Blocks(css=custom_css, theme=gr.themes.Soft())
 
 with demo:
-    gr.HTML(TITLE) # Keep your existing title HTML
+    # Use the TITLE variable imported from src.about
+    gr.HTML(TITLE)
+    # Use the INTRODUCTION_TEXT variable imported from src.about
     gr.Markdown(INTRODUCTION_TEXT, elem_classes="markdown-text")
 
     with gr.Tabs(elem_classes="tab-buttons") as tabs:
         with gr.TabItem("🏅 MLE-Dojo Benchmark", elem_id="llm-benchmark-tab-table", id=0):
             with gr.Column():
-                gr.Markdown("## Model Elo Rankings by Category") # Slightly updated title
+                gr.Markdown("## Model Elo Rankings by Category")
                 category_selector = gr.Radio(
                     choices=CATEGORIES,
-                    label="Select Category:", # Simpler label
-                    value=DEFAULT_CATEGORY, # Default selection
+                    label="Select Category:",
+                    value=DEFAULT_CATEGORY,
                     interactive=True,
-                    # container=False, # Removed for default layout
-                    # info="Select a category to see the rankings based on its specific Elo score." # Optional info tooltip
                 )
                 leaderboard_df_component = gr.Dataframe(
                     # Initialize with sorted data for the default category
                     value=update_leaderboard(DEFAULT_CATEGORY),
+                    # Headers for DISPLAY remain capitalized
                     headers=["Rank", "Model", "Organizer", "License", "Elo Score"],
-                    # Use 'html' for the Model column to render the <a> tag correctly.
-                    # Use 'markdown' if you used the markdown link format '[text](url)'
+                    # Datatype maps to the final df columns: Rank, Model, organizer, license, Elo Score
+                    # 'html' is used for the 'Model' column containing the <a> tag
                     datatype=["number", "html", "str", "str", "number"],
                     interactive=False,
-                    # Set height for better appearance, adjust as needed
-                    height=400 + (len(master_df) * 20), # Base height + dynamic part
+                    height=400 + (len(master_df) * 25), # Adjusted height slightly
                     row_count=(len(master_df), "fixed"),
                     col_count=(5, "fixed"),
-                    wrap=True, # Allow text wrapping in cells
-                    # elem_id="leaderboard-table" # Add elem_id for potential CSS targeting
+                    wrap=True, # Allow text wrapping
+                    elem_id="leaderboard-table" # CSS hook
                 )
                 # Link the radio button change to the update function
                 category_selector.change(
@@ -162,23 +173,58 @@ with demo:
                     outputs=leaderboard_df_component
                 )
 
-        with gr.TabItem("📝 About", elem_id="llm-benchmark-tab-about", id=1): # Changed ID for clarity
-            # (Content unchanged)
+        with gr.TabItem("📝 About", elem_id="llm-benchmark-tab-about", id=1):
+             # Use the LLM_BENCHMARKS_TEXT variable imported from src.about
             gr.Markdown(LLM_BENCHMARKS_TEXT, elem_classes="markdown-text")
 
         # --- Submit Tab (Commented out as in original request) ---
+        # Make sure EVALUATION_QUEUE_TEXT and add_new_eval are imported if uncommented
         # with gr.TabItem("🚀 Submit here! ", elem_id="llm-benchmark-tab-submit", id=2):
-        #     # (Content unchanged, still uses potentially empty/mock queue data)
-        #     # ... (Your submission form code remains here) ...
-        #     pass # Placeholder if you uncomment the tab
+        #     with gr.Column():
+        #          with gr.Row():
+        #              gr.Markdown(EVALUATION_QUEUE_TEXT, elem_classes="markdown-text") # Requires import
+        #          with gr.Column():
+        #              with gr.Accordion(f"✅ Finished Evaluations ({len(finished_eval_queue_df)})", open=False):
+        #                   finished_eval_table = gr.components.Dataframe(
+        #                       value=finished_eval_queue_df, headers=EVAL_COLS, datatype=EVAL_TYPES, row_count=5,
+        #                  )
+        #              with gr.Accordion(f"🔄 Running Evaluation Queue ({len(running_eval_queue_df)})", open=False):
+        #                   running_eval_table = gr.components.Dataframe(
+        #                       value=running_eval_queue_df, headers=EVAL_COLS, datatype=EVAL_TYPES, row_count=5,
+        #                  )
+        #              with gr.Accordion(f"⏳ Pending Evaluation Queue ({len(pending_eval_queue_df)})", open=False):
+        #                  pending_eval_table = gr.components.Dataframe(
+        #                      value=pending_eval_queue_df, headers=EVAL_COLS, datatype=EVAL_TYPES, row_count=5,
+        #                  )
+        #     with gr.Row():
+        #          gr.Markdown("# ✉️✨ Submit your model here!", elem_classes="markdown-text")
+        #     with gr.Row():
+        #          with gr.Column():
+        #              model_name_textbox = gr.Textbox(label="Model name (on Hugging Face Hub)") # Clarified label
+        #              revision_name_textbox = gr.Textbox(label="Revision / Commit Hash", placeholder="main")
+        #              # Example choices, adjust as needed for your actual submission logic
+        #              model_type = gr.Dropdown(choices=["Type A", "Type B", "Type C"], label="Model type", multiselect=False, value=None, interactive=True)
+        #          with gr.Column():
+        #              precision = gr.Dropdown(choices=["float16", "bfloat16", "float32", "int8", "auto"], label="Precision", multiselect=False, value="auto", interactive=True)
+        #              weight_type = gr.Dropdown(choices=["Original", "Adapter", "Delta"], label="Weights type", multiselect=False, value="Original", interactive=True)
+        #              base_model_name_textbox = gr.Textbox(label="Base model (for delta or adapter weights)")
+        #     submit_button = gr.Button("Submit Eval")
+        #     submission_result = gr.Markdown() # To display success/failure message
+        #     # Ensure add_new_eval is correctly imported and handles these inputs
+        #     submit_button.click(
+        #          add_new_eval, # Requires import
+        #          [ model_name_textbox, base_model_name_textbox, revision_name_textbox, precision, weight_type, model_type, ],
+        #          submission_result,
+        #      )
+
 
     # --- Citation Row (at the bottom, outside Tabs) ---
     with gr.Accordion("📙 Citation", open=False):
-         # (Content unchanged)
+         # Use the CITATION_BUTTON_TEXT and CITATION_BUTTON_LABEL variables imported from src.about
          citation_button = gr.Textbox(
              value=CITATION_BUTTON_TEXT,
              label=CITATION_BUTTON_LABEL,
-             lines=20,
+             lines=10, # Reduced lines slightly
              elem_id="citation-button",
              show_copy_button=True,
          )
@@ -189,5 +235,8 @@ with demo:
 # scheduler.start()
 
 # --- Launch the app ---
+# Ensures the app launches only when the script is run directly
 if __name__ == "__main__":
+    # Ensure you have installed necessary libraries: pip install gradio pandas apscheduler
+    # Make sure your src module files (about.py etc.) are in the same directory or accessible in PYTHONPATH
     demo.launch()