Merge b1dadb4a1a into d2a43a99c8

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/PromptHelper.java

@@ -33,13 +33,15 @@ public class PromptHelper {
 
     public List<List<Text2SQLExemplar>> getFewShotExemplars(LLMReq llmReq) {
         int exemplarRecallNumber =
-                Integer.parseInt(parserConfig.getParameterValue(PARSER_EXEMPLAR_RECALL_NUMBER));
+                Integer.valueOf(parserConfig.getParameterValue(PARSER_EXEMPLAR_RECALL_NUMBER));
-        int fewShotNumber = Integer.parseInt(parserConfig.getParameterValue(PARSER_FEW_SHOT_NUMBER));
+        int fewShotNumber = Integer.valueOf(parserConfig.getParameterValue(PARSER_FEW_SHOT_NUMBER));
         int selfConsistencyNumber =
-                Integer.parseInt(parserConfig.getParameterValue(PARSER_SELF_CONSISTENCY_NUMBER));
+                Integer.valueOf(parserConfig.getParameterValue(PARSER_SELF_CONSISTENCY_NUMBER));
 
         List<Text2SQLExemplar> exemplars = Lists.newArrayList();
-        exemplars.addAll(llmReq.getDynamicExemplars());
+        llmReq.getDynamicExemplars().stream().forEach(e -> {
+            exemplars.add(e);
+        });
 
         int recallSize = exemplarRecallNumber - llmReq.getDynamicExemplars().size();
         if (recallSize > 0) {
@@ -83,63 +85,60 @@ public class PromptHelper {
         String tableStr = llmReq.getSchema().getDataSetName();
 
         List<String> metrics = Lists.newArrayList();
-        llmReq.getSchema().getMetrics().forEach(metric -> {
+        llmReq.getSchema().getMetrics().stream().forEach(metric -> {
             StringBuilder metricStr = new StringBuilder();
             metricStr.append("<");
             metricStr.append(metric.getName());
             if (!CollectionUtils.isEmpty(metric.getAlias())) {
                 StringBuilder alias = new StringBuilder();
-                metric.getAlias().forEach(a -> alias.append(a).append(","));
+                metric.getAlias().stream().forEach(a -> alias.append(a + ","));
-                metricStr.append(" ALIAS '").append(alias).append("'");
+                metricStr.append(" ALIAS '" + alias + "'");
             }
             if (StringUtils.isNotEmpty(metric.getDataFormatType())) {
                 String dataFormatType = metric.getDataFormatType();
                 if (DataFormatTypeEnum.DECIMAL.getName().equalsIgnoreCase(dataFormatType)
                         || DataFormatTypeEnum.PERCENT.getName().equalsIgnoreCase(dataFormatType)) {
-                    metricStr.append(" FORMAT '").append(dataFormatType).append("'");
+                    metricStr.append(" FORMAT '" + dataFormatType + "'");
                 }
             }
             if (StringUtils.isNotEmpty(metric.getDescription())) {
-                metricStr.append(" COMMENT '").append(metric.getDescription()).append("'");
+                metricStr.append(" COMMENT '" + metric.getDescription() + "'");
             }
             if (StringUtils.isNotEmpty(metric.getDefaultAgg())) {
-                metricStr.append(" AGGREGATE '").append(metric.getDefaultAgg().toUpperCase()).append("'");
+                metricStr.append(" AGGREGATE '" + metric.getDefaultAgg().toUpperCase() + "'");
             }
             metricStr.append(">");
             metrics.add(metricStr.toString());
         });
 
         List<String> dimensions = Lists.newArrayList();
-        llmReq.getSchema().getDimensions().forEach(dimension -> {
+        llmReq.getSchema().getDimensions().stream().forEach(dimension -> {
             StringBuilder dimensionStr = new StringBuilder();
             dimensionStr.append("<");
             dimensionStr.append(dimension.getName());
             if (!CollectionUtils.isEmpty(dimension.getAlias())) {
                 StringBuilder alias = new StringBuilder();
-                dimension.getAlias().forEach(a -> alias.append(a).append(";"));
+                dimension.getAlias().stream().forEach(a -> alias.append(a + ";"));
-                dimensionStr.append(" ALIAS '").append(alias).append("'");
+                dimensionStr.append(" ALIAS '" + alias + "'");
             }
             if (StringUtils.isNotEmpty(dimension.getTimeFormat())) {
-                dimensionStr.append(" FORMAT '").append(dimension.getTimeFormat()).append("'");
+                dimensionStr.append(" FORMAT '" + dimension.getTimeFormat() + "'");
             }
             if (StringUtils.isNotEmpty(dimension.getDescription())) {
-                dimensionStr.append(" COMMENT '").append(dimension.getDescription()).append("'");
+                dimensionStr.append(" COMMENT '" + dimension.getDescription() + "'");
             }
             dimensionStr.append(">");
             dimensions.add(dimensionStr.toString());
         });
 
         List<String> values = Lists.newArrayList();
-        List<LLMReq.ElementValue> elementValueList = llmReq.getSchema().getValues();
+        llmReq.getSchema().getValues().stream().forEach(value -> {
-        if (elementValueList != null) {
+            StringBuilder valueStr = new StringBuilder();
-            elementValueList.forEach(value -> {
+            String fieldName = value.getFieldName();
-                StringBuilder valueStr = new StringBuilder();
+            String fieldValue = value.getFieldValue();
-                String fieldName = value.getFieldName();
+            valueStr.append(String.format("<%s='%s'>", fieldName, fieldValue));
-                String fieldValue = value.getFieldValue();
+            values.add(valueStr.toString());
-                valueStr.append(String.format("<%s='%s'>", fieldName, fieldValue));
+        });
-                values.add(valueStr.toString());
-            });
-        }
 
         String partitionTimeStr = "";
         if (llmReq.getSchema().getPartitionTime() != null) {
@@ -173,14 +172,14 @@ public class PromptHelper {
     private String buildTermStr(LLMReq llmReq) {
         List<LLMReq.Term> terms = llmReq.getTerms();
         List<String> termStr = Lists.newArrayList();
-        terms.forEach(term -> {
+        terms.stream().forEach(term -> {
             StringBuilder termsDesc = new StringBuilder();
             String description = term.getDescription();
             termsDesc.append(String.format("<%s COMMENT '%s'>", term.getName(), description));
             termStr.add(termsDesc.toString());
         });
         String ret = "";
-        if (!termStr.isEmpty()) {
+        if (termStr.size() > 0) {
             ret = String.join(",", termStr);
         }
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java

@@ -633,9 +633,6 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
 
     private DataItem getDataItem(MetricDO metricDO) {
         ModelResp modelResp = modelService.getModel(metricDO.getModelId());
-        if (modelResp == null) {
-            return null;
-        }
         MetricResp metricResp = MetricConverter.convert2MetricResp(metricDO,
                 ImmutableMap.of(modelResp.getId(), modelResp), Lists.newArrayList());
         fillDefaultAgg(metricResp);

webapp/packages/chat-sdk/src/components/ChatMsg/Bar/index.tsx

@@ -94,7 +94,7 @@ const BarChart: React.FC<Props> = ({
             return value === 0
               ? 0
               : metricField.dataFormatType === 'percent'
-              ? `${formatByDecimalPlaces(metricField.dataFormat?.needMultiply100 ? +value * 100 : value, metricField.dataFormat?.decimalPlaces || 2)}%`
+              ? `${formatByDecimalPlaces(value, metricField.dataFormat?.decimalPlaces || 2)}%`
               : getFormattedValue(value);
           },
         },
@@ -116,7 +116,7 @@ const BarChart: React.FC<Props> = ({
                     : metricField.dataFormatType === 'percent' ||
                       metricField.dataFormatType === 'decimal'
                     ? `${formatByDecimalPlaces(
-                        metricField.dataFormat?.needMultiply100 ? +item.value * 100 : item.value,
+                        item.value,
                         metricField.dataFormat?.decimalPlaces || 2
                       )}${metricField.dataFormatType === 'percent' ? '%' : ''}`
                     : getFormattedValue(item.value)
@@ -151,7 +151,7 @@ const BarChart: React.FC<Props> = ({
             return value === 0
               ? 0
               : metricField.dataFormatType === 'percent'
-              ? `${formatByDecimalPlaces(metricField.dataFormat?.needMultiply100 ? +value * 100 : value, metricField.dataFormat?.decimalPlaces || 2)}%`
+              ? `${formatByDecimalPlaces(value, metricField.dataFormat?.decimalPlaces || 2)}%`
               : getFormattedValue(value);
           },
         },