github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Hides hugging_face_elser service from the GET _inference/_services API (#116664)

Browse source 
* Adding hideFromConfigurationApi flag

* Update docs/changelog/116664.yaml
This commit is contained in:
Ying Mao 2024-11-12 11:22:55 -05:00 • committed by GitHub
parent d2e5c43c9b
commit 65de0f0ca9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/changelog/116664.yaml Normal file
View file

@ -0,0 +1,6 @@
pr: 116664
summary: Hides `hugging_face_elser` service from the `GET _inference/_services API`
area: Machine Learning
type: bug
issues:
- 116644

8
server/src/main/java/org/elasticsearch/inference/InferenceService.java
View file

@ -74,6 +74,14 @@ public interface InferenceService extends Closeable {
InferenceServiceConfiguration getConfiguration();
/**
* Whether this service should be hidden from the API. Should be used for services
* that are not ready to be used.
*/
default Boolean hideFromConfigurationApi() {
return Boolean.FALSE;
}
/**
* The task types supported by the service
* @return Set of supported.

13
x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceCrudIT.java
View file

@ -135,9 +135,9 @@ public class InferenceCrudIT extends InferenceBaseRestTest {
public void testGetServicesWithoutTaskType() throws IOException {
List<Object> services = getAllServices();
if (ElasticInferenceServiceFeature.ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG.isEnabled()) {
assertThat(services.size(), equalTo(19));
} else {
assertThat(services.size(), equalTo(18));
} else {
assertThat(services.size(), equalTo(17));
}
String[] providers = new String[services.size()];
@ -160,7 +160,6 @@ public class InferenceCrudIT extends InferenceBaseRestTest {
"googleaistudio",
"googlevertexai",
"hugging_face",
"hugging_face_elser",
"mistral",
"openai",
"streaming_completion_test_service",
@ -259,9 +258,9 @@ public class InferenceCrudIT extends InferenceBaseRestTest {
List<Object> services = getServices(TaskType.SPARSE_EMBEDDING);
if (ElasticInferenceServiceFeature.ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG.isEnabled()) {
assertThat(services.size(), equalTo(6));
} else {
assertThat(services.size(), equalTo(5));
} else {
assertThat(services.size(), equalTo(4));
}
String[] providers = new String[services.size()];
@ -272,9 +271,7 @@ public class InferenceCrudIT extends InferenceBaseRestTest {
Arrays.sort(providers);
var providerList = new ArrayList<>(
Arrays.asList("alibabacloud-ai-search", "elasticsearch", "hugging_face", "hugging_face_elser", "test_service")
);
var providerList = new ArrayList<>(Arrays.asList("alibabacloud-ai-search", "elasticsearch", "hugging_face", "test_service"));
if (ElasticInferenceServiceFeature.ELASTIC_INFERENCE_SERVICE_FEATURE_FLAG.isEnabled()) {
providerList.add(1, "elastic");
}

19
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportGetInferenceServicesAction.java
View file

@ -68,7 +68,10 @@ public class TransportGetInferenceServicesAction extends HandledTransportAction<
var filteredServices = serviceRegistry.getServices()
.entrySet()
.stream()
.filter(service -> service.getValue().supportedTaskTypes().contains(requestedTaskType))
.filter(
service -> service.getValue().hideFromConfigurationApi() == false
&& service.getValue().supportedTaskTypes().contains(requestedTaskType)
)
.collect(Collectors.toSet());
getServiceConfigurationsForServices(filteredServices, listener.delegateFailureAndWrap((delegate, configurations) -> {
@ -77,12 +80,14 @@ public class TransportGetInferenceServicesAction extends HandledTransportAction<
}
private void getAllServiceConfigurations(ActionListener<GetInferenceServicesAction.Response> listener) {
getServiceConfigurationsForServices(
serviceRegistry.getServices().entrySet(),
listener.delegateFailureAndWrap((delegate, configurations) -> {
delegate.onResponse(new GetInferenceServicesAction.Response(configurations));
})
);
var availableServices = serviceRegistry.getServices()
.entrySet()
.stream()
.filter(service -> service.getValue().hideFromConfigurationApi() == false)
.collect(Collectors.toSet());
getServiceConfigurationsForServices(availableServices, listener.delegateFailureAndWrap((delegate, configurations) -> {
delegate.onResponse(new GetInferenceServicesAction.Response(configurations));
}));
}
private void getServiceConfigurationsForServices(

5
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/elser/HuggingFaceElserService.java
View file

@ -125,6 +125,11 @@ public class HuggingFaceElserService extends HuggingFaceBaseService {
return Configuration.get();
}
@Override
public Boolean hideFromConfigurationApi() {
return Boolean.TRUE;
}
@Override
public EnumSet<TaskType> supportedTaskTypes() {
return supportedTaskTypes;