change column order for evaluatation dataframe (deepset-ai#1957)

* change column order for evaluatation dataframe * added missing eval column node_input * generic order for both document and answer returning nodes; ensure no columns get lost Co-authored-by: tstadel <[email protected]>
jamescalam · Jan 7, 2022 · b704194 · b704194
1 parent 5b3f693
commit b704194
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/haystack/pipelines/base.py b/haystack/pipelines/base.py
@@ -413,8 +413,25 @@ def eval(
  sas_model_name_or_path=sas_model_name_or_path)
  df["sas"] = sas
 
+ # reorder columns for better qualitative evaluation
+ for key, df in eval_result.node_results.items():
+ desired_col_order = ["query", # generic
+ "gold_answers", "answer", "context", "exact_match", "f1", "sas", # answer-specific
+ "gold_document_contents", "content", "gold_id_match", "answer_match", "gold_id_or_answer_match", # doc-specific
+ "rank", "document_id", "gold_document_ids", # generic
+ "offsets_in_document", "gold_offsets_in_documents", # answer-specific
+ "type", "node", "node_input"] # generic
+ eval_result.node_results[key] = self._reorder_columns(df, desired_col_order)
+
  return eval_result
 
+ def _reorder_columns(self, df: DataFrame, desired_order: List[str]) -> DataFrame:
+ filtered_order = [col for col in desired_order if col in df.columns]
+ missing_columns = [col for col in df.columns if col not in desired_order]
+ reordered_columns = filtered_order + missing_columns
+ assert len(reordered_columns) == len(df.columns)
+ return df.reindex(columns=reordered_columns)
+
  def _build_eval_dataframe(self, 
  query: str, 
  query_labels: MultiLabel,