Merge branch 'custom-inference-service' of github.com:davidkyle/elasticsearch into custom-inference-service

Author: jonathan-buttner

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceNamedWriteablesProvider.java

@@ -173,35 +173,15 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
 
     private static void addCustomNamedWriteables(List<NamedWriteableRegistry.Entry> namedWriteables) {
         namedWriteables.add(
-            new NamedWriteableRegistry.Entry(
-                ServiceSettings.class,
-                CustomServiceSettings.NAME,
-                CustomServiceSettings::new
-            )
+            new NamedWriteableRegistry.Entry(ServiceSettings.class, CustomServiceSettings.NAME, CustomServiceSettings::new)
         );
 
-        namedWriteables.add(
-            new NamedWriteableRegistry.Entry(
-                TaskSettings.class,
-                CustomTaskSettings.NAME,
-                CustomTaskSettings::new
-            )
-        );
+        namedWriteables.add(new NamedWriteableRegistry.Entry(TaskSettings.class, CustomTaskSettings.NAME, CustomTaskSettings::new));
 
-        namedWriteables.add(
-            new NamedWriteableRegistry.Entry(
-                SecretSettings.class,
-                CustomSecretSettings.NAME,
-                CustomSecretSettings::new
-            )
-        );
+        namedWriteables.add(new NamedWriteableRegistry.Entry(SecretSettings.class, CustomSecretSettings.NAME, CustomSecretSettings::new));
 
         namedWriteables.add(
-            new NamedWriteableRegistry.Entry(
-                CustomResponseParser.class,
-                TextEmbeddingResponseParser.NAME,
-                TextEmbeddingResponseParser::new
-            )
+            new NamedWriteableRegistry.Entry(CustomResponseParser.class, TextEmbeddingResponseParser.NAME, TextEmbeddingResponseParser::new)
         );
 
         namedWriteables.add(
@@ -213,27 +193,13 @@ private static void addCustomNamedWriteables(List<NamedWriteableRegistry.Entry>
         );
 
         namedWriteables.add(
-            new NamedWriteableRegistry.Entry(
-                CustomResponseParser.class,
-                RerankResponseParser.NAME,
-                RerankResponseParser::new
-            )
+            new NamedWriteableRegistry.Entry(CustomResponseParser.class, RerankResponseParser.NAME, RerankResponseParser::new)
         );
 
-        namedWriteables.add(
-            new NamedWriteableRegistry.Entry(
-                CustomResponseParser.class,
-                NoopResponseParser.NAME,
-                NoopResponseParser::new
-            )
-        );
+        namedWriteables.add(new NamedWriteableRegistry.Entry(CustomResponseParser.class, NoopResponseParser.NAME, NoopResponseParser::new));
 
         namedWriteables.add(
-            new NamedWriteableRegistry.Entry(
-                CustomResponseParser.class,
-                CompletionResponseParser.NAME,
-                CompletionResponseParser::new
-            )
+            new NamedWriteableRegistry.Entry(CustomResponseParser.class, CompletionResponseParser.NAME, CompletionResponseParser::new)
         );
     }
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/CustomSecretSettings.java

@@ -95,9 +95,7 @@ public TransportVersion getMinimalSupportedVersion() {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeMap(secretParameters, (streamOutput, v) -> {
-            v.writeTo(streamOutput);
-        });
+        out.writeMap(secretParameters, (streamOutput, v) -> { v.writeTo(streamOutput); });
     }
 
     @Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/BaseCustomResponseParser.java

@@ -54,7 +54,6 @@ static List<?> validateList(Object obj, String fieldName) {
         return (List<?>) obj;
     }
 
-
     static void validateNonNull(Object obj, String fieldName) {
         Objects.requireNonNull(obj, Strings.format("Failed to parse field [%s], extracted field was null", fieldName));
     }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/custom/response/SparseEmbeddingResponseParser.java

@@ -35,7 +35,11 @@ public class SparseEmbeddingResponseParser extends BaseCustomResponseParser<Spar
     private final String tokenPath;
     private final String weightPath;
 
-    public static SparseEmbeddingResponseParser fromMap(Map<String, Object> responseParserMap, String scope, ValidationException validationException) {
+    public static SparseEmbeddingResponseParser fromMap(
+        Map<String, Object> responseParserMap,
+        String scope,
+        ValidationException validationException
+    ) {
         var fullScope = String.join(".", scope, JSON_PARSER);
         var tokenPath = extractRequiredString(responseParserMap, SPARSE_EMBEDDING_TOKEN_PATH, fullScope, validationException);
 

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/custom/CustomRequestManagerTests.java

@@ -80,10 +80,7 @@ public void testCreateRequest_ThrowsException_ForInvalidUrl() {
         var manager = CustomRequestManager.of(model, threadPool);
         manager.execute(new EmbeddingsInput(List.of("abc", "123"), null, null), mock(RequestSender.class), () -> false, listener);
 
-        var exception = expectThrows(
-            ElasticsearchStatusException.class,
-            () -> listener.actionGet(TimeValue.timeValueSeconds(30))
-        );
+        var exception = expectThrows(ElasticsearchStatusException.class, () -> listener.actionGet(TimeValue.timeValueSeconds(30)));
 
         assertThat(exception.getMessage(), is("Failed to construct the custom service request"));
         assertThat(exception.getCause().getMessage(), is("Failed to build URI, error: Illegal character in path at index 0: ^"));

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/custom/QueryParametersTests.java

@@ -32,9 +32,7 @@ public static QueryParameters createRandom() {
     }
 
     public void testFromMap() {
-        Map<String, Object> params = new HashMap<>(
-            Map.of(QueryParameters.QUERY_PARAMETERS, List.of(List.of("test_key", "test_value")))
-        );
+        Map<String, Object> params = new HashMap<>(Map.of(QueryParameters.QUERY_PARAMETERS, List.of(List.of("test_key", "test_value"))));
 
         assertThat(
             QueryParameters.fromMap(params, new ValidationException()),