From 3e49fc4694a3b7a0fa1f6dd8e7483324e27386cb Mon Sep 17 00:00:00 2001 From: zane-neo Date: Fri, 15 Dec 2023 11:15:49 +0800 Subject: [PATCH 1/4] Change version to 3.0 on main branch Signed-off-by: zane-neo --- build.gradle | 13 ++++++++----- .../java/org/opensearch/agent/tools/PPLTool.java | 5 +++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 20d65b94..f26777e4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "2.11.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") } @@ -82,6 +82,12 @@ task addJarsToClasspath(type: Copy) { dependencies { compileOnly group: 'org.opensearch', name:'opensearch-ml-client', version: "${version}" compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1' + compileOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.19.0" + compileOnly group: 'org.json', name: 'json', version: '20230227' + zipArchive group: 'org.opensearch.plugin', name:'opensearch-sql-plugin', version: "${version}" + implementation("com.google.guava:guava:32.0.1-jre") + implementation fileTree(dir: sqlJarDirectory, include: ["opensearch-sql-${version}.jar", "ppl-${version}.jar", "protocol-${version}.jar"]) + compileOnly "org.opensearch:common-utils:${version}" testImplementation "org.opensearch.test:framework:${opensearch_version}" testImplementation "org.mockito:mockito-core:3.10.0" testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2' @@ -90,10 +96,6 @@ dependencies { testImplementation "com.cronutils:cron-utils:9.1.6" testImplementation "commons-validator:commons-validator:1.7" testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2' - compileOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.19.0" - compileOnly group: 'org.json', name: 'json', version: '20231013' - zipArchive group: 'org.opensearch.plugin', name:'opensearch-sql-plugin', version: "${version}" - implementation fileTree(dir: sqlJarDirectory, include: ["opensearch-sql-${version}.jar", "ppl-${version}.jar", "protocol-${version}.jar"]) } task extractSqlJar(type: Copy) { @@ -110,6 +112,7 @@ tasks.validateNebulaPom.dependsOn ':generatePomFileForPluginZipPublication' dependencyLicenses.enabled = false loggerUsageCheck.enabled = false testingConventions.enabled = false +thirdPartyAudit.enabled = false test { useJUnitPlatform() diff --git a/src/main/java/org/opensearch/agent/tools/PPLTool.java b/src/main/java/org/opensearch/agent/tools/PPLTool.java index 46240811..6e4ff4ec 100644 --- a/src/main/java/org/opensearch/agent/tools/PPLTool.java +++ b/src/main/java/org/opensearch/agent/tools/PPLTool.java @@ -43,7 +43,6 @@ import org.opensearch.ml.common.transport.MLTaskResponse; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction; import org.opensearch.ml.common.transport.prediction.MLPredictionTaskRequest; -import org.opensearch.ml.repackage.com.google.common.collect.ImmutableMap; import org.opensearch.search.SearchHit; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.sql.plugin.transport.PPLQueryAction; @@ -51,6 +50,7 @@ import org.opensearch.sql.plugin.transport.TransportPPLQueryResponse; import org.opensearch.sql.ppl.domain.PPLQueryRequest; +import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; import lombok.Getter; @@ -108,7 +108,8 @@ public void run(Map parameters, ActionListener listener) .build(); ActionRequest request = new MLPredictionTaskRequest( modelId, - MLInput.builder().algorithm(FunctionName.REMOTE).inputDataset(inputDataSet).build() + MLInput.builder().algorithm(FunctionName.REMOTE).inputDataset(inputDataSet).build(), + null ); client.execute(MLPredictionTaskAction.INSTANCE, request, ActionListener.wrap(mlTaskResponse -> { ModelTensorOutput modelTensorOutput = (ModelTensorOutput) mlTaskResponse.getOutput(); From 9a86d8d08e9908cfb6e3f2f76fa7b5b3a0857fbf Mon Sep 17 00:00:00 2001 From: zane-neo Date: Fri, 15 Dec 2023 11:21:40 +0800 Subject: [PATCH 2/4] format code Signed-off-by: zane-neo --- src/main/java/org/opensearch/agent/tools/PPLTool.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opensearch/agent/tools/PPLTool.java b/src/main/java/org/opensearch/agent/tools/PPLTool.java index 6e4ff4ec..a2b22cb5 100644 --- a/src/main/java/org/opensearch/agent/tools/PPLTool.java +++ b/src/main/java/org/opensearch/agent/tools/PPLTool.java @@ -318,10 +318,8 @@ private static TransportPPLQueryResponse fromActionResponse(ActionResponse actio } - private Map extractFromChatParameters(Map parameters) - { - if (parameters.containsKey("input")) - { + private Map extractFromChatParameters(Map parameters) { + if (parameters.containsKey("input")) { try { Map chatParameters = gson.fromJson(parameters.get("input"), Map.class); parameters.putAll(chatParameters); From 79ca5e60f71a0fb1b5c8e82ef0f38ff2fecb2ba9 Mon Sep 17 00:00:00 2001 From: zane-neo Date: Fri, 15 Dec 2023 11:32:32 +0800 Subject: [PATCH 3/4] fix delombok issue Signed-off-by: zane-neo --- build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f26777e4..d13e0d0a 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,11 @@ buildscript { plugins { id 'java-library' id 'com.diffplug.spotless' version '6.23.0' - id "io.freefair.lombok" version "8.0.1" + id "io.freefair.lombok" version "8.4" +} + +lombok { + version = "1.18.30" } repositories { From 1998260da93157db15a875061520f0ba979f111a Mon Sep 17 00:00:00 2001 From: zane-neo Date: Fri, 15 Dec 2023 11:47:48 +0800 Subject: [PATCH 4/4] upgrade json version Signed-off-by: zane-neo --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d13e0d0a..d2c7b668 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ dependencies { compileOnly group: 'org.opensearch', name:'opensearch-ml-client', version: "${version}" compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1' compileOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.19.0" - compileOnly group: 'org.json', name: 'json', version: '20230227' + compileOnly group: 'org.json', name: 'json', version: '20231013' zipArchive group: 'org.opensearch.plugin', name:'opensearch-sql-plugin', version: "${version}" implementation("com.google.guava:guava:32.0.1-jre") implementation fileTree(dir: sqlJarDirectory, include: ["opensearch-sql-${version}.jar", "ppl-${version}.jar", "protocol-${version}.jar"])