Update app.py

app.py

@@ -110,8 +110,8 @@ def load_leaderboard_data(csv_file_path):
         return pd.DataFrame(columns=UGI_COLS + WRITING_STYLE_COLS + ANIME_RATING_COLS + ADDITIONAL_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, is_foundation: bool, columns: list, w10_range: tuple, additional_cols: list) -> pd.DataFrame:
-    filtered_df = df.copy()
+def update_table(df, query, param_ranges, is_foundation, columns, w10_range, additional_cols):
+    mask = pd.Series(True, index=df.index)
     
     # Apply model size filter
     if param_ranges:
@@ -136,18 +136,19 @@ def update_table(df: pd.DataFrame, query: str, param_ranges: list, is_foundation
             elif param_range == 'Closed':
                 size_mask |= filtered_df['Total Params'].isna()
         filtered_df = filtered_df[size_mask]
+        mask &= size_mask
     
-    # Apply foundation model filter
     if is_foundation:
-        filtered_df = filtered_df[filtered_df['Foundation'] == 1]
+        mask &= df['Foundation'] == 1
     
     if query:
         escaped_query = re.escape(query)
-        filtered_df = filtered_df[filtered_df['Model'].str.contains(escaped_query, case=False, na=False, regex=True)]
+        mask &= df['Model'].str.contains(escaped_query, case=False, na=False, regex=True)
     
-    # Apply W/10 filtering
-    if 'W/10 👍' in filtered_df.columns:
-        filtered_df = filtered_df[(filtered_df['W/10 👍'] >= w10_range[0]) & (filtered_df['W/10 👍'] <= w10_range[1])]
+    if 'W/10 👍' in df.columns:
+        mask &= (df['W/10 👍'] >= w10_range[0]) & (df['W/10 👍'] <= w10_range[1])
+    
+    filtered_df = df[mask]
     
     # Add selected additional columns
     columns = columns + [col for col in additional_cols if col in ADDITIONAL_COLS]
@@ -339,19 +340,23 @@ with GraInter:
             """)
 
     def update_all_tables(query, param_ranges, is_foundation, w10_range, additional_cols):
-        ugi_table = update_table(leaderboard_df, query, param_ranges, is_foundation, UGI_COLS, w10_range, additional_cols)
-        
-        ws_df = leaderboard_df.sort_values(by='Reg+MyScore 🏆', ascending=False)
-        ws_table = update_table(ws_df, query, param_ranges, is_foundation, WRITING_STYLE_COLS, w10_range, additional_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)]
+        try:
+            ugi_table = update_table(leaderboard_df, query, param_ranges, is_foundation, UGI_COLS, w10_range, additional_cols)
+            ws_df = leaderboard_df.sort_values(by='Reg+MyScore 🏆', ascending=False)
+            ws_table = update_table(ws_df, query, param_ranges, is_foundation, WRITING_STYLE_COLS, w10_range, additional_cols)
         
-        arp_table = update_table(arp_df, query, param_ranges, is_foundation, ANIME_RATING_COLS, w10_range, additional_cols)
-        arp_na_table = update_table(arp_df_na, query, param_ranges, is_foundation, ANIME_RATING_COLS, w10_range, additional_cols).fillna('NA')
-        
-        return ugi_table, ws_table, arp_table, arp_na_table
+            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, is_foundation, ANIME_RATING_COLS, w10_range, additional_cols)
+            arp_na_table = update_table(arp_df_na, query, param_ranges, is_foundation, ANIME_RATING_COLS, w10_range, additional_cols).fillna('NA')
+            
+            return ugi_table, ws_table, arp_table, arp_na_table
+        except Exception as e:
+            print(f"Error in update_all_tables: {e}")
+            # Return the original tables or empty tables
+            return leaderboard_df[UGI_COLS], leaderboard_df[WRITING_STYLE_COLS], leaderboard_df[ANIME_RATING_COLS], leaderboard_df[ANIME_RATING_COLS]
 
     # Update the event handlers
     inputs = [search_bar, filter_columns_size, model_type, w10_range, additional_columns]
@@ -382,7 +387,7 @@ with GraInter:
         outputs=[leaderboard_table_ugi, leaderboard_table_ws, leaderboard_table_arp, leaderboard_table_arp_na]
     )
     
-    w10_range.change(
+    w10_range.release(
         fn=update_all_tables,
         inputs=[search_bar, filter_columns_size, model_type, w10_range, additional_columns],
         outputs=[leaderboard_table_ugi, leaderboard_table_ws, leaderboard_table_arp, leaderboard_table_arp_na]