fix sorting for CMD

app.py

@@ -454,7 +454,7 @@ def filter_columns_by_substrings(dataframe: pd.DataFrame, selected_task_substrin
     return dataframe[filtered_columns]
 
 def update_leaderboard(dataframe: pd.DataFrame, selected_task_substrings: List[str],
-                       selected_model_substrings: List[str]):
+                       selected_model_substrings: List[str], ascending: bool = False):
     """
     Update the leaderboard based on the selected substrings.
     """
@@ -476,20 +476,28 @@ def update_leaderboard(dataframe: pd.DataFrame, selected_task_substrings: List[s
         return df_transformed
 
     if show_average:
+        # Replace "-" with NaN for calculation, then use skipna=False to get NaN when any value is missing
         numeric_data = filtered_dataframe.replace("-", np.nan)
         means = numeric_data.mean(axis=1, skipna=False)
 
+        # Apply the same transformation for computing scores
         s_filtered_dataframe = _transform_floats(filtered_dataframe)
         s_numeric_data = s_filtered_dataframe.replace("-", np.nan)
         s_means = s_numeric_data.mean(axis=1, skipna=False)
 
         # Set Average and Score columns
-        # Use isna() to check for NaN values (which occur when any cell in the row was "-")
-        filtered_dataframe.loc[:, "Average"] = np.where(means.isna(), "-", means.round(2))
-        filtered_dataframe.loc[:, "Score"] = np.where(s_means.isna(), "-", s_means.round(2))
+        # Keep numeric values as NaN for proper sorting, convert to "-" only for display if needed
+        filtered_dataframe.loc[:, "Average"] = means.round(2)
+        filtered_dataframe.loc[:, "Score"] = s_means.round(2)
 
-        # Sort by Average
-        filtered_dataframe = filtered_dataframe.sort_values(by=["Average"], ascending=False, na_position='last')
+        # Sort by Average with NaN values at the end
+        filtered_dataframe = filtered_dataframe.sort_values(by=["Average"], ascending=ascending, na_position='last')
+        print(ascending)
+        print(filtered_dataframe)
+
+        # After sorting, convert NaN back to "-" for display
+        filtered_dataframe.loc[:, "Average"] = filtered_dataframe["Average"].fillna("-")
+        filtered_dataframe.loc[:, "Score"] = filtered_dataframe["Score"].fillna("-")
 
     return filtered_dataframe
 
@@ -526,15 +534,16 @@ with demo:
 
                     leaderboard, data = init_leaderboard_mib_subgraph(LEADERBOARD_DF_MIB_SUBGRAPH_FPL, "Subgraph")
                     original_leaderboard = gr.State(value=data)
+                    ascending = gr.State(value=False)
                     # Update the leaderboard when the user selects/deselects substrings
                     task_substring_checkbox.change(
                         fn=update_leaderboard,
-                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox],
+                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox, ascending],
                         outputs=leaderboard
                     )
                     model_substring_checkbox.change(
                         fn=update_leaderboard,
-                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox],
+                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox, ascending],
                         outputs=leaderboard
                     )
                     print(f"Leaderboard is {leaderboard}")
@@ -559,15 +568,16 @@ with demo:
 
                     leaderboard, data = init_leaderboard_mib_subgraph(LEADERBOARD_DF_MIB_SUBGRAPH_FEQ, "Subgraph")
                     original_leaderboard = gr.State(value=data)
+                    ascending = gr.State(value=True)
                     # Update the leaderboard when the user selects/deselects substrings
                     task_substring_checkbox.change(
                         fn=update_leaderboard,
-                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox],
+                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox, ascending],
                         outputs=leaderboard
                     )
                     model_substring_checkbox.change(
                         fn=update_leaderboard,
-                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox],
+                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox, ascending],
                         outputs=leaderboard
                     )
                     print(f"Leaderboard is {leaderboard}")
@@ -597,14 +607,15 @@ with demo:
                         "Causal Graph"
                     )
                     original_leaderboard = gr.State(value=data)
+                    ascending = gr.State(value=False)
                     task_substring_checkbox.change(
                         fn=update_leaderboard,
-                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox],
+                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox, ascending],
                         outputs=leaderboard_aggregated
                     )
                     model_substring_checkbox.change(
                         fn=update_leaderboard,
-                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox],
+                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox, ascending],
                         outputs=leaderboard_aggregated
                     )
                 with gr.TabItem("Averaged View", id=1):
@@ -625,14 +636,15 @@ with demo:
                         "Causal Graph"
                     )
                     original_leaderboard = gr.State(value=data)
+                    ascending = gr.State(value=False)
                     task_substring_checkbox.change(
                         fn=update_leaderboard,
-                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox],
+                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox, ascending],
                         outputs=leaderboard_averaged
                     )
                     model_substring_checkbox.change(
                         fn=update_leaderboard,
-                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox],
+                        inputs=[original_leaderboard, task_substring_checkbox, model_substring_checkbox, ascending],
                         outputs=leaderboard_averaged
                     )