Track param cleanup

Mikep86 · May 8, 2024 · 07af735 · 07af735
1 parent bc116e3
commit 07af735
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/so_semantic_text/operations/default.json b/so_semantic_text/operations/default.json
@@ -11,12 +11,12 @@
     {
       "name": "create-inference-service",
       "operation-type": "raw-request",
-      "path": "/_inference/{{p_task_type}}/my-inference-id-model",
+      "path": "/_inference/sparse_embedding/my-inference-id-model",
       "method": "PUT",
       "body": {
-        "service": "{{p_inference_service}}",
+        "service": "elser",
         "service_settings": {
-          "model_id": "{{p_inference_model_id}}",
+          "model_id": "{{p_elser_model_id}}",
           "num_allocations": {{ num_allocations | default(1) | int }},
           "num_threads": {{ num_threads | default(1) | int }}
         },
@@ -88,6 +88,6 @@
       "param-source": "semantic-search",
       "size": {{ semantic_search_page_size | default(20) | int }},
       "use_pipelines": {{ p_use_pipelines | lower }},
-      "use_text_expansion": {{ p_use_text_expansion | lower }},
-      "model_id": "{{ p_inference_model_id }}"
+      "use_nested_text_expansion": {{ p_use_nested_text_expansion | lower }},
+      "model_id": "{{ p_elser_model_id }}"
     }
diff --git a/so_semantic_text/track.json b/so_semantic_text/track.json
@@ -1,12 +1,10 @@
 {% import "rally.helpers" as rally with context %}
 
 {% set p_use_pipelines = (use_pipelines | default(false)) %}
-{% set p_inference_service = (inference_service | default("elser")) %}
-{% set p_inference_model_id = (inference_model_id | default(".elser_model_2")) %}
-{% set p_task_type = (task_type | default("sparse_embedding")) %}
+{% set p_elser_model_id = (elser_model_id | default(".elser_model_2")) %}
 {% set p_calculate_body_vector = (calculate_body_vector | default(false)) %}
 {% set p_enable_search = (enable_search | default(false)) %}
-{% set p_use_text_expansion = (use_text_expansion | default(false)) %}
+{% set p_use_nested_text_expansion = (use_nested_text_expansion | default(false)) %}
 
 {
   "version": 2,

diff --git a/so_semantic_text/track.py b/so_semantic_text/track.py
@@ -35,7 +35,7 @@ def params(self):
                     }
                 }
             }
-        elif self._params["use_text_expansion"]:
+        elif self._params["use_nested_text_expansion"]:
             es_query = {
                 "nested": {
                     "path": "title_semantic.inference.chunks",