[improvement][headless&chat]当LLM生成SQL包含日期类型字段时，Correcter不再额外增加日期 (#1473)

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SchemaElement.java

@@ -1,6 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.base.Objects;
+import com.tencent.supersonic.headless.api.pojo.enums.SemanticType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,6 +26,7 @@ public class SchemaElement implements Serializable {
     private String bizName;
     private Long useCnt;
     private SchemaElementType type;
+    private SemanticType semanticType;
     private List<String> alias;
     private List<SchemaValueMap> schemaValueMaps;
     private List<RelatedSchemaElement> relatedSchemaElements;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/TimeCorrector.java

@@ -8,6 +8,8 @@ import com.tencent.supersonic.common.jsqlparser.SqlDateSelectHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper;
 import com.tencent.supersonic.common.jsqlparser.DateVisitor.DateBoundInfo;
+import com.tencent.supersonic.headless.api.pojo.DataSetSchema;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.chat.ChatQueryContext;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +58,15 @@ public class TimeCorrector extends BaseSemanticCorrector {
         }
     }
 
+    private boolean checkIfNameInWhereFields(Set<SchemaElement> dims, List<String> whereFields) {
+        for (SchemaElement element : dims) {
+            if (whereFields.contains(element.getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void addDateIfNotExist(ChatQueryContext chatQueryContext, SemanticParseInfo semanticParseInfo) {
         String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectedS2SQL();
         List<String> whereFields = SqlSelectHelper.getWhereFields(correctS2SQL);
@@ -66,6 +77,12 @@ public class TimeCorrector extends BaseSemanticCorrector {
         if (StringUtils.isNotBlank(correctorDate) && !Boolean.parseBoolean(correctorDate)) {
             return;
         }
+        Long dataSetId = semanticParseInfo.getDataSetId();
+        DataSetSchema dataSetSchema = chatQueryContext.getSemanticSchema().getDataSetSchemaMap().get(dataSetId);
+        boolean isDateInWhere = checkIfNameInWhereFields(dataSetSchema.getDimensions(), whereFields);
+        if (isDateInWhere) {
+            return;
+        }
         if (CollectionUtils.isEmpty(whereFields) || !TimeDimensionEnum.containsZhTimeDimension(whereFields)) {
 
             Pair<String, String> startEndDate = S2SqlDateHelper.getStartEndDate(chatQueryContext,

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

@@ -9,6 +9,7 @@ import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.SchemaValueMap;
+import com.tencent.supersonic.headless.api.pojo.enums.SemanticType;
 import com.tencent.supersonic.headless.api.pojo.response.DataSetSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp;
@@ -154,6 +155,7 @@ public class DataSetSchemaBuilder {
                     schemaValueMaps.add(schemaValueMap);
                 }
             }
+            SemanticType semanticType = SemanticType.valueOf(dim.getSemanticType());
             SchemaElement dimToAdd = SchemaElement.builder()
                     .dataSetId(resp.getId())
                     .dataSetName(resp.getName())
@@ -162,6 +164,7 @@ public class DataSetSchemaBuilder {
                     .name(dim.getName())
                     .bizName(dim.getBizName())
                     .type(SchemaElementType.DIMENSION)
+                    .semanticType(semanticType)
                     .useCnt(dim.getUseCnt())
                     .alias(alias)
                     .schemaValueMaps(schemaValueMaps)

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

@@ -108,7 +108,11 @@ public class ModelConverter {
         dimensionReq.setName(dim.getName());
         dimensionReq.setBizName(dim.getBizName());
         dimensionReq.setDescription(dim.getName());
-        dimensionReq.setSemanticType(SemanticType.CATEGORY.name());
+        if (Objects.equals(dim.getType(), DimensionType.time.name())) {
+            dimensionReq.setSemanticType(SemanticType.DATE.name());
+        } else {
+            dimensionReq.setSemanticType(SemanticType.CATEGORY.name());
+        }
         dimensionReq.setModelId(modelDO.getId());
         dimensionReq.setExpr(dim.getBizName());
         dimensionReq.setType(DimensionType.categorical.name());
@@ -138,7 +142,11 @@ public class ModelConverter {
         dimensionReq.setName(identify.getName());
         dimensionReq.setBizName(identify.getBizName());
         dimensionReq.setDescription(identify.getName());
-        dimensionReq.setSemanticType(SemanticType.CATEGORY.name());
+        if (Objects.equals(identify.getType(), DimensionType.time.name())) {
+            dimensionReq.setSemanticType(SemanticType.DATE.name());
+        } else {
+            dimensionReq.setSemanticType(SemanticType.CATEGORY.name());
+        }
         dimensionReq.setModelId(modelDO.getId());
         dimensionReq.setExpr(identify.getBizName());
         dimensionReq.setType(identify.getType());