Skip to content

Commit e93f7a6

Browse files
austin-aryn-aiaustin-aryn-ai
committed
Fix spotless check issues.
Signed-off-by: Austin Lee <austin@aryn.ai>
1 parent 239a695 commit e93f7a6

File tree

1 file changed

+80
-75
lines changed

1 file changed

+80
-75
lines changed

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

+80-75
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@
2828
import java.util.Set;
2929

3030
import org.apache.commons.io.FileUtils;
31-
import org.apache.commons.text.StringEscapeUtils;
3231
import org.apache.hc.core5.http.HttpHeaders;
3332
import org.apache.hc.core5.http.io.entity.EntityUtils;
3433
import org.apache.hc.core5.http.message.BasicHeader;
3534
import org.junit.Before;
3635
import org.opensearch.client.Response;
3736
import org.opensearch.core.rest.RestStatus;
3837
import org.opensearch.ml.common.MLTaskState;
39-
import org.opensearch.ml.common.utils.StringUtils;
4038
import org.opensearch.ml.utils.TestHelper;
4139
import org.opensearch.searchpipelines.questionanswering.generative.llm.LlmIOUtil;
4240

@@ -212,7 +210,9 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
212210
+ " },\n"
213211
+ " \"url\": \"https://bedrock-runtime."
214212
+ GITHUB_CI_AWS_REGION
215-
+ ".amazonaws.com/model/" + BEDROCK_ANTHROPIC_CLAUDE_3_5_SONNET + "/converse\",\n"
213+
+ ".amazonaws.com/model/"
214+
+ BEDROCK_ANTHROPIC_CLAUDE_3_5_SONNET
215+
+ "/converse\",\n"
216216
+ " \"request_body\": \"{ \\\"system\\\": [{\\\"text\\\": \\\"you are a helpful assistant.\\\"}], \\\"messages\\\": ${parameters.messages} , \\\"inferenceConfig\\\": {\\\"temperature\\\": 0.0, \\\"topP\\\": 0.9, \\\"maxTokens\\\": 1000} }\"\n"
217217
+ " }\n"
218218
+ " ]\n"
@@ -250,7 +250,9 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
250250
+ " },\n"
251251
+ " \"url\": \"https://bedrock-runtime."
252252
+ GITHUB_CI_AWS_REGION
253-
+ ".amazonaws.com/model/" + BEDROCK_ANTHROPIC_CLAUDE_3_SONNET + "/converse\",\n"
253+
+ ".amazonaws.com/model/"
254+
+ BEDROCK_ANTHROPIC_CLAUDE_3_SONNET
255+
+ "/converse\",\n"
254256
+ " \"request_body\": \"{ \\\"messages\\\": ${parameters.messages} , \\\"inferenceConfig\\\": {\\\"temperature\\\": 0.0, \\\"topP\\\": 0.9, \\\"maxTokens\\\": 1000} }\"\n"
255257
+ " }\n"
256258
+ " ]\n"
@@ -261,8 +263,8 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
261263
: BEDROCK_CONNECTOR_BLUEPRINT1;
262264

263265
private static final String BEDROCK_CONVERSE_CONNECTOR_BLUEPRINT = AWS_SESSION_TOKEN == null
264-
? BEDROCK_CONVERSE_CONNECTOR_BLUEPRINT2
265-
: BEDROCK_CONVERSE_CONNECTOR_BLUEPRINT2;
266+
? BEDROCK_CONVERSE_CONNECTOR_BLUEPRINT2
267+
: BEDROCK_CONVERSE_CONNECTOR_BLUEPRINT2;
266268

267269
private static final String COHERE_KEY = System.getenv("COHERE_KEY");
268270
private static final String COHERE_CONNECTOR_BLUEPRINT = "{\n"
@@ -315,7 +317,7 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
315317
+ " \"tag\": \"%s\",\n"
316318
+ " \"description\": \"%s\",\n"
317319
+ " \"model_id\": \"%s\",\n"
318-
// + " \"system_prompt\": \"%s\",\n"
320+
// + " \"system_prompt\": \"%s\",\n"
319321
+ " \"user_instructions\": \"%s\",\n"
320322
+ " \"context_field_list\": [\"%s\"]\n"
321323
+ " }\n"
@@ -369,7 +371,7 @@ public class RestMLRAGSearchProcessorIT extends RestMLRemoteInferenceIT {
369371
+ " \"generative_qa_parameters\": {\n"
370372
+ " \"llm_model\": \"%s\",\n"
371373
+ " \"llm_question\": \"%s\",\n"
372-
// + " \"system_prompt\": \"%s\",\n"
374+
// + " \"system_prompt\": \"%s\",\n"
373375
+ " \"user_instructions\": \"%s\",\n"
374376
+ " \"context_size\": %d,\n"
375377
+ " \"message_size\": %d,\n"
@@ -594,7 +596,8 @@ public void testBM25WithOpenAIWithImage() throws Exception {
594596
Response response1 = createSearchPipeline("pipeline_test", pipelineParameters);
595597
assertEquals(200, response1.getStatusLine().getStatusCode());
596598

597-
byte[] rawImage = FileUtils.readFileToByteArray(Path.of(classLoader.getResource(TEST_DOC_PATH + "openai_boardwalk.jpg").toURI()).toFile());
599+
byte[] rawImage = FileUtils
600+
.readFileToByteArray(Path.of(classLoader.getResource(TEST_DOC_PATH + "openai_boardwalk.jpg").toURI()).toFile());
598601
String imageContent = Base64.getEncoder().encodeToString(rawImage);
599602

600603
SearchRequestParameters requestParameters = new SearchRequestParameters();
@@ -635,7 +638,8 @@ public void testBM25WithOpenAIWithImage() throws Exception {
635638
requestParameters.timeout = 60;
636639
requestParameters.imageFormat = "jpeg";
637640
requestParameters.imageType = "url";
638-
requestParameters.imageData = "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"; // imageContent;
641+
requestParameters.imageData =
642+
"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"; // imageContent;
639643
Response response3 = performSearch(INDEX_NAME, "pipeline_test", 5, requestParameters);
640644
assertEquals(200, response2.getStatusLine().getStatusCode());
641645

@@ -783,10 +787,10 @@ public void testBM25WithBedrockConverseUsingLlmMessages() throws Exception {
783787
Response response1 = createSearchPipeline("pipeline_test", pipelineParameters);
784788
assertEquals(200, response1.getStatusLine().getStatusCode());
785789

786-
byte[] rawImage = FileUtils.readFileToByteArray(Path.of(classLoader.getResource(TEST_DOC_PATH + "openai_boardwalk.jpg").toURI()).toFile());
790+
byte[] rawImage = FileUtils
791+
.readFileToByteArray(Path.of(classLoader.getResource(TEST_DOC_PATH + "openai_boardwalk.jpg").toURI()).toFile());
787792
String imageContent = Base64.getEncoder().encodeToString(rawImage);
788793

789-
790794
SearchRequestParameters requestParameters = new SearchRequestParameters();
791795

792796
requestParameters.source = "text";
@@ -971,7 +975,8 @@ public void testBM25WithOpenAIWithConversationAndImage() throws Exception {
971975
requestParameters.conversationId = conversationId;
972976
requestParameters.imageFormat = "jpeg";
973977
requestParameters.imageType = "url";
974-
requestParameters.imageData = "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg";
978+
requestParameters.imageData =
979+
"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg";
975980
Response response2 = performSearch(INDEX_NAME, "pipeline_test", 5, requestParameters);
976981
assertEquals(200, response2.getStatusLine().getStatusCode());
977982

@@ -1217,29 +1222,29 @@ private Response performSearch(String indexName, String pipeline, int size, Sear
12171222
requestParameters.llmResponseField
12181223
)
12191224
: (requestParameters.documentData != null && requestParameters.imageType != null)
1220-
? String
1221-
.format(
1222-
Locale.ROOT,
1223-
BM25_SEARCH_REQUEST_WITH_IMAGE_AND_DOCUMENT_TEMPLATE,
1224-
requestParameters.source,
1225-
requestParameters.source,
1226-
requestParameters.match,
1227-
requestParameters.llmModel,
1228-
requestParameters.llmQuestion,
1229-
requestParameters.systemPrompt,
1230-
requestParameters.userInstructions,
1231-
requestParameters.contextSize,
1232-
requestParameters.interactionSize,
1233-
requestParameters.timeout,
1234-
requestParameters.llmQuestion,
1235-
requestParameters.imageFormat,
1236-
requestParameters.imageType,
1237-
requestParameters.imageData,
1238-
requestParameters.documentFormat,
1239-
requestParameters.documentName,
1240-
requestParameters.documentData
1241-
)
1242-
: (requestParameters.documentData != null)
1225+
? String
1226+
.format(
1227+
Locale.ROOT,
1228+
BM25_SEARCH_REQUEST_WITH_IMAGE_AND_DOCUMENT_TEMPLATE,
1229+
requestParameters.source,
1230+
requestParameters.source,
1231+
requestParameters.match,
1232+
requestParameters.llmModel,
1233+
requestParameters.llmQuestion,
1234+
requestParameters.systemPrompt,
1235+
requestParameters.userInstructions,
1236+
requestParameters.contextSize,
1237+
requestParameters.interactionSize,
1238+
requestParameters.timeout,
1239+
requestParameters.llmQuestion,
1240+
requestParameters.imageFormat,
1241+
requestParameters.imageType,
1242+
requestParameters.imageData,
1243+
requestParameters.documentFormat,
1244+
requestParameters.documentName,
1245+
requestParameters.documentData
1246+
)
1247+
: (requestParameters.documentData != null)
12431248
? String
12441249
.format(
12451250
Locale.ROOT,
@@ -1260,46 +1265,46 @@ private Response performSearch(String indexName, String pipeline, int size, Sear
12601265
requestParameters.documentData
12611266
)
12621267
: (requestParameters.conversationId != null && requestParameters.imageType != null)
1263-
? String
1264-
.format(
1265-
Locale.ROOT,
1266-
BM25_SEARCH_REQUEST_WITH_CONVO_AND_IMAGE_TEMPLATE,
1267-
requestParameters.source,
1268-
requestParameters.source,
1269-
requestParameters.match,
1270-
requestParameters.llmModel,
1271-
requestParameters.llmQuestion,
1272-
requestParameters.conversationId,
1273-
requestParameters.systemPrompt,
1274-
requestParameters.userInstructions,
1275-
requestParameters.contextSize,
1276-
requestParameters.interactionSize,
1277-
requestParameters.timeout,
1278-
requestParameters.llmQuestion,
1279-
requestParameters.imageFormat,
1280-
requestParameters.imageType,
1281-
requestParameters.imageData
1282-
)
1268+
? String
1269+
.format(
1270+
Locale.ROOT,
1271+
BM25_SEARCH_REQUEST_WITH_CONVO_AND_IMAGE_TEMPLATE,
1272+
requestParameters.source,
1273+
requestParameters.source,
1274+
requestParameters.match,
1275+
requestParameters.llmModel,
1276+
requestParameters.llmQuestion,
1277+
requestParameters.conversationId,
1278+
requestParameters.systemPrompt,
1279+
requestParameters.userInstructions,
1280+
requestParameters.contextSize,
1281+
requestParameters.interactionSize,
1282+
requestParameters.timeout,
1283+
requestParameters.llmQuestion,
1284+
requestParameters.imageFormat,
1285+
requestParameters.imageType,
1286+
requestParameters.imageData
1287+
)
12831288
: (requestParameters.imageType != null)
1284-
? String
1285-
.format(
1286-
Locale.ROOT,
1287-
BM25_SEARCH_REQUEST_WITH_IMAGE_TEMPLATE,
1288-
requestParameters.source,
1289-
requestParameters.source,
1290-
requestParameters.match,
1291-
requestParameters.llmModel,
1292-
requestParameters.llmQuestion,
1293-
requestParameters.systemPrompt,
1294-
requestParameters.userInstructions,
1295-
requestParameters.contextSize,
1296-
requestParameters.interactionSize,
1297-
requestParameters.timeout,
1298-
requestParameters.llmQuestion,
1299-
requestParameters.imageFormat,
1300-
requestParameters.imageType,
1301-
requestParameters.imageData
1302-
)
1289+
? String
1290+
.format(
1291+
Locale.ROOT,
1292+
BM25_SEARCH_REQUEST_WITH_IMAGE_TEMPLATE,
1293+
requestParameters.source,
1294+
requestParameters.source,
1295+
requestParameters.match,
1296+
requestParameters.llmModel,
1297+
requestParameters.llmQuestion,
1298+
requestParameters.systemPrompt,
1299+
requestParameters.userInstructions,
1300+
requestParameters.contextSize,
1301+
requestParameters.interactionSize,
1302+
requestParameters.timeout,
1303+
requestParameters.llmQuestion,
1304+
requestParameters.imageFormat,
1305+
requestParameters.imageType,
1306+
requestParameters.imageData
1307+
)
13031308
: (requestParameters.conversationId == null)
13041309
? String
13051310
.format(

0 commit comments

Comments
 (0)