Skip to content

Commit 586ae7f

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent aacbd60 commit 586ae7f

File tree

9 files changed

+68
-47
lines changed

9 files changed

+68
-47
lines changed

‎server/src/test/java/org/elasticsearch/inference/SettingsConfigurationTestUtils.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ public class SettingsConfigurationTestUtils {
2121

2222
public static SettingsConfiguration getRandomSettingsConfigurationField() {
2323
return new SettingsConfiguration.Builder(EnumSet.of(TaskType.TEXT_EMBEDDING, TaskType.SPARSE_EMBEDDING, TaskType.RERANK))
24-
.setDefaultValue(randomAlphaOfLength(10)
25-
)
24+
.setDefaultValue(randomAlphaOfLength(10))
2625
.setDescription(randomAlphaOfLength(10))
2726
.setLabel(randomAlphaOfLength(10))
2827
.setRequired(randomBoolean())

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceRequestRerankManager.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ public static HuggingFaceRequestRerankManager of(
4848
private final ResponseHandler responseHandler;
4949
private final Truncator truncator;
5050

51-
private HuggingFaceRequestRerankManager(HuggingFaceModel model, ResponseHandler responseHandler, Truncator truncator, ThreadPool threadPool) {
51+
private HuggingFaceRequestRerankManager(
52+
HuggingFaceModel model,
53+
ResponseHandler responseHandler,
54+
Truncator truncator,
55+
ThreadPool threadPool
56+
) {
5257
super(threadPool, model.getInferenceEntityId(), RateLimitGrouping.of(model), model.rateLimitServiceSettings().rateLimitSettings());
5358
this.model = model;
5459
this.responseHandler = responseHandler;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/action/HuggingFaceActionCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import org.elasticsearch.xpack.inference.services.huggingface.HuggingFaceResponseHandler;
1818
import org.elasticsearch.xpack.inference.services.huggingface.elser.HuggingFaceElserModel;
1919
import org.elasticsearch.xpack.inference.services.huggingface.embeddings.HuggingFaceEmbeddingsModel;
20+
import org.elasticsearch.xpack.inference.services.huggingface.rerank.HuggingFaceRerankModel;
2021
import org.elasticsearch.xpack.inference.services.huggingface.response.HuggingFaceElserResponseEntity;
2122
import org.elasticsearch.xpack.inference.services.huggingface.response.HuggingFaceEmbeddingsResponseEntity;
22-
import org.elasticsearch.xpack.inference.services.huggingface.rerank.HuggingFaceRerankModel;
2323

2424
import java.util.Objects;
2525

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/request/HuggingFaceInferenceRerankRequest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public HttpRequest createHttpRequest() {
4242
HttpPost httpPost = new HttpPost(account.uri());
4343

4444
ByteArrayEntity byteEntity = new ByteArrayEntity(
45-
Strings.toString(new HuggingFaceInferenceRerankRequestEntity(truncationResult.input(), "default")).getBytes(StandardCharsets.UTF_8)
45+
Strings.toString(new HuggingFaceInferenceRerankRequestEntity(truncationResult.input(), "default"))
46+
.getBytes(StandardCharsets.UTF_8)
4647
);
4748
httpPost.setEntity(byteEntity);
4849
httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaTypeWithoutParameters());

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankService.java‎

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
import org.elasticsearch.common.util.LazyInitializable;
1616
import org.elasticsearch.core.Nullable;
1717
import org.elasticsearch.core.TimeValue;
18-
1918
import org.elasticsearch.inference.ChunkedInference;
20-
import org.elasticsearch.inference.InferenceServiceResults;
2119
import org.elasticsearch.inference.InferenceServiceConfiguration;
20+
import org.elasticsearch.inference.InferenceServiceResults;
2221
import org.elasticsearch.inference.InputType;
2322
import org.elasticsearch.inference.Model;
2423
import org.elasticsearch.inference.ModelConfigurations;
@@ -76,7 +75,14 @@ protected HuggingFaceRerankModel createModel(
7675
) {
7776
return switch (taskType) {
7877
case RERANK -> new HuggingFaceRerankModel(
79-
inferenceEntityId, taskType, NAME, serviceSettings, taskSettings, secretSettings, context);
78+
inferenceEntityId,
79+
taskType,
80+
NAME,
81+
serviceSettings,
82+
taskSettings,
83+
secretSettings,
84+
context
85+
);
8086
default -> throw new ElasticsearchStatusException(failureMessage, RestStatus.BAD_REQUEST);
8187
};
8288
}
@@ -143,8 +149,15 @@ private static HuggingFaceRerankModel createModel(
143149
ConfigurationParseContext context
144150
) {
145151
return switch (taskType) {
146-
case RERANK -> new HuggingFaceRerankModel(inferenceEntityId, taskType, name, serviceSettings,
147-
taskSettings, secretSettings, context);
152+
case RERANK -> new HuggingFaceRerankModel(
153+
inferenceEntityId,
154+
taskType,
155+
name,
156+
serviceSettings,
157+
taskSettings,
158+
secretSettings,
159+
context
160+
);
148161
default -> throw new ElasticsearchStatusException(failureMessage, RestStatus.BAD_REQUEST);
149162
};
150163
}
@@ -211,18 +224,25 @@ public void doInfer(
211224
}
212225

213226
@Override
214-
protected void validateInputType(InputType inputType, Model model, ValidationException validationException) {
215-
}
227+
protected void validateInputType(InputType inputType, Model model, ValidationException validationException) {}
216228

217229
@Override
218-
protected void doUnifiedCompletionInfer(Model model, UnifiedChatInput inputs,
219-
TimeValue timeout, ActionListener<InferenceServiceResults> listener) {
220-
}
230+
protected void doUnifiedCompletionInfer(
231+
Model model,
232+
UnifiedChatInput inputs,
233+
TimeValue timeout,
234+
ActionListener<InferenceServiceResults> listener
235+
) {}
221236

222237
@Override
223-
protected void doChunkedInfer(Model model, EmbeddingsInput inputs, Map<String, Object> taskSettings,
224-
InputType inputType, TimeValue timeout, ActionListener<List<ChunkedInference>> listener) {
225-
}
238+
protected void doChunkedInfer(
239+
Model model,
240+
EmbeddingsInput inputs,
241+
Map<String, Object> taskSettings,
242+
InputType inputType,
243+
TimeValue timeout,
244+
ActionListener<List<ChunkedInference>> listener
245+
) {}
226246

227247
@Override
228248
public EnumSet<TaskType> supportedTaskTypes() {

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankServiceSettings.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
public class HuggingFaceRerankServiceSettings extends FilteredXContentObject
3333
implements
34-
ServiceSettings,
35-
HuggingFaceRateLimitServiceSettings {
34+
ServiceSettings,
35+
HuggingFaceRateLimitServiceSettings {
3636

3737
public static final String NAME = "hugging_face_elser_service_settings";
3838
public static final String URL = "url";

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/action/HuggingFaceRerankActionTests.java‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ public void testExecute_ThrowsElasticsearchException_WhenSenderThrows() {
6161
var action = createAction(URL, sender);
6262

6363
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
64-
action.execute(
65-
new QueryAndDocsInputs("ef", List.of("abc")),
66-
InferenceAction.Request.DEFAULT_TIMEOUT,
67-
listener
68-
);
64+
action.execute(new QueryAndDocsInputs("ef", List.of("abc")), InferenceAction.Request.DEFAULT_TIMEOUT, listener);
6965

7066
var thrownException = expectThrows(ElasticsearchException.class, () -> listener.actionGet(TIMEOUT));
7167

@@ -85,18 +81,18 @@ public void testExecute_ThrowsElasticsearchException_WhenSenderOnFailureIsCalled
8581
var action = createAction(URL, sender, "inferenceEntityId");
8682

8783
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
88-
action.execute(
89-
new QueryAndDocsInputs("ef", List.of("abc")),
90-
InferenceAction.Request.DEFAULT_TIMEOUT,
91-
listener
92-
);
84+
action.execute(new QueryAndDocsInputs("ef", List.of("abc")), InferenceAction.Request.DEFAULT_TIMEOUT, listener);
9385

9486
var thrownException = expectThrows(ElasticsearchException.class, () -> listener.actionGet(TIMEOUT));
9587

9688
assertThat(
9789
thrownException.getMessage(),
98-
is(format(
99-
"Failed to send Hugging Face test action rerank request from inference entity id [%s]. Cause: failed", "inferenceEntityId"))
90+
is(
91+
format(
92+
"Failed to send Hugging Face test action rerank request from inference entity id [%s]. Cause: failed",
93+
"inferenceEntityId"
94+
)
95+
)
10096
);
10197
}
10298

@@ -107,18 +103,18 @@ public void testExecute_ThrowsException() {
107103
var action = createAction(URL, sender, "inferenceEntityId");
108104

109105
PlainActionFuture<InferenceServiceResults> listener = new PlainActionFuture<>();
110-
action.execute(
111-
new QueryAndDocsInputs("ef", List.of("abc")),
112-
InferenceAction.Request.DEFAULT_TIMEOUT,
113-
listener
114-
);
106+
action.execute(new QueryAndDocsInputs("ef", List.of("abc")), InferenceAction.Request.DEFAULT_TIMEOUT, listener);
115107

116108
var thrownException = expectThrows(ElasticsearchException.class, () -> listener.actionGet(TIMEOUT));
117109

118110
assertThat(
119111
thrownException.getMessage(),
120-
is(format(
121-
"Failed to send Hugging Face test action rerank request from inference entity id [%s]. Cause: failed", "inferenceEntityId"))
112+
is(
113+
format(
114+
"Failed to send Hugging Face test action rerank request from inference entity id [%s]. Cause: failed",
115+
"inferenceEntityId"
116+
)
117+
)
122118
);
123119
}
124120

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/request/HuggingFaceInferenceRerankRequestTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public void testIsTruncated_ReturnsTrue() throws URISyntaxException, IOException
7373
assertTrue(truncatedRequest.getTruncationInfo()[0]);
7474
}
7575

76-
public static HuggingFaceInferenceRerankRequest createRequest(String url, String apiKey,
77-
String documents, String query) throws URISyntaxException {
76+
public static HuggingFaceInferenceRerankRequest createRequest(String url, String apiKey, String documents, String query)
77+
throws URISyntaxException {
7878
return new HuggingFaceInferenceRerankRequest(
7979
TruncatorTests.createTruncator(),
8080
new Truncator.TruncationResult(List.of(documents), new boolean[] { false }),

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/rerank/HuggingFaceRerankModelTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public static HuggingFaceRerankModel createModel(String url, String apiKey) {
3434

3535
public static HuggingFaceRerankModel createModel(String url, String apiKey, String modelId) {
3636
return new HuggingFaceRerankModel(
37-
modelId,
38-
TaskType.RERANK,
39-
"service",
40-
new HuggingFaceRerankServiceSettings(url),
41-
null,
42-
new DefaultSecretSettings(new SecureString(apiKey.toCharArray()))
37+
modelId,
38+
TaskType.RERANK,
39+
"service",
40+
new HuggingFaceRerankServiceSettings(url),
41+
null,
42+
new DefaultSecretSettings(new SecureString(apiKey.toCharArray()))
4343
);
4444
}
4545
}

0 commit comments

Comments
 (0)