Skip to content

Commit 7dba8da

Browse files
Jan-Kazlouski-elasticJan-Kazlouski-elastic
committed
Remove updateServiceSettings method from various service settings classes to streamline validation handling
1 parent 674f773 commit 7dba8da

File tree

37 files changed

+0
-224
lines changed

37 files changed

+0
-224
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,5 @@ public ToXContentObject getFilteredXContentObject() {
263263
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
264264
return builder.startObject().field("model", modelId()).endObject();
265265
}
266-
267-
@Override
268-
public TestServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
269-
return fromMap(serviceSettings);
270-
}
271266
}
272267
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -482,11 +482,6 @@ public DenseVectorFieldMapper.ElementType elementType() {
482482
public String modelId() {
483483
return model;
484484
}
485-
486-
@Override
487-
public TestServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
488-
return fromMap(serviceSettings);
489-
}
490485
}
491486

492487
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,11 +392,6 @@ public String modelId() {
392392
return modelId;
393393
}
394394

395-
@Override
396-
public TestServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
397-
return fromMap(serviceSettings);
398-
}
399-
400395
@Override
401396
public ToXContentObject getFilteredXContentObject() {
402397
return (builder, params) -> {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,11 +349,6 @@ public String modelId() {
349349
return model;
350350
}
351351

352-
@Override
353-
public TestServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
354-
return fromMap(serviceSettings);
355-
}
356-
357352
@Override
358353
public ToXContentObject getFilteredXContentObject() {
359354
return (builder, params) -> {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,5 @@ public ToXContentObject getFilteredXContentObject() {
406406
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
407407
return builder.startObject().field("model", modelId()).endObject();
408408
}
409-
410-
@Override
411-
public TestServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
412-
return fromMap(serviceSettings);
413-
}
414409
}
415410
}

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/denseembeddings/ElasticInferenceServiceDenseEmbeddingsServiceSettings.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,6 @@ public String modelId() {
128128
return modelId;
129129
}
130130

131-
@Override
132-
public ElasticInferenceServiceDenseTextEmbeddingsServiceSettings updateServiceSettings(
133-
Map<String, Object> serviceSettings,
134-
TaskType taskType
135-
) {
136-
return fromMap(serviceSettings, ConfigurationParseContext.PERSISTENT);
137-
}
138-
139131
@Override
140132
public RateLimitSettings rateLimitSettings() {
141133
return rateLimitSettings;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googleaistudio/completion/GoogleAiStudioCompletionServiceSettings.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.elasticsearch.core.Nullable;
1515
import org.elasticsearch.inference.ModelConfigurations;
1616
import org.elasticsearch.inference.ServiceSettings;
17-
import org.elasticsearch.inference.TaskType;
1817
import org.elasticsearch.xcontent.XContentBuilder;
1918
import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
2019
import org.elasticsearch.xpack.inference.services.googleaistudio.GoogleAiStudioRateLimitServiceSettings;
@@ -80,11 +79,6 @@ public String modelId() {
8079
return modelId;
8180
}
8281

83-
@Override
84-
public GoogleAiStudioCompletionServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
85-
return fromMap(serviceSettings, ConfigurationParseContext.PERSISTENT);
86-
}
87-
8882
@Override
8983
public RateLimitSettings rateLimitSettings() {
9084
return rateLimitSettings;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googleaistudio/embeddings/GoogleAiStudioEmbeddingsServiceSettings.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.inference.ModelConfigurations;
1717
import org.elasticsearch.inference.ServiceSettings;
1818
import org.elasticsearch.inference.SimilarityMeasure;
19-
import org.elasticsearch.inference.TaskType;
2019
import org.elasticsearch.xcontent.XContentBuilder;
2120
import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
2221
import org.elasticsearch.xpack.inference.services.googleaistudio.GoogleAiStudioRateLimitServiceSettings;
@@ -113,11 +112,6 @@ public String modelId() {
113112
return modelId;
114113
}
115114

116-
@Override
117-
public GoogleAiStudioEmbeddingsServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
118-
return fromMap(serviceSettings, ConfigurationParseContext.PERSISTENT);
119-
}
120-
121115
@Override
122116
public RateLimitSettings rateLimitSettings() {
123117
return rateLimitSettings;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/completion/GoogleVertexAiChatCompletionServiceSettings.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.core.Nullable;
1616
import org.elasticsearch.inference.ModelConfigurations;
1717
import org.elasticsearch.inference.ServiceSettings;
18-
import org.elasticsearch.inference.TaskType;
1918
import org.elasticsearch.xcontent.ToXContent;
2019
import org.elasticsearch.xcontent.XContentBuilder;
2120
import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
@@ -240,11 +239,6 @@ public String modelId() {
240239
return modelId;
241240
}
242241

243-
@Override
244-
public GoogleVertexAiChatCompletionServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
245-
return fromMap(serviceSettings, ConfigurationParseContext.PERSISTENT);
246-
}
247-
248242
@Override
249243
public String projectId() {
250244
return projectId;

‎x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/googlevertexai/rerank/GoogleVertexAiRerankServiceSettings.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.elasticsearch.core.Nullable;
1515
import org.elasticsearch.inference.ModelConfigurations;
1616
import org.elasticsearch.inference.ServiceSettings;
17-
import org.elasticsearch.inference.TaskType;
1817
import org.elasticsearch.xcontent.XContentBuilder;
1918
import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
2019
import org.elasticsearch.xpack.inference.services.googlevertexai.GoogleVertexAiRateLimitServiceSettings;
@@ -88,11 +87,6 @@ public String modelId() {
8887
return modelId;
8988
}
9089

91-
@Override
92-
public GoogleVertexAiRerankServiceSettings updateServiceSettings(Map<String, Object> serviceSettings, TaskType taskType) {
93-
return fromMap(serviceSettings, ConfigurationParseContext.PERSISTENT);
94-
}
95-
9690
@Override
9791
public RateLimitSettings rateLimitSettings() {
9892
return rateLimitSettings;

0 commit comments

Comments
 (0)