From f3f60af231b8310318ab47cacd8b0e7e5bfe20c5 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 11 Dec 2023 19:31:36 +0800 Subject: [PATCH] (fix):fix python service interact (#494) --- .../chat/parser/sql/llm/OneStepsSqlGeneration.java | 2 +- .../chat/parser/sql/llm/TwoStepCSSqlGeneration.java | 2 +- .../chat/parser/sql/llm/TwoStepSqlGeneration.java | 2 +- .../supersonic/chat/query/llm/s2sql/LLMReq.java | 12 ++++++++---- chat/python/services_router/query2sql_service.py | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/OneStepsSqlGeneration.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/OneStepsSqlGeneration.java index bee7ac4a4..c87570d44 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/OneStepsSqlGeneration.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/OneStepsSqlGeneration.java @@ -19,6 +19,6 @@ public class OneStepsSqlGeneration implements SqlGeneration, InitializingBean { @Override public void afterPropertiesSet() { - SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.ONE_STEP, this); + SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.ONE_STEP_AUTO_COT, this); } } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/TwoStepCSSqlGeneration.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/TwoStepCSSqlGeneration.java index bf013a2a3..c741ade44 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/TwoStepCSSqlGeneration.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/TwoStepCSSqlGeneration.java @@ -19,6 +19,6 @@ public class TwoStepCSSqlGeneration implements SqlGeneration, InitializingBean { @Override public void afterPropertiesSet() { - SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.TWO_STEP_CS, this); + SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.TWO_STEP_AUTO_COT_SELF_CONSISTENCY, this); } } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/TwoStepSqlGeneration.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/TwoStepSqlGeneration.java index 43285d883..d2614e751 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/TwoStepSqlGeneration.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/TwoStepSqlGeneration.java @@ -65,6 +65,6 @@ public class TwoStepSqlGeneration implements SqlGeneration, InitializingBean { @Override public void afterPropertiesSet() { - SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.TWO_STEP, this); + SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.TWO_STEP_AUTO_COT, this); } } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMReq.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMReq.java index 2784c4ec0..d89ffaf93 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMReq.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMReq.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.chat.query.llm.s2sql; +import com.fasterxml.jackson.annotation.JsonValue; import java.util.List; import lombok.Data; @@ -18,7 +19,7 @@ public class LLMReq { private String priorExts; - private SqlGenerationMode sqlGenerationMode = SqlGenerationMode.TWO_STEP; + private SqlGenerationMode sqlGenerationMode = SqlGenerationMode.TWO_STEP_AUTO_COT_SELF_CONSISTENCY; @Data public static class ElementValue { @@ -48,11 +49,13 @@ public class LLMReq { public enum SqlGenerationMode { - ONE_STEP("ONE_STEP"), + ONE_STEP_AUTO_COT("1_pass_auto_cot"), - TWO_STEP("TWO_STEP"), + ONE_STEP_AUTO_COT_SELF_CONSISTENCY("1_pass_auto_cot_self_consistency"), - TWO_STEP_CS("TWO_STEP_CS"); + TWO_STEP_AUTO_COT("2_pass_auto_cot"), + + TWO_STEP_AUTO_COT_SELF_CONSISTENCY("2_pass_auto_cot_self_consistency"); private String name; @@ -61,6 +64,7 @@ public class LLMReq { this.name = name; } + @JsonValue public String getName() { return name; } diff --git a/chat/python/services_router/query2sql_service.py b/chat/python/services_router/query2sql_service.py index 0f3bfdc9d..75c6262d2 100644 --- a/chat/python/services_router/query2sql_service.py +++ b/chat/python/services_router/query2sql_service.py @@ -45,7 +45,7 @@ async def query2sql(query_body: Mapping[str, Any]): else: filter_condition = query_body['filterCondition'] - if 'sql_generation_mode' not in query_body: + if 'sqlGenerationMode' not in query_body: raise HTTPException(status_code=400, detail="sql_generation_mode is not in query_body") else: sql_generation_mode = query_body['sql_generation_mode']