Skip to content

Commit 89e040d

Browse files
committed
Shard bulk inference test never specifies chunking settings
1 parent 7cf7589 commit 89e040d

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterTests.java

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
3737
import org.elasticsearch.index.shard.ShardId;
3838
import org.elasticsearch.inference.ChunkedInference;
39-
import org.elasticsearch.inference.ChunkingSettings;
4039
import org.elasticsearch.inference.InferenceService;
4140
import org.elasticsearch.inference.InferenceServiceRegistry;
4241
import org.elasticsearch.inference.Model;
@@ -55,7 +54,6 @@
5554
import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceEmbedding;
5655
import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceError;
5756
import org.elasticsearch.xpack.inference.InferencePlugin;
58-
import org.elasticsearch.xpack.inference.chunking.ChunkingSettingsBuilder;
5957
import org.elasticsearch.xpack.inference.mapper.SemanticTextField;
6058
import org.elasticsearch.xpack.inference.model.TestModel;
6159
import org.elasticsearch.xpack.inference.registry.ModelRegistry;
@@ -79,7 +77,6 @@
7977
import static org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilter.getIndexRequestOrNull;
8078
import static org.elasticsearch.xpack.inference.mapper.SemanticTextField.getChunksFieldName;
8179
import static org.elasticsearch.xpack.inference.mapper.SemanticTextField.getOriginalTextFieldName;
82-
import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldTests.generateRandomChunkingSettings;
8380
import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldTests.randomChunkedInferenceEmbeddingSparse;
8481
import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldTests.randomSemanticText;
8582
import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldTests.randomSemanticTextInput;
@@ -383,10 +380,7 @@ public void testManyRandomDocs() throws Exception {
383380
for (int i = 0; i < numInferenceFields; i++) {
384381
String field = randomAlphaOfLengthBetween(5, 10);
385382
String inferenceId = randomFrom(inferenceModelMap.keySet());
386-
Map<String, Object> chunkingSettingsMap = Optional.ofNullable(generateRandomChunkingSettings())
387-
.map(ChunkingSettings::asMap)
388-
.orElse(null);
389-
inferenceFieldMap.put(field, new InferenceFieldMetadata(field, inferenceId, new String[] { field }, chunkingSettingsMap));
383+
inferenceFieldMap.put(field, new InferenceFieldMetadata(field, inferenceId, new String[] { field }, null));
390384
}
391385

392386
int numRequests = atLeast(100);
@@ -544,9 +538,6 @@ private static BulkItemRequest[] randomBulkItemRequest(
544538
for (var entry : fieldInferenceMap.values()) {
545539
String field = entry.getName();
546540
var model = modelMap.get(entry.getInferenceId());
547-
ChunkingSettings chunkingSettings = entry.getChunkingSettings() != null
548-
? ChunkingSettingsBuilder.fromMap(new HashMap<>(entry.getChunkingSettings()))
549-
: null;
550541
Object inputObject = randomSemanticTextInput();
551542
String inputText = inputObject.toString();
552543
docMap.put(field, inputObject);
@@ -566,21 +557,14 @@ private static BulkItemRequest[] randomBulkItemRequest(
566557
useLegacyFormat,
567558
field,
568559
model,
569-
chunkingSettings,
560+
null,
570561
List.of(inputText),
571562
results,
572563
requestContentType
573564
);
574565
} else {
575566
Map<String, List<String>> inputTextMap = Map.of(field, List.of(inputText));
576-
semanticTextField = randomSemanticText(
577-
useLegacyFormat,
578-
field,
579-
model,
580-
chunkingSettings,
581-
List.of(inputText),
582-
requestContentType
583-
);
567+
semanticTextField = randomSemanticText(useLegacyFormat, field, model, null, List.of(inputText), requestContentType);
584568
model.putResult(inputText, toChunkedResult(useLegacyFormat, inputTextMap, semanticTextField));
585569
}
586570

0 commit comments

Comments
 (0)