fix additional tests

Author: markjhoy

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

@@ -452,14 +452,8 @@ private void validateIndexOptions(SemanticTextIndexOptions indexOptions, String
                 return;
             }
 
-            if (modelSettings == null) {
-                throw new IllegalArgumentException(
-                    "Model settings must be set to validate index options for inference ID [" + inferenceId + "]"
-                );
-            }
-
             if (indexOptions.type() == SemanticTextIndexOptions.SupportedIndexOptions.SPARSE_VECTOR) {
-                if (modelSettings.taskType() != SPARSE_EMBEDDING) {
+                if (modelSettings != null && modelSettings.taskType() != SPARSE_EMBEDDING) {
                     throw new IllegalArgumentException(
                         "Invalid task type for index options, required ["
                             + SPARSE_EMBEDDING
@@ -471,6 +465,12 @@ private void validateIndexOptions(SemanticTextIndexOptions indexOptions, String
                 return;
             }
 
+            if (modelSettings == null) {
+                throw new IllegalArgumentException(
+                    "Model settings must be set to validate index options for inference ID [" + inferenceId + "]"
+                );
+            }
+
             if (indexOptions.type() == SemanticTextIndexOptions.SupportedIndexOptions.DENSE_VECTOR) {
                 if (modelSettings.taskType() != TEXT_EMBEDDING) {
                     throw new IllegalArgumentException(

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapperTests.java

@@ -36,7 +36,6 @@
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.CheckedConsumer;
-import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -385,6 +384,18 @@ public void testInvalidInferenceEndpoints() {
         }
     }
 
+    private SemanticTextIndexOptions getDefaultIndexOptionsForMapper(MapperService mapperService) {
+        var mapperIndexVersion = mapperService.getIndexSettings().getIndexVersionCreated();
+        var defaultSparseVectorIndexOptions = SparseVectorFieldMapper.SparseVectorIndexOptions
+            .getDefaultIndexOptions(mapperIndexVersion);
+        return defaultSparseVectorIndexOptions == null
+            ? null
+            : new SemanticTextIndexOptions(
+                SemanticTextIndexOptions.SupportedIndexOptions.SPARSE_VECTOR,
+                defaultSparseVectorIndexOptions
+            );
+    }
+
     public void testInvalidTaskTypes() {
         for (var taskType : TaskType.values()) {
             if (taskType == TaskType.TEXT_EMBEDDING || taskType == TaskType.SPARSE_EMBEDDING) {
@@ -446,7 +457,8 @@ public void testMultiFieldsSupport() throws IOException {
                 b.endObject();
                 b.endObject();
             }), useLegacyFormat);
-            assertSemanticTextField(mapperService, "field", true, null, null);
+            var expectedIndexOptions = getDefaultIndexOptionsForMapper(mapperService);
+            assertSemanticTextField(mapperService, "field", true, null, expectedIndexOptions);
 
             mapperService = createMapperService(fieldMapping(b -> {
                 b.field("type", "semantic_text");
@@ -477,7 +489,6 @@ public void testMultiFieldsSupport() throws IOException {
                 b.endObject();
             }), useLegacyFormat));
             assertThat(e.getMessage(), containsString("is already used by another field"));
-
         }
     }
 
@@ -719,13 +730,12 @@ public void testSparseVectorMappingUpdate() throws IOException {
                         model.getInferenceEntityId(),
                         null,
                         chunkingSettings,
-                        indexOptions,
-                        TaskType.SPARSE_EMBEDDING
+                        indexOptions
                     )
                 ),
                 useLegacyFormat
             );
-            assertSemanticTextField(mapperService, fieldName, true, chunkingSettings, indexOptions);
+            assertSemanticTextField(mapperService, fieldName, false, chunkingSettings, indexOptions);
 
             final SemanticTextIndexOptions newIndexOptions = randomSemanticTextIndexOptions(TaskType.SPARSE_EMBEDDING);
             ChunkingSettings newChunkingSettings = generateRandomChunkingSettingsOtherThan(chunkingSettings);
@@ -738,12 +748,11 @@ public void testSparseVectorMappingUpdate() throws IOException {
                         model.getInferenceEntityId(),
                         null,
                         newChunkingSettings,
-                        newIndexOptions,
-                        TaskType.SPARSE_EMBEDDING
+                        newIndexOptions
                     )
                 )
             );
-            assertSemanticTextField(mapperService, fieldName, true, newChunkingSettings, newIndexOptions);
+            assertSemanticTextField(mapperService, fieldName, false, newChunkingSettings, newIndexOptions);
         }
     }
 
@@ -939,29 +948,27 @@ public void testSuccessfulParse() throws IOException {
                     model1.getInferenceEntityId(),
                     setSearchInferenceId ? searchInferenceId : null,
                     chunkingSettings,
-                    indexOptions,
-                    TaskType.SPARSE_EMBEDDING
+                    indexOptions
                 );
                 addSemanticTextMapping(
                     b,
                     fieldName2,
                     model2.getInferenceEntityId(),
                     setSearchInferenceId ? searchInferenceId : null,
                     chunkingSettings,
-                    indexOptions,
-                    TaskType.SPARSE_EMBEDDING
+                    indexOptions
                 );
             });
 
             MapperService mapperService = createMapperService(mapping, useLegacyFormat);
-            assertSemanticTextField(mapperService, fieldName1, true, null, indexOptions);
+            assertSemanticTextField(mapperService, fieldName1, false, null, indexOptions);
             assertInferenceEndpoints(
                 mapperService,
                 fieldName1,
                 model1.getInferenceEntityId(),
                 setSearchInferenceId ? searchInferenceId : model1.getInferenceEntityId()
             );
-            assertSemanticTextField(mapperService, fieldName2, true, null, indexOptions);
+            assertSemanticTextField(mapperService, fieldName2, false, null, indexOptions);
             assertInferenceEndpoints(
                 mapperService,
                 fieldName2,
@@ -1732,18 +1739,6 @@ private static void addSemanticTextMapping(
         String searchInferenceId,
         ChunkingSettings chunkingSettings,
         SemanticTextIndexOptions indexOptions
-    ) throws IOException {
-        addSemanticTextMapping(mappingBuilder, fieldName, inferenceId, searchInferenceId, chunkingSettings, indexOptions, null);
-    }
-
-    private static void addSemanticTextMapping(
-        XContentBuilder mappingBuilder,
-        String fieldName,
-        String inferenceId,
-        String searchInferenceId,
-        ChunkingSettings chunkingSettings,
-        SemanticTextIndexOptions indexOptions,
-        @Nullable TaskType modelSettingsTaskType
     ) throws IOException {
         mappingBuilder.startObject(fieldName);
         mappingBuilder.field("type", SemanticTextFieldMapper.CONTENT_TYPE);
@@ -1760,11 +1755,6 @@ private static void addSemanticTextMapping(
             mappingBuilder.field(INDEX_OPTIONS_FIELD);
             indexOptions.toXContent(mappingBuilder, null);
         }
-        if (modelSettingsTaskType != null) {
-            mappingBuilder.startObject("model_settings");
-            mappingBuilder.field("task_type", modelSettingsTaskType.toString());
-            mappingBuilder.endObject();
-        }
         mappingBuilder.endObject();
     }