(improvement)(launcher) Optimize the demo to prevent the dimension value dictionary from being loaded after the demo is loaded. (#1059)

Co-authored-by: jolunoluo

chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java

@@ -2,6 +2,7 @@ package com.tencent.supersonic.chat.server.executor;
 
 import com.tencent.supersonic.chat.server.plugin.PluginQueryManager;
 import com.tencent.supersonic.chat.server.pojo.ChatExecuteContext;
+import com.tencent.supersonic.chat.server.util.ResultFormatter;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.request.ExecuteQueryReq;
@@ -20,7 +21,11 @@ public class SqlExecutor implements ChatExecutor {
         }
         ExecuteQueryReq executeQueryReq = buildExecuteReq(chatExecuteContext);
         ChatQueryService chatQueryService = ContextUtils.getBean(ChatQueryService.class);
-        return chatQueryService.performExecution(executeQueryReq);
+        QueryResult queryResult = chatQueryService.performExecution(executeQueryReq);
+        String textResult = ResultFormatter.transform2TextNew(queryResult.getQueryColumns(),
+                queryResult.getQueryResults());
+        queryResult.setTextResult(textResult);
+        return queryResult;
     }
 
     private ExecuteQueryReq buildExecuteReq(ChatExecuteContext chatExecuteContext) {

chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java

@@ -1,16 +1,22 @@
 package com.tencent.supersonic.chat.server.parser;
 
+import com.tencent.supersonic.chat.server.plugin.PluginQueryManager;
 import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
 import com.tencent.supersonic.chat.server.util.QueryReqConverter;
 import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.request.QueryFilter;
 import com.tencent.supersonic.headless.api.pojo.request.QueryReq;
 import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
 import com.tencent.supersonic.headless.server.service.ChatQueryService;
-
-import java.util.List;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Slf4j
 public class NL2SQLParser implements ChatParser {
@@ -31,6 +37,7 @@ public class NL2SQLParser implements ChatParser {
             parseResp.getSelectedParses().addAll(text2SqlParseResp.getSelectedParses());
         }
         parseResp.getParseTimeCost().setSqlTime(text2SqlParseResp.getParseTimeCost().getSqlTime());
+        formatParseResult(parseResp);
     }
 
     private boolean checkSkip(ParseResp parseResp) {
@@ -43,4 +50,49 @@ public class NL2SQLParser implements ChatParser {
         return false;
     }
 
+    private void formatParseResult(ParseResp parseResp) {
+        List<SemanticParseInfo> selectedParses = parseResp.getSelectedParses();
+        for (SemanticParseInfo parseInfo : selectedParses) {
+            formatParseInfo(parseInfo);
+        }
+    }
+
+    private void formatParseInfo(SemanticParseInfo parseInfo) {
+        if (!PluginQueryManager.isPluginQuery(parseInfo.getQueryMode())) {
+            formatNL2SQLParseInfo(parseInfo);
+        }
+    }
+
+    private void formatNL2SQLParseInfo(SemanticParseInfo parseInfo) {
+        StringBuilder textBuilder = new StringBuilder();
+        textBuilder.append("**数据集:** ").append(parseInfo.getDataSet().getName()).append(" ");
+        Optional<SchemaElement> metric = parseInfo.getMetrics().stream().findFirst();
+        metric.ifPresent(schemaElement ->
+                textBuilder.append("**指标:** ").append(schemaElement.getName()).append(" "));
+        List<String> dimensionNames = parseInfo.getDimensions().stream()
+                .map(SchemaElement::getName).filter(Objects::nonNull).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(dimensionNames)) {
+            textBuilder.append("**维度:** ").append(String.join(",", dimensionNames));
+        }
+        textBuilder.append("\n\n**筛选条件:** \n");
+        if (parseInfo.getDateInfo() != null) {
+            textBuilder.append("**数据时间:** ").append(parseInfo.getDateInfo().getStartDate()).append("~")
+                    .append(parseInfo.getDateInfo().getEndDate()).append(" ");
+        }
+        if (!CollectionUtils.isEmpty(parseInfo.getDimensionFilters())
+                || CollectionUtils.isEmpty(parseInfo.getMetricFilters())) {
+            Set<QueryFilter> queryFilters = parseInfo.getDimensionFilters();
+            queryFilters.addAll(parseInfo.getMetricFilters());
+            for (QueryFilter queryFilter : queryFilters) {
+                textBuilder.append("**").append(queryFilter.getName()).append("**")
+                        .append(" ")
+                        .append(queryFilter.getOperator().getValue())
+                        .append(" ")
+                        .append(queryFilter.getValue())
+                        .append(" ");
+            }
+        }
+        parseInfo.setTextInfo(textBuilder.toString());
+    }
+
 }

chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java

@@ -55,8 +55,13 @@ public class WebServiceQuery extends PluginSemanticQuery {
         log.info("webServiceResponse result:{}", JsonUtil.toString(object));
         try {
             Map<String, Object> data = JsonUtil.toMap(JsonUtil.toString(object), String.class, Object.class);
-            queryResult.setQueryResults((List<Map<String, Object>>) data.get("resultList"));
-            queryResult.setQueryColumns((List<QueryColumn>) data.get("columns"));
+            if (data.get("resultList") != null) {
+                queryResult.setQueryResults((List<Map<String, Object>>) data.get("resultList"));
+            }
+            if (data.get("columns") != null) {
+                queryResult.setQueryColumns((List<QueryColumn>) data.get("columns"));
+            }
+            queryResult.setTextResult(String.valueOf(data.get("textInfo")));
             queryResult.setQueryState(QueryState.SUCCESS);
         } catch (Exception e) {
             log.info("webServiceResponse result has an exception:{}", e.getMessage());

chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/recognize/PluginRecognizer.java

@@ -86,6 +86,7 @@ public abstract class PluginRecognizer {
         properties.put("name", plugin.getName());
         semanticParseInfo.setProperties(properties);
         semanticParseInfo.setScore(distance);
+        semanticParseInfo.setTextInfo(String.format("将由插件工具**%s**来解答", plugin.getName()));
         fillSemanticParseInfo(semanticParseInfo);
         return semanticParseInfo;
     }

chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/QueryResultFormatProcessor.java

@@ -1,16 +0,0 @@
-package com.tencent.supersonic.chat.server.processor.execute;
-
-import com.tencent.supersonic.chat.server.pojo.ChatExecuteContext;
-import com.tencent.supersonic.chat.server.util.ResultFormatter;
-import com.tencent.supersonic.headless.api.pojo.response.QueryResult;
-
-public class QueryResultFormatProcessor implements ExecuteResultProcessor {
-
-    @Override
-    public void process(ChatExecuteContext chatExecuteContext, QueryResult queryResult) {
-        String textResult = ResultFormatter.transform2TextNew(queryResult.getQueryColumns(),
-                queryResult.getQueryResults());
-        queryResult.setTextResult(textResult);
-    }
-
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/ParseResultFormatProcessor.java

@@ -1,61 +0,0 @@
-package com.tencent.supersonic.chat.server.processor.parse;
-
-import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
-import com.tencent.supersonic.headless.api.pojo.SchemaElement;
-import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.headless.api.pojo.request.QueryFilter;
-import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
-import org.springframework.util.CollectionUtils;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class ParseResultFormatProcessor implements ParseResultProcessor {
-
-    @Override
-    public void process(ChatParseContext chatParseContext, ParseResp parseResp) {
-        formatParseResult(parseResp);
-    }
-
-    private void formatParseResult(ParseResp parseResp) {
-        List<SemanticParseInfo> selectedParses = parseResp.getSelectedParses();
-        for (SemanticParseInfo parseInfo : selectedParses) {
-            formatParseInfo(parseInfo);
-        }
-    }
-
-    private void formatParseInfo(SemanticParseInfo parseInfo) {
-        StringBuilder textBuilder = new StringBuilder();
-        textBuilder.append("**数据集:** ").append(parseInfo.getDataSet().getName()).append(" ");
-        Optional<SchemaElement> metric = parseInfo.getMetrics().stream().findFirst();
-        metric.ifPresent(schemaElement ->
-                textBuilder.append("**指标:** ").append(schemaElement.getName()).append(" "));
-        List<String> dimensionNames = parseInfo.getDimensions().stream()
-                .map(SchemaElement::getName).filter(Objects::nonNull).collect(Collectors.toList());
-        if (!CollectionUtils.isEmpty(dimensionNames)) {
-            textBuilder.append("**维度:** ").append(String.join(",", dimensionNames));
-        }
-        textBuilder.append("\n\n**筛选条件:** \n");
-        if (parseInfo.getDateInfo() != null) {
-            textBuilder.append("**数据时间:** ").append(parseInfo.getDateInfo().getStartDate()).append("~")
-                    .append(parseInfo.getDateInfo().getEndDate()).append(" ");
-        }
-        if (!CollectionUtils.isEmpty(parseInfo.getDimensionFilters())
-                || CollectionUtils.isEmpty(parseInfo.getMetricFilters())) {
-            Set<QueryFilter> queryFilters = parseInfo.getDimensionFilters();
-            queryFilters.addAll(parseInfo.getMetricFilters());
-            for (QueryFilter queryFilter : queryFilters) {
-                textBuilder.append("**").append(queryFilter.getName()).append("**")
-                        .append(" ")
-                        .append(queryFilter.getOperator().getValue())
-                        .append(" ")
-                        .append(queryFilter.getValue())
-                        .append(" ");
-            }
-        }
-        parseInfo.setTextInfo(textBuilder.toString());
-    }
-
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/util/ResultFormatter.java

@@ -1,6 +1,7 @@
 package com.tencent.supersonic.chat.server.util;
 
 import com.tencent.supersonic.common.pojo.QueryColumn;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -8,6 +9,9 @@ import java.util.Map;
 public class ResultFormatter {
 
     public static String transform2TextNew(List<QueryColumn> queryColumns, List<Map<String, Object>> queryResults) {
+        if (CollectionUtils.isEmpty(queryColumns)) {
+            return "";
+        }
         StringBuilder table = new StringBuilder();
         for (QueryColumn column : queryColumns) {
             String columnName = column.getName();
@@ -18,6 +22,9 @@ public class ResultFormatter {
             table.append("|:---:");
         }
         table.append("|\n");
+        if (queryResults == null) {
+            return table.toString();
+        }
         for (Map<String, Object> row : queryResults) {
             for (QueryColumn column : queryColumns) {
                 String columnKey = column.getNameEn();