(improvement)(chat) Do not pass default date configuration to the large model uniformly. (#1601)

Author: lexluo09

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

@@ -1,10 +1,5 @@
 package com.tencent.supersonic.common.jsqlparser;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.BinaryExpression;
@@ -33,6 +28,12 @@
 import net.sf.jsqlparser.statement.select.SelectVisitorAdapter;
 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;
+
 /**
  * Sql Parser remove Helper
  */
@@ -228,7 +229,6 @@ public static String removeGroupBy(String sql, Set<String> fields) {
         if (selectStatement == null) {
             return sql;
         }
-        //SelectBody selectBody = selectStatement.getSelectBody();
         if (!(selectStatement instanceof PlainSelect)) {
             return sql;
         }

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

@@ -61,14 +61,15 @@ protected Map<String, String> getFieldNameMap(ChatQueryContext chatQueryContext,
                     return elements.stream();
                 })
                 .collect(Collectors.toMap(a -> a, a -> a, (k1, k2) -> k1));
-
-        result.put(TimeDimensionEnum.DAY.getChName(), TimeDimensionEnum.DAY.getChName());
-        result.put(TimeDimensionEnum.MONTH.getChName(), TimeDimensionEnum.MONTH.getChName());
-        result.put(TimeDimensionEnum.WEEK.getChName(), TimeDimensionEnum.WEEK.getChName());
-
-        result.put(TimeDimensionEnum.DAY.getName(), TimeDimensionEnum.DAY.getChName());
-        result.put(TimeDimensionEnum.MONTH.getName(), TimeDimensionEnum.MONTH.getChName());
-        result.put(TimeDimensionEnum.WEEK.getName(), TimeDimensionEnum.WEEK.getChName());
+        if (chatQueryContext.containsPartitionDimensions(dataSetId)) {
+            result.put(TimeDimensionEnum.DAY.getChName(), TimeDimensionEnum.DAY.getChName());
+            result.put(TimeDimensionEnum.MONTH.getChName(), TimeDimensionEnum.MONTH.getChName());
+            result.put(TimeDimensionEnum.WEEK.getChName(), TimeDimensionEnum.WEEK.getChName());
+
+            result.put(TimeDimensionEnum.DAY.getName(), TimeDimensionEnum.DAY.getChName());
+            result.put(TimeDimensionEnum.MONTH.getName(), TimeDimensionEnum.MONTH.getChName());
+            result.put(TimeDimensionEnum.WEEK.getName(), TimeDimensionEnum.WEEK.getChName());
+        }
         return result;
     }
 

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

@@ -47,6 +47,7 @@ private void removeDateIfExist(SemanticParseInfo semanticParseInfo) {
         removeFieldNames.add(TimeDimensionEnum.WEEK.getChName());
         removeFieldNames.add(TimeDimensionEnum.MONTH.getChName());
         correctS2SQL = SqlRemoveHelper.removeWhereCondition(correctS2SQL, removeFieldNames);
+        correctS2SQL = SqlRemoveHelper.removeGroupBy(correctS2SQL, removeFieldNames);
         semanticParseInfo.getSqlInfo().setCorrectedS2SQL(correctS2SQL);
     }
 

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

@@ -7,7 +7,6 @@
 import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
 import com.tencent.supersonic.headless.api.pojo.SemanticSchema;
-import com.tencent.supersonic.headless.api.pojo.TimeDefaultConfig;
 import com.tencent.supersonic.headless.chat.ChatQueryContext;
 import com.tencent.supersonic.headless.chat.parser.ParserConfig;
 import com.tencent.supersonic.headless.chat.parser.SatisfactionChecker;
@@ -231,38 +230,24 @@ protected List<SchemaElement> getMatchedMetrics(ChatQueryContext queryCtx, Long
     protected List<SchemaElement> getMatchedDimensions(ChatQueryContext queryCtx, Long dataSetId) {
 
         List<SchemaElementMatch> matchedElements = queryCtx.getMapInfo().getMatchedElements(dataSetId);
-        Set<SchemaElement> results = new HashSet<>();
-
-        if (!CollectionUtils.isEmpty(matchedElements)) {
-            results = matchedElements.stream()
-                    .filter(element -> SchemaElementType.DIMENSION.equals(element.getElement().getType()))
-                    .map(SchemaElementMatch::getElement)
-                    .collect(Collectors.toSet());
-        }
-
+        Set<SchemaElement> dimensionElements = matchedElements.stream()
+                .filter(element -> SchemaElementType.DIMENSION.equals(element.getElement().getType()))
+                .map(SchemaElementMatch::getElement)
+                .collect(Collectors.toSet());
         SemanticSchema semanticSchema = queryCtx.getSemanticSchema();
         if (semanticSchema == null || semanticSchema.getDataSetSchemaMap() == null) {
-            return new ArrayList<>(results);
+            return new ArrayList<>(dimensionElements);
         }
 
-        DataSetSchema dataSetSchema = semanticSchema.getDataSetSchemaMap().get(dataSetId);
+        Map<Long, DataSetSchema> dataSetSchemaMap = semanticSchema.getDataSetSchemaMap();
+        DataSetSchema dataSetSchema = dataSetSchemaMap.get(dataSetId);
         if (dataSetSchema == null) {
-            return new ArrayList<>(results);
+            return new ArrayList<>(dimensionElements);
         }
-
-        TimeDefaultConfig timeDefaultConfig = dataSetSchema.getTagTypeTimeDefaultConfig();
         SchemaElement partitionDimension = dataSetSchema.getPartitionDimension();
-
-        if (timeDefaultConfig == null || partitionDimension == null) {
-            return new ArrayList<>(results);
-        }
-
-        if (Objects.equals(timeDefaultConfig.getUnit(), -1)) {
-            results.remove(partitionDimension);
-        } else {
-            results.add(partitionDimension);
+        if (partitionDimension != null) {
+            dimensionElements.add(partitionDimension);
         }
-
-        return new ArrayList<>(results);
+        return new ArrayList<>(dimensionElements);
     }
 }