From 991ee79e4793e69fbf5d946961c154a455065cdd Mon Sep 17 00:00:00 2001
From: hagen-danswer <hagen@danswer.ai>
Date: Thu, 11 Jul 2024 17:42:11 -0700
Subject: [PATCH] some qol improvements for search pipeline (#1809)

---
 .gitignore                                    |  1 +
 .../regression/answer_quality/api_utils.py    | 13 +++--------
 .../regression/answer_quality/cli_utils.py    |  3 ++-
 .../tests/regression/answer_quality/relari.py | 23 ++++++++++++-------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1125f5f6..d9d7727b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /deployment/data/nginx/app.conf
 .vscode/launch.json
 *.sw?
+/backend/tests/regression/answer_quality/search_test_config.yaml
diff --git a/backend/tests/regression/answer_quality/api_utils.py b/backend/tests/regression/answer_quality/api_utils.py
index 20292f35b..cdb77c2b0 100644
--- a/backend/tests/regression/answer_quality/api_utils.py
+++ b/backend/tests/regression/answer_quality/api_utils.py
@@ -55,21 +55,14 @@ def get_answer_from_query(query: str, run_suffix: str) -> tuple[list[str], str]:
     body["user"] = None
     try:
         response_json = requests.post(url, headers=headers, json=body).json()
-        content_list = [
-            context.get("content", "")
-            for context in response_json.get("contexts", {}).get("contexts", [])
-        ]
-        answer = response_json.get("answer")
+        context_data_list = response_json.get("contexts", {}).get("contexts", [])
+        answer = response_json.get("answer", "")
     except Exception as e:
         print("Failed to answer the questions, trying again")
         print(f"error: {str(e)}")
         raise e
 
-    print("\nquery: ", query)
-    print("answer: ", answer)
-    print("content_list: ", content_list)
-
-    return content_list, answer
+    return context_data_list, answer
 
 
 def check_if_query_ready(run_suffix: str) -> bool:
diff --git a/backend/tests/regression/answer_quality/cli_utils.py b/backend/tests/regression/answer_quality/cli_utils.py
index a39309efd..ae8539216 100644
--- a/backend/tests/regression/answer_quality/cli_utils.py
+++ b/backend/tests/regression/answer_quality/cli_utils.py
@@ -112,7 +112,8 @@ def start_docker_compose(
     run_suffix: str, launch_web_ui: bool, use_cloud_gpu: bool
 ) -> None:
     print("Starting Docker Compose...")
-    os.chdir("../deployment/docker_compose")
+    os.chdir(os.path.dirname(__file__))
+    os.chdir("../../../../deployment/docker_compose/")
     command = f"docker compose -f docker-compose.search-testing.yml -p danswer-stack{run_suffix} up -d"
     command += " --build"
     command += " --force-recreate"
diff --git a/backend/tests/regression/answer_quality/relari.py b/backend/tests/regression/answer_quality/relari.py
index c669d55c2..bea1f37f6 100644
--- a/backend/tests/regression/answer_quality/relari.py
+++ b/backend/tests/regression/answer_quality/relari.py
@@ -16,26 +16,33 @@ def _get_and_write_relari_outputs(
     while not check_if_query_ready(run_suffix):
         time.sleep(5)
 
+    count = 0
     with open(output_file_path, "w", encoding="utf-8") as file:
         for sample in samples:
-            retrieved_context, answer = get_answer_from_query(
-                query=sample["question"],
+            print(f"On question number {count}")
+            query = sample["question"]
+            print(f"query: {query}")
+            context_data_list, answer = get_answer_from_query(
+                query=query,
                 run_suffix=run_suffix,
             )
 
-            if not answer:
-                print("NO ANSWER GIVEN FOR QUESTION:", sample["question"])
-                continue
+            print(f"answer: {answer[:50]}...")
+            if not context_data_list:
+                print("No context found")
+            else:
+                print(f"{len(context_data_list)} context docs found")
+            print("\n")
 
             output = {
-                "label": sample["uid"],
-                "question": sample["question"],
+                "question_data": sample,
                 "answer": answer,
-                "retrieved_context": retrieved_context,
+                "context_data_list": context_data_list,
             }
 
             file.write(json.dumps(output) + "\n")
             file.flush()
+            count += 1
 
 
 def _write_metadata_file(run_suffix: str, metadata_file_path: str) -> None: