Revert a bunch of changes to try to narrow down what broke CI

Author: kderusso

server/src/main/java/org/elasticsearch/cluster/metadata/InferenceFieldMetadata.java

@@ -46,7 +46,6 @@ public final class InferenceFieldMetadata implements SimpleDiffable<InferenceFie
     private final String[] sourceFields;
     private final Map<String, Object> chunkingSettings;
 
-    // TODO can this be ChunkingSettings instead of Map<String, Object>?
     public InferenceFieldMetadata(String name, String inferenceId, String[] sourceFields, Map<String, Object> chunkingSettings) {
         this(name, inferenceId, inferenceId, sourceFields, chunkingSettings);
     }
@@ -63,11 +62,6 @@ public InferenceFieldMetadata(
         this.searchInferenceId = Objects.requireNonNull(searchInferenceId);
         this.sourceFields = Objects.requireNonNull(sourceFields);
         this.chunkingSettings = chunkingSettings;
-
-        // TODO remove this, trying to get stack traces where this called
-        if (chunkingSettings != null && chunkingSettings.size() != 3) {
-            throw new IllegalArgumentException("Chunking settings must contain exactly 3 settings");
-        }
     }
 
     public InferenceFieldMetadata(StreamInput input) throws IOException {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java

@@ -307,25 +307,20 @@ public void onFailure(Exception exc) {
             }
             int currentBatchSize = Math.min(requests.size(), batchSize);
             ChunkingSettings chunkingSettings = requests.get(0).chunkingSettings;
-            List<FieldInferenceRequest> currentBatch = new ArrayList<>();
-            List<FieldInferenceRequest> others = new ArrayList<>();
-            for (int i = 0; i < currentBatchSize; i++) {
-                FieldInferenceRequest request = requests.get(i);
-                if ((chunkingSettings == null && request.chunkingSettings == null) || request.chunkingSettings.equals(chunkingSettings)) {
-                    currentBatch.add(request);
-                } else {
-                    others.add(request);
-                }
-            }
-
+            // final List<ChunkedInputs> currentBatch = new ArrayList<>();
+            // for (int i = 0; i < currentBatchSize; i++) {
+            // FieldInferenceRequest request = requests.get(i);
+            // ChunkedInputs chunkedInputs = new ChunkedInputs(chunkingSettings, List.of(request.input));
+            // currentBatch.add(chunkedInputs);
+            // }
+            final List<FieldInferenceRequest> currentBatch = requests.subList(0, currentBatchSize);
             final List<FieldInferenceRequest> nextBatch = requests.subList(currentBatchSize, requests.size());
-            nextBatch.addAll(others);
 
-            // We can assume current batch has all the same chunking settings
-            ChunkedInputs chunkedInputs = new ChunkedInputs(
-                chunkingSettings,
-                currentBatch.stream().map(r -> r.input).collect(Collectors.toList())
-            );
+            // ChunkedInputs chunkedInputs = new ChunkedInputs(
+            // chunkingSettings,
+            // currentBatch.stream().map(FieldInferenceRequest::input).collect(Collectors.toList())
+            // );
+            final List<String> inputs = currentBatch.stream().map(FieldInferenceRequest::input).toList();
 
             ActionListener<List<ChunkedInference>> completionListener = new ActionListener<>() {
                 @Override
@@ -395,9 +390,9 @@ private void onFinish() {
                 .chunkedInfer(
                     inferenceProvider.model(),
                     null,
-                    chunkedInputs.inputs(),
+                    inputs,
                     Map.of(),
-                    chunkedInputs.chunkingSettings(),
+                    null, // TODO add chunking settings
                     InputType.INGEST,
                     TimeValue.MAX_VALUE,
                     completionListener