Skip to content

[ML] Inference services - remove unused init method #131759

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

Merged
merged 6 commits into from
Aug 27, 2025
+0 −9
Merged

[ML] Inference services - remove unused init method #131759

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90499bc
Remove unused init method
davidkyle Jul 23, 2025
8e30dd6
Remove unused cluster service from the SenderService
davidkyle Jul 23, 2025
534a396
[CI] Auto commit changes from spotless
Jul 23, 2025
acccb17
Revert "Remove unused cluster service from the SenderService"
davidkyle Aug 26, 2025
7386b76
Merge branch 'main' into inference-api-cleanup
davidkyle Aug 26, 2025
2f7fe25
Merge branch 'main' into inference-api-cleanup
davidkyle Aug 27, 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
3 changes: 0 additions & 3 deletions server/src/main/java/org/elasticsearch/inference/InferenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import org.elasticsearch.TransportVersion;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.inference.validation.ServiceIntegrationValidator;
Expand All @@ -24,8 +23,6 @@

public interface InferenceService extends Closeable {

default void init(Client client) {}

String name();

/**
Expand Down
5 changes: 0 additions & 5 deletions server/src/main/java/org/elasticsearch/inference/InferenceServiceRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

package org.elasticsearch.inference;

import org.elasticsearch.client.internal.Client;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;

import java.io.Closeable;
Expand Down Expand Up @@ -42,10 +41,6 @@ public InferenceServiceRegistry(
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}

public void init(Client client) {
services.values().forEach(s -> s.init(client));
}

public void onNodeStarted() {
for (var service : services.values()) {
try {
Expand Down
3 changes: 1 addition & 2 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 @@ -350,8 +350,7 @@ private ElasticInferenceService createElasticInferenceService() {
createWithEmptySettings(threadPool),
ElasticInferenceServiceSettingsTests.create(gatewayUrl),
modelRegistry,
new ElasticInferenceServiceAuthorizationRequestHandler(gatewayUrl, threadPool),
mockClusterServiceEmpty()
new ElasticInferenceServiceAuthorizationRequestHandler(gatewayUrl, threadPool)
);
}
}
1 change: 0 additions & 1 deletion x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,6 @@ public Collection<?> createComponents(PluginServices services) {
// This must be done after the HttpRequestSenderFactory is created so that the services can get the
// reference correctly
var serviceRegistry = new InferenceServiceRegistry(inferenceServices, factoryContext);
serviceRegistry.init(services.client());
for (var service : serviceRegistry.getServices().values()) {
service.defaultConfigIds().forEach(modelRegistry.get()::addDefaultIds);
}
Expand Down
5 changes: 1 addition & 4 deletions ...gin/inference/src/main/java/org/elasticsearch/xpack/inference/services/SenderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.core.IOUtils;
import org.elasticsearch.core.Nullable;
Expand Down Expand Up @@ -43,13 +42,11 @@ public abstract class SenderService implements InferenceService {
protected static final Set<TaskType> COMPLETION_ONLY = EnumSet.of(TaskType.COMPLETION);
private final Sender sender;
private final ServiceComponents serviceComponents;
private final ClusterService clusterService;
Copy link
Contributor

@jonathan-buttner jonathan-buttner Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this PR: https://github.com/elastic/elasticsearch/pull/131551/files#diff-7ac70d182c5505ff84ebb34581462f562d52780c090b60ce80e665476819d4ccR76

Is planning on using the ClusterService.

Copy link
Member Author

@davidkyle davidkyle Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left a comment on the PR


public SenderService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
public SenderService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
Objects.requireNonNull(factory);
sender = factory.createSender();
this.serviceComponents = Objects.requireNonNull(serviceComponents);
this.clusterService = Objects.requireNonNull(clusterService);
}

public Sender getSender() {
Expand Down
11 changes: 3 additions & 8 deletions .../elasticsearch/xpack/inference/services/alibabacloudsearch/AlibabaCloudSearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.core.Nullable;
Expand Down Expand Up @@ -92,15 +91,11 @@ public AlibabaCloudSearchService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public AlibabaCloudSearchService(
HttpRequestSender.Factory factory,
ServiceComponents serviceComponents,
ClusterService clusterService
) {
super(factory, serviceComponents, clusterService);
public AlibabaCloudSearchService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
8 changes: 3 additions & 5 deletions ...n/java/org/elasticsearch/xpack/inference/services/amazonbedrock/AmazonBedrockService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
Expand Down Expand Up @@ -98,16 +97,15 @@ public AmazonBedrockService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(httpSenderFactory, amazonBedrockFactory, serviceComponents, context.clusterService());
this(httpSenderFactory, amazonBedrockFactory, serviceComponents);
}

public AmazonBedrockService(
HttpRequestSender.Factory httpSenderFactory,
AmazonBedrockRequestSender.Factory amazonBedrockFactory,
ServiceComponents serviceComponents,
ClusterService clusterService
ServiceComponents serviceComponents
) {
super(httpSenderFactory, serviceComponents, clusterService);
super(httpSenderFactory, serviceComponents);
this.amazonBedrockSender = amazonBedrockFactory.createSender();
}

Expand Down
7 changes: 3 additions & 4 deletions .../src/main/java/org/elasticsearch/xpack/inference/services/anthropic/AnthropicService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.core.Nullable;
Expand Down Expand Up @@ -65,11 +64,11 @@ public AnthropicService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public AnthropicService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public AnthropicService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions ...n/java/org/elasticsearch/xpack/inference/services/azureaistudio/AzureAiStudioService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
Expand Down Expand Up @@ -91,11 +90,11 @@ public AzureAiStudioService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public AzureAiStudioService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public AzureAiStudioService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions .../main/java/org/elasticsearch/xpack/inference/services/azureopenai/AzureOpenAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.core.Nullable;
Expand Down Expand Up @@ -76,11 +75,11 @@ public AzureOpenAiService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public AzureOpenAiService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public AzureOpenAiService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions ...erence/src/main/java/org/elasticsearch/xpack/inference/services/cohere/CohereService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.core.Nullable;
Expand Down Expand Up @@ -91,11 +90,11 @@ public CohereService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public CohereService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public CohereService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions ...erence/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.core.Nullable;
Expand Down Expand Up @@ -81,11 +80,11 @@ public CustomService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public CustomService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public CustomService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions ...ce/src/main/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.core.Strings;
Expand Down Expand Up @@ -65,11 +64,11 @@ public DeepSeekService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public DeepSeekService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public DeepSeekService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
15 changes: 3 additions & 12 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 @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
Expand Down Expand Up @@ -144,25 +143,17 @@ public ElasticInferenceService(
ElasticInferenceServiceAuthorizationRequestHandler authorizationRequestHandler,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(
factory,
serviceComponents,
elasticInferenceServiceSettings,
modelRegistry,
authorizationRequestHandler,
context.clusterService()
);
this(factory, serviceComponents, elasticInferenceServiceSettings, modelRegistry, authorizationRequestHandler);
}

public ElasticInferenceService(
HttpRequestSender.Factory factory,
ServiceComponents serviceComponents,
ElasticInferenceServiceSettings elasticInferenceServiceSettings,
ModelRegistry modelRegistry,
ElasticInferenceServiceAuthorizationRequestHandler authorizationRequestHandler,
ClusterService clusterService
ElasticInferenceServiceAuthorizationRequestHandler authorizationRequestHandler
) {
super(factory, serviceComponents, clusterService);
super(factory, serviceComponents);
this.elasticInferenceServiceComponents = new ElasticInferenceServiceComponents(
elasticInferenceServiceSettings.getElasticInferenceServiceUrl()
);
Expand Down
7 changes: 3 additions & 4 deletions ...java/org/elasticsearch/xpack/inference/services/googleaistudio/GoogleAiStudioService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
Expand Down Expand Up @@ -89,11 +88,11 @@ public GoogleAiStudioService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public GoogleAiStudioService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public GoogleAiStudioService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions ...java/org/elasticsearch/xpack/inference/services/googlevertexai/GoogleVertexAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.core.Nullable;
Expand Down Expand Up @@ -104,11 +103,11 @@ public GoogleVertexAiService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public GoogleVertexAiService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public GoogleVertexAiService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions ...n/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceBaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.elasticsearch.xpack.inference.services.huggingface;

import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.ValidationException;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.inference.ChunkingSettings;
Expand Down Expand Up @@ -51,11 +50,11 @@ public HuggingFaceBaseService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public HuggingFaceBaseService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public HuggingFaceBaseService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions .../main/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.LazyInitializable;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.inference.ChunkedInference;
Expand Down Expand Up @@ -78,11 +77,11 @@ public HuggingFaceService(
ServiceComponents serviceComponents,
InferenceServiceExtension.InferenceServiceFactoryContext context
) {
this(factory, serviceComponents, context.clusterService());
this(factory, serviceComponents);
}

public HuggingFaceService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents, ClusterService clusterService) {
super(factory, serviceComponents, clusterService);
public HuggingFaceService(HttpRequestSender.Factory factory, ServiceComponents serviceComponents) {
super(factory, serviceComponents);
}

@Override
Expand Down
Loading