|
46 | 46 | import org.elasticsearch.xcontent.XContent; |
47 | 47 | import org.elasticsearch.xpack.core.XPackField; |
48 | 48 | import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceError; |
49 | | -import org.elasticsearch.xpack.inference.chunking.ChunkingSettingsBuilder; |
50 | 49 | import org.elasticsearch.xpack.inference.InferenceException; |
| 50 | +import org.elasticsearch.xpack.inference.chunking.ChunkingSettingsBuilder; |
51 | 51 | import org.elasticsearch.xpack.inference.mapper.SemanticTextField; |
52 | 52 | import org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper; |
53 | 53 | import org.elasticsearch.xpack.inference.mapper.SemanticTextUtils; |
@@ -318,7 +318,7 @@ public void onFailure(Exception exc) { |
318 | 318 | return; |
319 | 319 | } |
320 | 320 | int currentBatchSize = Math.min(requests.size(), batchSize); |
321 | | - final ChunkingSettings chunkingSettings = requests.getFirst().chunkingSettings; |
| 321 | + final ChunkingSettings chunkingSettings = requests.isEmpty() == false ? requests.getFirst().chunkingSettings : null; |
322 | 322 | final List<FieldInferenceRequest> currentBatch = new ArrayList<>(); |
323 | 323 | for (FieldInferenceRequest request : requests) { |
324 | 324 | if (Objects.equals(request.chunkingSettings, chunkingSettings) == false || currentBatch.size() >= currentBatchSize) { |
@@ -621,7 +621,9 @@ private Map<String, List<FieldInferenceRequest>> createFieldInferenceRequests(Bu |
621 | 621 | new FieldInferenceResponse(field, sourceField, v, order++, 0, null, EMPTY_CHUNKED_INFERENCE) |
622 | 622 | ); |
623 | 623 | } else { |
624 | | - fieldRequests.add(new FieldInferenceRequest(itemIndex, field, sourceField, v, order++, offsetAdjustment, chunkingSettings)); |
| 624 | + fieldRequests.add( |
| 625 | + new FieldInferenceRequest(itemIndex, field, sourceField, v, order++, offsetAdjustment, chunkingSettings) |
| 626 | + ); |
625 | 627 | } |
626 | 628 |
|
627 | 629 | // When using the inference metadata fields format, all the input values are concatenated so that the |
|
0 commit comments