Update app.py

app.py

@@ -8,12 +8,13 @@ import base64
 import os
 
 # Define the columns
-MAIN_COLS = ['#P', 'Model', 'UGI 🏆', 'W/10 👍', 'NatInt 💡', 'Coding 💻', 'Political Lean 📋', 'Ideology Name']
+MAIN_COLS = ['#P', 'Model', 'UGI 🏆', 'W/10 👍', 'NatInt 💡', 'Coding 💻', 'Unruly', 'Internet', 'Soc/Pol', 'Political Lean 📋', 'Ideology Name']
 AXES_COLS_1 = ['govt', 'dipl', 'econ', 'scty']
 AXES_COLS_2 = ['Federal-Unitary', 'Democratic-Autocratic', 'Security-Freedom', 'Nationalism-Internationalism',
                'Militarist-Pacifist', 'Assimilationist-Multiculturalist', 'Collectivize-Privatize',
                'Planned-LaissezFaire', 'Isolationism-Globalism', 'Irreligious-Religious',
                'Progressive-Traditional', 'Acceleration-Bioconservative']
+UGI_CATEGORY_COLS = ['Unruly', 'Internet', 'Soc/Pol']
 
 def load_leaderboard_data(csv_file_path):
     try:
@@ -163,16 +164,17 @@ app.index_string = '''
                 color: var(--text-color) !important;
             }
             /* Filter Styles */
-            .model-type-filter label,
+            .model-type-filter {
+                color: var(--text-color) !important;
+                margin-right: 10px;
+                font-weight: bold;
+            },
             #model-type-filter label,
             #na-model-filter label {
                 color: var(--text-color) !important;
                 margin-right: 10px;
                 font-weight: bold;
             }
-            .filter-description {
-                color: var(--secondary-text) !important;
-            }
             /* Grid Styles */
             .ag-theme-alpine {
                 --ag-font-family: 'Segoe UI', Arial, sans-serif;
@@ -206,6 +208,7 @@ app.index_string = '''
                 white-space: normal !important;
                 line-height: 1.2em;
                 overflow: visible;
+                padding-bottom: 4px;
             }
             
             .ag-header-cell {
@@ -499,7 +502,14 @@ columnDefs = [
         "cellClass": "ag-left-aligned-cell",
         "wrapHeaderText": True,
         "autoHeaderHeight": True
-    },
+    }
+]
+
+ugi_category_columns = [
+    create_numeric_column(col, width=120) for col in UGI_CATEGORY_COLS
+]
+
+political_columns = [
     {
         "headerName": "Ideology",
         "field": "Ideology Name",
@@ -672,7 +682,16 @@ dashGridOptions = {
             }
         """
     },
-    "theme": "ag-theme-alpine-dark" if "prefers-color-scheme: dark" else "ag-theme-alpine"
+    "theme": "ag-theme-alpine-dark" if "prefers-color-scheme: dark" else "ag-theme-alpine",
+    "columnState": {
+        "function": """
+            function() {
+                return {
+                    columnVisibility: {}
+                };
+            }
+        """
+    }
 }
 
 # Define the layout
@@ -721,14 +740,14 @@ app.layout = html.Div([
 
     html.Div([
         html.Div("To filter columns, click the ≡ next to a column's name. On mobile, hold the column name for the menu to appear.",
-                 className='filter-description',
-                 style={'marginBottom': '20px'}),
+                 style={'marginBottom': '20px', 'color': 'var(--text-color)'}),  # Use text-color variable
     ], style={'padding': '0 20px'}),
     
     # Model Type Filter
     html.Div([
         html.Div([
-            html.Label("Display Models:", className="model-type-filter"),
+            html.Label("Display Models:", 
+                className="model-type-filter"),  # This will make it bold
             dcc.Checklist(
                 id='model-type-filter',
                 options=[
@@ -737,21 +756,40 @@ app.layout = html.Div([
                     {'label': 'Merge', 'value': 'Is Merged'},
                     {'label': 'Proprietary', 'value': 'proprietary'}
                 ],
-                value=['Is Foundation', 'Is Finetuned', 'Is Merged', 'proprietary'],  # All checked by default
+                value=['Is Foundation', 'Is Finetuned', 'Is Merged', 'proprietary'],
                 inline=True,
-                style={'display': 'inline-block'}
+                style={'display': 'inline-block'},
+                labelStyle={'fontWeight': 'normal', 'marginRight': '15px'}  # Add consistent spacing
             )
         ], style={'float': 'left'}),
         html.Div([
             dcc.Checklist(
                 id='na-model-filter',
                 options=[{'label': 'NA Models', 'value': 'show_na'}],
-                value=[],  # Unchecked by default
+                value=[],
                 inline=True,
-                style={'display': 'inline-block'}
+                style={'display': 'inline-block'},
+                labelStyle={'fontWeight': 'normal'}  # Make sure NA Models isn't bold
             )
         ], style={'float': 'right'})
-    ], style={'marginBottom': '20px', 'padding': '0 20px', 'overflow': 'hidden'}),  # Added comma here
+    ], style={'marginBottom': '20px', 'padding': '0 20px', 'overflow': 'hidden'}),
+    
+    # Additional Columns Filter
+    html.Div([
+        html.Label("Show additional columns:", 
+            className="model-type-filter"),  # Use same class for consistent styling
+        dcc.Checklist(
+            id='additional-columns-filter',
+            options=[
+                {'label': 'UGI Categories', 'value': 'ugi_categories'},
+                {'label': 'Political Test Axes', 'value': 'political_axes'}
+            ],
+            value=[],
+            inline=True,
+            style={'display': 'inline-block'},
+            labelStyle={'fontWeight': 'normal', 'marginRight': '15px'}  # Add consistent spacing
+        )
+    ], style={'marginBottom': '20px', 'padding': '0 20px', 'overflow': 'hidden'}),
     
     # Grid
     html.Div([
@@ -927,6 +965,32 @@ def update_grid(selected_types, show_na, pinned_rows):
     
     return records, selected_types, pinned_models
 
+@app.callback(
+    Output('leaderboard-grid', 'columnDefs'),
+    [Input('additional-columns-filter', 'value')]
+)
+def update_columns(additional_columns):
+    # Start with base columns up to UGI
+    current_columns = columnDefs[:7]  # Include up to UGI column
+    
+    # Add UGI category columns if selected
+    if 'ugi_categories' in additional_columns:
+        current_columns.extend(ugi_category_columns)
+    
+    # Add remaining base columns (W/10, NatInt, Coding, Political Lean)
+    current_columns.extend(columnDefs[7:11])
+    
+    # Add political columns if selected
+    if 'political_axes' in additional_columns:
+        current_columns.extend(political_columns)
+        current_columns.extend([col for col in columnDefs if col['field'] in AXES_COLS_1])
+        current_columns.extend([col for col in columnDefs if col['field'] in AXES_COLS_2])
+    
+    # Always add date columns at the end
+    current_columns.extend([col for col in columnDefs if col['field'] in ['Release Date', 'Test Date']])
+    
+    return current_columns
+
 @app.callback(
     Output('ideology-descriptions', 'children'),
     [Input('leaderboard-grid', 'rowData')]