Fix loading of default feature flag settings, update tests to pick up

changes in memory API.

Signed-off-by: Austin Lee <[email protected]>

Author: austintlee

plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java

@@ -347,6 +347,12 @@ public class MachineLearningPlugin extends Plugin implements ActionPlugin, Searc
     private ScriptService scriptService;
     private Encryptor encryptor;
 
+    public MachineLearningPlugin(Settings settings) {
+        // Handle this here as this feature is tied to Search/Query API, not to a ml-common API
+        // and as such, it can't be lazy-loaded when a ml-commons API is invoked.
+        this.ragSearchPipelineEnabled = MLCommonsSettings.ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED.get(settings);
+    }
+
     @Override
     public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         return ImmutableList

plugin/src/test/java/org/opensearch/ml/plugin/MachineLearningPluginTests.java

@@ -34,6 +34,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opensearch.client.Client;
+import org.opensearch.common.settings.Settings;
 import org.opensearch.ml.common.spi.MLCommonsExtension;
 import org.opensearch.ml.common.spi.tools.Tool;
 import org.opensearch.ml.engine.tools.MLModelTool;
@@ -47,7 +48,7 @@
 
 public class MachineLearningPluginTests {
 
-    MachineLearningPlugin plugin = new MachineLearningPlugin();
+    MachineLearningPlugin plugin = new MachineLearningPlugin(Settings.EMPTY);
 
     @Rule
     public ExpectedException exceptionRule = ExpectedException.none();

plugin/src/test/java/org/opensearch/ml/rest/RestMLRAGSearchProcessorIT.java

@@ -172,7 +172,7 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
         + "        \"llm_model\": \"%s\",\n"
         + "        \"llm_question\": \"%s\",\n"
         + "        \"context_size\": %d,\n"
-        + "        \"interaction_size\": %d,\n"
+        + "        \"message_size\": %d,\n"
         + "        \"timeout\": %d\n"
         + "      }\n"
         + "  }\n"
@@ -187,9 +187,9 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
         + "      \"generative_qa_parameters\": {\n"
         + "        \"llm_model\": \"%s\",\n"
         + "        \"llm_question\": \"%s\",\n"
-        + "        \"conversation_id\": \"%s\",\n"
+        + "        \"memory_id\": \"%s\",\n"
         + "        \"context_size\": %d,\n"
-        + "        \"interaction_size\": %d,\n"
+        + "        \"message_size\": %d,\n"
         + "        \"timeout\": %d\n"
         + "      }\n"
         + "  }\n"
@@ -208,6 +208,7 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
     @Before
     public void init() throws Exception {
 
+        /*
         Response response = TestHelper
             .makeRequest(
                 client(),
@@ -218,7 +219,7 @@ public void init() throws Exception {
                 ImmutableList.of(new BasicHeader(HttpHeaders.USER_AGENT, DEFAULT_USER_AGENT))
             );
         assertEquals(200, response.getStatusLine().getStatusCode());
-
+        
         response = TestHelper
             .makeRequest(
                 client(),
@@ -229,8 +230,9 @@ public void init() throws Exception {
                 ImmutableList.of(new BasicHeader(HttpHeaders.USER_AGENT, DEFAULT_USER_AGENT))
             );
         assertEquals(200, response.getStatusLine().getStatusCode());
+        */
 
-        response = TestHelper
+        Response response = TestHelper
             .makeRequest(
                 client(),
                 "PUT",
@@ -428,7 +430,7 @@ public void testBM25WithOpenAIWithConversation() throws Exception {
         String answer = (String) rag.get("answer");
         assertNotNull(answer);
 
-        String interactionId = (String) rag.get("interaction_id");
+        String interactionId = (String) rag.get("message_id");
         assertNotNull(interactionId);
     }
 
@@ -485,7 +487,7 @@ public void testBM25WithBedrockWithConversation() throws Exception {
         String answer = (String) rag.get("answer");
         assertNotNull(answer);
 
-        String interactionId = (String) rag.get("interaction_id");
+        String interactionId = (String) rag.get("message_id");
         assertNotNull(interactionId);
     }
 
@@ -557,12 +559,12 @@ private String createConversation(String name) throws Exception {
         Response response = makeRequest(
             client(),
             "POST",
-            "/_plugins/_ml/memory/conversation",
+            "/_plugins/_ml/memory",
             null,
             toHttpEntity(String.format(Locale.ROOT, "{\"name\": \"%s\"}", name)),
             ImmutableList.of(new BasicHeader(HttpHeaders.USER_AGENT, DEFAULT_USER_AGENT))
         );
-        return (String) ((Map) parseResponseToMap(response)).get("conversation_id");
+        return (String) ((Map) parseResponseToMap(response)).get("memory_id");
     }
 
     static class PipelineParameters {

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

@@ -35,7 +35,7 @@ public class GenerativeSearchResponse extends SearchResponse {
     private static final String EXT_SECTION_NAME = "ext";
     private static final String GENERATIVE_QA_ANSWER_FIELD_NAME = "answer";
     private static final String GENERATIVE_QA_ERROR_FIELD_NAME = "error";
-    private static final String INTERACTION_ID_FIELD_NAME = "interaction_id";
+    private static final String INTERACTION_ID_FIELD_NAME = "message_id";
 
     private final String answer;
     private String errorMessage;