Rename default rerank model (#138498)

Safety measure to make sure we've the correct default rerank endpoint in
place in case #138249
doesn't make it.

Endpoint name: `.elastic-rerank-v1` -> `.jina-reranker-v2` Model name:
`elastic-rerank-v1` -> `jina-reranker-v2`

Author: timgrein

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceGetModelsWithElasticInferenceServiceIT.java

@@ -53,7 +53,7 @@ public void testGetDefaultEndpoints() throws IOException {
         assertInferenceIdTaskType(allModels, ".gp-llm-v2-chat_completion", TaskType.CHAT_COMPLETION);
         assertInferenceIdTaskType(allModels, ".elser-2-elastic", TaskType.SPARSE_EMBEDDING);
         assertInferenceIdTaskType(allModels, ".jina-embeddings-v3", TaskType.TEXT_EMBEDDING);
-        assertInferenceIdTaskType(allModels, ".elastic-rerank-v1", TaskType.RERANK);
+        assertInferenceIdTaskType(allModels, ".jina-reranker-v2", TaskType.RERANK);
     }
 
     private static void assertInferenceIdTaskType(List<Map<String, Object>> models, String inferenceId, TaskType taskType) {

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/MockElasticInferenceServiceAuthorizationServer.java

@@ -51,7 +51,7 @@ public void enqueueAuthorizeAllModelsResponse() {
                       "task_types": ["embed/text/dense"]
                     },
                   {
-                      "model_name": "elastic-rerank-v1",
+                      "model_name": "jina-reranker-v2",
                       "task_types": ["rerank/text/text-similarity"]
                     }
                 ]

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/InternalPreconfiguredEndpoints.java

@@ -46,9 +46,9 @@ public class InternalPreconfiguredEndpoints {
     public static final String DEFAULT_MULTILINGUAL_EMBED_MODEL_ID = "jina-embeddings-v3";
     public static final String DEFAULT_MULTILINGUAL_EMBED_ENDPOINT_ID = ".jina-embeddings-v3";
 
-    // rerank-v1
-    public static final String DEFAULT_RERANK_MODEL_ID_V1 = "elastic-rerank-v1";
-    public static final String DEFAULT_RERANK_ENDPOINT_ID_V1 = ".elastic-rerank-v1";
+    // jina-reranker-v2
+    public static final String DEFAULT_RERANK_MODEL_ID = "jina-reranker-v2";
+    public static final String DEFAULT_RERANK_ENDPOINT_ID = ".jina-reranker-v2";
 
     public record MinimalModel(
         ModelConfigurations configurations,
@@ -69,7 +69,7 @@ public record MinimalModel(
             null
         );
     private static final ElasticInferenceServiceRerankServiceSettings RERANK_SERVICE_SETTINGS =
-        new ElasticInferenceServiceRerankServiceSettings(DEFAULT_RERANK_MODEL_ID_V1);
+        new ElasticInferenceServiceRerankServiceSettings(DEFAULT_RERANK_MODEL_ID);
 
     // A single model name can map to multiple inference endpoints, so we need a String to a List
     private static final Map<String, List<MinimalModel>> MODEL_NAME_TO_MINIMAL_MODELS = Map.of(
@@ -125,11 +125,11 @@ public record MinimalModel(
                 DENSE_TEXT_EMBEDDINGS_SERVICE_SETTINGS
             )
         ),
-        DEFAULT_RERANK_MODEL_ID_V1,
+        DEFAULT_RERANK_MODEL_ID,
         List.of(
             new MinimalModel(
                 new ModelConfigurations(
-                    DEFAULT_RERANK_ENDPOINT_ID_V1,
+                    DEFAULT_RERANK_ENDPOINT_ID,
                     TaskType.RERANK,
                     ElasticInferenceService.NAME,
                     RERANK_SERVICE_SETTINGS,

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/PreconfiguredEndpointModelAdapterTests.java

@@ -31,8 +31,8 @@
 import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.DEFAULT_ELSER_ENDPOINT_ID_V2;
 import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.DEFAULT_MULTILINGUAL_EMBED_ENDPOINT_ID;
 import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.DEFAULT_MULTILINGUAL_EMBED_MODEL_ID;
-import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.DEFAULT_RERANK_ENDPOINT_ID_V1;
-import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.DEFAULT_RERANK_MODEL_ID_V1;
+import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.DEFAULT_RERANK_ENDPOINT_ID;
+import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.DEFAULT_RERANK_MODEL_ID;
 import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.DENSE_TEXT_EMBEDDINGS_DIMENSIONS;
 import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.GP_LLM_V2_CHAT_COMPLETION_ENDPOINT_ID;
 import static org.elasticsearch.xpack.inference.services.elastic.InternalPreconfiguredEndpoints.GP_LLM_V2_MODEL_ID;
@@ -57,7 +57,7 @@ public class PreconfiguredEndpointModelAdapterTests extends ESTestCase {
             null
         );
     private static final ElasticInferenceServiceRerankServiceSettings RERANK_SETTINGS = new ElasticInferenceServiceRerankServiceSettings(
-        DEFAULT_RERANK_MODEL_ID_V1
+        DEFAULT_RERANK_MODEL_ID
     );
     private static final ElasticInferenceServiceComponents EIS_COMPONENTS = new ElasticInferenceServiceComponents("");
 
@@ -66,7 +66,7 @@ public void testGetModelsWithValidId() {
             DEFAULT_CHAT_COMPLETION_ENDPOINT_ID_V1,
             GP_LLM_V2_CHAT_COMPLETION_ENDPOINT_ID,
             DEFAULT_ELSER_ENDPOINT_ID_V2,
-            DEFAULT_RERANK_ENDPOINT_ID_V1,
+            DEFAULT_RERANK_ENDPOINT_ID,
             DEFAULT_MULTILINGUAL_EMBED_ENDPOINT_ID
         );
         var models = PreconfiguredEndpointModelAdapter.getModels(endpointIds, EIS_COMPONENTS);
@@ -125,7 +125,7 @@ public void testGetModelsWithValidId() {
                 ),
                 new ElasticInferenceServiceModel(
                     new ModelConfigurations(
-                        DEFAULT_RERANK_ENDPOINT_ID_V1,
+                        DEFAULT_RERANK_ENDPOINT_ID,
                         TaskType.RERANK,
                         ElasticInferenceService.NAME,
                         RERANK_SETTINGS,