Updated YAML tests

Author: Mikep86

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

@@ -11,6 +11,7 @@
 import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.xpack.inference.mapper.SemanticInferenceMetadataFieldsMapper;
 import org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper;
+import org.elasticsearch.xpack.inference.queries.SemanticQueryBuilder;
 import org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder;
 
 import java.util.HashSet;
@@ -82,7 +83,8 @@ public Set<NodeFeature> getTestFeatures() {
                 SEMANTIC_QUERY_REWRITE_INTERCEPTORS_PROPAGATE_BOOST_AND_QUERY_NAME_FIX,
                 SEMANTIC_TEXT_HIGHLIGHTING_FLAT,
                 SEMANTIC_TEXT_SPARSE_VECTOR_INDEX_OPTIONS,
-                SEMANTIC_TEXT_FIELDS_CHUNKS_FORMAT
+                SEMANTIC_TEXT_FIELDS_CHUNKS_FORMAT,
+                SemanticQueryBuilder.SEMANTIC_QUERY_MULTIPLE_INFERENCE_IDS
             )
         );
         if (RERANK_SNIPPETS.isEnabled()) {

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

@@ -15,6 +15,7 @@
 import org.elasticsearch.cluster.metadata.InferenceFieldMetadata;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.query.AbstractQueryBuilder;
 import org.elasticsearch.index.query.MatchNoneQueryBuilder;
@@ -53,6 +54,8 @@
 public class SemanticQueryBuilder extends AbstractQueryBuilder<SemanticQueryBuilder> {
     public static final String NAME = "semantic";
 
+    public static final NodeFeature SEMANTIC_QUERY_MULTIPLE_INFERENCE_IDS = new NodeFeature("semantic_query.multiple_inference_ids");
+
     private static final ParseField FIELD_FIELD = new ParseField("field");
     private static final ParseField QUERY_FIELD = new ParseField("query");
     private static final ParseField LENIENT_FIELD = new ParseField("lenient");

x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/40_semantic_text_query.yml

@@ -641,8 +641,29 @@ setup:
 
 ---
 "Query multiple indices":
+  - requires:
+      cluster_features: "semantic_query.multiple_inference_ids"
+      reason: Semantic query support for querying multiple inference IDs
+
+  - do:
+      index:
+        index: test-sparse-index
+        id: doc_1
+        body:
+          inference_field: [ "inference test", "another inference test" ]
+          non_inference_field: "non inference test"
+        refresh: true
+
+  - do:
+      index:
+        index: test-dense-index
+        id: doc_2
+        body:
+          inference_field: [ "inference test", "another inference test" ]
+          non_inference_field: "non inference test"
+        refresh: true
+
   - do:
-      catch: bad_request
       search:
         index:
           - test-sparse-index
@@ -653,12 +674,12 @@ setup:
               field: "inference_field"
               query: "inference test"
 
-  - match: { error.type: "illegal_argument_exception" }
-  - match: { error.reason: "Field [inference_field] has multiple inference IDs associated with it" }
+  - match: { hits.total.value: 2 }
+  - match: { hits.hits.0._id: "doc_1" }
+  - match: { hits.hits.1._id: "doc_2" }
 
   # Test wildcard resolution
   - do:
-      catch: bad_request
       search:
         index: test-*
         body:
@@ -667,8 +688,9 @@ setup:
               field: "inference_field"
               query: "inference test"
 
-  - match: { error.type: "illegal_argument_exception" }
-  - match: { error.reason: "Field [inference_field] has multiple inference IDs associated with it" }
+  - match: { hits.total.value: 2 }
+  - match: { hits.hits.0._id: "doc_1" }
+  - match: { hits.hits.1._id: "doc_2" }
 
   # Test querying an index alias that resolves to multiple indices
   - do:
@@ -679,7 +701,6 @@ setup:
         name: my-alias
 
   - do:
-      catch: bad_request
       search:
         index: my-alias
         body:
@@ -688,10 +709,11 @@ setup:
               field: "inference_field"
               query: "inference test"
 
-  - match: { error.type: "illegal_argument_exception" }
-  - match: { error.reason: "Field [inference_field] has multiple inference IDs associated with it" }
+  - match: { hits.total.value: 2 }
+  - match: { hits.hits.0._id: "doc_1" }
+  - match: { hits.hits.1._id: "doc_2" }
 
-  # Test querying multiple indices that use the same inference ID - this should work
+  # Test querying multiple indices that use the same inference ID
   - do:
       indices.create:
         index: test-sparse-index-2
@@ -704,18 +726,10 @@ setup:
               non_inference_field:
                 type: text
 
-  - do:
-      index:
-        index: test-sparse-index
-        id: doc_1
-        body:
-          inference_field: "inference test"
-        refresh: true
-
   - do:
       index:
         index: test-sparse-index-2
-        id: doc_2
+        id: doc_3
         body:
           inference_field: "another inference test"
         refresh: true
@@ -730,8 +744,8 @@ setup:
               query: "inference test"
 
   - match: { hits.total.value: 2 }
-  - match: { hits.hits.0._id: "doc_2" }
-  - match: { hits.hits.1._id: "doc_1" }
+  - match: { hits.hits.0._id: "doc_1" }
+  - match: { hits.hits.1._id: "doc_3" }
 
 ---
 "Query a field that has no indexed inference results":