Skip to content

Commit 9605f38

Browse files
authored
[Inference API] Rename E5 model/inference endpoint in EIS to JinaAI counterpart (#137028)
1 parent dc2dcec commit 9605f38

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

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
@@ -51,7 +51,7 @@ public void testGetDefaultEndpoints() throws IOException {
5151

5252
assertInferenceIdTaskType(allModels, ".rainbow-sprinkles-elastic", TaskType.CHAT_COMPLETION);
5353
assertInferenceIdTaskType(allModels, ".elser-2-elastic", TaskType.SPARSE_EMBEDDING);
54-
assertInferenceIdTaskType(allModels, ".multilingual-embed-v1-elastic", TaskType.TEXT_EMBEDDING);
54+
assertInferenceIdTaskType(allModels, ".jina-embeddings-v3", TaskType.TEXT_EMBEDDING);
5555
assertInferenceIdTaskType(allModels, ".rerank-v1-elastic", TaskType.RERANK);
5656
}
5757

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
@@ -43,7 +43,7 @@ public void enqueueAuthorizeAllModelsResponse() {
4343
"task_types": ["embed/text/sparse"]
4444
},
4545
{
46-
"model_name": "multilingual-embed-v1",
46+
"model_name": "jina-embeddings-v3",
4747
"task_types": ["embed/text/dense"]
4848
},
4949
{

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
203203
"task_types": ["chat"]
204204
},
205205
{
206-
"model_name": "multilingual-embed-v1",
206+
"model_name": "jina-embeddings-v3",
207207
"task_types": ["embed/text/dense"]
208208
},
209209
{
@@ -234,7 +234,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
234234
service
235235
),
236236
new InferenceService.DefaultConfigId(
237-
".multilingual-embed-v1-elastic",
237+
".jina-embeddings-v3",
238238
MinimalServiceSettings.textEmbedding(
239239
ElasticInferenceService.NAME,
240240
ElasticInferenceService.DENSE_TEXT_EMBEDDINGS_DIMENSIONS,
@@ -258,10 +258,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
258258
PlainActionFuture<List<Model>> listener = new PlainActionFuture<>();
259259
service.defaultConfigs(listener);
260260
assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
261-
assertThat(
262-
listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(),
263-
is(".multilingual-embed-v1-elastic")
264-
);
261+
assertThat(listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(), is(".jina-embeddings-v3"));
265262
assertThat(listener.actionGet(TIMEOUT).get(2).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
266263
assertThat(listener.actionGet(TIMEOUT).get(3).getConfigurations().getInferenceEntityId(), is(".rerank-v1-elastic"));
267264

@@ -287,7 +284,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
287284
"task_types": ["rerank/text/text-similarity"]
288285
},
289286
{
290-
"model_name": "multilingual-embed-v1",
287+
"model_name": "jina-embeddings-v3",
291288
"task_types": ["embed/text/dense"]
292289
}
293290
]
@@ -309,7 +306,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
309306
service
310307
),
311308
new InferenceService.DefaultConfigId(
312-
".multilingual-embed-v1-elastic",
309+
".jina-embeddings-v3",
313310
MinimalServiceSettings.textEmbedding(
314311
ElasticInferenceService.NAME,
315312
ElasticInferenceService.DENSE_TEXT_EMBEDDINGS_DIMENSIONS,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ public class ElasticInferenceService extends SenderService {
117117
static final String DEFAULT_ELSER_ENDPOINT_ID_V2 = defaultEndpointId("elser-2");
118118

119119
// multilingual-text-embed
120-
static final String DEFAULT_MULTILINGUAL_EMBED_MODEL_ID = "multilingual-embed-v1";
121-
static final String DEFAULT_MULTILINGUAL_EMBED_ENDPOINT_ID = defaultEndpointId(DEFAULT_MULTILINGUAL_EMBED_MODEL_ID);
120+
static final String DEFAULT_MULTILINGUAL_EMBED_MODEL_ID = "jina-embeddings-v3";
121+
static final String DEFAULT_MULTILINGUAL_EMBED_ENDPOINT_ID = ".jina-embeddings-v3";
122122

123123
// rerank-v1
124124
static final String DEFAULT_RERANK_MODEL_ID_V1 = "rerank-v1";

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
@@ -1238,7 +1238,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
12381238
"task_types": ["embed/text/sparse"]
12391239
},
12401240
{
1241-
"model_name": "multilingual-embed-v1",
1241+
"model_name": "jina-embeddings-v3",
12421242
"task_types": ["embed/text/dense"]
12431243
},
12441244
{
@@ -1266,7 +1266,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
12661266
service
12671267
),
12681268
new InferenceService.DefaultConfigId(
1269-
".multilingual-embed-v1-elastic",
1269+
".jina-embeddings-v3",
12701270
MinimalServiceSettings.textEmbedding(
12711271
ElasticInferenceService.NAME,
12721272
ElasticInferenceService.DENSE_TEXT_EMBEDDINGS_DIMENSIONS,
@@ -1298,7 +1298,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
12981298
var models = listener.actionGet(TIMEOUT);
12991299
assertThat(models.size(), is(4));
13001300
assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
1301-
assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".multilingual-embed-v1-elastic"));
1301+
assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".jina-embeddings-v3"));
13021302
assertThat(models.get(2).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
13031303
assertThat(models.get(3).getConfigurations().getInferenceEntityId(), is(".rerank-v1-elastic"));
13041304
}

0 commit comments

Comments
 (0)