Stash changes

Author: kderusso

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java

@@ -264,6 +264,7 @@ public Collection<?> createComponents(PluginServices services) {
 
         ModelRegistry modelRegistry = new ModelRegistry(services.clusterService(), services.client());
         services.clusterService().addListener(modelRegistry);
+        SemanticTextFieldMapper.setModelRegistry(modelRegistry);
 
         if (inferenceServiceExtensions == null) {
             inferenceServiceExtensions = new ArrayList<>();

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextField.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
+import org.elasticsearch.index.mapper.MappingParserContext;
 import org.elasticsearch.inference.ChunkedInference;
 import org.elasticsearch.inference.ChunkingSettings;
 import org.elasticsearch.inference.MinimalServiceSettings;
@@ -293,6 +294,12 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             null,
             new ParseField(CHUNKING_SETTINGS_FIELD)
         );
+        INFERENCE_RESULT_PARSER.declareObjectOrNull(
+            optionalConstructorArg(),
+            (p, c) -> parseIndexOptionsFromMap(c.fieldName, p.map(), c.indexVersion()),
+            null,
+            new ParseField(INDEX_OPTIONS_FIELD)
+        );
         INFERENCE_RESULT_PARSER.declareField(constructorArg(), (p, c) -> {
             if (c.useLegacyFormat()) {
                 return Map.of(c.fieldName, parseChunksArrayLegacy(p, c));

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java

@@ -76,6 +76,7 @@
 import org.elasticsearch.xpack.core.ml.inference.results.TextExpansionResults;
 import org.elasticsearch.xpack.core.ml.search.SparseVectorQueryBuilder;
 import org.elasticsearch.xpack.inference.highlight.SemanticTextHighlighter;
+import org.elasticsearch.xpack.inference.registry.ModelRegistry;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -144,6 +145,12 @@ public static BiConsumer<String, MappingParserContext> validateParserContext(Str
         };
     }
 
+    private static ModelRegistry modelRegistry;
+
+    public static void setModelRegistry(ModelRegistry registry) {
+        modelRegistry = registry;
+    }
+
     public static class Builder extends FieldMapper.Builder {
         private final boolean useLegacyFormat;
 
@@ -281,6 +288,9 @@ public SemanticTextFieldMapper build(MapperBuilderContext context) {
             if (modelSettings.get() != null) {
                 validateServiceSettings(modelSettings.get());
             }
+            if (indexOptions.get() != null) {
+                validateIndexOptions(indexOptions.get(), inferenceId.getValue(), modelSettings.get());
+            }
             final String fullName = context.buildFullName(leafName());
 
             if (context.isInNestedContext()) {
@@ -323,6 +333,26 @@ private void validateServiceSettings(MinimalServiceSettings settings) {
             }
         }
 
+        private void validateIndexOptions(SemanticTextIndexOptions indexOptions, String inferenceId, MinimalServiceSettings modelSettings) {
+            if (indexOptions == null) {
+                return;
+            }
+            if (modelSettings == null) {
+                modelSettings = modelRegistry.getMinimalServiceSettings(inferenceId);
+            }
+
+            if (modelSettings == null) {
+                // TODO throw
+                return;
+            }
+
+            if (modelSettings.taskType() != TEXT_EMBEDDING) {
+                throw new IllegalArgumentException("Invalid task type");
+            }
+
+            // TODO additional verification
+        }
+
         /**
          * As necessary, copy settings from this builder to the passed-in mapper.
          * Used to preserve {@link MinimalServiceSettings} when updating a semantic text mapping to one where the model settings

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java

@@ -228,7 +228,11 @@ public MinimalServiceSettings getMinimalServiceSettings(String inferenceEntityId
         if (config != null) {
             return config.settings();
         }
-        var state = ModelRegistryMetadata.fromState(clusterService.state().projectState().metadata());
+        var clusterState = clusterService.state();
+        if (clusterState == null) {
+            return null;
+        }
+        var state = ModelRegistryMetadata.fromState(clusterState.projectState().metadata());
         var existing = state.getMinimalServiceSettings(inferenceEntityId);
         if (state.isUpgraded() && existing == null) {
             throw new ResourceNotFoundException(inferenceEntityId + " does not exist in this cluster.");