Fix Cohere test. (opensearch-project#2831) (opensearch-project#2864)

Signed-off-by: Austin Lee <[email protected]> (cherry picked from commit 659a836) Co-authored-by: Austin Lee <[email protected]>
dbwiddis · Aug 30, 2024 · ed6844b · ed6844b
1 parent 5227a61
commit ed6844b
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLRAGSearchProcessorIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLRAGSearchProcessorIT.java
@@ -149,7 +149,7 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
         ? BEDROCK_CONNECTOR_BLUEPRINT2
         : BEDROCK_CONNECTOR_BLUEPRINT1;
 
-    private static final String COHERE_API_KEY = System.getenv("COHERE_KEY");
+    private static final String COHERE_KEY = System.getenv("COHERE_KEY");
     // Package private to share with Tenant Aware ITs in this package
     static final String COHERE_CONNECTOR_BLUEPRINT = "{\n"
         + "    \"name\": \"Cohere Chat Model\",\n"
@@ -158,7 +158,7 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
         + "    \"protocol\": \"http\",\n"
         + "    \"credential\": {\n"
         + "        \"cohere_key\": \""
-        + COHERE_API_KEY
+        + COHERE_KEY
         + "\"\n"
         + "    },\n"
         + "    \"parameters\": {\n"
@@ -522,7 +522,7 @@ public void testBM25WithBedrockWithConversation() throws Exception {
 
     public void testBM25WithCohere() throws Exception {
         // Skip test if key is null
-        if (COHERE_API_KEY == null) {
+        if (COHERE_KEY == null) {
             return;
         }
         Response response = createConnector(COHERE_CONNECTOR_BLUEPRINT);
@@ -574,7 +574,7 @@ public void testBM25WithCohere() throws Exception {
 
     public void testBM25WithCohereUsingLlmResponseField() throws Exception {
         // Skip test if key is null
-        if (COHERE_API_KEY == null) {
+        if (COHERE_KEY == null) {
             return;
         }
         Response response = createConnector(COHERE_CONNECTOR_BLUEPRINT);
@@ -661,8 +661,6 @@ private Response performSearch(String indexName, String pipeline, int size, Sear
                     requestParameters.match,
                     requestParameters.llmModel,
                     requestParameters.llmQuestion,
-                    requestParameters.systemPrompt,
-                    requestParameters.userInstructions,
                     requestParameters.contextSize,
                     requestParameters.interactionSize,
                     requestParameters.timeout,