1 files changed, 21 insertions, 28 deletions
diff --git a/gnqa/paper2_eval/src/run_questions.py b/gnqa/paper2_eval/src/run_questions.py
index 5e0b28b2..88053290 100644
--- a/gnqa/paper2_eval/src/run_questions.py
+++ b/gnqa/paper2_eval/src/run_questions.py
@@ -3,37 +3,24 @@ import sys
 import os
 
 from r2r import R2R, Document, GenerationConfig, R2RClient
+from document_operations import DocOps, QuestionList
 
-
-def writeDatasetFile(responses, outp_file):
-  print(outp_file)
-  output = json.dumps(responses, indent=2)
-  if os.path.exists(outp_file):
-    with open(outp_file, "a") as the_data:
-      the_data.write('' + output)
-  else:
-    with open(outp_file, "a") as the_data:
-      the_data.write(output)
-
-client = R2RClient("http://localhost:8000")
-
-health_resp = client.health()
-
-print("The R2R client's health status is {0}".format(health_resp))
-
-questions = [
-    "List as many studies as you can that include rapamycin.",
-    "Why is it so difficult to map gene loci that control aging in humans?"
-]
+'''
+*******************************************************************************
+Variables
+*******************************************************************************
+'''
 rag_response = {}
+client       = R2RClient("http://localhost:8000")
+health_resp  = client.health()
 
-ndx = 1
-for question in questions:
-    rag_response[str(ndx)] = client.rag(question)
-    ndx = ndx + 1
-
-#print(json.dumps(rag_response, indent=2))
+'''
+*******************************************************************************
+Commands
+*******************************************************************************
+'''
 
+print("The R2R client's health status is {0}".format(health_resp))
 
 try:
     read_file = str(sys.argv[1])
@@ -41,5 +28,11 @@ try:
 except:
     exit('Example use "python run_questions.py ../data/questions/human/de/aging.json ../data/responses/human/de/aging_resp.json"')
 
+qLst = QuestionList(read_file, 1) # second parameter is for verbose output
+ndx = 1
+for question in qLst.get("domainexpert","aging"):
+    print('Getting response for the following question --> {0}'.format(question))
+    rag_response[str(ndx)] = client.rag(question)
+    ndx += 1
 
-writeDatasetFile(rag_response, out_file)
\ No newline at end of file
+DocOps.writeDatasetFile(rag_response, out_file)
\ No newline at end of file