From c09b9428b22acda347abcdc392e85507c3d01049 Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Fri, 7 Jun 2024 11:03:08 +0800 Subject: [PATCH] (improvement)(headless) System parameter compatible with historical data (#1112) Co-authored-by: jolunoluo --- .../supersonic/common/pojo/SystemConfig.java | 14 ++++++++++++++ .../headless/core/config/ParserConfig.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/SystemConfig.java b/common/src/main/java/com/tencent/supersonic/common/pojo/SystemConfig.java index 456c76aee..40d2f18f1 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/SystemConfig.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/SystemConfig.java @@ -60,4 +60,18 @@ public class SystemConfig { return defaultParameters; } + public List getParameters() { + List defaultParameters = buildDefaultParameters(); + if (CollectionUtils.isEmpty(parameters)) { + return defaultParameters; + } + Map parameterNameValueMap = parameters.stream() + .collect(Collectors.toMap(Parameter::getName, Parameter::getValue, (v1, v2) -> v2)); + for (Parameter parameter : defaultParameters) { + parameter.setValue(parameterNameValueMap.getOrDefault(parameter.getName(), + parameter.getDefaultValue())); + } + return defaultParameters; + } + } diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/config/ParserConfig.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/config/ParserConfig.java index 24ef726fb..26714c6f7 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/config/ParserConfig.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/config/ParserConfig.java @@ -13,7 +13,7 @@ import java.util.List; public class ParserConfig extends ParameterConfig { public static final Parameter PARSER_STRATEGY_TYPE = - new Parameter("s2.parser.strategy", "ONE_PASS_SELF_CONSISTENCY", + new Parameter("s2.parser.s2sql.strategy", "ONE_PASS_SELF_CONSISTENCY", "LLM解析生成S2SQL策略", "ONE_PASS_SELF_CONSISTENCY: 通过投票方式一步生成sql" + "\nTWO_PASS_AUTO_COT_SELF_CONSISTENCY: 通过思维链且投票方式两步生成sql",