[fix]Fix unit test cases.

chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java

@@ -19,7 +19,8 @@ public class ParseContext {
     }
 
     public boolean enableNL2SQL() {
-        return Objects.nonNull(agent) && agent.containsDatasetTool()&&response.getSelectedParses().size() == 0;
+        return Objects.nonNull(agent) && agent.containsDatasetTool()
+                && response.getSelectedParses().size() == 0;
     }
 
     public boolean enableLLM() {

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java

@@ -727,7 +727,7 @@ public class SqlReplaceHelper {
         List<PlainSelect> plainSelects = SqlSelectHelper.getPlainSelects(plainSelectList);
         for (PlainSelect plainSelect : plainSelects) {
             if (Objects.nonNull(plainSelect.getFromItem())) {
-                Table table = (Table) plainSelect.getFromItem();
+                Table table = SqlSelectHelper.getTable(plainSelect.getFromItem());
                 if (table.getName().equals(tableName)) {
                     replacePlainSelectByExpr(plainSelect, replace);
                     if (SqlSelectHelper.hasAggregateFunction(plainSelect)) {

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelper.java

@@ -723,6 +723,44 @@ public class SqlSelectHelper {
         return null;
     }
 
+    public static Table getTable(FromItem fromItem) {
+        Table table = null;
+        if (fromItem instanceof Table) {
+            table = (Table) fromItem;
+        } else if (fromItem instanceof ParenthesedSelect) {
+            ParenthesedSelect parenthesedSelect = (ParenthesedSelect) fromItem;
+            if (parenthesedSelect.getSelect() instanceof PlainSelect) {
+                PlainSelect subSelect = (PlainSelect) parenthesedSelect.getSelect();
+                table = getTable(subSelect.getSelectBody());
+            } else if (parenthesedSelect.getSelect() instanceof SetOperationList) {
+                table = getTable(parenthesedSelect.getSelect());
+            }
+        }
+        return table;
+    }
+
+    public static Table getTable(Select select) {
+        if (select == null) {
+            return null;
+        }
+        List<PlainSelect> plainSelectList = getWithItem(select);
+        if (!CollectionUtils.isEmpty(plainSelectList)) {
+            List<PlainSelect> selectList = new ArrayList<>(plainSelectList);
+            Table table = getTable(selectList.get(0));
+            return table;
+        }
+        if (select instanceof PlainSelect) {
+            PlainSelect plainSelect = (PlainSelect) select;
+            return getTable(plainSelect.getFromItem());
+        } else if (select instanceof SetOperationList) {
+            SetOperationList setOperationList = (SetOperationList) select;
+            if (!CollectionUtils.isEmpty(setOperationList.getSelects())) {
+                return getTable(setOperationList.getSelects().get(0));
+            }
+        }
+        return null;
+    }
+
     public static String getDbTableName(String sql) {
         Table table = getTable(sql);
         return table.getFullyQualifiedName();

common/src/main/java/com/tencent/supersonic/common/pojo/ChatModelConfig.java

@@ -28,6 +28,8 @@ public class ChatModelConfig implements Serializable {
     private Boolean logRequests = false;
     private Boolean logResponses = false;
     private Boolean enableSearch = false;
+    private Boolean jsonFormat = false;
+    private String jsonFormatType = "json_schema";
 
     public String keyDecrypt() {
         return AESEncryptionUtil.aesDecryptECB(getApiKey());

common/src/main/java/dev/langchain4j/provider/OpenAiModelFactory.java

@@ -22,13 +22,19 @@ public class OpenAiModelFactory implements ModelFactory, InitializingBean {
 
     @Override
     public ChatLanguageModel createChatModel(ChatModelConfig modelConfig) {
-        return OpenAiChatModel.builder().baseUrl(modelConfig.getBaseUrl())
+        OpenAiChatModel.OpenAiChatModelBuilder openAiChatModelBuilder = OpenAiChatModel.builder()
-                .modelName(modelConfig.getModelName()).apiKey(modelConfig.keyDecrypt())
+                .baseUrl(modelConfig.getBaseUrl()).modelName(modelConfig.getModelName())
-                .apiVersion(modelConfig.getApiVersion()).temperature(modelConfig.getTemperature())
+                .apiKey(modelConfig.keyDecrypt()).apiVersion(modelConfig.getApiVersion())
-                .topP(modelConfig.getTopP()).maxRetries(modelConfig.getMaxRetries())
+                .temperature(modelConfig.getTemperature()).topP(modelConfig.getTopP())
+                .maxRetries(modelConfig.getMaxRetries())
                 .timeout(Duration.ofSeconds(modelConfig.getTimeOut()))
                 .logRequests(modelConfig.getLogRequests())
-                .logResponses(modelConfig.getLogResponses()).build();
+                .logResponses(modelConfig.getLogResponses());
+        if (modelConfig.getJsonFormat()) {
+            openAiChatModelBuilder.strictJsonSchema(true)
+                    .responseFormat(modelConfig.getJsonFormatType());
+        }
+        return openAiChatModelBuilder.build();
     }
 
     @Override

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java

@@ -3,7 +3,11 @@ package com.tencent.supersonic.headless.api.pojo.request;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.pojo.*;
+import com.tencent.supersonic.common.pojo.Aggregator;
+import com.tencent.supersonic.common.pojo.Constants;
+import com.tencent.supersonic.common.pojo.DateConf;
+import com.tencent.supersonic.common.pojo.Filter;
+import com.tencent.supersonic.common.pojo.Order;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.util.ContextUtils;
@@ -21,14 +25,22 @@ import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.select.*;
+import net.sf.jsqlparser.statement.select.GroupByElement;
+import net.sf.jsqlparser.statement.select.Limit;
+import net.sf.jsqlparser.statement.select.Offset;
+import net.sf.jsqlparser.statement.select.OrderByElement;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.SelectItem;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Data
@@ -176,7 +188,7 @@ public class QueryStructReq extends SemanticQueryReq {
 
     private List<SelectItem<?>> buildSelectItems(QueryStructReq queryStructReq) {
         List<SelectItem<?>> selectItems = new ArrayList<>();
-        List<String> groups = queryStructReq.getGroups();
+        Set<String> groups = new HashSet<>(queryStructReq.getGroups());
 
         if (!CollectionUtils.isEmpty(groups)) {
             for (String group : groups) {
@@ -236,7 +248,7 @@ public class QueryStructReq extends SemanticQueryReq {
     }
 
     private GroupByElement buildGroupByElement(QueryStructReq queryStructReq) {
-        List<String> groups = queryStructReq.getGroups();
+        Set<String> groups = new HashSet<>(queryStructReq.getGroups());
         if ((!CollectionUtils.isEmpty(groups) && !queryStructReq.getAggregators().isEmpty())
                 || !queryStructReq.getMetricFilters().isEmpty()) {
             GroupByElement groupByElement = new GroupByElement();

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java

@@ -23,9 +23,9 @@ public class SqlExecuteReq {
     private Integer limit = 1000;
 
     public String getSql() {
-        if(StringUtils.isNotBlank(sql)){
+        if (StringUtils.isNotBlank(sql)) {
-            sql=sql.replaceAll("^[\\n]+|[\\n]+$", "");
+            sql = sql.replaceAll("^[\\n]+|[\\n]+$", "");
-            sql=StringUtils.removeEnd(sql,";");
+            sql = StringUtils.removeEnd(sql, ";");
         }
 
         return String.format(LIMIT_WRAPPER, sql, limit);

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/file/FileHandlerImpl.java

@@ -175,7 +175,7 @@ public class FileHandlerImpl implements FileHandler {
     private DictValueResp convert2Resp(String lineStr) {
         DictValueResp dictValueResp = new DictValueResp();
         if (StringUtils.isNotEmpty(lineStr)) {
-            lineStr=StringUtils.stripStart(lineStr,null);
+            lineStr = StringUtils.stripStart(lineStr, null);
             String[] itemArray = lineStr.split("\\s+");
             if (Objects.nonNull(itemArray) && itemArray.length >= 3) {
                 dictValueResp.setValue(itemArray[0].replace("#", " "));

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMatchStrategy.java

@@ -168,10 +168,11 @@ public class EmbeddingMatchStrategy extends BatchMatchStrategy<EmbeddingResult>
             variable.put("retrievedInfo", JSONObject.toJSONString(results));
 
             Prompt prompt = PromptTemplate.from(LLM_FILTER_PROMPT).apply(variable);
-            ChatModelConfig chatModelConfig=null;
+            ChatModelConfig chatModelConfig = null;
-            if(chatQueryContext.getRequest().getChatAppConfig()!=null
+            if (chatQueryContext.getRequest().getChatAppConfig() != null && chatQueryContext
-                    && chatQueryContext.getRequest().getChatAppConfig().containsKey("REWRITE_MULTI_TURN")){
+                    .getRequest().getChatAppConfig().containsKey("REWRITE_MULTI_TURN")) {
-                chatModelConfig=chatQueryContext.getRequest().getChatAppConfig().get("REWRITE_MULTI_TURN").getChatModelConfig();
+                chatModelConfig = chatQueryContext.getRequest().getChatAppConfig()
+                        .get("REWRITE_MULTI_TURN").getChatModelConfig();
             }
             ChatLanguageModel chatLanguageModel = ModelProvider.getChatModel(chatModelConfig);
             String response = chatLanguageModel.generate(prompt.toUserMessage().singleText());

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/KeywordMapper.java

@@ -87,7 +87,8 @@ public class KeywordMapper extends BaseMapper {
                         .similarity(hanlpMapResult.getSimilarity())
                         .detectWord(hanlpMapResult.getDetectWord()).build();
                 // doDimValueAliasLogic 将维度值别名进行替换成真实维度值
-                doDimValueAliasLogic(schemaElementMatch,chatQueryContext.getSemanticSchema().getDimensionValues());
+                doDimValueAliasLogic(schemaElementMatch,
+                        chatQueryContext.getSemanticSchema().getDimensionValues());
                 addToSchemaMap(chatQueryContext.getMapInfo(), dataSetId, schemaElementMatch);
             }
         }

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/ParserConfig.java

@@ -57,6 +57,10 @@ public class ParserConfig extends ParameterConfig {
             new Parameter("s2.parser.field.count.threshold", "0", "语义字段个数阈值",
                     "如果映射字段小于该阈值，则将数据集所有字段输入LLM", "number", "语义解析配置");
 
+    public static final Parameter PARSER_FORMAT_JSON_TYPE =
+            new Parameter("s2.parser.format.json-type", "", "请求llm返回json格式,默认不设置json格式",
+                    "选项：json_schema或者json_object", "string", "语义解析配置");
+
     @Override
     public List<Parameter> getSysParameters() {
         return Lists.newArrayList(PARSER_LINKING_VALUE_ENABLE, PARSER_RULE_CORRECTOR_ENABLE,

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

@@ -2,9 +2,11 @@ package com.tencent.supersonic.headless.chat.parser.llm;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.ChatApp;
+import com.tencent.supersonic.common.pojo.ChatModelConfig;
 import com.tencent.supersonic.common.pojo.Text2SQLExemplar;
 import com.tencent.supersonic.common.pojo.enums.AppModule;
 import com.tencent.supersonic.common.util.ChatAppManager;
+import com.tencent.supersonic.headless.chat.parser.ParserConfig;
 import com.tencent.supersonic.headless.chat.query.llm.s2sql.LLMReq;
 import com.tencent.supersonic.headless.chat.query.llm.s2sql.LLMResp;
 import dev.langchain4j.model.chat.ChatLanguageModel;
@@ -14,9 +16,11 @@ import dev.langchain4j.model.output.structured.Description;
 import dev.langchain4j.service.AiServices;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -24,6 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static com.tencent.supersonic.headless.chat.parser.ParserConfig.PARSER_FORMAT_JSON_TYPE;
+
 @Service
 @Slf4j
 public class OnePassSCSqlGenStrategy extends SqlGenStrategy {
@@ -31,6 +37,10 @@ public class OnePassSCSqlGenStrategy extends SqlGenStrategy {
     private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
 
     public static final String APP_KEY = "S2SQL_PARSER";
+
+    @Autowired
+    private ParserConfig parserConfig;
+
     public static final String INSTRUCTION =
             "#Role: You are a data analyst experienced in SQL languages."
                     + "\n#Task: You will be provided with a natural language question asked by users,"
@@ -74,7 +84,13 @@ public class OnePassSCSqlGenStrategy extends SqlGenStrategy {
 
         // 2.generate sql generation prompt for each self-consistency inference
         ChatApp chatApp = llmReq.getChatAppConfig().get(APP_KEY);
-        ChatLanguageModel chatLanguageModel = getChatLanguageModel(chatApp.getChatModelConfig());
+        ChatModelConfig chatModelConfig = chatApp.getChatModelConfig();
+        if (!StringUtils.isBlank(parserConfig.getParameterValue(PARSER_FORMAT_JSON_TYPE))) {
+            chatModelConfig.setJsonFormat(true);
+            chatModelConfig
+                    .setJsonFormatType(parserConfig.getParameterValue(PARSER_FORMAT_JSON_TYPE));
+        }
+        ChatLanguageModel chatLanguageModel = getChatLanguageModel(chatModelConfig);
         SemanticSqlExtractor extractor =
                 AiServices.create(SemanticSqlExtractor.class, chatLanguageModel);
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java

@@ -124,7 +124,10 @@ public class DimValueAspect {
         sql = SqlReplaceHelper.replaceValue(sql, filedNameToValueMap);
         log.debug("correctorSql after replacing:{}", sql);
         querySqlReq.setSql(sql);
+        if (StringUtils.isEmpty(querySqlReq.getSqlInfo().getParsedS2SQL())
+                && StringUtils.isEmpty(querySqlReq.getSqlInfo().getCorrectedS2SQL())) {
             querySqlReq.getSqlInfo().setQuerySQL(sql);
+        }
         Map<String, Map<String, String>> techNameToBizName = getTechNameToBizName(dimensions);
 
         SemanticQueryResp queryResultWithColumns = (SemanticQueryResp) joinPoint.proceed();

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DimensionRepositoryImpl.java

@@ -88,7 +88,7 @@ public class DimensionRepositoryImpl implements DimensionRepository {
         }
         if (StringUtils.isNotBlank(dimensionFilter.getKey())) {
             String key = dimensionFilter.getKey();
-            queryWrapper.and(qw->qw.lambda().like(DimensionDO::getName, key).or()
+            queryWrapper.and(qw -> qw.lambda().like(DimensionDO::getName, key).or()
                     .like(DimensionDO::getBizName, key).or().like(DimensionDO::getDescription, key)
                     .or().like(DimensionDO::getAlias, key).or()
                     .like(DimensionDO::getCreatedBy, key));

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java

@@ -114,14 +114,9 @@ public class MetricRepositoryImpl implements MetricRepository {
         }
         if (StringUtils.isNotBlank(metricFilter.getKey())) {
             String key = metricFilter.getKey();
-            queryWrapper.lambda()
+            queryWrapper.lambda().and(wrapper -> wrapper.like(MetricDO::getName, key).or()
-                    .and(wrapper -> wrapper
+                    .like(MetricDO::getBizName, key).or().like(MetricDO::getDescription, key).or()
-                            .like(MetricDO::getName, key)
+                    .like(MetricDO::getAlias, key).or().like(MetricDO::getCreatedBy, key));
-                            .or().like(MetricDO::getBizName, key)
-                            .or().like(MetricDO::getDescription, key)
-                            .or().like(MetricDO::getAlias, key)
-                            .or().like(MetricDO::getCreatedBy, key)
-                    );
         }
 
         return metricDOMapper.selectList(queryWrapper);

headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java

@@ -51,8 +51,9 @@ public class DataSetController {
 
     @GetMapping("/getDataSetList")
     public List<DataSetResp> getDataSetList(@RequestParam("domainId") Long domainId) {
-        List<Integer> statuCodeList = Arrays.asList(StatusEnum.ONLINE.getCode(),StatusEnum.OFFLINE.getCode());
+        List<Integer> statuCodeList =
-        return dataSetService.getDataSetList(domainId,statuCodeList);
+                Arrays.asList(StatusEnum.ONLINE.getCode(), StatusEnum.OFFLINE.getCode());
+        return dataSetService.getDataSetList(domainId, statuCodeList);
     }
 
     @DeleteMapping("/{id}")

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java

@@ -20,7 +20,7 @@ public interface DataSetService {
 
     List<DataSetResp> getDataSetList(MetaFilter metaFilter);
 
-    List<DataSetResp> getDataSetList(Long domainId ,List<Integer> statuCodesList);
+    List<DataSetResp> getDataSetList(Long domainId, List<Integer> statuCodesList);
 
     void delete(Long id, User user);
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java

@@ -27,7 +27,8 @@ public interface DimensionService {
 
     DimensionResp createDimension(DimensionReq dimensionReq, User user) throws Exception;
 
-    void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId, User user) throws Exception;
+    void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId, User user)
+            throws Exception;
 
     void createDimensionBatch(List<DimensionReq> dimensionReqs, User user) throws Exception;
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java

@@ -55,7 +55,9 @@ public interface ModelService {
 
     void batchUpdateStatus(MetaBatchReq metaBatchReq, User user);
 
-    void updateModelByDimAndMetric(Long modelId, List<DimensionReq> dimensionReqList, List<MetricReq> metricReqList, User user);
+    void updateModelByDimAndMetric(Long modelId, List<DimensionReq> dimensionReqList,
+            List<MetricReq> metricReqList, User user);
 
-    void deleteModelDetailByDimAndMetric(Long modelId, List<DimensionDO> dimensionReqList, List<MetricDO> metricReqList);
+    void deleteModelDetailByDimAndMetric(Long modelId, List<DimensionDO> dimensionReqList,
+            List<MetricDO> metricReqList);
 }

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

@@ -104,7 +104,7 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
 
     @Override
     public List<DataSetResp> getDataSetList(Long domainId, List<Integer> statuCodesList) {
-        if(domainId==null || CollectionUtils.isEmpty(statuCodesList)){
+        if (domainId == null || CollectionUtils.isEmpty(statuCodesList)) {
             return List.of();
         }
         QueryWrapper<DataSetDO> wrapper = new QueryWrapper<>();

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

@@ -86,13 +86,15 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
         sendEventBatch(Lists.newArrayList(dimensionDO), EventType.ADD);
 
         // should update modelDetail
-        modelService.updateModelByDimAndMetric(dimensionReq.getModelId(), Lists.newArrayList(dimensionReq), null, user);
+        modelService.updateModelByDimAndMetric(dimensionReq.getModelId(),
+                Lists.newArrayList(dimensionReq), null, user);
 
         return DimensionConverter.convert2DimensionResp(dimensionDO);
     }
 
     @Override
-    public void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId, User user) throws Exception {
+    public void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId, User user)
+            throws Exception {
         List<DimensionResp> dimensionResps = getDimensions(modelId);
         // get all dimension in model, only use bizname, because name can be changed to everything
         Map<String, DimensionResp> bizNameMap = dimensionResps.stream()
@@ -117,7 +119,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
         });
 
         // the bizNames from alter dimensions
-        List<String> bizNames = dimensionReqs.stream().map(DimensionReq::getBizName).collect(Collectors.toList());
+        List<String> bizNames =
+                dimensionReqs.stream().map(DimensionReq::getBizName).collect(Collectors.toList());
         bizNameMap.keySet().forEach(bizNameInDb -> {
             if (!bizNames.contains(bizNameInDb)) {
                 dimensionToDelete.add(bizNameMap.get(bizNameInDb).getId());
@@ -148,7 +151,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
                         .map(DimensionConverter::convert2DimensionDO).collect(Collectors.toList());
         dimensionRepository.createDimensionBatch(dimensionDOS);
         // should update modelDetail as well
-        modelService.updateModelByDimAndMetric(dimensionReqs.get(0).getModelId(), dimensionReqs, null,  user);
+        modelService.updateModelByDimAndMetric(dimensionReqs.get(0).getModelId(), dimensionReqs,
+                null, user);
 
         sendEventBatch(dimensionDOS, EventType.ADD);
     }
@@ -162,7 +166,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
         DimensionConverter.convert(dimensionDO, dimensionReq);
         dimensionRepository.updateDimension(dimensionDO);
         // should update modelDetail as well
-        modelService.updateModelByDimAndMetric(dimensionReq.getModelId(), Lists.newArrayList(dimensionReq), null,  user);
+        modelService.updateModelByDimAndMetric(dimensionReq.getModelId(),
+                Lists.newArrayList(dimensionReq), null, user);
 
         if (!oldName.equals(dimensionDO.getName())) {
             sendEvent(getDataItem(dimensionDO), EventType.UPDATE);
@@ -172,10 +177,12 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
     @Override
     public void updateDimensionBatch(List<DimensionReq> dimensionReqList, User user) {
         checkExist(dimensionReqList);
-        List<DimensionDO> dimensionDOS = dimensionReqList.stream().map(DimensionConverter::convert2DimensionDO).collect(Collectors.toList());
+        List<DimensionDO> dimensionDOS = dimensionReqList.stream()
+                .map(DimensionConverter::convert2DimensionDO).collect(Collectors.toList());
         dimensionRepository.batchUpdate(dimensionDOS);
         // should update modelDetail as well
-        modelService.updateModelByDimAndMetric(dimensionReqList.get(0).getModelId(),dimensionReqList, null, user);
+        modelService.updateModelByDimAndMetric(dimensionReqList.get(0).getModelId(),
+                dimensionReqList, null, user);
         sendEventBatch(dimensionDOS, EventType.UPDATE);
     }
 
@@ -231,7 +238,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
         dimensionDO.setUpdatedBy(user.getName());
         dimensionRepository.updateDimension(dimensionDO);
         // should update modelDetail
-        modelService.deleteModelDetailByDimAndMetric(dimensionDO.getModelId(), Lists.newArrayList(dimensionDO), null);
+        modelService.deleteModelDetailByDimAndMetric(dimensionDO.getModelId(),
+                Lists.newArrayList(dimensionDO), null);
         sendEventBatch(Lists.newArrayList(dimensionDO), EventType.DELETE);
     }
 
@@ -241,7 +249,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
         dimensionFilter.setDimensionIds(idList);
         List<DimensionDO> dimensionDOList = dimensionRepository.getDimensions(dimensionFilter);
         if (CollectionUtils.isEmpty(dimensionDOList)) {
-            throw new RuntimeException(String.format("the dimension %s not exist", StringUtils.join(",",idList)));
+            throw new RuntimeException(
+                    String.format("the dimension %s not exist", StringUtils.join(",", idList)));
         }
         dimensionDOList.forEach(dimensionDO -> {
             dimensionDO.setStatus(StatusEnum.DELETED.getCode());
@@ -250,7 +259,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
         });
         dimensionRepository.batchUpdateStatus(dimensionDOList);
         // should update modelDetail
-        modelService.deleteModelDetailByDimAndMetric(dimensionDOList.get(0).getModelId(), dimensionDOList, null);
+        modelService.deleteModelDetailByDimAndMetric(dimensionDOList.get(0).getModelId(),
+                dimensionDOList, null);
         sendEventBatch(dimensionDOList, EventType.DELETE);
     }
 

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

@@ -80,7 +80,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         metricRepository.createMetric(metricDO);
         sendEventBatch(Lists.newArrayList(metricDO), EventType.ADD);
         // should update modelDetail as well
-        modelService.updateModelByDimAndMetric(metricReq.getModelId(),null, Lists.newArrayList(metricReq), user);
+        modelService.updateModelByDimAndMetric(metricReq.getModelId(), null,
+                Lists.newArrayList(metricReq), user);
 
 
         return MetricConverter.convert2MetricResp(metricDO);
@@ -93,7 +94,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
                         .map(MetricConverter::convert2MetricDO).collect(Collectors.toList());
         metricRepository.createMetricBatch(metricDOS);
         // should update modelDetail as well
-        modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs, user);
+        modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs,
+                user);
 
         sendEventBatch(metricDOS, EventType.ADD);
     }
@@ -123,7 +125,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         });
 
         // the bizNames from alter dimensions
-        List<String> bizNames = metricReqs.stream().map(MetricReq::getBizName).collect(Collectors.toList());
+        List<String> bizNames =
+                metricReqs.stream().map(MetricReq::getBizName).collect(Collectors.toList());
         bizNameMap.keySet().forEach(bizNameInDb -> {
             if (!bizNames.contains(bizNameInDb)) {
                 metricToDelete.add(bizNameMap.get(bizNameInDb).getId());
@@ -163,7 +166,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
             sendEvent(dataItem, EventType.UPDATE);
         }
         // should update modelDetail as well
-        modelService.updateModelByDimAndMetric(metricReq.getModelId(), null, Lists.newArrayList(metricReq), user);
+        modelService.updateModelByDimAndMetric(metricReq.getModelId(), null,
+                Lists.newArrayList(metricReq), user);
         return MetricConverter.convert2MetricResp(metricDO);
     }
 
@@ -171,10 +175,12 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
     public void updateMetricBatch(List<MetricReq> metricReqs, User user) {
         MetricCheckUtils.checkParam(metricReqs);
         checkExist(metricReqs);
-        List<MetricDO> metricDOS = metricReqs.stream().map(MetricConverter::convert2MetricDO).collect(Collectors.toList());
+        List<MetricDO> metricDOS = metricReqs.stream().map(MetricConverter::convert2MetricDO)
+                .collect(Collectors.toList());
         metricRepository.batchUpdateMetric(metricDOS);
         // should update modelDetail as well
-        modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs, user);
+        modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs,
+                user);
         sendEventBatch(metricDOS, EventType.UPDATE);
     }
 
@@ -277,7 +283,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         metricDO.setUpdatedBy(user.getName());
         metricRepository.updateMetric(metricDO);
         // should update modelDetail
-        modelService.deleteModelDetailByDimAndMetric(metricDO.getModelId(), null, Lists.newArrayList(metricDO));
+        modelService.deleteModelDetailByDimAndMetric(metricDO.getModelId(), null,
+                Lists.newArrayList(metricDO));
         sendEventBatch(Lists.newArrayList(metricDO), EventType.DELETE);
     }
 
@@ -287,7 +294,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         metricsFilter.setMetricIds(idList);
         List<MetricDO> metricDOList = metricRepository.getMetrics(metricsFilter);
         if (CollectionUtils.isEmpty(metricDOList)) {
-            throw new RuntimeException(String.format("the metrics %s not exist", StringUtils.join(",",idList)));
+            throw new RuntimeException(
+                    String.format("the metrics %s not exist", StringUtils.join(",", idList)));
         }
         metricDOList.forEach(metricDO -> {
             metricDO.setStatus(StatusEnum.DELETED.getCode());
@@ -296,7 +304,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         });
         metricRepository.batchUpdateStatus(metricDOList);
         // should update modelDetail
-        modelService.deleteModelDetailByDimAndMetric(metricDOList.get(0).getModelId(), null, metricDOList);
+        modelService.deleteModelDetailByDimAndMetric(metricDOList.get(0).getModelId(), null,
+                metricDOList);
         sendEventBatch(metricDOList, EventType.DELETE);
     }
 
@@ -889,7 +898,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
 
     private boolean isChange(MetricReq metricReq, MetricResp metricResp) {
         boolean isNameChange = !metricReq.getName().equals(metricResp.getName());
-        boolean isBizNameChange = !Objects.equals(metricReq.getMetricDefineByMeasureParams(),metricResp.getMetricDefineByMeasureParams());
+        boolean isBizNameChange = !Objects.equals(metricReq.getMetricDefineByMeasureParams(),
+                metricResp.getMetricDefineByMeasureParams());
         return isNameChange || isBizNameChange;
     }
 }

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

@@ -521,13 +521,14 @@ public class ModelServiceImpl implements ModelService {
     }
 
     @Override
-    public void updateModelByDimAndMetric(Long modelId, List<DimensionReq> dimensionReqList, List<MetricReq> metricReqList, User user) {
+    public void updateModelByDimAndMetric(Long modelId, List<DimensionReq> dimensionReqList,
+            List<MetricReq> metricReqList, User user) {
         ModelDO modelDO = getModelDO(modelId);
         ModelDetail modelDetail = JsonUtil.toObject(modelDO.getModelDetail(), ModelDetail.class);
         if (!CollectionUtils.isEmpty(dimensionReqList)) {
             dimensionReqList.forEach(dimensionReq -> {
-                Optional<Dimension> dimOptional = modelDetail.getDimensions().stream()
+                Optional<Dimension> dimOptional = modelDetail.getDimensions().stream().filter(
-                        .filter(dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
+                        dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
                         .findFirst();
                 if (dimOptional.isPresent()) {
                     Dimension dimension = dimOptional.get();
@@ -547,10 +548,13 @@ public class ModelServiceImpl implements ModelService {
 
         if (!CollectionUtils.isEmpty(metricReqList)) {
             // 目前modeltail中的measure
-            Map<String, Measure> mesureMap = modelDetail.getMeasures().stream().collect(Collectors.toMap(Measure::getBizName, a -> a, (k1, k2) -> k1));
+            Map<String, Measure> mesureMap = modelDetail.getMeasures().stream()
+                    .collect(Collectors.toMap(Measure::getBizName, a -> a, (k1, k2) -> k1));
             metricReqList.forEach(metricReq -> {
-                if (null != metricReq.getMetricDefineByMeasureParams() && !CollectionUtils.isEmpty(metricReq.getMetricDefineByMeasureParams().getMeasures())) {
+                if (null != metricReq.getMetricDefineByMeasureParams() && !CollectionUtils
-                    for(Measure alterMeasure : metricReq.getMetricDefineByMeasureParams().getMeasures()) {
+                        .isEmpty(metricReq.getMetricDefineByMeasureParams().getMeasures())) {
+                    for (Measure alterMeasure : metricReq.getMetricDefineByMeasureParams()
+                            .getMeasures()) {
                         if (mesureMap.containsKey(alterMeasure.getBizName())) {
                             Measure measure = mesureMap.get(alterMeasure.getBizName());
                             BeanUtils.copyProperties(alterMeasure, measure);
@@ -569,13 +573,14 @@ public class ModelServiceImpl implements ModelService {
     }
 
     @Override
-    public void deleteModelDetailByDimAndMetric(Long modelId, List<DimensionDO> dimensionList, List<MetricDO> metricReqList) {
+    public void deleteModelDetailByDimAndMetric(Long modelId, List<DimensionDO> dimensionList,
+            List<MetricDO> metricReqList) {
         ModelDO modelDO = getModelDO(modelId);
         ModelDetail modelDetail = JsonUtil.toObject(modelDO.getModelDetail(), ModelDetail.class);
         if (!CollectionUtils.isEmpty(dimensionList)) {
             dimensionList.forEach(dimensionReq -> {
-                Optional<Dimension> dimOptional = modelDetail.getDimensions().stream()
+                Optional<Dimension> dimOptional = modelDetail.getDimensions().stream().filter(
-                        .filter(dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
+                        dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
                         .findFirst();
                 if (dimOptional.isPresent()) {
                     Dimension dimension = dimOptional.get();

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java

@@ -198,8 +198,7 @@ public class DataSetSchemaBuilder {
         }).collect(Collectors.toList());
     }
 
-    private static void setDefaultTimeFormat(SchemaElement dimToAdd,
+    private static void setDefaultTimeFormat(SchemaElement dimToAdd, String timeFormat) {
-                                             String timeFormat) {
         dimToAdd.getExtInfo().put(DimensionConstants.DIMENSION_TIME_FORMAT, timeFormat);
     }
 }

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java

@@ -56,7 +56,8 @@ public class MetricCheckUtils {
             if (StringUtils.isBlank(expr)) {
                 throw new InvalidArgumentException("表达式不可为空");
             }
-            String forbiddenCharacters = NameCheckUtils.findForbiddenCharacters(metricReq.getName());
+            String forbiddenCharacters =
+                    NameCheckUtils.findForbiddenCharacters(metricReq.getName());
             if (StringUtils.isNotBlank(forbiddenCharacters)) {
                 throw new InvalidArgumentException(
                         String.format("名称包含特殊字符%s, 请修改", forbiddenCharacters));

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java

@@ -294,7 +294,8 @@ public class ModelConverter {
         List<Dimension> dimensions = modelReq.getModelDetail().getDimensions();
         List<Identify> identifiers = modelReq.getModelDetail().getIdentifiers();
         List<Field> fields = modelReq.getModelDetail().getFields();
-        List<String> fieldNames = fields.stream().map(Field::getFieldName).collect(Collectors.toList());
+        List<String> fieldNames =
+                fields.stream().map(Field::getFieldName).collect(Collectors.toList());
 
         if (measures != null) {
             for (Measure measure : measures) {
@@ -302,7 +303,8 @@ public class ModelConverter {
                         && StringUtils.isBlank(measure.getExpr())) {
                     measure.setExpr(measure.getBizName());
                 }
-                if (StringUtils.isNotBlank(measure.getBizName()) && !fieldNames.contains(measure.getBizName())) {
+                if (StringUtils.isNotBlank(measure.getBizName())
+                        && !fieldNames.contains(measure.getBizName())) {
                     fields.add(new Field(measure.getBizName(), ""));
                 }
             }
@@ -313,18 +315,21 @@ public class ModelConverter {
                         && StringUtils.isBlank(dimension.getExpr())) {
                     dimension.setExpr(dimension.getBizName());
                 }
-                if (StringUtils.isNotBlank(dimension.getBizName()) && !fieldNames.contains(dimension.getBizName())) {
+                if (StringUtils.isNotBlank(dimension.getBizName())
+                        && !fieldNames.contains(dimension.getBizName())) {
                     fields.add(new Field(dimension.getBizName(), ""));
                 }
             }
         }
         if (identifiers != null) {
             for (Identify identify : identifiers) {
-                if (StringUtils.isNotBlank(identify.getBizName()) && StringUtils.isBlank(identify.getName())) {
+                if (StringUtils.isNotBlank(identify.getBizName())
+                        && StringUtils.isBlank(identify.getName())) {
                     identify.setName(identify.getBizName());
                 }
                 identify.setIsCreateDimension(1);
-                if (StringUtils.isNotBlank(identify.getBizName()) && !fieldNames.contains(identify.getBizName())) {
+                if (StringUtils.isNotBlank(identify.getBizName())
+                        && !fieldNames.contains(identify.getBizName())) {
                     fields.add(new Field(identify.getBizName(), ""));
                 }
             }

launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java

@@ -82,6 +82,7 @@ public class BaseTest extends BaseApplication {
     protected SemanticQueryReq buildQuerySqlReq(String sql) {
         QuerySqlReq querySqlCmd = new QuerySqlReq();
         querySqlCmd.setSql(sql);
+        querySqlCmd.getSqlInfo().setCorrectedS2SQL(sql);
         querySqlCmd.setModelIds(DataUtils.getMetricAgentIModelIds());
         return querySqlCmd;
     }

launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryBySqlTest.java

@@ -33,8 +33,7 @@ public class QueryBySqlTest extends BaseTest {
     @Test
     @SetSystemProperty(key = "s2.test", value = "true")
     public void testSumQuery() throws Exception {
-        SemanticQueryResp semanticQueryResp =
+        SemanticQueryResp semanticQueryResp = queryBySql("SELECT SUM(访问次数) AS 总访问次数 FROM 超音数数据集 ");
-                queryBySql("SELECT SUM(访问次数) AS 总访问次数 FROM 超音数PVUV统计 ");
 
         assertEquals(1, semanticQueryResp.getColumns().size());
         QueryColumn queryColumn = semanticQueryResp.getColumns().get(0);
@@ -45,7 +44,7 @@ public class QueryBySqlTest extends BaseTest {
     @Test
     public void testGroupByQuery() throws Exception {
         SemanticQueryResp result =
-                queryBySql("SELECT 部门, SUM(访问次数) AS 总访问次数 FROM 超音数PVUV统计  GROUP BY 部门 ");
+                queryBySql("SELECT 部门, SUM(访问次数) AS 总访问次数 FROM 超音数数据集  GROUP BY 部门 ");
         assertEquals(2, result.getColumns().size());
         QueryColumn firstColumn = result.getColumns().get(0);
         QueryColumn secondColumn = result.getColumns().get(1);
@@ -56,8 +55,8 @@ public class QueryBySqlTest extends BaseTest {
 
     @Test
     public void testFilterQuery() throws Exception {
-        SemanticQueryResp result = queryBySql(
+        SemanticQueryResp result =
-                "SELECT 部门, SUM(访问次数) AS 总访问次数 FROM 超音数PVUV统计 WHERE 部门 ='HR' GROUP BY 部门 ");
+                queryBySql("SELECT 部门, SUM(访问次数) AS 总访问次数 FROM 超音数数据集 WHERE 部门 ='HR' GROUP BY 部门 ");
         assertEquals(2, result.getColumns().size());
         QueryColumn firstColumn = result.getColumns().get(0);
         QueryColumn secondColumn = result.getColumns().get(1);
@@ -71,8 +70,7 @@ public class QueryBySqlTest extends BaseTest {
     public void testDateSumQuery() throws Exception {
         String startDate = now().plusDays(-365).toString();
         String endDate = now().plusDays(0).toString();
-        String sql =
+        String sql = "SELECT SUM(访问次数) AS 总访问次数 FROM 超音数数据集 WHERE 数据日期 >= '%s' AND 数据日期 <= '%s' ";
-                "SELECT SUM(访问次数) AS 总访问次数 FROM 超音数PVUV统计 WHERE 数据日期 >= '%s' AND 数据日期 <= '%s' ";
         SemanticQueryResp semanticQueryResp = queryBySql(String.format(sql, startDate, endDate));
         assertEquals(1, semanticQueryResp.getColumns().size());
         QueryColumn queryColumn = semanticQueryResp.getColumns().get(0);
@@ -82,9 +80,9 @@ public class QueryBySqlTest extends BaseTest {
 
     @Test
     public void testCacheQuery() throws Exception {
-        queryBySql("SELECT 部门, SUM(访问次数) AS 访问次数 FROM 超音数PVUV统计  GROUP BY 部门 ");
+        queryBySql("SELECT 部门, SUM(访问次数) AS 访问次数 FROM 超音数数据集  GROUP BY 部门 ");
         SemanticQueryResp result2 =
-                queryBySql("SELECT 部门, SUM(访问次数) AS 访问次数 FROM 超音数PVUV统计  GROUP BY 部门 ");
+                queryBySql("SELECT 部门, SUM(访问次数) AS 访问次数 FROM 超音数数据集  GROUP BY 部门 ");
         assertTrue(result2.isUseCache());
     }
 

pom.xml

@@ -172,6 +172,11 @@
                 <artifactId>langchain4j-ollama</artifactId>
                 <version>${langchain4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>ai.djl.huggingface</groupId>
+                <artifactId>tokenizers</artifactId>
+                <version>0.28.0</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>