Update app.py

app.py

@@ -62,7 +62,7 @@ def load_leaderboard_data(csv_file_path):
         return pd.DataFrame(columns=UGI_COLS + WRITING_STYLE_COLS + ANIME_RATING_COLS)
 
 # Update the leaderboard table based on the search query and parameter range filters
-def update_table(df: pd.DataFrame, query: str, param_ranges: list, w10_min: float, w10_max: float, columns: list) -> pd.DataFrame:
+def update_table(df: pd.DataFrame, query: str, param_ranges: list, w10_range: list, columns: list) -> pd.DataFrame:
     filtered_df = df.copy()
     if param_ranges:
         param_mask = pd.Series(False, index=filtered_df.index)
@@ -86,7 +86,7 @@ def update_table(df: pd.DataFrame, query: str, param_ranges: list, w10_min: floa
         filtered_df = filtered_df[param_mask]
     
     # Apply W/10 filter
-    filtered_df = filtered_df[(filtered_df['W/10 👍'] >= w10_min) & (filtered_df['W/10 👍'] <= w10_max)]
+    filtered_df = filtered_df[(filtered_df['W/10 👍'] >= w10_range[0]) & (filtered_df['W/10 👍'] <= w10_range[1])]
     
     if query:
         filtered_df = filtered_df[filtered_df['Model'].str.contains(query, case=False, na=False)]
@@ -124,21 +124,13 @@ with GraInter:
                 elem_id="filter-columns-size",
             )
         with gr.Row():
-            w10_min = gr.Slider(
+            w10_slider = gr.Slider(
                 minimum=0,
                 maximum=10,
-                value=0,
+                value=[0, 10],
                 step=0.1,
-                label="W/10 Minimum",
-                elem_id="w10-min-slider"
-            )
-            w10_max = gr.Slider(
-                minimum=0,
-                maximum=10,
-                value=10,
-                step=0.1,
-                label="W/10 Maximum",
-                elem_id="w10-max-slider"
+                label="W/10 Range",
+                elem_id="w10-slider"
             )
     
     # Load the initial leaderboard data
@@ -259,42 +251,36 @@ with GraInter:
             **NA:** When models either reply with one number for every anime, give ratings not between 1 and 10, or don't give every anime in the list a rating.
             """)
 
-    def update_all_tables(query, param_ranges, w10_min, w10_max):
-        ugi_table = update_table(leaderboard_df, query, param_ranges, w10_min, w10_max, UGI_COLS)
+    def update_all_tables(query, param_ranges, w10_range):
+        ugi_table = update_table(leaderboard_df, query, param_ranges, w10_range, UGI_COLS)
         
         ws_df = leaderboard_df.sort_values(by='Reg+MyScore 🏆', ascending=False)
-        ws_table = update_table(ws_df, query, param_ranges, w10_min, w10_max, WRITING_STYLE_COLS)
+        ws_table = update_table(ws_df, query, param_ranges, w10_range, WRITING_STYLE_COLS)
         
         arp_df = leaderboard_df.sort_values(by='Score 🏆', ascending=False)
         arp_df_na = arp_df[arp_df[['Dif', 'Cor']].isna().any(axis=1)]
         arp_df = arp_df[~arp_df[['Dif', 'Cor']].isna().any(axis=1)]
         
-        arp_table = update_table(arp_df, query, param_ranges, w10_min, w10_max, ANIME_RATING_COLS)
-        arp_na_table = update_table(arp_df_na, query, param_ranges, w10_min, w10_max, ANIME_RATING_COLS).fillna('NA')
+        arp_table = update_table(arp_df, query, param_ranges, w10_range, ANIME_RATING_COLS)
+        arp_na_table = update_table(arp_df_na, query, param_ranges, w10_range, ANIME_RATING_COLS).fillna('NA')
         
         return ugi_table, ws_table, arp_table, arp_na_table
 
     search_bar.change(
         fn=update_all_tables,
-        inputs=[search_bar, filter_columns_size, w10_min, w10_max],
+        inputs=[search_bar, filter_columns_size, w10_slider],
         outputs=[leaderboard_table_ugi, leaderboard_table_ws, leaderboard_table_arp, leaderboard_table_arp_na]
     )
     
     filter_columns_size.change(
         fn=update_all_tables,
-        inputs=[search_bar, filter_columns_size, w10_min, w10_max],
+        inputs=[search_bar, filter_columns_size, w10_slider],
         outputs=[leaderboard_table_ugi, leaderboard_table_ws, leaderboard_table_arp, leaderboard_table_arp_na]
     )
     
-    w10_min.change(
-        fn=update_all_tables,
-        inputs=[search_bar, filter_columns_size, w10_min, w10_max],
-        outputs=[leaderboard_table_ugi, leaderboard_table_ws, leaderboard_table_arp, leaderboard_table_arp_na]
-    )
-
-    w10_max.change(
+    w10_slider.change(
         fn=update_all_tables,
-        inputs=[search_bar, filter_columns_size, w10_min, w10_max],
+        inputs=[search_bar, filter_columns_size, w10_slider],
         outputs=[leaderboard_table_ugi, leaderboard_table_ws, leaderboard_table_arp, leaderboard_table_arp_na]
     )