Removed unnecessary gradle dependencies

Signed-off-by: Arjun kumar Giri <arjung@amazon.com>
arjunkumargiri · Dec 14, 2023 · 8a73866 · 8a73866
1 parent 07fdfeb
commit 8a73866
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 39 deletions.
diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/RAGTool.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/RAGTool.java
@@ -32,7 +32,6 @@
 import org.opensearch.ml.common.output.model.ModelTensor;
 import org.opensearch.ml.common.output.model.ModelTensorOutput;
 import org.opensearch.ml.common.output.model.ModelTensors;
-import org.opensearch.ml.common.spi.tools.Parser;
 import org.opensearch.ml.common.spi.tools.ToolAnnotation;
 import org.opensearch.ml.common.transport.MLTaskResponse;
 import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction;
@@ -71,10 +70,6 @@ public class RAGTool extends AbstractRetrieverTool {
     private String embeddingModelId;
     private Integer docSize;
     private Integer k;
-    @Setter
-    private Parser inputParser;
-    @Setter
-    private Parser outputParser;
 
     @Builder
     public RAGTool(
@@ -88,7 +83,7 @@ public RAGTool(
         String embeddingModelId,
         String modelId
     ) {
-        super(client, xContentRegistry, index, sourceFields, docSize);
+        super(TYPE, DEFAULT_DESCRIPTION, client, xContentRegistry, index, sourceFields, docSize);
         this.client = client;
         this.xContentRegistry = xContentRegistry;
         this.index = index;
@@ -99,13 +94,10 @@ public RAGTool(
         this.k = k == null ? DEFAULT_K : k;
         this.modelId = modelId;
 
-        outputParser = new Parser() {
-            @Override
-            public Object parse(Object o) {
-                List<ModelTensors> mlModelOutputs = (List<ModelTensors>) o;
-                return mlModelOutputs.get(0).getMlModelTensors().get(0).getDataAsMap().get("response");
-            }
-        };
+        this.setOutputParser(o -> {
+            List<ModelTensors> mlModelOutputs = (List<ModelTensors>) o;
+            return mlModelOutputs.get(0).getMlModelTensors().get(0).getDataAsMap().get("response");
+        });
     }
 
     @Override
@@ -195,10 +187,10 @@ public <T> void run(Map<String, String> parameters, ActionListener<T> listener)
                 client.execute(MLPredictionTaskAction.INSTANCE, request, ActionListener.<MLTaskResponse>wrap(resp -> {
                     ModelTensorOutput modelTensorOutput = (ModelTensorOutput) resp.getOutput();
                     modelTensorOutput.getMlModelOutputs();
-                    if (outputParser == null) {
+                    if (this.getOutputParser() == null) {
                         listener.onResponse((T) modelTensorOutput.getMlModelOutputs());
                     } else {
-                        listener.onResponse((T) outputParser.parse(modelTensorOutput.getMlModelOutputs()));
+                        listener.onResponse((T) this.getOutputParser().parse(modelTensorOutput.getMlModelOutputs()));
                     }
                 }, e -> {
                     log.error("Failed to run model " + modelId, e);
@@ -214,21 +206,6 @@ public <T> void run(Map<String, String> parameters, ActionListener<T> listener)
         }
     }
 
-    @Override
-    public String getType() {
-        return TYPE;
-    }
-
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    @Override
-    public void setName(String s) {
-        this.name = s;
-    }
-
     @Override
     public boolean validate(Map<String, String> parameters) {
         if (parameters == null || parameters.size() == 0) {

diff --git a/spi/build.gradle b/spi/build.gradle
@@ -8,7 +8,6 @@ import org.opensearch.gradle.test.RestIntegTestTask
 
 plugins {
     id 'java'
-    id "io.freefair.lombok"
     id 'jacoco'
     id 'com.github.johnrengelman.shadow'
     id 'maven-publish'
@@ -72,14 +71,6 @@ test {
     systemProperty 'tests.security.manager', 'false'
 }
 
-task integTest(type: RestIntegTestTask) {
-    description 'Run integ test with opensearch test framework'
-    group 'verification'
-    systemProperty 'tests.security.manager', 'false'
-    dependsOn test
-}
-check.dependsOn integTest
-
 task sourcesJar(type: Jar) {
     archiveClassifier.set 'sources'
     from sourceSets.main.allJava