Skip to content

Commit a6e4941

Browse files
timgreintimgrein
authored
[EIS] Rename the elser 2 default model and the default inference endpoint (#130336) (#132526)
1 parent 472e913 commit a6e4941

File tree

9 files changed

+23
-37
lines changed

9 files changed

+23
-37
lines changed

‎docs/changelog/130336.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130336
2+
summary: "[EIS] Rename the elser 2 default model and the default inference endpoint"
3+
area: Machine Learning
4+
type: bug
5+
issues: []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void testGetDefaultEndpoints() throws IOException {
4141
}
4242

4343
assertInferenceIdTaskType(allModels, ".rainbow-sprinkles-elastic", TaskType.CHAT_COMPLETION);
44-
assertInferenceIdTaskType(allModels, ".elser-v2-elastic", TaskType.SPARSE_EMBEDDING);
44+
assertInferenceIdTaskType(allModels, ".elser-2-elastic", TaskType.SPARSE_EMBEDDING);
4545
assertInferenceIdTaskType(allModels, ".multilingual-embed-v1-elastic", TaskType.TEXT_EMBEDDING);
4646
assertInferenceIdTaskType(allModels, ".rerank-v1-elastic", TaskType.RERANK);
4747
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void enqueueAuthorizeAllModelsResponse() {
3939
"task_types": ["chat"]
4040
},
4141
{
42-
"model_name": "elser-v2",
42+
"model_name": "elser_model_2",
4343
"task_types": ["embed/text/sparse"]
4444
},
4545
{

‎x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/InferenceRevokeDefaultEndpointsIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
195195
{
196196
"models": [
197197
{
198-
"model_name": "elser-v2",
198+
"model_name": "elser_model_2",
199199
"task_types": ["embed/text/sparse"]
200200
},
201201
{
@@ -224,7 +224,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
224224
service.defaultConfigIds(),
225225
containsInAnyOrder(
226226
new InferenceService.DefaultConfigId(
227-
".elser-v2-elastic",
227+
".elser-2-elastic",
228228
MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME),
229229
service
230230
),
@@ -257,7 +257,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
257257

258258
PlainActionFuture<List<Model>> listener = new PlainActionFuture<>();
259259
service.defaultConfigs(listener);
260-
assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-v2-elastic"));
260+
assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
261261
assertThat(
262262
listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(),
263263
is(".multilingual-embed-v1-elastic")
@@ -279,7 +279,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
279279
{
280280
"models": [
281281
{
282-
"model_name": "elser-v2",
282+
"model_name": "elser_model_2",
283283
"task_types": ["embed/text/sparse"]
284284
},
285285
{
@@ -304,7 +304,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
304304
service.defaultConfigIds(),
305305
containsInAnyOrder(
306306
new InferenceService.DefaultConfigId(
307-
".elser-v2-elastic",
307+
".elser-2-elastic",
308308
MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME),
309309
service
310310
),

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ public class ElasticInferenceService extends SenderService {
111111
static final String DEFAULT_CHAT_COMPLETION_MODEL_ID_V1 = "rainbow-sprinkles";
112112
static final String DEFAULT_CHAT_COMPLETION_ENDPOINT_ID_V1 = defaultEndpointId(DEFAULT_CHAT_COMPLETION_MODEL_ID_V1);
113113

114-
// elser-v2
115-
static final String DEFAULT_ELSER_MODEL_ID_V2 = "elser-v2";
116-
static final String DEFAULT_ELSER_ENDPOINT_ID_V2 = defaultEndpointId(DEFAULT_ELSER_MODEL_ID_V2);
114+
// elser-2
115+
static final String DEFAULT_ELSER_2_MODEL_ID = "elser_model_2";
116+
static final String DEFAULT_ELSER_ENDPOINT_ID_V2 = defaultEndpointId("elser-2");
117117

118118
// multilingual-text-embed
119119
static final String DEFAULT_MULTILINGUAL_EMBED_MODEL_ID = "multilingual-embed-v1";
@@ -179,13 +179,13 @@ private static Map<String, DefaultModelConfig> initDefaultEndpoints(
179179
),
180180
MinimalServiceSettings.chatCompletion(NAME)
181181
),
182-
DEFAULT_ELSER_MODEL_ID_V2,
182+
DEFAULT_ELSER_2_MODEL_ID,
183183
new DefaultModelConfig(
184184
new ElasticInferenceServiceSparseEmbeddingsModel(
185185
DEFAULT_ELSER_ENDPOINT_ID_V2,
186186
TaskType.SPARSE_EMBEDDING,
187187
NAME,
188-
new ElasticInferenceServiceSparseEmbeddingsServiceSettings(DEFAULT_ELSER_MODEL_ID_V2, null, null),
188+
new ElasticInferenceServiceSparseEmbeddingsServiceSettings(DEFAULT_ELSER_2_MODEL_ID, null, null),
189189
EmptyTaskSettings.INSTANCE,
190190
EmptySecretSettings.INSTANCE,
191191
elasticInferenceServiceComponents,
@@ -218,7 +218,6 @@ private static Map<String, DefaultModelConfig> initDefaultEndpoints(
218218
DenseVectorFieldMapper.ElementType.FLOAT
219219
)
220220
),
221-
222221
DEFAULT_RERANK_MODEL_ID_V1,
223222
new DefaultModelConfig(
224223
new ElasticInferenceServiceRerankModel(

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModels.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,4 @@ public static boolean isValidModel(String model) {
2626
return model != null && VALID_ELSER_MODEL_IDS.contains(model);
2727
}
2828

29-
public static boolean isValidEisModel(String model) {
30-
return ELSER_V2_MODEL.equals(model);
31-
}
32-
3329
}

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
12431243
"task_types": ["chat"]
12441244
},
12451245
{
1246-
"model_name": "elser-v2",
1246+
"model_name": "elser_model_2",
12471247
"task_types": ["embed/text/sparse"]
12481248
},
12491249
{
@@ -1270,7 +1270,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
12701270
is(
12711271
List.of(
12721272
new InferenceService.DefaultConfigId(
1273-
".elser-v2-elastic",
1273+
".elser-2-elastic",
12741274
MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME),
12751275
service
12761276
),
@@ -1306,7 +1306,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
13061306
service.defaultConfigs(listener);
13071307
var models = listener.actionGet(TIMEOUT);
13081308
assertThat(models.size(), is(4));
1309-
assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elser-v2-elastic"));
1309+
assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
13101310
assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".multilingual-embed-v1-elastic"));
13111311
assertThat(models.get(2).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
13121312
assertThat(models.get(3).getConfigurations().getInferenceEntityId(), is(".rerank-v1-elastic"));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,13 @@ private static Map<String, DefaultModelConfig> initDefaultEndpoints() {
264264
),
265265
MinimalServiceSettings.chatCompletion(ElasticInferenceService.NAME)
266266
),
267-
"elser-v2",
267+
"elser-2",
268268
new DefaultModelConfig(
269269
new ElasticInferenceServiceSparseEmbeddingsModel(
270-
defaultEndpointId("elser-v2"),
270+
defaultEndpointId("elser-2"),
271271
TaskType.SPARSE_EMBEDDING,
272272
"test",
273-
new ElasticInferenceServiceSparseEmbeddingsServiceSettings("elser-v2", null, null),
273+
new ElasticInferenceServiceSparseEmbeddingsServiceSettings("elser-2", null, null),
274274
EmptyTaskSettings.INSTANCE,
275275
EmptySecretSettings.INSTANCE,
276276
ElasticInferenceServiceComponents.EMPTY_INSTANCE,

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserModelsTests.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,7 @@ public void testIsValidModel() {
1919
assertTrue(org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.isValidModel(randomElserModel()));
2020
}
2121

22-
public void testIsValidEisModel() {
23-
assertTrue(
24-
org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.isValidEisModel(
25-
org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.ELSER_V2_MODEL
26-
)
27-
);
28-
}
29-
3022
public void testIsInvalidModel() {
3123
assertFalse(org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.isValidModel("invalid"));
3224
}
33-
34-
public void testIsInvalidEisModel() {
35-
assertFalse(
36-
org.elasticsearch.xpack.inference.services.elasticsearch.ElserModels.isValidEisModel(ElserModels.ELSER_V2_MODEL_LINUX_X86)
37-
);
38-
}
3925
}

0 commit comments

Comments
 (0)