fix normal flow

Author: Ismail Mehdi

evalbench/eval_service.py

@@ -10,7 +10,8 @@
 import grpc
 import pathlib
 from dataset.dataset import load_json
-from evaluator.orchestrator import Orchestrator
+from evaluator import get_orchestrator
+
 import reporting.report as report
 from reporting import get_reporters
 import reporting.analyzer as analyzer
@@ -114,7 +115,10 @@ async def Eval(
         config, db_configs, model_config, setup_config = load_session_configs(session)
         dataset = await get_dataset_from_request(request_iterator)
 
-        evaluator = Orchestrator(config, db_configs, setup_config)
+        evaluator = get_orchestrator(
+            config, db_configs, setup_config, report_progress=True
+        )
+        
         evaluator.evaluate(dataset)
 
         job_id, run_time, results_tf, scores_tf = evaluator.process()

evalbench/generators/prompts/passthrough.py

@@ -9,4 +9,5 @@ def setup(self):
         pass
 
     def generate(self, item):
+        item["prompt"] = item["nl_prompt"]
         return item

evalbench/work/promptgenwork.py

@@ -23,10 +23,10 @@ def run(self, work_config: Any = None) -> dict:
         generated_prompt = None
         prompt_generator_error = None
         try:
-            generated_prompt = self.generator.generate(self.eval_result)
+            self.generator.generate(self.eval_result)
         except Exception as e:
             prompt_generator_error = str(e)
 
-        self.eval_result["generated_prompt"] = generated_prompt
+        self.eval_result["generated_prompt"] = self.eval_result["prompt"]
         self.eval_result["prompt_generator_error"] = prompt_generator_error
         return self.eval_result