From 4b6e3e323bc0e92ee51aef07bf588b7d167c42fb Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Mon, 18 Sep 2023 16:51:50 -0700 Subject: [PATCH] Addressed PR comments Signed-off-by: Owais Kazi --- build.gradle | 3 +- .../workflow/CreateIndex/CreateIndexStep.java | 45 ++++++++++++++----- .../{knn-index-mapping.json => knn.json} | 0 3 files changed, 35 insertions(+), 13 deletions(-) rename src/main/resources/mappings/{knn-index-mapping.json => knn.json} (100%) diff --git a/build.gradle b/build.gradle index aa20423ee..c3b193b15 100644 --- a/build.gradle +++ b/build.gradle @@ -56,6 +56,7 @@ opensearchplugin { dependencyLicenses.enabled = false // This requires an additional Jar not published as part of build-tools loggerUsageCheck.enabled = false +thirdPartyAudit.enabled = false // No need to validate pom, as we do not upload to maven/sonatype validateNebulaPom.enabled = false @@ -106,7 +107,7 @@ dependencies { implementation "org.opensearch:opensearch:${opensearch_version}" implementation 'org.junit.jupiter:junit-jupiter:5.10.0' implementation "com.google.code.gson:gson:2.10.1" - compileOnly "com.google.guava:guava:32.1.2-jre" + implementation "com.google.guava:guava:32.1.2-jre" api group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}" configurations.all { diff --git a/src/main/java/org/opensearch/flowframework/workflow/CreateIndex/CreateIndexStep.java b/src/main/java/org/opensearch/flowframework/workflow/CreateIndex/CreateIndexStep.java index 242d80bae..50b258b9c 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/CreateIndex/CreateIndexStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/CreateIndex/CreateIndexStep.java @@ -12,11 +12,12 @@ import com.google.common.io.Resources; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.client.Client; +import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.action.ActionListener; import org.opensearch.flowframework.workflow.WorkflowData; import org.opensearch.flowframework.workflow.WorkflowStep; @@ -26,12 +27,19 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; +/** + * Step to create an index + */ public class CreateIndexStep implements WorkflowStep { private static final Logger logger = LogManager.getLogger(CreateIndexStep.class); private Client client; - private final String CREATE_INDEX_STEP = "create_index_step"; + private final String NAME = "create_index_step"; + /** + * Instantiate this class + * @param client Client to create an index + */ public CreateIndexStep(Client client) { this.client = client; } @@ -43,7 +51,7 @@ public CompletableFuture execute(List data) { @Override public void onResponse(CreateIndexResponse createIndexResponse) { - logger.info("created index:{}"); + logger.info("created index:{}", createIndexResponse.index()); future.complete(new WorkflowData() { @Override public Map getContent() { @@ -54,41 +62,54 @@ public Map getContent() { @Override public void onFailure(Exception e) { - logger.error("Index creation failed", e); + logger.error("Failed to create an index", e); future.completeExceptionally(e); } }; String index = null; + String type = null; + Settings settings = null; for (WorkflowData workflowData : data) { // Fetch index from content i.e. request body of execute API Map content = workflowData.getContent(); index = (String) content.get("index"); + type = (String) content.get("type"); + settings = (Settings) content.get("settings"); + if (index != null && type != null) { + break; + } } // TODO: - // 1. Map index type -> fileName - // 2. Create settings based on the index settings received from content - CreateIndexRequest request = new CreateIndexRequest(index).mapping(getIndexMappings(fileName), XContentType.JSON) - .settings(settings); - client.admin().indices().create(request, actionListener); + // 1. Create settings based on the index settings received from content + + try { + CreateIndexRequest request = new CreateIndexRequest(index).mapping(getIndexMappings(type), XContentType.JSON) + .settings(settings); + client.admin().indices().create(request, actionListener); + } catch (Exception e) { + logger.error("Failed to find the right mapping for the index", e); + } + return future; } @Override public String getName() { - return CREATE_INDEX_STEP; + return NAME; } /** * Get index mapping json content. * + * @param mapping type of the index to fetch the specific mapping file * @return index mapping * @throws IOException IOException if mapping file can't be read correctly */ - public static String getIndexMappings(String mappingFileName) throws IOException { - URL url = CreateIndexStep.class.getClassLoader().getResource(mappingFileName); + public static String getIndexMappings(String mapping) throws IOException { + URL url = CreateIndexStep.class.getClassLoader().getResource(mapping); return Resources.toString(url, Charsets.UTF_8); } } diff --git a/src/main/resources/mappings/knn-index-mapping.json b/src/main/resources/mappings/knn.json similarity index 100% rename from src/main/resources/mappings/knn-index-mapping.json rename to src/main/resources/mappings/knn.json