From 507c02a8fd04efaab21fb85f78213734b33b978a Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Thu, 30 Nov 2023 19:36:18 +0800 Subject: [PATCH] (improvement)(chat) Remove redundant maven dependencies and classes (#453) Co-authored-by: jolunoluo --- chat/core/pom.xml | 12 ------- .../chat/parser/SatisfactionChecker.java | 2 +- .../parser/analytics/MetricAnalyzeParser.java | 2 +- .../parser/sql/llm/LLMRequestService.java | 4 +-- .../chat/parser/sql/llm/LLMSqlParser.java | 2 +- .../chat/query/EntityInfoQueryResponder.java | 35 ------------------- .../supersonic/chat/query/plugin/WebBase.java | 4 +++ .../chat/query/plugin/WebBaseResult.java | 14 -------- .../query/plugin/webpage/WebPageQuery.java | 11 +++--- .../query/plugin/webpage/WebPageResp.java | 6 ++-- .../main/resources/META-INF/spring.factories | 1 - .../integration/plugin/BasePluginTest.java | 4 +-- semantic/api/pom.xml | 10 +----- 13 files changed, 20 insertions(+), 87 deletions(-) delete mode 100644 chat/core/src/main/java/com/tencent/supersonic/chat/query/EntityInfoQueryResponder.java delete mode 100644 chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/WebBaseResult.java diff --git a/chat/core/pom.xml b/chat/core/pom.xml index 42cc3a8ad..24806171f 100644 --- a/chat/core/pom.xml +++ b/chat/core/pom.xml @@ -40,11 +40,6 @@ compile - - org.junit.jupiter - junit-jupiter - test - org.springframework.boot spring-boot-starter-test @@ -89,7 +84,6 @@ com.tencent.supersonic semantic-query ${project.version} - test com.tencent.supersonic @@ -97,12 +91,6 @@ ${project.version} compile - - com.tencent.supersonic - semantic-query - ${project.version} - compile - com.github.xkzhangsan diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/SatisfactionChecker.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/SatisfactionChecker.java index b3cb12f2c..49cfdf145 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/SatisfactionChecker.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/SatisfactionChecker.java @@ -18,7 +18,7 @@ import lombok.extern.slf4j.Slf4j; public class SatisfactionChecker { // check all the parse info in candidate - public static boolean check(QueryContext queryContext) { + public static boolean isSkip(QueryContext queryContext) { for (SemanticQuery query : queryContext.getCandidateQueries()) { if (query.getQueryMode().equals(LLMSqlQuery.QUERY_MODE)) { continue; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/analytics/MetricAnalyzeParser.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/analytics/MetricAnalyzeParser.java index f29a0ad63..cc288ecba 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/analytics/MetricAnalyzeParser.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/analytics/MetricAnalyzeParser.java @@ -38,7 +38,7 @@ public class MetricAnalyzeParser implements SemanticParser { @Override public void parse(QueryContext queryContext, ChatContext chatContext) { - if (SatisfactionChecker.check(queryContext)) { + if (SatisfactionChecker.isSkip(queryContext)) { log.info("skip MetricAnalyzeParser"); return; } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java index 2d52b8898..2df434f09 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java @@ -59,13 +59,13 @@ public class LLMRequestService { @Autowired private OptimizationConfig optimizationConfig; - public boolean check(QueryContext queryCtx) { + public boolean isSkip(QueryContext queryCtx) { QueryReq request = queryCtx.getRequest(); if (StringUtils.isEmpty(llmParserConfig.getUrl())) { log.info("llm parser url is empty, skip {} , llmParserConfig:{}", LLMSqlParser.class, llmParserConfig); return true; } - if (SatisfactionChecker.check(queryCtx)) { + if (SatisfactionChecker.isSkip(queryCtx)) { log.info("skip {}, queryText:{}", LLMSqlParser.class, request.getQueryText()); return true; } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMSqlParser.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMSqlParser.java index a0f36b530..a7f8eac28 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMSqlParser.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMSqlParser.java @@ -29,7 +29,7 @@ public class LLMSqlParser implements SemanticParser { LLMRequestService requestService = ContextUtils.getBean(LLMRequestService.class); SemanticService semanticService = ContextUtils.getBean(SemanticService.class); //1.determine whether to skip this parser. - if (requestService.check(queryCtx)) { + if (requestService.isSkip(queryCtx)) { return; } try { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/EntityInfoQueryResponder.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/EntityInfoQueryResponder.java deleted file mode 100644 index 1ae6d0118..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/EntityInfoQueryResponder.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.tencent.supersonic.chat.query; - -import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo; -import com.tencent.supersonic.chat.api.pojo.request.ExecuteQueryReq; -import com.tencent.supersonic.chat.api.pojo.response.EntityInfo; -import com.tencent.supersonic.chat.api.pojo.response.QueryResult; -import com.tencent.supersonic.chat.query.llm.analytics.MetricAnalyzeQuery; -import com.tencent.supersonic.chat.service.SemanticService; -import com.tencent.supersonic.common.util.ContextUtils; - -/** - * EntityInfoQueryResponder fills core attributes of an entity so that - * users get to know which entity is returned. - */ -public class EntityInfoQueryResponder implements QueryResponder { - - @Override - public void fillInfo(QueryResult queryResult, SemanticParseInfo semanticParseInfo, ExecuteQueryReq queryReq) { - if (semanticParseInfo == null) { - return; - } - String queryMode = semanticParseInfo.getQueryMode(); - if (QueryManager.containsPluginQuery(queryMode) - || MetricAnalyzeQuery.QUERY_MODE.equalsIgnoreCase(queryMode)) { - return; - } - SemanticService semanticService = ContextUtils.getBean(SemanticService.class); - User user = queryReq.getUser(); - EntityInfo entityInfo = semanticService.getEntityInfo(semanticParseInfo, user); - queryResult.setEntityInfo(entityInfo); - - } - -} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/WebBase.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/WebBase.java index dd26c2ff0..82e6932ec 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/WebBase.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/WebBase.java @@ -11,4 +11,8 @@ public class WebBase { private List paramOptions = Lists.newArrayList(); + public List getParams() { + return paramOptions; + } + } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/WebBaseResult.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/WebBaseResult.java deleted file mode 100644 index 8ba6cde74..000000000 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/WebBaseResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.tencent.supersonic.chat.query.plugin; - -import com.google.common.collect.Lists; -import lombok.Data; -import java.util.List; - -@Data -public class WebBaseResult { - - private String url; - - private List params = Lists.newArrayList(); - -} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/webpage/WebPageQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/webpage/WebPageQuery.java index 8b61d9045..d7cf8da7c 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/webpage/WebPageQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/webpage/WebPageQuery.java @@ -15,7 +15,6 @@ import com.tencent.supersonic.chat.query.QueryManager; import com.tencent.supersonic.chat.query.plugin.ParamOption; import com.tencent.supersonic.chat.query.plugin.PluginSemanticQuery; import com.tencent.supersonic.chat.query.plugin.WebBase; -import com.tencent.supersonic.chat.query.plugin.WebBaseResult; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.util.JsonUtil; import lombok.extern.slf4j.Slf4j; @@ -61,13 +60,13 @@ public class WebPageQuery extends PluginSemanticQuery { webPageResponse.setPluginId(plugin.getId()); webPageResponse.setPluginType(plugin.getType()); WebBase webPage = JsonUtil.toObject(plugin.getConfig(), WebBase.class); - WebBaseResult webBaseResult = buildWebPageResult(webPage, pluginParseResult); - webPageResponse.setWebPage(webBaseResult); + WebBase webBase = buildWebPageResult(webPage, pluginParseResult); + webPageResponse.setWebPage(webBase); return webPageResponse; } - private WebBaseResult buildWebPageResult(WebBase webPage, PluginParseResult pluginParseResult) { - WebBaseResult webBaseResult = new WebBaseResult(); + private WebBase buildWebPageResult(WebBase webPage, PluginParseResult pluginParseResult) { + WebBase webBaseResult = new WebBase(); webBaseResult.setUrl(webPage.getUrl()); Map elementValueMap = getElementMap(pluginParseResult); List paramOptions = Lists.newArrayList(); @@ -86,7 +85,7 @@ public class WebPageQuery extends PluginSemanticQuery { paramOption.setValue(elementValue); } } - webBaseResult.setParams(paramOptions); + webBaseResult.setParamOptions(paramOptions); return webBaseResult; } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/webpage/WebPageResp.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/webpage/WebPageResp.java index dff378dab..1071731f8 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/webpage/WebPageResp.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/webpage/WebPageResp.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.chat.query.plugin.webpage; -import com.tencent.supersonic.chat.query.plugin.WebBaseResult; +import com.tencent.supersonic.chat.query.plugin.WebBase; import lombok.Data; import java.util.List; @@ -15,8 +15,8 @@ public class WebPageResp { private String description; - private WebBaseResult webPage; + private WebBase webPage; - private List moreWebPage; + private List moreWebPage; } diff --git a/launchers/standalone/src/main/resources/META-INF/spring.factories b/launchers/standalone/src/main/resources/META-INF/spring.factories index 513a4feb6..d639e8e52 100644 --- a/launchers/standalone/src/main/resources/META-INF/spring.factories +++ b/launchers/standalone/src/main/resources/META-INF/spring.factories @@ -46,5 +46,4 @@ com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor=\ com.tencent.supersonic.auth.authentication.adaptor.DefaultUserAdaptor com.tencent.supersonic.chat.query.QueryResponder=\ - com.tencent.supersonic.chat.query.EntityInfoQueryResponder, \ com.tencent.supersonic.chat.query.SimilarMetricQueryResponder \ No newline at end of file diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/BasePluginTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/BasePluginTest.java index c1949ec0c..f18d2896e 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/BasePluginTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/BasePluginTest.java @@ -3,7 +3,7 @@ package com.tencent.supersonic.integration.plugin; import com.tencent.supersonic.StandaloneLauncher; import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.chat.api.pojo.response.QueryState; -import com.tencent.supersonic.chat.query.plugin.WebBaseResult; +import com.tencent.supersonic.chat.query.plugin.WebBase; import com.tencent.supersonic.chat.query.plugin.webpage.WebPageQuery; import com.tencent.supersonic.chat.query.plugin.webpage.WebPageResp; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ public class BasePluginTest { Assert.assertEquals(queryResult.getQueryState(), QueryState.SUCCESS); Assert.assertEquals(queryResult.getQueryMode(), WebPageQuery.QUERY_MODE); WebPageResp webPageResponse = (WebPageResp) queryResult.getResponse(); - WebBaseResult webPage = webPageResponse.getWebPage(); + WebBase webPage = webPageResponse.getWebPage(); Assert.assertEquals(webPage.getUrl(), "www.yourbi.com"); Assert.assertEquals(1, webPage.getParams().size()); Assert.assertEquals("alice", webPage.getParams().get(0).getValue()); diff --git a/semantic/api/pom.xml b/semantic/api/pom.xml index a501cf4bb..f00176620 100644 --- a/semantic/api/pom.xml +++ b/semantic/api/pom.xml @@ -24,10 +24,7 @@ all - - org.projectlombok - lombok - + com.tencent.supersonic common @@ -63,11 +60,6 @@ spring-boot-starter-web ${spring.version} - - com.tencent.supersonic - common - ${project.version} - com.tencent.supersonic auth-api