Add mappings for endpoint_version

Author: Max Hniebergall

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

@@ -10,6 +10,7 @@
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.indices.SystemIndexDescriptor;
+import org.elasticsearch.inference.ModelConfigurations;
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -27,7 +28,7 @@ private InferenceIndex() {}
     public static final String INDEX_ALIAS = ".inference-alias";
 
     // Increment this version number when the mappings change
-    private static final int INDEX_MAPPING_VERSION = 2;
+    private static final int INDEX_MAPPING_VERSION = 3;
 
     public static Settings settings() {
         return Settings.builder()
@@ -58,6 +59,56 @@ public static Settings settings() {
      * @return The index mappings
      */
     public static XContentBuilder mappings() {
+        try {
+            var jsonBuilder = jsonBuilder().startObject().startObject(SINGLE_MAPPING_NAME);
+            {
+                jsonBuilder.startObject("_meta").field(SystemIndexDescriptor.VERSION_META_KEY, INDEX_MAPPING_VERSION).endObject();
+
+                jsonBuilder.field("dynamic", "strict");
+
+                jsonBuilder.startObject("properties");
+                {
+                    jsonBuilder.startObject("model_id").field("type", "keyword").endObject();
+
+                    jsonBuilder.startObject("task_type").field("type", "keyword").endObject();
+
+                    jsonBuilder.startObject("service").field("type", "keyword").endObject();
+
+                    jsonBuilder.startObject("service_settings").field("dynamic", "false");
+                    {
+                        jsonBuilder.startObject("properties").endObject();
+                    }
+                    jsonBuilder.endObject();
+
+                    jsonBuilder.startObject("task_settings").field("dynamic", "false");
+                    {
+                        jsonBuilder.startObject("properties").endObject();
+                    }
+                    jsonBuilder.endObject();
+
+                    jsonBuilder.startObject("chunking_settings");
+                    {
+                        jsonBuilder.field("dynamic", "false");
+                        jsonBuilder.startObject("properties");
+                        {
+                            jsonBuilder.startObject("strategy").field("type", "keyword").endObject();
+                        }
+                        jsonBuilder.endObject();
+                    }
+                    jsonBuilder.endObject();
+
+                    jsonBuilder.startObject("endpoint_version").field("dynamic", "false").field("type", "keyword").endObject();
+                }
+                jsonBuilder.endObject().endObject().endObject();
+            }
+
+            return jsonBuilder;
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to build mappings for index " + INDEX_NAME, e);
+        }
+    }
+
+    public static XContentBuilder mappingsV2() {
         try {
             return jsonBuilder().startObject()
                 .startObject(SINGLE_MAPPING_NAME)

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

@@ -259,6 +259,18 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
     @Override
     public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings settings) {
 
+        var inferenceIndexV2Descriptor = SystemIndexDescriptor.builder()
+            .setType(SystemIndexDescriptor.Type.INTERNAL_MANAGED)
+            .setIndexPattern(InferenceIndex.INDEX_PATTERN)
+            .setAliasName(InferenceIndex.INDEX_ALIAS)
+            .setPrimaryIndex(InferenceIndex.INDEX_NAME)
+            .setDescription("Contains inference service and model configuration")
+            .setMappings(InferenceIndex.mappingsV2())
+            .setSettings(InferenceIndex.settings())
+            .setVersionMetaKey("version")
+            .setOrigin(ClientHelper.INFERENCE_ORIGIN)
+            .build();
+
         var inferenceIndexV1Descriptor = SystemIndexDescriptor.builder()
             .setType(SystemIndexDescriptor.Type.INTERNAL_MANAGED)
             .setIndexPattern(InferenceIndex.INDEX_PATTERN)
@@ -282,7 +294,7 @@ public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings sett
                 .setSettings(InferenceIndex.settings())
                 .setVersionMetaKey("version")
                 .setOrigin(ClientHelper.INFERENCE_ORIGIN)
-                .setPriorSystemIndexDescriptors(List.of(inferenceIndexV1Descriptor))
+                .setPriorSystemIndexDescriptors(List.of(inferenceIndexV1Descriptor, inferenceIndexV2Descriptor))
                 .build(),
             SystemIndexDescriptor.builder()
                 .setType(SystemIndexDescriptor.Type.INTERNAL_MANAGED)

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

@@ -177,7 +177,15 @@ private void parseAndStoreModel(
                             new ElasticsearchStatusException(
                                 "One or more nodes in your cluster does not support chunking_settings. "
                                     + "Please update all nodes in your cluster to the latest version to use chunking_settings.",
-                                RestStatus.BAD_REQUEST
+                                RestStatus.CONFLICT
+                            )
+                        );
+                    } else if (e.getCause() instanceof StrictDynamicMappingException) {
+                        delegate.onFailure(
+                            new ElasticsearchStatusException(
+                                "One or more nodes in your cluster is not on the latest version "
+                                    + "Please update all nodes in your cluster to the latest version to put inference endpoints.",
+                                RestStatus.CONFLICT
                             )
                         );
                     } else {