Remove the ability to override the inference config in the rescorer.

afoucret · Nov 10, 2023 · d3d3479 · d3d3479
1 parent f8880bd
commit d3d3479
Show file tree

Hide file tree

Showing 8 changed files with 225 additions and 699 deletions.
diff --git a/...e/src/main/java/org/elasticsearch/xpack/core/ml/inference/MlLTRNamedXContentProvider.java b/...e/src/main/java/org/elasticsearch/xpack/core/ml/inference/MlLTRNamedXContentProvider.java
@@ -10,9 +10,7 @@
 import org.elasticsearch.plugins.spi.NamedXContentProvider;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 import org.elasticsearch.xpack.core.ml.inference.trainedmodel.InferenceConfig;
-import org.elasticsearch.xpack.core.ml.inference.trainedmodel.InferenceConfigUpdate;
 import org.elasticsearch.xpack.core.ml.inference.trainedmodel.LearnToRankConfig;
-import org.elasticsearch.xpack.core.ml.inference.trainedmodel.LearnToRankConfigUpdate;
 import org.elasticsearch.xpack.core.ml.inference.trainedmodel.LenientlyParsedInferenceConfig;
 import org.elasticsearch.xpack.core.ml.inference.trainedmodel.StrictlyParsedInferenceConfig;
 import org.elasticsearch.xpack.core.ml.inference.trainedmodel.ltr.LearnToRankFeatureExtractorBuilder;
@@ -46,14 +44,6 @@ public List<NamedXContentRegistry.Entry> getNamedXContentParsers() {
                 LearnToRankConfig::fromXContentStrict
             )
         );
-        // Inference Config Update
-        namedXContent.add(
-            new NamedXContentRegistry.Entry(
-                InferenceConfigUpdate.class,
-                LearnToRankConfigUpdate.NAME,
-                LearnToRankConfigUpdate::fromXContentStrict
-            )
-        );
         // LTR extractors
         namedXContent.add(
             new NamedXContentRegistry.Entry(
@@ -71,14 +61,6 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
         namedWriteables.add(
             new NamedWriteableRegistry.Entry(InferenceConfig.class, LearnToRankConfig.NAME.getPreferredName(), LearnToRankConfig::new)
         );
-        // Inference config update
-        namedWriteables.add(
-            new NamedWriteableRegistry.Entry(
-                InferenceConfigUpdate.class,
-                LearnToRankConfigUpdate.NAME.getPreferredName(),
-                LearnToRankConfigUpdate::new
-            )
-        );
         // LTR Extractors
         namedWriteables.add(
             new NamedWriteableRegistry.Entry(

diff --git a/.../java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/LearnToRankConfigUpdate.java b/.../java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/LearnToRankConfigUpdate.java