Skip to content

[Inference API] Rename Elastic Inference Service rerank model/endpoint #137030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[Inference API] Rename Elastic Inference Service rerank model/endpoint #137030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
936784e
Rename Elastic Inference Service rerank model/endpoint
timgrein Oct 23, 2025
1c94995
Merge branch 'main' into rename-eis-rerank-endpoint
timgrein Oct 23, 2025
34fd601
Merge branch 'main' into rename-eis-rerank-endpoint
timgrein Oct 23, 2025
4c44a94
Fix integration test
timgrein Oct 24, 2025
4ca53f8
Merge remote-tracking branch 'origin/rename-eis-rerank-endpoint' into…
timgrein Oct 24, 2025
a41df7a
Merge branch 'main' into rename-eis-rerank-endpoint
timgrein Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...va/org/elasticsearch/xpack/inference/InferenceGetModelsWithElasticInferenceServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void testGetDefaultEndpoints() throws IOException {
assertInferenceIdTaskType(allModels, ".rainbow-sprinkles-elastic", TaskType.CHAT_COMPLETION);
assertInferenceIdTaskType(allModels, ".elser-2-elastic", TaskType.SPARSE_EMBEDDING);
assertInferenceIdTaskType(allModels, ".multilingual-embed-v1-elastic", TaskType.TEXT_EMBEDDING);
assertInferenceIdTaskType(allModels, ".rerank-v1-elastic", TaskType.RERANK);
assertInferenceIdTaskType(allModels, ".elastic-rerank-v1", TaskType.RERANK);
}

private static void assertInferenceIdTaskType(List<Map<String, Object>> models, String inferenceId, TaskType taskType) {
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/elasticsearch/xpack/inference/MockElasticInferenceServiceAuthorizationServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void enqueueAuthorizeAllModelsResponse() {
"task_types": ["embed/text/dense"]
},
{
"model_name": "rerank-v1",
"model_name": "elastic-rerank-v1",
"task_types": ["rerank/text/text-similarity"]
}
]
Expand Down
16 changes: 8 additions & 8 deletions ...java/org/elasticsearch/xpack/inference/integration/InferenceRevokeDefaultEndpointsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
"task_types": ["embed/text/dense"]
},
{
"model_name": "rerank-v1",
"model_name": "elastic-rerank-v1",
"task_types": ["rerank/text/text-similarity"]
}
]
Expand Down Expand Up @@ -244,7 +244,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
service
),
new InferenceService.DefaultConfigId(
".rerank-v1-elastic",
".elastic-rerank-v1",
MinimalServiceSettings.rerank(ElasticInferenceService.NAME),
service
)
Expand All @@ -257,13 +257,13 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA

PlainActionFuture<List<Model>> listener = new PlainActionFuture<>();
service.defaultConfigs(listener);
assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
assertThat(listener.actionGet(TIMEOUT).get(0).getConfigurations().getInferenceEntityId(), is(".elastic-rerank-v1"));
assertThat(listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
assertThat(
listener.actionGet(TIMEOUT).get(1).getConfigurations().getInferenceEntityId(),
listener.actionGet(TIMEOUT).get(2).getConfigurations().getInferenceEntityId(),
is(".multilingual-embed-v1-elastic")
);
assertThat(listener.actionGet(TIMEOUT).get(2).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
assertThat(listener.actionGet(TIMEOUT).get(3).getConfigurations().getInferenceEntityId(), is(".rerank-v1-elastic"));
assertThat(listener.actionGet(TIMEOUT).get(3).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));

var getModelListener = new PlainActionFuture<UnparsedModel>();
// persists the default endpoints
Expand All @@ -283,7 +283,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
"task_types": ["embed/text/sparse"]
},
{
"model_name": "rerank-v1",
"model_name": "elastic-rerank-v1",
"task_types": ["rerank/text/text-similarity"]
},
{
Expand Down Expand Up @@ -319,7 +319,7 @@ public void testRemoves_DefaultChatCompletion_V1_WhenAuthorizationDoesNotReturnA
service
),
new InferenceService.DefaultConfigId(
".rerank-v1-elastic",
".elastic-rerank-v1",
MinimalServiceSettings.rerank(ElasticInferenceService.NAME),
service
)
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ public class ElasticInferenceService extends SenderService {
static final String DEFAULT_MULTILINGUAL_EMBED_ENDPOINT_ID = defaultEndpointId(DEFAULT_MULTILINGUAL_EMBED_MODEL_ID);

// rerank-v1
static final String DEFAULT_RERANK_MODEL_ID_V1 = "rerank-v1";
static final String DEFAULT_RERANK_ENDPOINT_ID_V1 = defaultEndpointId(DEFAULT_RERANK_MODEL_ID_V1);
static final String DEFAULT_RERANK_MODEL_ID_V1 = "elastic-rerank-v1";
static final String DEFAULT_RERANK_ENDPOINT_ID_V1 = ".elastic-rerank-v1";

/**
* The task types that the {@link InferenceAction.Request} can accept.
Expand Down
20 changes: 10 additions & 10 deletions ...java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
"task_types": ["embed/text/dense"]
},
{
"model_name": "rerank-v1",
"model_name": "elastic-rerank-v1",
"task_types": ["rerank/text/text-similarity"]
}
]
Expand All @@ -1260,6 +1260,11 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
service.defaultConfigIds(),
is(
List.of(
new InferenceService.DefaultConfigId(
".elastic-rerank-v1",
MinimalServiceSettings.rerank(ElasticInferenceService.NAME),
service
),
new InferenceService.DefaultConfigId(
".elser-2-elastic",
MinimalServiceSettings.sparseEmbedding(ElasticInferenceService.NAME),
Expand All @@ -1279,11 +1284,6 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
".rainbow-sprinkles-elastic",
MinimalServiceSettings.chatCompletion(ElasticInferenceService.NAME),
service
),
new InferenceService.DefaultConfigId(
".rerank-v1-elastic",
MinimalServiceSettings.rerank(ElasticInferenceService.NAME),
service
)
)
)
Expand All @@ -1297,10 +1297,10 @@ public void testDefaultConfigs_Returns_DefaultEndpoints_WhenTaskTypeIsCorrect()
service.defaultConfigs(listener);
var models = listener.actionGet(TIMEOUT);
assertThat(models.size(), is(4));
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"));
assertThat(models.get(0).getConfigurations().getInferenceEntityId(), is(".elastic-rerank-v1"));
assertThat(models.get(1).getConfigurations().getInferenceEntityId(), is(".elser-2-elastic"));
assertThat(models.get(2).getConfigurations().getInferenceEntityId(), is(".multilingual-embed-v1-elastic"));
assertThat(models.get(3).getConfigurations().getInferenceEntityId(), is(".rainbow-sprinkles-elastic"));
}
}

Expand Down