diff --git a/docs/changelog/130336.yaml b/docs/changelog/130336.yaml new file mode 100644 index 0000000000000..090374287743c --- /dev/null +++ b/docs/changelog/130336.yaml @@ -0,0 +1,5 @@ +pr: 130336 +summary: "[EIS] Rename the elser 2 default model and the default inference endpoint" +area: Machine Learning +type: bug +issues: [] 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 index e548fcc4f2eb1..e9ba9923fdcf8 100644 --- 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 @@ -41,7 +41,7 @@ public void testGetDefaultEndpoints() throws IOException { } assertInferenceIdTaskType(allModels, ".rainbow-sprinkles-elastic", TaskType.CHAT_COMPLETION); - assertInferenceIdTaskType(allModels, ".elser-v2-elastic", TaskType.SPARSE_EMBEDDING); + assertInferenceIdTaskType(allModels, ".elser-2-elastic", TaskType.SPARSE_EMBEDDING); assertInferenceIdTaskType(allModels, ".multilingual-embed-v1-elastic", TaskType.TEXT_EMBEDDING); assertInferenceIdTaskType(allModels, ".rerank-v1-elastic", TaskType.RERANK); } 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 index f2986e3c5aadf..963b29aa80e47 100644 --- 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 @@ -39,7 +39,7 @@ public void enqueueAuthorizeAllModelsResponse() { "task_types": ["chat"] }, { - "model_name": "elser-v2", + "model_name": "elser_model_2", "task_types": ["embed/text/sparse"] }, { 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 index cfd1d324d7d54..8e40bba8b32f7 100644 --- 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 @@ -193,7 +193,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA { "models": [ { - "model_name": "elser-v2", + "model_name": "elser_model_2", "task_types": ["embed/text/sparse"] }, { @@ -222,7 +222,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA service.defaultConfigIds(), containsInAnyOrder( new InferenceService.DefaultConfigId( - ".elser-v2-elastic", + ".elser-2-elastic", MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME), service ), @@ -255,7 +255,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA PlainActionFuture> listener = new PlainActionFuture<>(); service.defaultConfigs(listener); - assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-v2-elastic")); + assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic")); assertThat( listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(), is(".multilingual-embed-v1-elastic") @@ -277,13 +277,12 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA { "models": [ { - "model_name": "elser-v2", + "model_name": "elser_model_2", "task_types": ["embed/text/sparse"] }, { "model_name": "rerank-v1", "task_types": ["rerank/text/text-similarity"] - }, { "model_name": "multilingual-embed-v1", @@ -300,29 +299,28 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA assertThat(service.supportedStreamingTasks(), is(EnumSet.noneOf(TaskType.class))); assertThat( - service.supportedTaskTypes(), - is(EnumSet.of(TaskType.TEXT_EMBEDDING, TaskType.SPARSE_EMBEDDING, TaskType.RERANK)) - ); - containsInAnyOrder( - new InferenceService.DefaultConfigId( - ".elser-v2-elastic", - MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME), - service - ), - new InferenceService.DefaultConfigId( - ".multilingual-embed-v1-elastic", - MinimalServiceSettings.textEmbedding( - ElasticInferenceService.NAME, - ElasticInferenceService.DENSE_TEXT_EMBEDDINGS_DIMENSIONS, - ElasticInferenceService.defaultDenseTextEmbeddingsSimilarity(), - DenseVectorFieldMapper.ElementType.FLOAT + service.defaultConfigIds(), + containsInAnyOrder( + new InferenceService.DefaultConfigId( + ".elser-2-elastic", + MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME), + service + ), + new InferenceService.DefaultConfigId( + ".multilingual-embed-v1-elastic", + MinimalServiceSettings.textEmbedding( + ElasticInferenceService.NAME, + ElasticInferenceService.DENSE_TEXT_EMBEDDINGS_DIMENSIONS, + ElasticInferenceService.defaultDenseTextEmbeddingsSimilarity(), + DenseVectorFieldMapper.ElementType.FLOAT + ), + service ), - service - ), - new InferenceService.DefaultConfigId( - ".rerank-v1-elastic", - MinimalServiceSettings.rerank(ElasticInferenceService.NAME), - service + new InferenceService.DefaultConfigId( + ".rerank-v1-elastic", + MinimalServiceSettings.rerank(ElasticInferenceService.NAME), + service + ) ) ); assertThat( 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 index f2c47b554aed9..c4a1b8d0ca89c 100644 --- 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 @@ -103,9 +103,9 @@ public class ElasticInferenceService extends SenderService { static final String DEFAULT_CHAT_COMPLETION_MODEL_ID_V1 = "rainbow-sprinkles"; static final String DEFAULT_CHAT_COMPLETION_ENDPOINT_ID_V1 = defaultEndpointId(DEFAULT_CHAT_COMPLETION_MODEL_ID_V1); - // elser-v2 - static final String DEFAULT_ELSER_MODEL_ID_V2 = "elser-v2"; - static final String DEFAULT_ELSER_ENDPOINT_ID_V2 = defaultEndpointId(DEFAULT_ELSER_MODEL_ID_V2); + // elser-2 + static final String DEFAULT_ELSER_2_MODEL_ID = "elser_model_2"; + static final String DEFAULT_ELSER_ENDPOINT_ID_V2 = defaultEndpointId("elser-2"); // multilingual-text-embed static final String DEFAULT_MULTILINGUAL_EMBED_MODEL_ID = "multilingual-embed-v1"; @@ -171,13 +171,13 @@ private static Map initDefaultEndpoints( ), MinimalServiceSettings.chatCompletion(NAME) ), - DEFAULT_ELSER_MODEL_ID_V2, + DEFAULT_ELSER_2_MODEL_ID, new DefaultModelConfig( new ElasticInferenceServiceSparseEmbeddingsModel( DEFAULT_ELSER_ENDPOINT_ID_V2, TaskType.SPARSE_EMBEDDING, NAME, - new ElasticInferenceServiceSparseEmbeddingsServiceSettings(DEFAULT_ELSER_MODEL_ID_V2, null, null), + new ElasticInferenceServiceSparseEmbeddingsServiceSettings(DEFAULT_ELSER_2_MODEL_ID, null, null), EmptyTaskSettings.INSTANCE, EmptySecretSettings.INSTANCE, elasticInferenceServiceComponents, diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModels.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModels.java index 37f528ea3a750..c47a6b9db691d 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModels.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModels.java @@ -26,8 +26,4 @@ public static boolean isValidModel(String model) { return model != null && VALID_ELSER_MODEL_IDS.contains(model); } - public static boolean isValidEisModel(String model) { - return ELSER_V2_MODEL.equals(model); - } - } 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 index 7372bb8d53953..134533285eed5 100644 --- 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 @@ -1253,7 +1253,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect() "task_types": ["chat"] }, { - "model_name": "elser-v2", + "model_name": "elser_model_2", "task_types": ["embed/text/sparse"] }, { @@ -1280,7 +1280,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect() is( List.of( new InferenceService.DefaultConfigId( - ".elser-v2-elastic", + ".elser-2-elastic", MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME), service ), @@ -1317,7 +1317,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect() var models = listener.actionGet(TIMEOUT); assertThat(models.size(), is(4)); - assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elser-v2-elastic")); + assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic")); assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".multilingual-embed-v1-elastic")); assertThat(models.get(2).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic")); assertThat(models.get(3).getConfigurations().getInferenceEntityId(), is(".rerank-v1-elastic")); diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java index 8cfe977d2787b..cb569d3f1aff3 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationHandlerTests.java @@ -188,13 +188,13 @@ private static Map initDefaultEndpoints() { ), MinimalServiceSettings.chatCompletion(ElasticInferenceService.NAME) ), - "elser-v2", + "elser-2", new DefaultModelConfig( new ElasticInferenceServiceSparseEmbeddingsModel( - defaultEndpointId("elser-v2"), + defaultEndpointId("elser-2"), TaskType.SPARSE_EMBEDDING, "test", - new ElasticInferenceServiceSparseEmbeddingsServiceSettings("elser-v2", null, null), + new ElasticInferenceServiceSparseEmbeddingsServiceSettings("elser-2", null, null), EmptyTaskSettings.INSTANCE, EmptySecretSettings.INSTANCE, ElasticInferenceServiceComponents.EMPTY_INSTANCE, diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModelsTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModelsTests.java index fa0148ac69df5..d9ffddd62fb40 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModelsTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModelsTests.java @@ -19,21 +19,7 @@ public void testIsValidModel() { assertTrue(org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.isValidModel(randomElserModel())); } - public void testIsValidEisModel() { - assertTrue( - org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.isValidEisModel( - org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.ELSER_V2_MODEL - ) - ); - } - public void testIsInvalidModel() { assertFalse(org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.isValidModel("invalid")); } - - public void testIsInvalidEisModel() { - assertFalse( - org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.isValidEisModel(ElserModels.ELSER_V2_MODEL_LINUX_X86) - ); - } }