fix format violations

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
rbhavna · Nov 20, 2023 · fc36290 · fc36290
1 parent 81c6691
commit fc36290
Show file tree

Hide file tree

Showing 9 changed files with 215 additions and 153 deletions.
diff --git a/...main/java/org/opensearch/ml/engine/algorithms/metrics_correlation/MetricsCorrelation.java b/...main/java/org/opensearch/ml/engine/algorithms/metrics_correlation/MetricsCorrelation.java
@@ -5,20 +5,10 @@
 
 package org.opensearch.ml.engine.algorithms.metrics_correlation;
 
-import static org.opensearch.index.query.QueryBuilders.termQuery;
-import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_INDEX;
-import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_INDEX_MAPPING;
-import static org.opensearch.ml.common.CommonValue.ML_MODEL_INDEX;
-import static org.opensearch.ml.common.MLModel.MODEL_STATE_FIELD;
-
-import java.io.IOException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BooleanSupplier;
-
+import ai.djl.modality.Output;
+import ai.djl.translate.TranslateException;
+import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.log4j.Log4j2;
 import org.opensearch.action.admin.indices.create.CreateIndexRequest;
 import org.opensearch.action.admin.indices.create.CreateIndexResponse;
 import org.opensearch.action.get.GetRequest;
@@ -70,11 +60,19 @@
 import org.opensearch.ml.engine.annotation.Function;
 import org.opensearch.search.builder.SearchSourceBuilder;
 
-import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BooleanSupplier;
 
-import ai.djl.modality.Output;
-import ai.djl.translate.TranslateException;
-import lombok.extern.log4j.Log4j2;
+import static org.opensearch.index.query.QueryBuilders.termQuery;
+import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_INDEX;
+import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_INDEX_MAPPING;
+import static org.opensearch.ml.common.CommonValue.ML_MODEL_INDEX;
+import static org.opensearch.ml.common.MLModel.MODEL_STATE_FIELD;
 
 @Log4j2
 @Function(FunctionName.METRICS_CORRELATION)
@@ -175,9 +173,7 @@ public MetricsCorrelationOutput execute(Input input) throws ExecuteException {
                                     )
                             );
                         }
-                    }, e-> {
-                        log.error("Failed to get model", e);
-                    });
+                    }, e -> { log.error("Failed to get model", e); });
                     client.get(getModelRequest, ActionListener.runBefore(listener, context::restore));
                 }
             }
@@ -199,12 +195,19 @@ public MetricsCorrelationOutput execute(Input input) throws ExecuteException {
         waitUntil(() -> {
             if (modelId != null) {
                 MLModelState modelState = getModel(modelId).getModelState();
-                if (modelState == MLModelState.DEPLOYED || modelState == MLModelState.PARTIALLY_DEPLOYED){
+                if (modelState == MLModelState.DEPLOYED || modelState == MLModelState.PARTIALLY_DEPLOYED) {
                     log.info("Model deployed: " + modelState);
                     return true;
                 } else if (modelState == MLModelState.UNDEPLOYED || modelState == MLModelState.DEPLOY_FAILED) {
                     log.info("Model not deployed: " + modelState);
-                    deployModel(modelId, ActionListener.wrap(deployModelResponse -> modelId = getTask(deployModelResponse.getTaskId()).getModelId(), e -> log.error("Metrics correlation model didn't get deployed to the index successfully", e)));
+                    deployModel(
+                        modelId,
+                        ActionListener
+                            .wrap(
+                                deployModelResponse -> modelId = getTask(deployModelResponse.getTaskId()).getModelId(),
+                                e -> log.error("Metrics correlation model didn't get deployed to the index successfully", e)
+                            )
+                    );
                     return false;
                 }
             }

diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/ConnectorUtils.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/ConnectorUtils.java
@@ -186,7 +186,9 @@ public static ModelTensors processOutput(
         // execute user defined painless script.
         Optional<String> processedResponse = executePostProcessFunction(scriptService, postProcessFunction, modelResponse);
         String response = processedResponse.orElse(modelResponse);
-        boolean scriptReturnModelTensor = postProcessFunction != null && processedResponse.isPresent() && org.opensearch.ml.common.utils.StringUtils.isJson(response);
+        boolean scriptReturnModelTensor = postProcessFunction != null
+            && processedResponse.isPresent()
+            && org.opensearch.ml.common.utils.StringUtils.isJson(response);
         if (responseFilter == null) {
             connector.parseResponse(response, modelTensors, scriptReturnModelTensor);
         } else {

diff --git a/...hms/src/main/java/org/opensearch/ml/engine/algorithms/remote/RemoteConnectorExecutor.java b/...hms/src/main/java/org/opensearch/ml/engine/algorithms/remote/RemoteConnectorExecutor.java
@@ -33,10 +33,17 @@ default ModelTensorOutput executePredict(MLInput mlInput) {
         if (mlInput.getInputDataset() instanceof TextDocsInputDataSet) {
             TextDocsInputDataSet textDocsInputDataSet = (TextDocsInputDataSet) mlInput.getInputDataset();
             int processedDocs = 0;
-            while(processedDocs < textDocsInputDataSet.getDocs().size()) {
+            while (processedDocs < textDocsInputDataSet.getDocs().size()) {
                 List<String> textDocs = textDocsInputDataSet.getDocs().subList(processedDocs, textDocsInputDataSet.getDocs().size());
                 List<ModelTensors> tempTensorOutputs = new ArrayList<>();
-                preparePayloadAndInvokeRemoteModel(MLInput.builder().algorithm(FunctionName.TEXT_EMBEDDING).inputDataset(TextDocsInputDataSet.builder().docs(textDocs).build()).build(), tempTensorOutputs);
+                preparePayloadAndInvokeRemoteModel(
+                    MLInput
+                        .builder()
+                        .algorithm(FunctionName.TEXT_EMBEDDING)
+                        .inputDataset(TextDocsInputDataSet.builder().docs(textDocs).build())
+                        .build(),
+                    tempTensorOutputs
+                );
                 int tensorCount = 0;
                 if (tempTensorOutputs.size() > 0 && tempTensorOutputs.get(0).getMlModelTensors() != null) {
                     tensorCount = tempTensorOutputs.get(0).getMlModelTensors().size();

diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/encryptor/EncryptorImpl.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/encryptor/EncryptorImpl.java
@@ -18,13 +18,13 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import org.opensearch.ResourceNotFoundException;
-import org.opensearch.core.action.ActionListener;
 import org.opensearch.action.LatchedActionListener;
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.ml.common.exception.MLException;
 
 import com.amazonaws.encryptionsdk.AwsCrypto;

diff --git a/ml-algorithms/src/test/java/org/opensearch/ml/engine/MLEngineTest.java b/ml-algorithms/src/test/java/org/opensearch/ml/engine/MLEngineTest.java
@@ -327,4 +327,4 @@ private MLModel trainLinearRegressionModel() {
 
         return mlEngine.train(mlInput);
     }
-}
+}
diff --git a/.../java/org/opensearch/ml/engine/algorithms/metrics_correlation/MetricsCorrelationTest.java b/.../java/org/opensearch/ml/engine/algorithms/metrics_correlation/MetricsCorrelationTest.java
@@ -5,7 +5,41 @@
 
 package org.opensearch.ml.engine.algorithms.metrics_correlation;
 
-import com.google.common.collect.ImmutableMap;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_INDEX;
+import static org.opensearch.ml.common.CommonValue.ML_MODEL_INDEX;
+import static org.opensearch.ml.engine.algorithms.DLModel.ML_ENGINE;
+import static org.opensearch.ml.engine.algorithms.DLModel.MODEL_HELPER;
+import static org.opensearch.ml.engine.algorithms.DLModel.MODEL_ZIP_FILE;
+import static org.opensearch.ml.engine.algorithms.metrics_correlation.MetricsCorrelation.MCORR_ML_VERSION;
+import static org.opensearch.ml.engine.algorithms.metrics_correlation.MetricsCorrelation.MODEL_CONTENT_HASH;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import org.apache.lucene.search.TotalHits;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -81,41 +115,7 @@
 import org.opensearch.search.suggest.Suggest;
 import org.opensearch.threadpool.ThreadPool;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.opensearch.ml.common.CommonValue.ML_MODEL_GROUP_INDEX;
-import static org.opensearch.ml.common.CommonValue.ML_MODEL_INDEX;
-import static org.opensearch.ml.engine.algorithms.DLModel.ML_ENGINE;
-import static org.opensearch.ml.engine.algorithms.DLModel.MODEL_HELPER;
-import static org.opensearch.ml.engine.algorithms.DLModel.MODEL_ZIP_FILE;
-import static org.opensearch.ml.engine.algorithms.metrics_correlation.MetricsCorrelation.MCORR_ML_VERSION;
-import static org.opensearch.ml.engine.algorithms.metrics_correlation.MetricsCorrelation.MODEL_CONTENT_HASH;
-
+import com.google.common.collect.ImmutableMap;
 
 public class MetricsCorrelationTest {
     @Rule
@@ -295,7 +295,6 @@ public void setUp() throws IOException, URISyntaxException {
         extendedInput = MetricsCorrelationInput.builder().inputData(extendedInputData).build();
     }
 
-
     @Ignore
     @Test
     public void testWhenModelIdNotNullButModelIsNotDeployed() throws ExecuteException {
@@ -306,16 +305,17 @@ public void testWhenModelIdNotNullButModelIsNotDeployed() throws ExecuteExceptio
 
         doAnswer(invocation -> {
 
-            MLModel smallModel = MLModel.builder()
-                    .modelFormat(MLModelFormat.TORCH_SCRIPT)
-                    .name(FunctionName.METRICS_CORRELATION.name())
-                    .modelId(modelId)
-                    .modelGroupId(modelGroupId)
-                    .algorithm(FunctionName.METRICS_CORRELATION)
-                    .version(MCORR_ML_VERSION)
-                    .modelConfig(modelConfig)
-                    .modelState(MLModelState.UNDEPLOYED)
-                    .build();
+            MLModel smallModel = MLModel
+                .builder()
+                .modelFormat(MLModelFormat.TORCH_SCRIPT)
+                .name(FunctionName.METRICS_CORRELATION.name())
+                .modelId(modelId)
+                .modelGroupId(modelGroupId)
+                .algorithm(FunctionName.METRICS_CORRELATION)
+                .version(MCORR_ML_VERSION)
+                .modelConfig(modelConfig)
+                .modelState(MLModelState.UNDEPLOYED)
+                .build();
             MLModelGetResponse responseTemp = new MLModelGetResponse(smallModel);
             ActionFuture<MLModelGetResponse> mockedFutureTemp = mock(ActionFuture.class);
             MLTaskGetResponse taskResponse = new MLTaskGetResponse(mlTask);
@@ -436,7 +436,6 @@ public void testExecuteWithNoModelIndexAndOneEvent() throws ExecuteException, UR
         assertNotNull(mlModelOutputs.get(0).getMCorrModelTensors().get(0).getSuspected_metrics());
     }
 
-
     @Ignore
     @Test
     public void testExecuteWithModelInIndexAndInvokeDeployAndOneEvent() throws ExecuteException, URISyntaxException {
@@ -526,8 +525,7 @@ public void testExecuteWithNoModelInIndexAndOneEvent() throws ExecuteException,
         assertNotNull(mlModelOutputs.get(0).getMCorrModelTensors().get(0).getSuspected_metrics());
     }
 
-
-    //working
+    // working
     @Test
     public void testGetModel() {
         ActionFuture<MLModelGetResponse> mockedFuture = mock(ActionFuture.class);
@@ -560,7 +558,7 @@ public static XContentBuilder builder() throws IOException {
         return XContentBuilder.builder(XContentType.JSON.xContent());
     }
 
-    //working
+    // working
     @Test
     public void testSearchRequest() {
         String expectedIndex = CommonValue.ML_MODEL_INDEX;
@@ -770,49 +768,56 @@ public static ClusterState setupTestClusterState() {
         Set<DiscoveryNodeRole> roleSet = new HashSet<>();
         roleSet.add(DiscoveryNodeRole.DATA_ROLE);
         DiscoveryNode node = new DiscoveryNode(
-                "node",
-                new TransportAddress(TransportAddress.META_ADDRESS, new AtomicInteger().incrementAndGet()),
-                new HashMap<>(),
-                roleSet,
-                Version.CURRENT
+            "node",
+            new TransportAddress(TransportAddress.META_ADDRESS, new AtomicInteger().incrementAndGet()),
+            new HashMap<>(),
+            roleSet,
+            Version.CURRENT
         );
         Metadata metadata = new Metadata.Builder()
-                .indices(
-                        ImmutableMap
-                                .<String, IndexMetadata>builder()
-                                .put(
-                                        ML_MODEL_INDEX,
-                                        IndexMetadata
-                                                .builder("test")
-                                                .settings(
-                                                        Settings
-                                                                .builder()
-                                                                .put("index.number_of_shards", 1)
-                                                                .put("index.number_of_replicas", 1)
-                                                                .put("index.version.created", Version.CURRENT.id)
-                                                )
-                                                .build()
-                                )
-                                .put(ML_MODEL_GROUP_INDEX, IndexMetadata.builder(ML_MODEL_GROUP_INDEX)
-                                        .settings(Settings.builder()
-                                                .put("index.number_of_shards", 1)
-                                                .put("index.number_of_replicas", 1)
-                                                .put("index.version.created", Version.CURRENT.id))
-                                        .build())
-                                .build()
-                )
-                .build();
+            .indices(
+                ImmutableMap
+                    .<String, IndexMetadata>builder()
+                    .put(
+                        ML_MODEL_INDEX,
+                        IndexMetadata
+                            .builder("test")
+                            .settings(
+                                Settings
+                                    .builder()
+                                    .put("index.number_of_shards", 1)
+                                    .put("index.number_of_replicas", 1)
+                                    .put("index.version.created", Version.CURRENT.id)
+                            )
+                            .build()
+                    )
+                    .put(
+                        ML_MODEL_GROUP_INDEX,
+                        IndexMetadata
+                            .builder(ML_MODEL_GROUP_INDEX)
+                            .settings(
+                                Settings
+                                    .builder()
+                                    .put("index.number_of_shards", 1)
+                                    .put("index.number_of_replicas", 1)
+                                    .put("index.version.created", Version.CURRENT.id)
+                            )
+                            .build()
+                    )
+                    .build()
+            )
+            .build();
         return new ClusterState(
-                new ClusterName("test cluster"),
-                123l,
-                "111111",
-                metadata,
-                null,
-                DiscoveryNodes.builder().add(node).build(),
-                null,
-                Map.of(),
-                0,
-                false
+            new ClusterName("test cluster"),
+            123l,
+            "111111",
+            metadata,
+            null,
+            DiscoveryNodes.builder().add(node).build(),
+            null,
+            Map.of(),
+            0,
+            false
         );
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -327,4 +327,4 @@ private MLModel trainLinearRegressionModel() { @@
             return mlEngine.train(mlInput);
         }
-    }
+    }