Skip to content

Commit fe3fed6

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 8860a61 commit fe3fed6

File tree

4 files changed

+5
-28
lines changed

4 files changed

+5
-28
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/cohere/action/CohereActionCreator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.elasticsearch.xpack.inference.external.request.Request;
2121
import org.elasticsearch.xpack.inference.services.ServiceComponents;
2222
import org.elasticsearch.xpack.inference.services.cohere.CohereResponseHandler;
23-
import org.elasticsearch.xpack.inference.services.cohere.CohereServiceSettings;
2423
import org.elasticsearch.xpack.inference.services.cohere.completion.CohereCompletionModel;
2524
import org.elasticsearch.xpack.inference.services.cohere.embeddings.CohereEmbeddingsModel;
2625
import org.elasticsearch.xpack.inference.services.cohere.request.v1.CohereV1CompletionRequest;

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/CohereServiceTests.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInConfig() throws I
266266
var serviceSettings = CohereEmbeddingsServiceSettingsTests.getServiceSettingsMap(null, null, null);
267267
serviceSettings.put(CohereServiceSettings.MODEL_ID, "foo");
268268

269-
var config = getRequestConfigMap(
270-
serviceSettings,
271-
getTaskSettingsMapEmpty(),
272-
getSecretSettingsMap("secret")
273-
);
269+
var config = getRequestConfigMap(serviceSettings, getTaskSettingsMapEmpty(), getSecretSettingsMap("secret"));
274270
config.put("extra_key", "value");
275271

276272
var failureListener = getModelListenerForException(
@@ -323,11 +319,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInSecretSettingsMap
323319

324320
var serviceSettings = CohereEmbeddingsServiceSettingsTests.getServiceSettingsMap(null, null, null);
325321
serviceSettings.put(CohereServiceSettings.MODEL_ID, "foo");
326-
var config = getRequestConfigMap(
327-
serviceSettings,
328-
getTaskSettingsMapEmpty(),
329-
secretSettingsMap
330-
);
322+
var config = getRequestConfigMap(serviceSettings, getTaskSettingsMapEmpty(), secretSettingsMap);
331323

332324
var failureListener = getModelListenerForException(
333325
ElasticsearchStatusException.class,
@@ -353,11 +345,7 @@ public void testParseRequestConfig_CreatesACohereEmbeddingsModelWithoutUrl() thr
353345
service.parseRequestConfig(
354346
"id",
355347
TaskType.TEXT_EMBEDDING,
356-
getRequestConfigMap(
357-
serviceSettings,
358-
getTaskSettingsMapEmpty(),
359-
getSecretSettingsMap("secret")
360-
),
348+
getRequestConfigMap(serviceSettings, getTaskSettingsMapEmpty(), getSecretSettingsMap("secret")),
361349
modelListener
362350
);
363351

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/action/CohereEmbeddingsActionTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import static org.hamcrest.Matchers.containsString;
5555
import static org.hamcrest.Matchers.equalTo;
5656
import static org.hamcrest.Matchers.hasSize;
57-
import static org.hamcrest.Matchers.in;
5857
import static org.hamcrest.Matchers.is;
5958
import static org.mockito.ArgumentMatchers.any;
6059
import static org.mockito.Mockito.doAnswer;

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/embeddings/CohereEmbeddingsModelTests.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ public static CohereEmbeddingsModel createModel(
146146
@Nullable Integer dimensions,
147147
String model,
148148
@Nullable CohereEmbeddingType embeddingType
149-
)
150-
{
149+
) {
151150
return createModel(
152151
url,
153152
apiKey,
@@ -173,15 +172,7 @@ public static CohereEmbeddingsModel createModel(
173172
return new CohereEmbeddingsModel(
174173
"id",
175174
new CohereEmbeddingsServiceSettings(
176-
new CohereServiceSettings(
177-
url,
178-
SimilarityMeasure.DOT_PRODUCT,
179-
dimensions,
180-
tokenLimit,
181-
model,
182-
null,
183-
apiVersion
184-
),
175+
new CohereServiceSettings(url, SimilarityMeasure.DOT_PRODUCT, dimensions, tokenLimit, model, null, apiVersion),
185176
Objects.requireNonNullElse(embeddingType, CohereEmbeddingType.FLOAT)
186177
),
187178
taskSettings,

0 commit comments

Comments
 (0)