fix: fix eval name from driver (jina-ai#1623)

* fix: fix eval name from driver

* chore: update jina/drivers/evaluate.py

Co-authored-by: Han Xiao <[email protected]>

Author: JoanFM

jina/drivers/evaluate.py

@@ -55,7 +55,7 @@ def _apply_all(
             if self._running_avg:
                 evaluation.value = self.exec.mean
 
-            if hasattr(self.exec, 'eval_at'):
+            if getattr(self.exec, 'eval_at', None):
                 evaluation.op_name = f'{self.exec.__class__.__name__}@{self.exec.eval_at}'
             else:
                 evaluation.op_name = self.exec.__class__.__name__

tests/unit/drivers/test_rankingevaluation_driver.py

@@ -137,11 +137,13 @@ def add_matches(doc: jina_pb2.DocumentProto):
     return req
 
 
+@pytest.mark.parametrize('eval_at', [None, 2])
 def test_ranking_evaluate_driver_matches_in_chunks(simple_chunk_rank_evaluate_driver,
-                                                   eval_request):
+                                                   eval_request,
+                                                   eval_at):
     # this test proves that we can evaluate matches at chunk level,
     # proving that the driver can traverse in a parallel way docs and groundtruth
-    simple_chunk_rank_evaluate_driver.attach(executor=PrecisionEvaluator(eval_at=2), runtime=None)
+    simple_chunk_rank_evaluate_driver.attach(executor=PrecisionEvaluator(eval_at=eval_at), runtime=None)
     simple_chunk_rank_evaluate_driver.eval_request = eval_request
     simple_chunk_rank_evaluate_driver()
 
@@ -152,7 +154,10 @@ def test_ranking_evaluate_driver_matches_in_chunks(simple_chunk_rank_evaluate_dr
         assert len(doc.chunks) == 1
         chunk = doc.chunks[0]
         assert len(chunk.evaluations) == 1  # evaluation done at chunk level
-        assert chunk.evaluations[0].op_name == 'PrecisionEvaluator@2'
+        if eval_at:
+            assert chunk.evaluations[0].op_name == 'PrecisionEvaluator@2'
+        else:
+            assert chunk.evaluations[0].op_name == 'PrecisionEvaluator'
         assert chunk.evaluations[0].value == 1.0