From c47b8b37b97754b3baaa5ca608a661d83c354ebb Mon Sep 17 00:00:00 2001
From: jerryjzhang <zhangjun2915@163.com>
Date: Thu, 10 Oct 2024 16:53:41 +0800
Subject: [PATCH] [fix][launcher]Fix `Text2SQLEval`.

---
 .../java/com/tencent/supersonic/demo/S2BaseDemo.java     | 3 ---
 .../test/java/com/tencent/supersonic/chat/BaseTest.java  | 9 ++++++---
 .../com/tencent/supersonic/evaluation/Text2SQLEval.java  | 2 ++
 .../test/java/com/tencent/supersonic/util/DataUtils.java | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java
index 0cf800a12..ab1fdc245 100644
--- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java
+++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java
@@ -91,9 +91,6 @@ public abstract class S2BaseDemo implements CommandLineRunner {
     @Value("${s2.demo.names:S2VisitsDemo}")
     protected List<String> demoList;
 
-    @Value("${s2.demo.enableLLM:true}")
-    protected boolean demoEnableLlm;
-
     public void run(String... args) {
         demoDatabase = addDatabaseIfNotExist();
         demoChatModel = addChatModelIfNotExist();
diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java
index f6a587291..63e69e827 100644
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java
@@ -14,7 +14,7 @@ import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
 import com.tencent.supersonic.headless.api.pojo.response.QueryState;
 import com.tencent.supersonic.util.DataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.time.LocalDate;
 import java.util.Set;
@@ -22,7 +22,6 @@ import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
 
-@TestPropertySource(properties = {"s2.demo.enableLLM = false"})
 public class BaseTest extends BaseApplication {
 
     protected final int unit = 7;
@@ -37,6 +36,9 @@ public class BaseTest extends BaseApplication {
     @Autowired
     protected ChatModelService chatModelService;
 
+    @Value("${s2.demo.enableLLM:false}")
+    protected boolean enableLLM;
+
     protected QueryResult submitMultiTurnChat(String queryText, Integer agentId, Integer chatId)
             throws Exception {
         ParseResp parseResp = submitParse(queryText, agentId, chatId);
@@ -65,7 +67,8 @@ public class BaseTest extends BaseApplication {
     }
 
     protected ParseResp submitParse(String queryText, Integer agentId, Integer chatId) {
-        ChatParseReq chatParseReq = DataUtils.getChatParseReq(chatId, queryText);
+
+        ChatParseReq chatParseReq = DataUtils.getChatParseReq(chatId, queryText, enableLLM);
         chatParseReq.setAgentId(agentId);
         return chatQueryService.parse(chatParseReq);
     }
diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java b/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java
index 9b628d44f..2fe2e2c58 100644
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java
@@ -12,11 +12,13 @@ import com.tencent.supersonic.common.pojo.enums.ChatModelType;
 import com.tencent.supersonic.util.DataUtils;
 import com.tencent.supersonic.util.LLMConfigUtils;
 import org.junit.jupiter.api.*;
+import org.springframework.test.context.TestPropertySource;
 
 import java.util.List;
 import java.util.Map;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@TestPropertySource(properties = {"s2.demo.enableLLM = true"})
 @Disabled
 public class Text2SQLEval extends BaseTest {
 
diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java b/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java
index a1a5441b1..9b5f0d8e7 100644
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java
@@ -37,12 +37,12 @@ public class DataUtils {
         return User.get(3L, "tom");
     }
 
-    public static ChatParseReq getChatParseReq(Integer id, String query) {
+    public static ChatParseReq getChatParseReq(Integer id, String query, boolean enableLLM) {
         ChatParseReq chatParseReq = new ChatParseReq();
         chatParseReq.setQueryText(query);
         chatParseReq.setChatId(id);
         chatParseReq.setUser(user_test);
-        chatParseReq.setDisableLLM(true);
+        chatParseReq.setDisableLLM(!enableLLM);
         return chatParseReq;
     }