[Inference API] Rename Elastic Inference Service rerank model/endpoint (#137030)

timgrein · web-flow · commit 797cf9d9acf0 · 2025-10-27T17:24:17.000+01:00
diff --git a/x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceGetModelsWithElasticInferenceServiceIT.java b/x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceGetModelsWithElasticInferenceServiceIT.java
@@ -52,7 +52,7 @@ public void testGetDefaultEndpoints() throws IOException {
         assertInferenceIdTaskType(allModels, ".rainbow-sprinkles-elastic", TaskType.CHAT_COMPLETION);
         assertInferenceIdTaskType(allModels, ".elser-2-elastic", TaskType.SPARSE_EMBEDDING);
         assertInferenceIdTaskType(allModels, ".jina-embeddings-v3", TaskType.TEXT_EMBEDDING);
-        assertInferenceIdTaskType(allModels, ".rerank-v1-elastic", TaskType.RERANK);
+        assertInferenceIdTaskType(allModels, ".elastic-rerank-v1", TaskType.RERANK);
     }
 
     private static void assertInferenceIdTaskType(List<Map<String, Object>> models, String inferenceId, TaskType taskType) {
diff --git a/x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/MockElasticInferenceServiceAuthorizationServer.java b/x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/MockElasticInferenceServiceAuthorizationServer.java
@@ -47,7 +47,7 @@ public void enqueueAuthorizeAllModelsResponse() {
                       "task_types": ["embed/text/dense"]
                     },
                   {
-                      "model_name": "rerank-v1",
+                      "model_name": "elastic-rerank-v1",
                       "task_types": ["rerank/text/text-similarity"]
                     }
                 ]
diff --git a/x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/InferenceRevokeDefaultEndpointsIT.java b/x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/InferenceRevokeDefaultEndpointsIT.java
@@ -207,7 +207,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
                           "task_types": ["embed/text/dense"]
                         },
                         {
-                          "model_name": "rerank-v1",
+                          "model_name": "elastic-rerank-v1",
                           "task_types": ["rerank/text/text-similarity"]
                         }
                     ]
@@ -244,7 +244,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
                             service
                         ),
                         new InferenceService.DefaultConfigId(
-                            ".rerank-v1-elastic",
+                            ".elastic-rerank-v1",
                             MinimalServiceSettings.rerank(ElasticInferenceService.NAME),
                             service
                         )
@@ -257,10 +257,11 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
 
                 PlainActionFuture<List<Model>> listener = new PlainActionFuture<>();
                 service.defaultConfigs(listener);
-                assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
-                assertThat(listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(), is(".jina-embeddings-v3"));
-                assertThat(listener.actionGet(TIMEOUT).get(2).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
-                assertThat(listener.actionGet(TIMEOUT).get(3).getConfigurations().getInferenceEntityId(), is(".rerank-v1-elastic"));
+
+                assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elastic-rerank-v1"));
+                assertThat(listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
+                assertThat(listener.actionGet(TIMEOUT).get(2).getConfigurations().getInferenceEntityId(), is(".jina-embeddings-v3"));
+                assertThat(listener.actionGet(TIMEOUT).get(3).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
 
                 var getModelListener = new PlainActionFuture<UnparsedModel>();
                 // persists the default endpoints
@@ -280,7 +281,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
                           "task_types": ["embed/text/sparse"]
                         },
                         {
-                          "model_name": "rerank-v1",
+                          "model_name": "elastic-rerank-v1",
                           "task_types": ["rerank/text/text-similarity"]
                         },
                         {
@@ -316,7 +317,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
                             service
                         ),
                         new InferenceService.DefaultConfigId(
-                            ".rerank-v1-elastic",
+                            ".elastic-rerank-v1",
                             MinimalServiceSettings.rerank(ElasticInferenceService.NAME),
                             service
                         )
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java
@@ -121,8 +121,8 @@ public class ElasticInferenceService extends SenderService {
     static final String DEFAULT_MULTILINGUAL_EMBED_ENDPOINT_ID = ".jina-embeddings-v3";
 
     // rerank-v1
-    static final String DEFAULT_RERANK_MODEL_ID_V1 = "rerank-v1";
-    static final String DEFAULT_RERANK_ENDPOINT_ID_V1 = defaultEndpointId(DEFAULT_RERANK_MODEL_ID_V1);
+    static final String DEFAULT_RERANK_MODEL_ID_V1 = "elastic-rerank-v1";
+    static final String DEFAULT_RERANK_ENDPOINT_ID_V1 = ".elastic-rerank-v1";
 
     /**
      * The task types that the {@link InferenceAction.Request} can accept.
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceTests.java
@@ -1242,7 +1242,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
                       "task_types": ["embed/text/dense"]
                     },
                   {
-                      "model_name": "rerank-v1",
+                      "model_name": "elastic-rerank-v1",
                       "task_types": ["rerank/text/text-similarity"]
                     }
                 ]
@@ -1260,6 +1260,11 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
                 service.defaultConfigIds(),
                 is(
                     List.of(
+                        new InferenceService.DefaultConfigId(
+                            ".elastic-rerank-v1",
+                            MinimalServiceSettings.rerank(ElasticInferenceService.NAME),
+                            service
+                        ),
                         new InferenceService.DefaultConfigId(
                             ".elser-2-elastic",
                             MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME),
@@ -1279,11 +1284,6 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
                             ".rainbow-sprinkles-elastic",
                             MinimalServiceSettings.chatCompletion(ElasticInferenceService.NAME),
                             service
-                        ),
-                        new InferenceService.DefaultConfigId(
-                            ".rerank-v1-elastic",
-                            MinimalServiceSettings.rerank(ElasticInferenceService.NAME),
-                            service
                         )
                     )
                 )
@@ -1297,10 +1297,10 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
             service.defaultConfigs(listener);
             var models = listener.actionGet(TIMEOUT);
             assertThat(models.size(), is(4));
-            assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
-            assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".jina-embeddings-v3"));
-            assertThat(models.get(2).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
-            assertThat(models.get(3).getConfigurations().getInferenceEntityId(), is(".rerank-v1-elastic"));
+            assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elastic-rerank-v1"));
+            assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
+            assertThat(models.get(2).getConfigurations().getInferenceEntityId(), is(".jina-embeddings-v3"));
+            assertThat(models.get(3).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public void testGetDefaultEndpoints() throws IOException {`
`52`	`52`	`assertInferenceIdTaskType(allModels, ".rainbow-sprinkles-elastic", TaskType.CHAT_COMPLETION);`
`53`	`53`	`assertInferenceIdTaskType(allModels, ".elser-2-elastic", TaskType.SPARSE_EMBEDDING);`
`54`	`54`	`assertInferenceIdTaskType(allModels, ".jina-embeddings-v3", TaskType.TEXT_EMBEDDING);`
`55`		`- assertInferenceIdTaskType(allModels, ".rerank-v1-elastic", TaskType.RERANK);`
	`55`	`+ assertInferenceIdTaskType(allModels, ".elastic-rerank-v1", TaskType.RERANK);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`private static void assertInferenceIdTaskType(List<Map<String, Object>> models, String inferenceId, TaskType taskType) {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void enqueueAuthorizeAllModelsResponse() {`
`47`	`47`	`"task_types": ["embed/text/dense"]`
`48`	`48`	`},`
`49`	`49`	`{`
`50`		`- "model_name": "rerank-v1",`
	`50`	`+ "model_name": "elastic-rerank-v1",`
`51`	`51`	`"task_types": ["rerank/text/text-similarity"]`
`52`	`52`	`}`
`53`	`53`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1242,7 +1242,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()`
`1242`	`1242`	`"task_types": ["embed/text/dense"]`
`1243`	`1243`	`},`
`1244`	`1244`	`{`
`1245`		`- "model_name": "rerank-v1",`
	`1245`	`+ "model_name": "elastic-rerank-v1",`
`1246`	`1246`	`"task_types": ["rerank/text/text-similarity"]`
`1247`	`1247`	`}`
`1248`	`1248`	`]`
`@@ -1260,6 +1260,11 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()`
`1260`	`1260`	`service.defaultConfigIds(),`
`1261`	`1261`	`is(`
`1262`	`1262`	`List.of(`
	`1263`	`+ new InferenceService.DefaultConfigId(`
	`1264`	`+ ".elastic-rerank-v1",`
	`1265`	`+ MinimalServiceSettings.rerank(ElasticInferenceService.NAME),`
	`1266`	`+ service`
	`1267`	`+ ),`
`1263`	`1268`	`new InferenceService.DefaultConfigId(`
`1264`	`1269`	`".elser-2-elastic",`
`1265`	`1270`	`MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME),`
`@@ -1279,11 +1284,6 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()`
`1279`	`1284`	`".rainbow-sprinkles-elastic",`
`1280`	`1285`	`MinimalServiceSettings.chatCompletion(ElasticInferenceService.NAME),`
`1281`	`1286`	`service`
`1282`		`- ),`
`1283`		`- new InferenceService.DefaultConfigId(`
`1284`		`- ".rerank-v1-elastic",`
`1285`		`- MinimalServiceSettings.rerank(ElasticInferenceService.NAME),`
`1286`		`- service`
`1287`	`1287`	`)`
`1288`	`1288`	`)`
`1289`	`1289`	`)`
`@@ -1297,10 +1297,10 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()`
`1297`	`1297`	`service.defaultConfigs(listener);`
`1298`	`1298`	`var models = listener.actionGet(TIMEOUT);`
`1299`	`1299`	`assertThat(models.size(), is(4));`
`1300`		`- assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));`
`1301`		`- assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".jina-embeddings-v3"));`
`1302`		`- assertThat(models.get(2).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));`
`1303`		`- assertThat(models.get(3).getConfigurations().getInferenceEntityId(), is(".rerank-v1-elastic"));`
	`1300`	`+ assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elastic-rerank-v1"));`
	`1301`	`+ assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));`
	`1302`	`+ assertThat(models.get(2).getConfigurations().getInferenceEntityId(), is(".jina-embeddings-v3"));`
	`1303`	`+ assertThat(models.get(3).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));`
`1304`	`1304`	`}`
`1305`	`1305`	`}`
`1306`	`1306`