Skip to content

Commit d7737e7

Browse files
ashm-devashm-dev
authored
[ML] Remove ChunkingOptions parameter (#117235)
1 parent 04dd9c2 commit d7737e7

File tree

39 files changed

+13
-146
lines changed

39 files changed

+13
-146
lines changed

‎docs/changelog/117235.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117235
2+
summary: "Deprecate `ChunkingOptions` parameter"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎server/src/main/java/org/elasticsearch/inference/ChunkingOptions.java‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎server/src/main/java/org/elasticsearch/inference/InferenceService.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,11 @@ void infer(
112112
);
113113

114114
/**
115-
* Chunk long text according to {@code chunkingOptions} or the
116-
* model defaults if {@code chunkingOptions} contains unset
117-
* values.
118-
*
119115
* @param model The model
120116
* @param query Inference query, mainly for re-ranking
121117
* @param input Inference input
122118
* @param taskSettings Settings in the request to override the model's defaults
123119
* @param inputType For search, ingest etc
124-
* @param chunkingOptions The window and span options to apply
125120
* @param timeout The timeout for the request
126121
* @param listener Chunked Inference result listener
127122
*/
@@ -131,7 +126,6 @@ void chunkedInfer(
131126
List<String> input,
132127
Map<String, Object> taskSettings,
133128
InputType inputType,
134-
ChunkingOptions chunkingOptions,
135129
TimeValue timeout,
136130
ActionListener<List<ChunkedInferenceServiceResults>> listener
137131
);

‎x-pack/plugin/inference/qa/test-service-plugin/src/main/java/org/elasticsearch/xpack/inference/mock/TestDenseInferenceServiceExtension.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.elasticsearch.core.TimeValue;
1919
import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
2020
import org.elasticsearch.inference.ChunkedInferenceServiceResults;
21-
import org.elasticsearch.inference.ChunkingOptions;
2221
import org.elasticsearch.inference.EmptySettingsConfiguration;
2322
import org.elasticsearch.inference.InferenceServiceConfiguration;
2423
import org.elasticsearch.inference.InferenceServiceExtension;
@@ -140,7 +139,6 @@ public void chunkedInfer(
140139
List<String> input,
141140
Map<String, Object> taskSettings,
142141
InputType inputType,
143-
ChunkingOptions chunkingOptions,
144142
TimeValue timeout,
145143
ActionListener<List<ChunkedInferenceServiceResults>> listener
146144
) {

‎x-pack/plugin/inference/qa/test-service-plugin/src/main/java/org/elasticsearch/xpack/inference/mock/TestRerankingServiceExtension.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.elasticsearch.core.Nullable;
1818
import org.elasticsearch.core.TimeValue;
1919
import org.elasticsearch.inference.ChunkedInferenceServiceResults;
20-
import org.elasticsearch.inference.ChunkingOptions;
2120
import org.elasticsearch.inference.EmptySettingsConfiguration;
2221
import org.elasticsearch.inference.InferenceServiceConfiguration;
2322
import org.elasticsearch.inference.InferenceServiceExtension;
@@ -128,7 +127,6 @@ public void chunkedInfer(
128127
List<String> input,
129128
Map<String, Object> taskSettings,
130129
InputType inputType,
131-
ChunkingOptions chunkingOptions,
132130
TimeValue timeout,
133131
ActionListener<List<ChunkedInferenceServiceResults>> listener
134132
) {

‎x-pack/plugin/inference/qa/test-service-plugin/src/main/java/org/elasticsearch/xpack/inference/mock/TestSparseInferenceServiceExtension.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.elasticsearch.core.Nullable;
1818
import org.elasticsearch.core.TimeValue;
1919
import org.elasticsearch.inference.ChunkedInferenceServiceResults;
20-
import org.elasticsearch.inference.ChunkingOptions;
2120
import org.elasticsearch.inference.EmptySettingsConfiguration;
2221
import org.elasticsearch.inference.InferenceServiceConfiguration;
2322
import org.elasticsearch.inference.InferenceServiceExtension;
@@ -131,7 +130,6 @@ public void chunkedInfer(
131130
List<String> input,
132131
Map<String, Object> taskSettings,
133132
InputType inputType,
134-
ChunkingOptions chunkingOptions,
135133
TimeValue timeout,
136134
ActionListener<List<ChunkedInferenceServiceResults>> listener
137135
) {

‎x-pack/plugin/inference/qa/test-service-plugin/src/main/java/org/elasticsearch/xpack/inference/mock/TestStreamingCompletionServiceExtension.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
2020
import org.elasticsearch.core.TimeValue;
2121
import org.elasticsearch.inference.ChunkedInferenceServiceResults;
22-
import org.elasticsearch.inference.ChunkingOptions;
2322
import org.elasticsearch.inference.EmptySettingsConfiguration;
2423
import org.elasticsearch.inference.InferenceServiceConfiguration;
2524
import org.elasticsearch.inference.InferenceServiceExtension;
@@ -160,7 +159,6 @@ public void chunkedInfer(
160159
List<String> input,
161160
Map<String, Object> taskSettings,
162161
InputType inputType,
163-
ChunkingOptions chunkingOptions,
164162
TimeValue timeout,
165163
ActionListener<List<ChunkedInferenceServiceResults>> listener
166164
) {

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.elasticsearch.core.Releasable;
3131
import org.elasticsearch.core.TimeValue;
3232
import org.elasticsearch.inference.ChunkedInferenceServiceResults;
33-
import org.elasticsearch.inference.ChunkingOptions;
3433
import org.elasticsearch.inference.InferenceService;
3534
import org.elasticsearch.inference.InferenceServiceRegistry;
3635
import org.elasticsearch.inference.InputType;
@@ -337,16 +336,7 @@ private void onFinish() {
337336
}
338337
};
339338
inferenceProvider.service()
340-
.chunkedInfer(
341-
inferenceProvider.model(),
342-
null,
343-
inputs,
344-
Map.of(),
345-
InputType.INGEST,
346-
new ChunkingOptions(null, null),
347-
TimeValue.MAX_VALUE,
348-
completionListener
349-
);
339+
.chunkedInfer(inferenceProvider.model(), null, inputs, Map.of(), InputType.INGEST, TimeValue.MAX_VALUE, completionListener);
350340
}
351341

352342
private FieldInferenceResponseAccumulator ensureResponseAccumulatorSlot(int id) {

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/SenderService.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.core.Nullable;
1313
import org.elasticsearch.core.TimeValue;
1414
import org.elasticsearch.inference.ChunkedInferenceServiceResults;
15-
import org.elasticsearch.inference.ChunkingOptions;
1615
import org.elasticsearch.inference.InferenceService;
1716
import org.elasticsearch.inference.InferenceServiceResults;
1817
import org.elasticsearch.inference.InputType;
@@ -76,13 +75,12 @@ public void chunkedInfer(
7675
List<String> input,
7776
Map<String, Object> taskSettings,
7877
InputType inputType,
79-
ChunkingOptions chunkingOptions,
8078
TimeValue timeout,
8179
ActionListener<List<ChunkedInferenceServiceResults>> listener
8280
) {
8381
init();
8482
// a non-null query is not supported and is dropped by all providers
85-
doChunkedInfer(model, new DocumentsOnlyInput(input), taskSettings, inputType, chunkingOptions, timeout, listener);
83+
doChunkedInfer(model, new DocumentsOnlyInput(input), taskSettings, inputType, timeout, listener);
8684
}
8785

8886
protected abstract void doInfer(
@@ -99,7 +97,6 @@ protected abstract void doChunkedInfer(
9997
DocumentsOnlyInput inputs,
10098
Map<String, Object> taskSettings,
10199
InputType inputType,
102-
ChunkingOptions chunkingOptions,
103100
TimeValue timeout,
104101
ActionListener<List<ChunkedInferenceServiceResults>> listener
105102
);

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/AlibabaCloudSearchService.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.core.Nullable;
1616
import org.elasticsearch.core.TimeValue;
1717
import org.elasticsearch.inference.ChunkedInferenceServiceResults;
18-
import org.elasticsearch.inference.ChunkingOptions;
1918
import org.elasticsearch.inference.ChunkingSettings;
2019
import org.elasticsearch.inference.EmptySettingsConfiguration;
2120
import org.elasticsearch.inference.InferenceServiceConfiguration;
@@ -289,7 +288,6 @@ protected void doChunkedInfer(
289288
DocumentsOnlyInput inputs,
290289
Map<String, Object> taskSettings,
291290
InputType inputType,
292-
ChunkingOptions chunkingOptions,
293291
TimeValue timeout,
294292
ActionListener<List<ChunkedInferenceServiceResults>> listener
295293
) {

0 commit comments

Comments
 (0)