topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-11 03:58:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(chat) support show logicSql querySql llmParseSql (#148)

Browse Source
This commit is contained in:
lexluo09
2023-09-26 20:17:02 +08:00
committed by GitHub
parent e4af83380b
commit 4ad3e1d9cf
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java
View File

@@ -1,20 +1,20 @@
package com.tencent.supersonic.chat.api.pojo;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.LinkedHashSet;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.Comparator;
import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
import com.tencent.supersonic.chat.api.pojo.response.EntityInfo;
import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
import com.tencent.supersonic.common.pojo.DateConf;
import com.tencent.supersonic.common.pojo.Order;
import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import lombok.Data;
@Data
@@ -37,8 +37,7 @@ public class SemanticParseInfo {
private List<SchemaElementMatch> elementMatches = new ArrayList<>();
private Map<String, Object> properties = new HashMap<>();
private EntityInfo entityInfo;
private String logicSql;
private String querySql;
private SqlInfo sqlInfo = new SqlInfo();
public Long getModelId() {
return model != null ? model.getId() : 0L;

11
chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SqlInfo.java Normal file
View File

@@ -0,0 +1,11 @@
package com.tencent.supersonic.chat.api.pojo.response;
import lombok.Data;
@Data
public class SqlInfo {
private String llmParseSql;
private String logicSql;
private String querySql;
}

3
chat/core/src/main/java/com/tencent/supersonic/chat/parser/llm/dsl/LLMDslParser.java
View File

@@ -132,7 +132,7 @@ public class LLMDslParser implements SemanticParser {
if (StringUtils.isEmpty(correctorSql)) {
correctorSql = semanticCorrectInfo.getSql();
}
parseInfo.setLogicSql(correctorSql);
parseInfo.getSqlInfo().setLogicSql(correctorSql);
List<FilterExpression> expressions = SqlParserSelectHelper.getFilterExpression(correctorSql);
//set dataInfo
try {
@@ -281,6 +281,7 @@ public class LLMDslParser implements SemanticParser {
parseInfo.setProperties(properties);
parseInfo.setScore(function_bonus_threshold);
parseInfo.setQueryMode(semanticQuery.getQueryMode());
parseInfo.getSqlInfo().setLlmParseSql(dslParseResult.getLlmResp().getSqlOutput());
SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
Map<Long, String> modelIdToName = semanticSchema.getModelIdToName();

2
chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java
View File

@@ -165,7 +165,7 @@ public class QueryServiceImpl implements QueryService {
if (Objects.isNull(explain)) {
return;
}
parseInfo.setQuerySql(explain.getSql());
parseInfo.getSqlInfo().setQuerySql(explain.getSql());
}
@Override