sh1gechan commited on
Commit
95eda9e
·
verified ·
1 Parent(s): 2913db5

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +16 -8
app.py CHANGED
@@ -105,16 +105,24 @@ def search_table(df: pd.DataFrame, query: str) -> pd.DataFrame:
105
  return df[(df[AutoEvalColumn.dummy.name].str.contains(query, case=False))]
106
 
107
 
 
 
 
 
 
 
 
 
 
 
 
108
  def select_columns(df: pd.DataFrame, columns: list) -> pd.DataFrame:
109
  always_here_cols = [
110
  AutoEvalColumn.model_type_symbol.name,
111
  AutoEvalColumn.model.name,
112
  ]
113
- # We use COLS to maintain sorting
114
- filtered_df = df[
115
- always_here_cols + [c for c in COLS if c in df.columns and c in columns]# + [AutoEvalColumn.dummy.name]
116
- ]
117
- return filtered_df
118
 
119
 
120
  def filter_queries(query: str, filtered_df: pd.DataFrame):
@@ -261,7 +269,10 @@ with demo:
261
  )
262
 
263
  leaderboard_df_filtered = filter_models(leaderboard_df, [t.to_str(" : ") for t in ModelType], list(NUMERIC_INTERVALS.keys()), [i.value.name for i in Precision], [i.value.name for i in AddSpecialTokens], [i.value.name for i in NumFewShots], False, False, False)
 
 
264
 
 
265
  leaderboard_table = gr.components.Dataframe(
266
  value=leaderboard_df_filtered,
267
  headers=[c.name for c in fields(AutoEvalColumn) if c.never_hidden] + shown_columns.value,
@@ -270,9 +281,6 @@ with demo:
270
  interactive=False,
271
  visible=True,
272
  )
273
- print("Leaderboard table initial value:")
274
- print(leaderboard_table.value)
275
- print(f"Leaderboard table shape: {leaderboard_table.value.shape if isinstance(leaderboard_table.value, pd.DataFrame) else 'Not a DataFrame'}")
276
 
277
  # Dummy leaderboard for handling the case when the user uses backspace key
278
  hidden_leaderboard_table_for_search = gr.components.Dataframe(
 
105
  return df[(df[AutoEvalColumn.dummy.name].str.contains(query, case=False))]
106
 
107
 
108
+ # def select_columns(df: pd.DataFrame, columns: list) -> pd.DataFrame:
109
+ # always_here_cols = [
110
+ # AutoEvalColumn.model_type_symbol.name,
111
+ # AutoEvalColumn.model.name,
112
+ # ]
113
+ # # We use COLS to maintain sorting
114
+ # filtered_df = df[
115
+ # always_here_cols + [c for c in COLS if c in df.columns and c in columns]# + [AutoEvalColumn.dummy.name]
116
+ # ]
117
+ # return filtered_df
118
+
119
  def select_columns(df: pd.DataFrame, columns: list) -> pd.DataFrame:
120
  always_here_cols = [
121
  AutoEvalColumn.model_type_symbol.name,
122
  AutoEvalColumn.model.name,
123
  ]
124
+ selected_cols = always_here_cols + [c for c in columns if c in df.columns]
125
+ return df[selected_cols]
 
 
 
126
 
127
 
128
  def filter_queries(query: str, filtered_df: pd.DataFrame):
 
269
  )
270
 
271
  leaderboard_df_filtered = filter_models(leaderboard_df, [t.to_str(" : ") for t in ModelType], list(NUMERIC_INTERVALS.keys()), [i.value.name for i in Precision], [i.value.name for i in AddSpecialTokens], [i.value.name for i in NumFewShots], False, False, False)
272
+ initial_columns = [c.name for c in fields(AutoEvalColumn) if c.never_hidden] + shown_columns.value
273
+ leaderboard_df_filtered = select_columns(leaderboard_df_filtered, initial_columns)
274
 
275
+
276
  leaderboard_table = gr.components.Dataframe(
277
  value=leaderboard_df_filtered,
278
  headers=[c.name for c in fields(AutoEvalColumn) if c.never_hidden] + shown_columns.value,
 
281
  interactive=False,
282
  visible=True,
283
  )
 
 
 
284
 
285
  # Dummy leaderboard for handling the case when the user uses backspace key
286
  hidden_leaderboard_table_for_search = gr.components.Dataframe(