Revert "use non results fields"

This reverts commit 2a9395d.

server/src/main/java/org/elasticsearch/inference/InferenceResults.java

@@ -31,29 +31,9 @@ static void writeResult(InferenceResults results, IngestDocument ingestDocument,
         }
     }
 
-    static void writeResultToField(InferenceResults results, IngestDocument ingestDocument, String outputField, String modelId, boolean includeModelId) {
-        Objects.requireNonNull(results, "results");
-        Objects.requireNonNull(ingestDocument, "ingestDocument");
-        Objects.requireNonNull(outputField, "outputField");
-        Map<String, Object> resultMap = results.asMap();
-        if (includeModelId) {
-            resultMap.put(MODEL_ID_RESULTS_FIELD, modelId);
-        }
-        Object predictedValue = results.predictedValue();
-        if (predictedValue != null) {
-            if (ingestDocument.hasField(outputField)) {
-                ingestDocument.appendFieldValue(outputField, results.predictedValue());
-            } else {
-                ingestDocument.setFieldValue(outputField, resultMap);
-            }
-        }
-    }
-
     String getResultsField();
 
     Map<String, Object> asMap();
 
-    Map<String, Object> nonResultFeatures();
-
     Object predictedValue();
 }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/ClassificationInferenceResults.java

@@ -218,14 +218,8 @@ public String getResultsField() {
 
     @Override
     public Map<String, Object> asMap() {
-        Map<String, Object> map = nonResultFeatures();
-        map.put(resultsField, predictionFieldType.transformPredictedValue(value(), valueAsString()));
-        return map;
-    }
-
-    @Override
-    public Map<String, Object> nonResultFeatures() {
         Map<String, Object> map = new LinkedHashMap<>();
+        map.put(resultsField, predictionFieldType.transformPredictedValue(value(), valueAsString()));
         if (topClasses.isEmpty() == false) {
             map.put(topNumClassesField, topClasses.stream().map(TopClassEntry::asValueMap).collect(Collectors.toList()));
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/ErrorInferenceResults.java

@@ -69,11 +69,6 @@ public String getResultsField() {
 
     @Override
     public Map<String, Object> asMap() {
-        return nonResultFeatures();
-    }
-
-    @Override
-    public Map<String, Object> nonResultFeatures() {
         Map<String, Object> asMap = new LinkedHashMap<>();
         asMap.put(NAME, exception.getMessage());
         return asMap;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/FillMaskResults.java

@@ -55,13 +55,6 @@ void addMapFields(Map<String, Object> map) {
         map.put(resultsField + "_sequence", predictedSequence);
     }
 
-    @Override
-    public Map<String, Object> nonResultFeatures() {
-        var map = super.nonResultFeatures();
-        map.put(resultsField + "_sequence", predictedSequence); // TODO
-        return map;
-    }
-
     @Override
     public String getWriteableName() {
         return NAME;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/NerResults.java

@@ -73,12 +73,6 @@ void addMapFields(Map<String, Object> map) {
         map.put(ENTITY_FIELD, entityGroups.stream().map(EntityGroup::toMap).collect(Collectors.toList()));
     }
 
-    @Override
-    public Map<String, Object> nonResultFeatures() {
-        var map = super.nonResultFeatures();
-        return Map.of(ENTITY_FIELD, entityGroups.stream().map(EntityGroup::toMap).collect(Collectors.toList()));
-    }
-
     @Override
     public Object predictedValue() {
         return annotatedResult;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/NlpClassificationInferenceResults.java

@@ -100,17 +100,6 @@ public Object predictedValue() {
     @Override
     void addMapFields(Map<String, Object> map) {
         map.put(resultsField, classificationLabel);
-        addNonResultFeaturesToMap(map);
-    }
-
-    @Override
-    public Map<String, Object> nonResultFeatures() {
-        var map = super.nonResultFeatures();
-        addNonResultFeaturesToMap(map);
-        return map;
-    }
-
-    private void addNonResultFeaturesToMap(Map<String, Object> map) {
         if (topClasses.isEmpty() == false) {
             map.put(
                 NlpConfig.DEFAULT_TOP_CLASSES_RESULTS_FIELD,

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/NlpInferenceResults.java

@@ -14,7 +14,6 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -66,13 +65,6 @@ public final Map<String, Object> asMap() {
         return map;
     }
 
-    @Override
-    public Map<String, Object> nonResultFeatures() {
-        var map = new HashMap<String, Object>();
-        map.put("is_truncated", isTruncated);
-        return map;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/QuestionAnsweringInferenceResults.java

@@ -120,18 +120,7 @@ public String predictedValue() {
 
     @Override
     void addMapFields(Map<String, Object> map) {
-        addNonResultFeaturesToMap(map);
         map.put(resultsField, answer);
-    }
-
-    @Override
-    public Map<String, Object> nonResultFeatures() {
-        var map = super.nonResultFeatures();
-        addNonResultFeaturesToMap(map);
-        return map;
-    }
-
-    private void addNonResultFeaturesToMap(Map<String, Object> map) {
         map.put(START_OFFSET.getPreferredName(), startOffset);
         map.put(END_OFFSET.getPreferredName(), endOffset);
         if (topClasses.isEmpty() == false) {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/RawInferenceResults.java

@@ -69,11 +69,6 @@ public Map<String, Object> asMap() {
         throw new UnsupportedOperationException("[raw] does not support map conversion");
     }
 
-    @Override
-    public Map<String, Object> nonResultFeatures() {
-        throw new UnsupportedOperationException("[raw] does not support map conversion of features");
-    }
-
     @Override
     public Object predictedValue() {
         return null;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/RegressionInferenceResults.java

@@ -120,14 +120,8 @@ public String getResultsField() {
 
     @Override
     public Map<String, Object> asMap() {
-        Map<String, Object> map = nonResultFeatures();
-        map.put(resultsField, predictedValue());
-        return map;
-    }
-
-    @Override
-    public Map<String, Object> nonResultFeatures() {
         Map<String, Object> map = new LinkedHashMap<>();
+        map.put(resultsField, value());
         if (featureImportance.isEmpty() == false) {
             map.put(FEATURE_IMPORTANCE, featureImportance.stream().map(RegressionFeatureImportance::toMap).collect(Collectors.toList()));
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/results/WarningInferenceResults.java

@@ -70,11 +70,6 @@ public String getResultsField() {
 
     @Override
     public Map<String, Object> asMap() {
-        return nonResultFeatures();
-    }
-
-    @Override
-    public Map<String, Object> nonResultFeatures() {
         Map<String, Object> asMap = new LinkedHashMap<>();
         asMap.put(NAME, warning);
         return asMap;

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ingest/InferenceProcessor.java

@@ -213,7 +213,7 @@ InferModelAction.Request buildRequest(IngestDocument ingestDocument) {
         if (configuredWithInputsFields) {
             List<String> requestInputs = new ArrayList<>();
             for (var inputFields : inputs) {
-                var lookup = (String) fields.get(inputFields.inputField);
+                var lookup = (String)fields.get(inputFields.inputField);
                 if (lookup == null) {
                     lookup = ""; // need to send a non-null request to the same number of results back
                 }
@@ -249,15 +249,11 @@ void mutateDocument(InferModelAction.Response response, IngestDocument ingestDoc
 
         if (configuredWithInputsFields) {
             if (response.getInferenceResults().size() != inputs.size()) {
-                throw new ElasticsearchStatusException(
-                    "number of results [{}] does not match the number of inputs [{}]",
-                    RestStatus.INTERNAL_SERVER_ERROR,
-                    response.getInferenceResults().size(),
-                    inputs.size()
-                );
+                throw new ElasticsearchStatusException("number of results [{}] does not match the number of inputs [{}]",
+                    RestStatus.INTERNAL_SERVER_ERROR, response.getInferenceResults().size(), inputs.size());
             }
 
-            for (int i = 0; i < inputs.size(); i++) {
+            for (int i=0; i< inputs.size(); i++) {
                 InferenceResults.writeResult(
                     response.getInferenceResults().get(i),
                     ingestDocument,

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/inference/ingest/InferenceProcessorFactoryTests.java

@@ -27,6 +27,7 @@
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.core.Tuple;
+import org.elasticsearch.inference.InferenceResults;
 import org.elasticsearch.ingest.IngestMetadata;
 import org.elasticsearch.ingest.PipelineConfiguration;
 import org.elasticsearch.test.ESTestCase;