Missing a few changes

Author: jonathan-buttner

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

@@ -7,6 +7,9 @@
 
 package org.elasticsearch.xpack.inference.services.custom.response;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -31,6 +34,7 @@
 
 public class ErrorResponseParser implements ToXContentFragment, Function<HttpResult, ErrorResponse> {
 
+    private static final Logger logger = LogManager.getLogger(ErrorResponseParser.class);
     public static final String MESSAGE_PATH = "path";
 
     private final String messagePath;
@@ -90,7 +94,6 @@ public ErrorResponse apply(HttpResult httpResult) {
                 .createParser(XContentParserConfiguration.EMPTY, httpResult.body())
         ) {
             var map = jsonParser.map();
-
             // NOTE: This deviates from what we've done in the past. In the ErrorMessageResponseEntity logic
             // if we find the top level error field we'll return a response with an empty message but indicate
             // that we found the structure of the error object. Here if we're missing the final field we will return
@@ -101,7 +104,14 @@ public ErrorResponse apply(HttpResult httpResult) {
             var errorText = toType(MapPathExtractor.extract(map, messagePath).extractedObject(), String.class, messagePath);
             return new ErrorResponse(errorText);
         } catch (Exception e) {
-            // swallow the error
+            logger.info(
+                Strings.format(
+                    "Failed to parse error object for custom service inference id [%s], message path: [%s]",
+                    httpResult.request().inferenceEntityId(),
+                    messagePath
+                ),
+                e
+            );
         }
 
         return ErrorResponse.UNDEFINED_ERROR;

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

@@ -9,6 +9,7 @@
 
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
 import org.elasticsearch.inference.InferenceServiceResults;
 import org.elasticsearch.inference.InputType;
 import org.elasticsearch.inference.Model;
@@ -227,9 +228,12 @@ private static CustomModel createInternalEmbeddingModel(
             TaskType.TEXT_EMBEDDING,
             CustomService.NAME,
             new CustomServiceSettings(
-                similarityMeasure,
-                123,
-                456,
+                new CustomServiceSettings.TextEmbeddingSettings(
+                    SimilarityMeasure.DOT_PRODUCT,
+                    123,
+                    456,
+                    DenseVectorFieldMapper.ElementType.FLOAT
+                ),
                 url,
                 Map.of("key", "value"),
                 QueryParameters.EMPTY,
@@ -249,9 +253,7 @@ private static CustomModel createCustomModel(TaskType taskType, CustomResponsePa
             taskType,
             CustomService.NAME,
             new CustomServiceSettings(
-                null,
-                null,
-                null,
+                CustomServiceSettings.TextEmbeddingSettings.EMPTY,
                 url,
                 Map.of("key", "value"),
                 QueryParameters.EMPTY,