Skip to content

Commit c1b43d8

Browse files
timgreintimgrein
authored
[EIS] Rename the elser 2 default model and the default inference endpoint (#130336)
1 parent 72f2121 commit c1b43d8

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
@@ -193,7 +193,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
193193
{
194194
"models": [
195195
{
196-
"model_name": "elser-v2",
196+
"model_name": "elser_model_2",
197197
"task_types": ["embed/text/sparse"]
198198
},
199199
{
@@ -222,7 +222,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
222222
service.defaultConfigIds(),
223223
containsInAnyOrder(
224224
new InferenceService.DefaultConfigId(
225-
".elser-v2-elastic",
225+
".elser-2-elastic",
226226
MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME),
227227
service
228228
),
@@ -255,7 +255,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
255255

256256
PlainActionFuture<List<Model>> listener = new PlainActionFuture<>();
257257
service.defaultConfigs(listener);
258-
assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-v2-elastic"));
258+
assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
259259
assertThat(
260260
listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(),
261261
is(".multilingual-embed-v1-elastic")
@@ -277,7 +277,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
277277
{
278278
"models": [
279279
{
280-
"model_name": "elser-v2",
280+
"model_name": "elser_model_2",
281281
"task_types": ["embed/text/sparse"]
282282
},
283283
{
@@ -302,7 +302,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
302302
service.defaultConfigIds(),
303303
containsInAnyOrder(
304304
new InferenceService.DefaultConfigId(
305-
".elser-v2-elastic",
305+
".elser-2-elastic",
306306
MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME),
307307
service
308308
),

‎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
@@ -106,9 +106,9 @@ public class ElasticInferenceService extends SenderService {
106106
static final String DEFAULT_CHAT_COMPLETION_MODEL_ID_V1 = "rainbow-sprinkles";
107107
static final String DEFAULT_CHAT_COMPLETION_ENDPOINT_ID_V1 = defaultEndpointId(DEFAULT_CHAT_COMPLETION_MODEL_ID_V1);
108108

109-
// elser-v2
110-
static final String DEFAULT_ELSER_MODEL_ID_V2 = "elser-v2";
111-
static final String DEFAULT_ELSER_ENDPOINT_ID_V2 = defaultEndpointId(DEFAULT_ELSER_MODEL_ID_V2);
109+
// elser-2
110+
static final String DEFAULT_ELSER_2_MODEL_ID = "elser_model_2";
111+
static final String DEFAULT_ELSER_ENDPOINT_ID_V2 = defaultEndpointId("elser-2");
112112

113113
// multilingual-text-embed
114114
static final String DEFAULT_MULTILINGUAL_EMBED_MODEL_ID = "multilingual-embed-v1";
@@ -174,13 +174,13 @@ private static Map<String, DefaultModelConfig> initDefaultEndpoints(
174174
),
175175
MinimalServiceSettings.chatCompletion(NAME)
176176
),
177-
DEFAULT_ELSER_MODEL_ID_V2,
177+
DEFAULT_ELSER_2_MODEL_ID,
178178
new DefaultModelConfig(
179179
new ElasticInferenceServiceSparseEmbeddingsModel(
180180
DEFAULT_ELSER_ENDPOINT_ID_V2,
181181
TaskType.SPARSE_EMBEDDING,
182182
NAME,
183-
new ElasticInferenceServiceSparseEmbeddingsServiceSettings(DEFAULT_ELSER_MODEL_ID_V2, null, null),
183+
new ElasticInferenceServiceSparseEmbeddingsServiceSettings(DEFAULT_ELSER_2_MODEL_ID, null, null),
184184
EmptyTaskSettings.INSTANCE,
185185
EmptySecretSettings.INSTANCE,
186186
elasticInferenceServiceComponents,
@@ -213,7 +213,6 @@ private static Map<String, DefaultModelConfig> initDefaultEndpoints(
213213
DenseVectorFieldMapper.ElementType.FLOAT
214214
)
215215
),
216-
217216
DEFAULT_RERANK_MODEL_ID_V1,
218217
new DefaultModelConfig(
219218
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
@@ -188,13 +188,13 @@ private static Map<String, DefaultModelConfig> initDefaultEndpoints() {
188188
),
189189
MinimalServiceSettings.chatCompletion(ElasticInferenceService.NAME)
190190
),
191-
"elser-v2",
191+
"elser-2",
192192
new DefaultModelConfig(
193193
new ElasticInferenceServiceSparseEmbeddingsModel(
194-
defaultEndpointId("elser-v2"),
194+
defaultEndpointId("elser-2"),
195195
TaskType.SPARSE_EMBEDDING,
196196
"test",
197-
new ElasticInferenceServiceSparseEmbeddingsServiceSettings("elser-v2", null, null),
197+
new ElasticInferenceServiceSparseEmbeddingsServiceSettings("elser-2", null, null),
198198
EmptyTaskSettings.INSTANCE,
199199
EmptySecretSettings.INSTANCE,
200200
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)