change type for baseline ranx

Author: rbs333

redisvl/utils/optimize/cache.py

@@ -12,19 +12,19 @@
 
 def _generate_run_cache(test_data: List[LabeledData], threshold: float) -> Run:
     """Format observed data for evaluation with ranx"""
-    run_dict: Dict[str, Dict[str, int]] = {}
+    run_dict: Dict[str, Dict[str, float]] = {}
 
     for td in test_data:
         run_dict[td.id] = {}
         for res in td.response:
             if float(res["vector_distance"]) < threshold:
                 # value of 1 is irrelevant checks only on match for f1
-                run_dict[td.id][res["id"]] = 1
+                run_dict[td.id][res["id"]] = 1.0
 
         if not run_dict[td.id]:
             # ranx is a little odd in that if there are no matches it errors
             # if however there are no keys that match you get the correct score
-            run_dict[td.id][NULL_RESPONSE_KEY] = 1
+            run_dict[td.id][NULL_RESPONSE_KEY] = 1.0
 
     return Run(run_dict)
 

redisvl/utils/optimize/router.py

@@ -18,9 +18,9 @@ def _generate_run_router(test_data: List[LabeledData], router: SemanticRouter) -
         run_dict[td.id] = {}
         route_match = router(td.query)
         if route_match and route_match.name == td.query_match:
-            run_dict[td.id][td.query_match] = np.int64(1)
+            run_dict[td.id][td.query_match] = 1.0
         else:
-            run_dict[td.id][NULL_RESPONSE_KEY] = np.int64(1)
+            run_dict[td.id][NULL_RESPONSE_KEY] = 1.0
 
     return Run(run_dict)
 

redisvl/utils/optimize/utils.py

@@ -1,6 +1,5 @@
 from typing import List
 
-import numpy as np
 from ranx import Qrels
 
 from redisvl.utils.optimize.schema import LabeledData
@@ -14,10 +13,10 @@ def _format_qrels(test_data: List[LabeledData]) -> Qrels:
 
     for td in test_data:
         if td.query_match:
-            qrels_dict[td.id] = {td.query_match: np.int64(1)}
+            qrels_dict[td.id] = {td.query_match: 1.0}
         else:
             # This is for capturing true negatives from test set
-            qrels_dict[td.id] = {NULL_RESPONSE_KEY: np.int64(1)}
+            qrels_dict[td.id] = {NULL_RESPONSE_KEY: 1.0}
 
     return Qrels(qrels_dict)
 

schemas/semantic_router.yaml

@@ -1,4 +1,4 @@
-name: test-router-01JSHK4MJ79HH51PS6WEK6M9MF
+name: test-router
 routes:
 - name: greeting
   references:

tests/integration/test_semantic_router.py

@@ -200,6 +200,7 @@ def test_from_dict(semantic_router):
 
 def test_to_yaml(semantic_router):
     yaml_file = str(get_base_path().joinpath("../../schemas/semantic_router.yaml"))
+    semantic_router.name = "test-router"
     semantic_router.to_yaml(yaml_file, overwrite=True)
     assert pathlib.Path(yaml_file).exists()