From 551a376b008aa3fb5599f088d8f1c926fd5e624f Mon Sep 17 00:00:00 2001
From: lexluo09 <39718951+lexluo09@users.noreply.github.com>
Date: Mon, 13 Nov 2023 20:22:25 +0800
Subject: [PATCH] (improvement)(chat) add linking value switch and rename
 use.s2SQL.switch parameters (#376)

---
 .../supersonic/chat/config/OptimizationConfig.java        | 5 ++++-
 .../chat/parser/llm/s2sql/LLMRequestService.java          | 8 ++++++--
 .../standalone/src/main/resources/optimization.properties | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/config/OptimizationConfig.java b/chat/core/src/main/java/com/tencent/supersonic/chat/config/OptimizationConfig.java
index 3ad7fcc7d..186e01215 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/config/OptimizationConfig.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/config/OptimizationConfig.java
@@ -39,7 +39,7 @@ public class OptimizationConfig {
     @Value("${candidate.threshold}")
     private Double candidateThreshold;
 
-    @Value("${user.s2SQL.switch:false}")
+    @Value("${use.s2SQL.switch:false}")
     private boolean useS2SqlSwitch;
 
     @Value("${embedding.mapper.word.min:4}")
@@ -59,4 +59,7 @@ public class OptimizationConfig {
 
     @Value("${embedding.mapper.distance.threshold:0.58}")
     private Double embeddingMapperDistanceThreshold;
+
+    @Value("${use.linking.value.switch:true}")
+    private boolean useLinkingValueSwitch;
 }
diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/llm/s2sql/LLMRequestService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/llm/s2sql/LLMRequestService.java
index 7a7ae5550..c88016afb 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/llm/s2sql/LLMRequestService.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/llm/s2sql/LLMRequestService.java
@@ -11,6 +11,7 @@ import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
 import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.config.LLMParserConfig;
+import com.tencent.supersonic.chat.config.OptimizationConfig;
 import com.tencent.supersonic.chat.parser.SatisfactionChecker;
 import com.tencent.supersonic.chat.query.llm.s2sql.LLMReq;
 import com.tencent.supersonic.chat.query.llm.s2sql.LLMReq.ElementValue;
@@ -59,9 +60,10 @@ public class LLMRequestService {
     private AgentService agentService;
     @Autowired
     private SchemaService schemaService;
-
     @Autowired
     private RestTemplate restTemplate;
+    @Autowired
+    private OptimizationConfig optimizationConfig;
 
     public boolean check(QueryContext queryCtx) {
         QueryReq request = queryCtx.getRequest();
@@ -128,7 +130,9 @@ public class LLMRequestService {
         llmReq.setSchema(llmSchema);
 
         List<ElementValue> linking = new ArrayList<>();
-        linking.addAll(getValueList(queryCtx, modelId, semanticSchema));
+        if (optimizationConfig.isUseLinkingValueSwitch()) {
+            linking.addAll(getValueList(queryCtx, modelId, semanticSchema));
+        }
         llmReq.setLinking(linking);
 
         String currentDate = S2SQLDateHelper.getReferenceDate(modelId);
diff --git a/launchers/standalone/src/main/resources/optimization.properties b/launchers/standalone/src/main/resources/optimization.properties
index 941ea88da..628025850 100644
--- a/launchers/standalone/src/main/resources/optimization.properties
+++ b/launchers/standalone/src/main/resources/optimization.properties
@@ -8,4 +8,4 @@ long.text.threshold=0.8
 short.text.threshold=0.5
 query.text.length.threshold=10
 candidate.threshold=0.2
-user.s2SQL.switch=true
\ No newline at end of file
+use.s2SQL.switch=true
\ No newline at end of file