Fix missing RAG response from generative_qa_parameters

Signed-off-by: rithin-pullela-aws <[email protected]>

Author: rithin-pullela-aws

plugin/src/main/java/org/opensearch/ml/processor/MLInferenceSearchResponse.java

@@ -10,6 +10,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchResponseSections;
 import org.opensearch.action.search.ShardSearchFailure;
+import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 public class MLInferenceSearchResponse extends SearchResponse {
@@ -41,16 +42,21 @@ public Map<String, Object> getParams() {
     }
 
     @Override
-    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject();
-        innerToXContent(builder, params);
-
+    public XContentBuilder innerToXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
+        super.innerToXContent(builder, params);
         if (this.params != null) {
             builder.startObject(EXT_SECTION_NAME);
             builder.field(MLInferenceSearchResponseProcessor.TYPE, this.params);
 
             builder.endObject();
         }
+        return builder;
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject();
+        innerToXContent(builder, params);
         builder.endObject();
         return builder;
     }

search-processors/src/main/java/org/opensearch/searchpipelines/questionanswering/generative/GenerativeSearchResponse.java

@@ -23,6 +23,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchResponseSections;
 import org.opensearch.action.search.ShardSearchFailure;
+import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 /**
@@ -63,9 +64,8 @@ public GenerativeSearchResponse(
     }
 
     @Override
-    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject();
-        innerToXContent(builder, params);
+    public XContentBuilder innerToXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
+        super.innerToXContent(builder, params);
         /* start of ext */ builder.startObject(EXT_SECTION_NAME);
         /*   start of our stuff */ builder.startObject(GenerativeQAProcessorConstants.RESPONSE_PROCESSOR_TYPE);
         if (answer == null) {
@@ -80,6 +80,13 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
         /*   end of our stuff   */ builder.endObject();
         /* end of ext */ builder.endObject();
+        return builder;
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject();
+        innerToXContent(builder, params);
         builder.endObject();
         return builder;
     }