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

[fix][chat]Fix logic in s2sql parsing.

Browse Source
This commit is contained in:
jerryjzhang
2024-12-27 14:12:10 +08:00
parent 920d8f280a
commit 7145f27671
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java
View File

@@ -101,7 +101,7 @@ public class NL2SQLParser implements ChatQueryParser {
doParse(queryNLReq, parseResp); doParse(queryNLReq, parseResp);
} }
if (parseResp.getSelectedParses().isEmpty()) { if (parseResp.getSelectedParses().isEmpty() && candidateParses.isEmpty()) {
queryNLReq.setMapModeEnum(MapModeEnum.LOOSE); queryNLReq.setMapModeEnum(MapModeEnum.LOOSE);
doParse(queryNLReq, parseResp); doParse(queryNLReq, parseResp);
} }

4
common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelper.java
View File

@@ -276,8 +276,10 @@ public class SqlSelectHelper {
Set<String> aliases = new HashSet<>(); Set<String> aliases = new HashSet<>();
for (PlainSelect plainSelect : plainSelects) { for (PlainSelect plainSelect : plainSelects) {
List<String> fields = getFieldsByPlainSelect(plainSelect); List<String> fields = getFieldsByPlainSelect(plainSelect);
Set<String> subaliases = getAliasFields(plainSelect);
subaliases.removeAll(fields);
results.addAll(fields); results.addAll(fields);
aliases.addAll(getAliasFields(plainSelect)); aliases.addAll(subaliases);
} }
// do not account in aliases // do not account in aliases
results.removeAll(aliases); results.removeAll(aliases);

2
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java
View File

@@ -51,7 +51,7 @@ public class MapperConfig extends ParameterConfig {
"每个文本进行向量语义召回的文本结果个数", "number", "Mapper相关配置"); "每个文本进行向量语义召回的文本结果个数", "number", "Mapper相关配置");
public static final Parameter EMBEDDING_MAPPER_THRESHOLD = public static final Parameter EMBEDDING_MAPPER_THRESHOLD =
new Parameter("s2.mapper.embedding.threshold", "0.8", "向量召回相似度阈值", "相似度小于该阈值的则舍弃", new Parameter("s2.mapper.embedding.threshold", "0.9", "向量召回相似度阈值", "相似度小于该阈值的则舍弃",
"number", "Mapper相关配置"); "number", "Mapper相关配置");
public static final Parameter EMBEDDING_MAPPER_ROUND_NUMBER = public static final Parameter EMBEDDING_MAPPER_ROUND_NUMBER =

1
launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java
View File

@@ -108,6 +108,7 @@ public class Text2SQLEval extends BaseTest {
} }
@Test @Test
@SetSystemProperty(key = "s2.test", value = "true")
public void test_filter_and_top() throws Exception { public void test_filter_and_top() throws Exception {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
QueryResult result = submitNewChat("近半个月来marketing部门访问量最高的用户是谁", agent.getId()); QueryResult result = submitNewChat("近半个月来marketing部门访问量最高的用户是谁", agent.getId());