[improvement][headless]Refactor LLMReq and move linking values to LLM…

…Schema.
tencentmusic · Sep 12, 2024 · de6a5c9 · de6a5c9
1 parent 71ff817
commit de6a5c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMRequestService.java b/...chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMRequestService.java
@@ -67,7 +67,6 @@ public LLMReq getLlmReq(ChatQueryContext queryCtx, Long dataSetId) {
         llmSchema.setDimensions(getMappedDimensions(queryCtx, dataSetId));
         llmSchema.setPartitionTime(getPartitionTime(queryCtx, dataSetId));
         llmSchema.setPrimaryKey(getPrimaryKey(queryCtx, dataSetId));
-        llmSchema.setTerms(getTerms(queryCtx, dataSetId));
 
         boolean linkingValueEnabled =
                 Boolean.valueOf(parserConfig.getParameterValue(PARSER_LINKING_VALUE_ENABLE));
@@ -76,6 +75,7 @@ public LLMReq getLlmReq(ChatQueryContext queryCtx, Long dataSetId) {
         }
 
         llmReq.setCurrentDate(DateUtils.getBeforeDate(0));
+        llmReq.setTerms(getTerms(queryCtx, dataSetId));
         llmReq.setSqlGenType(
                 LLMReq.SqlGenType.valueOf(parserConfig.getParameterValue(PARSER_STRATEGY_TYPE)));
         llmReq.setModelConfig(queryCtx.getModelConfig());

diff --git a/...less/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/PromptHelper.java b/...less/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/PromptHelper.java
@@ -176,7 +176,7 @@ public String buildSchemaStr(LLMReq llmReq) {
     }
 
     private String buildTermStr(LLMReq llmReq) {
-        List<LLMReq.Term> terms = llmReq.getSchema().getTerms();
+        List<LLMReq.Term> terms = llmReq.getTerms();
         List<String> termStr = Lists.newArrayList();
         terms.stream()
                 .forEach(

diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/llm/s2sql/LLMReq.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/llm/s2sql/LLMReq.java
@@ -17,6 +17,7 @@
 public class LLMReq {
     private String queryText;
     private LLMSchema schema;
+    private List<Term> terms;
     private String currentDate;
     private String priorExts;
     private SqlGenType sqlGenType;
@@ -39,7 +40,6 @@ public static class LLMSchema {
         private List<ElementValue> values;
         private SchemaElement partitionTime;
         private SchemaElement primaryKey;
-        private List<Term> terms;
 
         public List<String> getFieldNameList() {
             List<String> fieldNameList = new ArrayList<>();