fix: fix the bug in duplicated columns

src/display/utils.py

@@ -52,10 +52,10 @@ def get_default_auto_eval_column_dict():
         ["average", ColumnContent, ColumnContent(COL_NAME_AVG, "number", True)]
     )
     auto_eval_column_dict.append(
-        ["retrieval_model_link", ColumnContent, ColumnContent(COL_NAME_RETRIEVAL_MODEL, "markdown", False, hidden=True, never_hidden=False)]
+        ["retrieval_model_link", ColumnContent, ColumnContent(COL_NAME_RETRIEVAL_MODEL_LINK, "markdown", False, hidden=True, never_hidden=False)]
     )
     auto_eval_column_dict.append(
-        ["reranking_model_link", ColumnContent, ColumnContent(COL_NAME_RERANKING_MODEL, "markdown", False, hidden=True, never_hidden=False)]
+        ["reranking_model_link", ColumnContent, ColumnContent(COL_NAME_RERANKING_MODEL_LINK, "markdown", False, hidden=True, never_hidden=False)]
     )
     auto_eval_column_dict.append(
         ["is_anonymous", ColumnContent, ColumnContent(COL_NAME_IS_ANONYMOUS, "bool", False, hidden=True)]

src/utils.py

@@ -43,7 +43,7 @@ def search_table(df: pd.DataFrame, query: str) -> pd.DataFrame:
     return df[(df[COL_NAME_RETRIEVAL_MODEL].str.contains(query, case=False))]
 
 
-def get_default_cols(task: str, columns: list = [], add_fix_cols: bool = True) -> list:
+def get_default_cols(task: str, columns: list=[], add_fix_cols: bool=True) -> list:
     cols = []
     types = []
     if task == "qa":
@@ -65,12 +65,19 @@ def get_default_cols(task: str, columns: list = [], add_fix_cols: bool = True) -
         types.append(col_type)
 
     if add_fix_cols:
-        cols = FIXED_COLS + cols
-        types = FIXED_COLS_TYPES + types
+        _cols = []
+        _types = []
+        for col_name, col_type in zip(cols, types):
+            if col_name in FIXED_COLS:
+                continue
+            _cols.append(col_name)
+            _types.append(col_type)
+        cols = FIXED_COLS + _cols
+        types = FIXED_COLS_TYPES + _types
     return cols, types
 
 
-fixed_cols = get_default_auto_eval_column_dict()[:-2]
+fixed_cols = get_default_auto_eval_column_dict()[:-3]
 
 FIXED_COLS = [c.name for _, _, c in fixed_cols]
 FIXED_COLS_TYPES = [c.type for _, _, c in fixed_cols]

tests/src/display/test_utils.py

@@ -1,5 +1,5 @@
 import pytest
-from src.display.utils import fields, AutoEvalColumnQA, COLS_QA, COLS_LONG_DOC, COLS_LITE, TYPES_QA, TYPES_LONG_DOC, QA_BENCHMARK_COLS, LONG_DOC_BENCHMARK_COLS
+from src.display.utils import fields, AutoEvalColumnQA, COLS_QA, COLS_LONG_DOC, COLS_LITE, TYPES_QA, TYPES_LONG_DOC, QA_BENCHMARK_COLS, LONG_DOC_BENCHMARK_COLS, get_default_auto_eval_column_dict
 
 
 def test_fields():
@@ -15,3 +15,9 @@ def test_macro_variables():
     print(f'TYPES_LONG_DOC: {TYPES_LONG_DOC}')
     print(f'QA_BENCHMARK_COLS: {QA_BENCHMARK_COLS}')
     print(f'LONG_DOC_BENCHMARK_COLS: {LONG_DOC_BENCHMARK_COLS}')
+
+
+def test_get_default_auto_eval_column_dict():
+    auto_eval_column_dict_list = get_default_auto_eval_column_dict()
+    assert len(auto_eval_column_dict_list) == 9
+

tests/test_utils.py

@@ -91,4 +91,5 @@ def test_get_iso_format_timestamp():
 def test_get_default_cols():
     cols, types = get_default_cols("qa")
     for c, t in zip(cols, types):
-        print(f"type({c}): {t}")
+        print(f"type({c}): {t}")
+    assert len(frozenset(cols)) == len(cols)