MohamedRashad commited on
Commit
ef6f53c
·
1 Parent(s): 89f161d

Refactor retrieval and reranking result loading to support customizable sorting and column dropping

Browse files
Files changed (2) hide show
  1. app.py +2 -2
  2. utils.py +6 -5
app.py CHANGED
@@ -110,12 +110,12 @@ def main():
110
  global retrieval_df, reranking_df
111
 
112
  # Prepare retrieval dataframe
113
- retrieval_df = load_retrieval_results(prepare_for_display=True)
114
  retrieval_columns_to_show = ["Model", "Web Search Dataset (Overall Score)", "Model Size (in Millions)", "Embedding Dimension", "Max Tokens", "Num Likes"]
115
  retrieval_cols = retrieval_df.columns.tolist() # cache columns
116
 
117
  # Prepare reranking dataframe
118
- reranking_df = load_reranking_results(prepare_for_display=True)
119
  reranking_columns_to_show = reranking_df.columns.tolist()
120
  reranking_cols = reranking_df.columns.tolist() # cache columns
121
 
 
110
  global retrieval_df, reranking_df
111
 
112
  # Prepare retrieval dataframe
113
+ retrieval_df = load_retrieval_results(True, "Web Search Dataset (Overall Score)", ["Revision", "Precision", "Task"])
114
  retrieval_columns_to_show = ["Model", "Web Search Dataset (Overall Score)", "Model Size (in Millions)", "Embedding Dimension", "Max Tokens", "Num Likes"]
115
  retrieval_cols = retrieval_df.columns.tolist() # cache columns
116
 
117
  # Prepare reranking dataframe
118
+ reranking_df = load_reranking_results(True, sort_col="Overall Score")
119
  reranking_columns_to_show = reranking_df.columns.tolist()
120
  reranking_cols = reranking_df.columns.tolist() # cache columns
121
 
utils.py CHANGED
@@ -30,21 +30,22 @@ def load_json_results(file_path: Path, prepare_for_display=False, sort_col=None,
30
  df.sort_values(sort_col, ascending=False, inplace=True)
31
  return df
32
 
33
- def load_retrieval_results(prepare_for_display=False):
34
  dataframe_path = results_dir / "retrieval_results.json"
35
  return load_json_results(
36
  dataframe_path,
37
  prepare_for_display=prepare_for_display,
38
- sort_col="Web Search Dataset (Overall Score)",
39
- drop_cols=["Revision", "Precision", "Task"]
40
  )
41
 
42
- def load_reranking_results(prepare_for_display=False):
43
  dataframe_path = results_dir / "reranking_results.json"
44
  return load_json_results(
45
  dataframe_path,
46
  prepare_for_display=prepare_for_display,
47
- sort_col="Overall Score"
 
48
  )
49
 
50
  def get_model_info(model_id, verbose=False):
 
30
  df.sort_values(sort_col, ascending=False, inplace=True)
31
  return df
32
 
33
+ def load_retrieval_results(prepare_for_display=False, sort_col=None, drop_cols=None):
34
  dataframe_path = results_dir / "retrieval_results.json"
35
  return load_json_results(
36
  dataframe_path,
37
  prepare_for_display=prepare_for_display,
38
+ sort_col=sort_col,
39
+ drop_cols=drop_cols
40
  )
41
 
42
+ def load_reranking_results(prepare_for_display=False, sort_col=None, drop_cols=None):
43
  dataframe_path = results_dir / "reranking_results.json"
44
  return load_json_results(
45
  dataframe_path,
46
  prepare_for_display=prepare_for_display,
47
+ sort_col=sort_col,
48
+ drop_cols=drop_cols
49
  )
50
 
51
  def get_model_info(model_id, verbose=False):