(improvement)(project) Upgrade to version 0.9.2. (#1072)

Co-authored-by: jolunoluo

.gitignore

@@ -8,6 +8,7 @@ log/
 *.bin
 *.log
 *.tar.gz
+*.zip
 *.lib
 assembly/runtime/*
 **/dist/
@@ -18,3 +19,4 @@ assembly/runtime/*
 chm_db/
 __pycache__/
 /dict
+assembly/build/*-SNAPSHOT

CHANGELOG.md

@@ -4,6 +4,29 @@
 - "Breaking Changes" describes any changes that may break existing functionality or cause
   compatibility issues with previous versions.
 
+## SuperSonic [0.9.2] - 2024-06-01
+
+### Added
+- support multiple rounds of dialogue
+- add term configuration and identification to help LLM learn private domain knowledge
+- support configuring LLM parameters in the agent
+- metric market supports searching in natural language
+
+### Updated
+- introducing WorkFlow, Mapper, Parser, and Corrector support jump execution
+- Introducing the concept of Model-Set to simplify Domain management
+- overall optimization and upgrade of system pages
+- optimize startup script
+
+## SuperSonic [0.9.0] - 2024-04-03
+
+### Added
+- add tag abstraction and enhance tag marketplace management.
+- headless-server provides Chat API interface.
+
+### Updated
+- migrate chat-core core component to headless-core.
+
 ## SuperSonic [0.8.6] - 2024-02-23
 
 ### Added

README.md

@@ -2,32 +2,39 @@
 
 ![Java CI](https://github.com/tencentmusic/supersonic/workflows/supersonic%20CI/badge.svg)
 
-# SuperSonic (超音数)
+# SuperSonic
 
-**SuperSonic is the next-generation LLM-powered data analytics platform that integrates ChatBI and HeadlessBI**. SuperSonic provides a chat interface that empowers users to query data using natural language and visualize the results with suitable charts. To enable such experience, the only thing necessary is to build logical semantic models (definition of entities/metrics/dimensions/tags, along with their meaning, context and relationships) with semantic layer, and **no data modification or copying** is required. Meanwhile, SuperSonic is designed to be **highly extensible**, allowing custom functionalities to be added and configured with Java SPI.
+SuperSonic is the next-generation BI platform that integrates **Chat BI** (powered by LLM) and **Headless BI** (powered by semantic layer) paradigms. This integration ensures that Chat BI has access to the same curated and governed semantic data models as traditional BI. Furthermore, the implementation of both paradigms benefits from the integration: 
+
+- Chat BI's Text2SQL gets augmented with context-retrieval from semantic models.
+- Headless BI's query interface gets extended with natural language API.
+
+<img src="./docs/images/supersonic_ideas.png" height="75%" width="75%" align="center"/>
+
+SuperSonic provides a **Chat BI interface** that empowers users to query data using natural language and visualize the results with suitable charts. To enable such experience, the only thing necessary is to build logical semantic models (definition of metric/dimension/tag, along with their meaning and relationships) through a **Headless BI interface**. Meanwhile, SuperSonic is designed to be extensible and composable, allowing custom implementations to be added and configured with Java SPI.
 
 <img src="./docs/images/supersonic_demo.gif" height="100%" width="100%" align="center"/>
 
 ## Motivation
 
-The emergence of Large Language Model (LLM) like ChatGPT is reshaping the way information is retrieved. In the field of data analytics, both academia and industry are primarily focused on leveraging LLM to convert natural language into SQL (so called Text2SQL or NL2SQL). While some approaches exhibit promising results, their **reliability** and **efficiency** are insufficient for real-world applications.  
+The emergence of Large Language Model (LLM) like ChatGPT is reshaping the way information is retrieved, leading to a new paradigm in the field of data analytics known as Chat BI. To implement Chat BI, both academia and industry are primarily focused on harnessing the power of LLMs to convert natural language into SQL, commonly referred to as Text2SQL or NL2SQL. While some approaches show promising results, their **reliability** falls short for large-scale real-world applications.
 
-From our perspective, the key to filling the real-world gap lies in three aspects: 
-1. Integrate ChatBI with HeadlessBI encapsulating underlying data context (joins, keys, formulas, etc) to **reduce complexity**. 
-   <img src="./docs/images/supersonic_ideas.png" height="65%" width="65%" align="center"/>
-2. Augment the LLM with schema mappers(as a kind of preprocessor) and semantic correctors(as a kind of postprocessor) to **mitigate hallucination**.
-3. Utilize rule-based schema parsers when necessary to **improve efficiency**(in terms of latency and cost).
+Meanwhile, another emerging paradigm called Headless BI, which focuses on constructing unified semantic data models, has garnered significant attention. Headless BI is implemented through a universal semantic layer that exposes consistent data semantics via an open API.
 
-With these ideas in mind, we develop SuperSonic as a practical reference implementation and use it to power our real-world products. Additionally, to facilitate further development of ChatBI, we decide to open source SuperSonic as an extensible framework.
+From our perspective, the integration of Chat BI and Headless BI has the potential to enhance the Text2SQL generation in two dimensions:
+
+1. Incorporate data semantics (such as business terms, column values, etc.) into the prompt, enabling LLM to better understand the semantics and **reduce hallucination**.
+2. Offload the generation of advanced SQL syntax (such as join, formula, etc.) from LLM to the semantic layer to **reduce complexity**. 
+
+With these ideas in mind, we develop SuperSonic as a practical reference implementation and use it to power our real-world products. Additionally, to facilitate further development we decide to open source SuperSonic as an extensible framework.
 
 ## Out-of-the-box Features
 
-- Built-in ChatBI interface for *business users* to enter natural language queries
-- Built-in HeadlessBI interface for *analytics engineers* to build semantic models
-- Built-in GUI for *system administrators* to manage chat agents and third-party plugins
-- Support input auto-completion as well as query recommendation
-- Support multi-turn conversation and history context management 
-- Support four-level permission control: domain-level, model-level, column-level and row-level
+- Built-in Chat BI interface for *business users* to enter natural language queries
+- Built-in Headless BI interface for *analytics engineers* to build semantic data models
+- Built-in rule-based semantic parser to improve efficiency in certain scenarios (e.g. demonstration, integration testing)
+- Built-in support for input auto-completion, multi-turn conversation as well as post-query recommendation
+- Built-in support for three-level data access control: dataset-level, column-level and row-level
 
 ## Extensible Components
 
@@ -39,11 +46,11 @@ The high-level architecture and main process flow is as follows:
 
 - **Schema Mapper:** identifies references to schema elements(metrics/dimensions/entities/values) in user queries. It matches the query text against the knowledge base.
 
-- **Semantic Parser:** understands user queries and extracts semantic information. It consists of a combination of rule-based and model-based parsers, each of which deals with specific scenarios.
+- **Semantic Parser:** understands user queries and generates semantic query statement. It consists of a combination of rule-based and model-based parsers, each of which deals with specific scenarios.
 
-- **Semantic Corrector:** checks validity of extracted semantic information and performs correction and optimization if needed.
+- **Semantic Corrector:** checks validity of semantic query statement and performs correction and optimization if needed.
 
-- **Semantic Interpreter:** performs execution according to extracted semantic information. It generates SQL statements and executes them against physical data models.
+- **Semantic Translator:** converts semantic query statement into SQL statement that can be executed against physical data models.
 
 - **Chat Plugin:** extends functionality with third-party tools. The LLM is going to select the most suitable one, given all configured plugins with function description and sample questions.
 

README_CN.md

@@ -1,30 +1,36 @@
-# SuperSonic (超音数)
+# SuperSonic
 
-**SuperSonic融合ChatBI和HeadlessBI打造新一代的数据分析平台**。通过SuperSonic的问答对话界面，用户能够使用自然语言查询数据，系统会选择合适的可视化图表呈现结果。SuperSonic不需要修改或复制数据，只需要在物理数据模型之上构建逻辑语义模型（指标/维度/实体的定义，以及他们的业务含义、相互间关系等），即可开启数据问答体验。与此同时，SuperSonic被设计为可插拔的框架，采用Java SPI机制来扩展定制功能。
+**SuperSonic融合Chat BI（powered by LLM）和Headless BI（powered by 语义层）打造新一代的BI平台**。这种融合确保了Chat BI能够与传统BI一样访问统一化治理的语义数据模型。此外，两种BI新范式都从中获得收益：
+
+- Chat BI的Text2SQL生成通过检索语义数据模型得到增强。
+- Headless BI的查询接口通过支持自然语言API得到拓展。
+
+<img src="./docs/images/supersonic_ideas.png" height="75%" width="75%" align="center"/>
+
+通过SuperSonic的问答对话界面，用户能够使用自然语言查询数据，系统会选择合适的可视化图表呈现结果。SuperSonic不需要修改或复制数据，只需要在物理数据模型之上构建逻辑语义模型（定义指标/维度/实体/标签，以及它们的业务含义、相互关系等），即可开启数据问答体验。与此同时，SuperSonic被设计为可插拔的框架，采用Java SPI机制来扩展定制功能。
 
 <img src="./docs/images/supersonic_demo.gif" height="100%" width="100%" align="center"/>
 
 ## 项目动机
 
-大型语言模型（LLMs）如ChatGPT的出现正在重塑信息检索的方式。在数据分析领域，学术界和工业界主要关注利用深度学习模型将自然语言查询转换为SQL查询。虽然一些工作显示出有前景的结果，但它们的可靠性还达不到生产可用的要求。
+大型语言模型（LLM）如ChatGPT的出现正在重塑信息检索的方式，引领数据分析领域的一种新范式，被称为Chat BI。为了实现Chat BI，学术界和工业界主要关注利用LLM的能力将自然语言转换为SQL，通常称为Text2SQL或NL2SQL。尽管一些方法显示出有希望的结果，但它们在大规模实际应用中的可靠性还不足。
 
-在我们看来，为了在实际场景发挥价值，有三个关键点：
-1. 融合HeadlessBI，通过统一语义层封装底层数据细节（关联、键值、公式等），降低SQL生成的**复杂度**。
+与此同时，另一种新兴范式被称为Headless BI，它专注于构建统一的语义数据模型，并引起了广泛的关注。Headless BI通过一个通用的语义层来实现，通过开放的API公开一致的数据语义。
 
-   <img src="./docs/images/supersonic_ideas.png" height="65%" width="65%" align="center"/>
-2. 通过一前一后的模式映射器和语义修正器，来缓解LLM常见的**幻觉**现象。
-3. 设计启发式的规则，在一些特定场景提升语义解析的**效率**。
+从我们的角度来看，Chat BI和Headless BI的融合有潜力在两个方面增强Text2SQL的能力：
+
+1. 将数据语义（如业务术语、列值等）纳入提示词中，使LLM能够更好地理解语义，以**减少幻觉**。
+2. 将高级SQL语法（如连接、公式等）的生成从LLM卸载到语义层，以**减少复杂度**。
 
 为了验证上述想法，我们开发了SuperSonic项目，并将其应用在实际的内部产品中。与此同时，我们将SuperSonic作为一个可扩展的框架开源，希望能够促进数据问答对话领域的进一步发展。
 
 ## 开箱即用的特性
 
-- 内置ChatBI界面以便*业务用户*输入数据查询。
-- 内置HeadlessBI界面以便*分析工程师*构建语义模型。
-- 内置图形用户界面以便*系统管理员*管理第三方插件和对话助理。
-- 支持文本输入的联想和查询问题的推荐。
-- 支持多轮对话，根据语境自动切换上下文。
-- 支持四级权限控制：主题域级、模型级、列级、行级。
+- 内置Chat BI界面以便*业务用户*输入数据查询。
+- 内置Headless BI界面以便*分析工程师*构建语义模型。
+- 内置基于规则的语义解析器，在特定场景（比如DEMO演示、集成测试）可以提升推理效率。
+- 支持文本输入联想、多轮对话、查询后问题推荐等高级特征。
+- 支持三级权限控制：数据集级、列级、行级。
 
 ## 易于扩展的组件
 
@@ -36,11 +42,11 @@ SuperSonic的整体架构和主流程如下图所示：
 
 - **模式映射器(Schema Mapper)：** 将自然语言文本在知识库中进行匹配，为后续的语义解析提供相关信息。
 
-- **语义解析器(Semantic Parser)：** 理解用户查询并抽取语义信息，其由一组基于规则和基于模型的解析器组成，每个解析器可应对不同的特定场景。
+- **语义解析器(Semantic Parser)：** 理解用户查询并抽取语义信息，生成语义查询语句S2SQL。
 
-- **语义修正器(Semantic Corrector)：** 检查语义信息的合法性，对不合法的信息做修正和优化处理。
+- **语义修正器(Semantic Corrector)：** 检查语义查询语句的合法性，对不合法的信息做修正和优化处理。
 
-- **语义解释器(Semantic Interpreter)：** 根据语义信息生成物理SQL执行查询。
+- **语义翻译器(Semantic Translator)：** 将语义查询语句翻译成可在物理数据模型上执行的SQL语句。
 
 - **问答插件(Chat Plugin)：** 通过第三方工具扩展功能。给定所有配置的插件及其功能描述和示例问题，大语言模型将选择最合适的插件。
 

assembly/bin/supersonic-build.bat

@@ -1,72 +1,98 @@
 @echo off
-setlocal
+setlocal enabledelayedexpansion
 chcp 65001
-set "sbinDir=%~dp0"
-set "baseDir=%~dp0.."
-set "buildDir=%baseDir%\build"
-set "runtimeDir=%baseDir%\..\runtime"
-set "pip_path=pip3"
+
+call supersonic-common.bat %*
+
 set "service=%~1"
 
-
-rem 1. build backend java modules
-del /q "%buildDir%\*.tar.gz" 2>NUL
-call mvn -f "%baseDir%\..\pom.xml" clean package -DskipTests
-
-IF ERRORLEVEL 1 (
-    ECHO Failed to build backend Java modules.
-    EXIT /B 1
+cd %projectDir%
+if "%service%"=="" (
+    set service=%standalone_service%
 )
 
-rem 2. move package to build
-echo f|xcopy "%baseDir%\..\launchers\standalone\target\*.tar.gz" "%buildDir%\supersonic-standalone.tar.gz"
+call mvn help:evaluate -Dexpression=project.version > temp.txt
+for /f "delims=" %%i in (temp.txt) do (
+    set line=%%i
+    if not "!line:~0,1!"=="[" (
+        set MVN_VERSION=!line!
+    )
+)
+del temp.txt
+cd %baseDir%
 
-rem 3. build frontend webapp
-cd "%baseDir%\..\webapp"
-call start-fe-prod.bat
-copy /y "%baseDir%\..\webapp\supersonic-webapp.tar.gz" "%buildDir%\"
 
-IF ERRORLEVEL 1 (
-    ECHO Failed to build frontend webapp.
-    EXIT /B 1
+if "%service%"=="%pyllm_service%" (
+   echo start installing python modules required by supersonic-pyllm: %pip_path%
+   %pip_path% install -r %projectDir%\headless\python\requirements.txt"
+   echo install python modules success
+   goto :EOF
+) else if "%service%"=="webapp" (
+   call :buildWebapp
+   tar xvf supersonic-webapp.tar.gz
+   move /y supersonic-webapp webapp
+   move /y webapp %projectDir%\launchers\%STANDALONE_SERVICE%\target\classes
+   goto :EOF
+) else (
+   call :buildJavaService
+   call :buildWebapp
+   call :packageRelease
+   goto :EOF
 )
 
-rem 4. copy webapp to java classpath
-cd "%buildDir%"
-tar -zxvf supersonic-webapp.tar.gz
-move supersonic-webapp webapp
-move webapp ..\..\launchers\standalone\target\classes
 
-rem 5. build backend python modules
-if "%service%"=="pyllm" (
-    echo "start installing python modules with pip: ${pip_path}"
-    set requirementPath="%baseDir%/../chat/python/requirements.txt"
-    %pip_path% install -r %requirementPath%
-    echo "install python modules success"
-)
+:buildJavaService
+   set "model_name=%service%"
+   echo "starting building supersonic-%model_name% service"
+   call mvn -f %projectDir%\launchers\%model_name% clean package -DskipTests
+   IF ERRORLEVEL 1 (
+      ECHO Failed to build backend Java modules.
+      EXIT /B 1
+   )
+   copy /y %projectDir%\launchers\%model_name%\target\*.tar.gz %buildDir%\
+   echo "finished building supersonic-%model_name% service"
+   goto :EOF
 
-call :BUILD_RUNTIME
 
-:BUILD_RUNTIME
-  rem 6. reset runtime
-  IF EXIST "%runtimeDir%" (
-      echo begin to delete dir : %runtimeDir%
-      rd /s /q "%runtimeDir%"
-  ) ELSE (
-      echo %runtimeDir% does not exist, create directly
-  )
-  mkdir "%runtimeDir%"
-  tar -zxvf "%buildDir%\supersonic-standalone.tar.gz" -C "%runtimeDir%"
-  for /d %%f in ("%runtimeDir%\launchers-standalone-*") do (
-      move "%%f" "%runtimeDir%\supersonic-standalone"
-  )
+:buildWebapp
+   echo "starting building supersonic webapp"
+   cd %projectDir%\webapp
+   call start-fe-prod.bat
+   copy /y supersonic-webapp.tar.gz %buildDir%\
+   rem check build result
+   IF ERRORLEVEL 1 (
+        ECHO Failed to build frontend webapp.
+        EXIT /B 1
+   )
+   echo "finished building supersonic webapp"
+   goto :EOF
 
-  rem 7. copy webapp to runtime
-  tar -zxvf "%buildDir%\supersonic-webapp.tar.gz" -C "%buildDir%"
-  if not exist "%runtimeDir%\supersonic-standalone\webapp" mkdir "%runtimeDir%\supersonic-standalone\webapp"
-  xcopy /s /e /h /y "%buildDir%\supersonic-webapp\*" "%runtimeDir%\supersonic-standalone\webapp"
-  if not exist "%runtimeDir%\supersonic-standalone\conf\webapp" mkdir "%runtimeDir%\supersonic-standalone\conf\webapp"
-  xcopy /s /e /h /y "%runtimeDir%\supersonic-standalone\webapp\*" "%runtimeDir%\supersonic-standalone\conf\webapp"
-  rd /s /q "%buildDir%\supersonic-webapp"
+
+:packageRelease
+   set "model_name=%service%"
+   set "release_dir=supersonic-%model_name%-%MVN_VERSION%"
+   set "service_name=launchers-%model_name%-%MVN_VERSION%"
+   echo "starting packaging supersonic release"
+   cd %buildDir%
+   if exist %release_dir% rmdir /s /q %release_dir%
+   if exist %release_dir%.zip del %release_dir%.zip
+   mkdir %release_dir%
+   rem package webapp
+   tar xvf supersonic-webapp.tar.gz
+   move /y supersonic-webapp webapp
+   echo {"env": ""} > webapp\supersonic.config.json
+   move /y webapp %release_dir%
+   rem package java service
+   tar xvf %service_name%-bin.tar.gz
+   for /d %%D in ("%service_name%\*") do (
+       move "%%D" "%release_dir%"
+   )
+   rem generate zip file
+   powershell Compress-Archive -Path %release_dir% -DestinationPath %release_dir%.zip
+   del %service_name%-bin.tar.gz
+   del supersonic-webapp.tar.gz
+   rmdir /s /q %service_name%
+   echo "finished packaging supersonic release"
+   goto :EOF
 
 endlocal

assembly/bin/supersonic-build.sh

@@ -1,58 +1,80 @@
 #!/usr/bin/env bash
 
-set -x
 sbinDir=$(cd "$(dirname "$0")"; pwd)
 chmod +x $sbinDir/supersonic-common.sh
 source $sbinDir/supersonic-common.sh
+cd $projectDir
+MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version | grep -e '^[^\[]')
+
 cd $baseDir
-
 service=$1
-#1. build backend java modules
-rm -fr ${buildDir}/*.tar.gz
-rm -fr dist
-set +x
-mvn -f $baseDir/../ clean package -DskipTests
-# check build result
-if [ $? -ne 0 ]; then
-    echo "Failed to build backend Java modules."
-    exit 1
+if [ -z "$service"  ]; then
+  service=${STANDALONE_SERVICE}
 fi
 
-#2. move package to build
-cp $baseDir/../launchers/headless/target/*.tar.gz ${buildDir}/supersonic-headless.tar.gz
-cp $baseDir/../launchers/chat/target/*.tar.gz ${buildDir}/supersonic-chat.tar.gz
-cp $baseDir/../launchers/standalone/target/*.tar.gz ${buildDir}/supersonic-standalone.tar.gz
+function buildJavaService {
+  model_name=$1
+  echo "starting building supersonic-${model_name} service"
+  mvn -f $projectDir clean package -DskipTests
+  if [ $? -ne 0 ]; then
+      echo "Failed to build backend Java modules."
+      exit 1
+  fi
+  cp $projectDir/launchers/${model_name}/target/*.tar.gz ${buildDir}/
+  echo "finished building supersonic-${model_name} service"
+}
 
-#3. build frontend webapp
-chmod +x $baseDir/../webapp/start-fe-prod.sh
-cd ../webapp
-sh ./start-fe-prod.sh
-cp -fr  ./supersonic-webapp.tar.gz ${buildDir}/
+function buildWebapp {
+  echo "starting building supersonic webapp"
+  chmod +x $projectDir/webapp/start-fe-prod.sh
+  cd $projectDir/webapp
+  sh ./start-fe-prod.sh
+  cp -fr  ./supersonic-webapp.tar.gz ${buildDir}/
+  # check build result
+  if [ $? -ne 0 ]; then
+      echo "Failed to build frontend webapp."
+      exit 1
+  fi
+  echo "finished building supersonic webapp"
+}
 
-# check build result
-if [ $? -ne 0 ]; then
-    echo "Failed to build frontend webapp."
-    exit 1
-fi
-#4. copy webapp to java classpath
-cd $buildDir
-tar xvf supersonic-webapp.tar.gz
-mv supersonic-webapp webapp
-cp -fr webapp ../../launchers/headless/target/classes
-cp -fr webapp ../../launchers/chat/target/classes
-cp -fr webapp ../../launchers/standalone/target/classes
-rm -fr  ${buildDir}/webapp
+function packageRelease {
+  model_name=$1
+  release_dir=supersonic-${model_name}-${MVN_VERSION}
+  service_name=launchers-${model_name}-${MVN_VERSION}
+  echo "starting packaging supersonic release"
+  cd $buildDir
+  mkdir $release_dir
+  # package webapp
+  tar xvf supersonic-webapp.tar.gz
+  mv supersonic-webapp webapp
+  json='{"env": "''"}'
+  echo $json > webapp/supersonic.config.json
+  mv webapp $release_dir/
+  # package java service
+  tar xvf $service_name-bin.tar.gz
+  mv $service_name/* $release_dir/
+  # generate zip file
+  zip -r $release_dir.zip $release_dir
+  # delete intermediate files
+  rm supersonic-webapp.tar.gz $service_name-bin.tar.gz
+  rm -rf webapp $service_name $release_dir
+  echo "finished packaging supersonic release"
+}
 
-#5. build backend python modules
-if [ "$service" == "pyllm" ]; then
-  echo "start installing python modules with pip: ${pip_path}"
-  requirementPath=$baseDir/../chat/python/requirements.txt
+#1. build backend services
+if [ "$service" == $PYLLM_SERVICE ]; then
+  echo "start installing python modules required by supersonic-pyllm: ${pip_path}"
+  requirementPath=$projectDir/headless/python/requirements.txt
   ${pip_path} install -r ${requirementPath}
   echo "install python modules success"
+elif [ "$service" == "webapp" ]; then
+  buildWebapp
+  target_path=$projectDir/launchers/$STANDALONE_SERVICE/target/classes
+  tar xvf $projectDir/webapp/supersonic-webapp.tar.gz -C $target_path
+  mv $target_path/supersonic-webapp $target_path/webapp
+else
+  buildJavaService $service
+  buildWebapp
+  packageRelease $service
 fi
-
-#6. reset runtime
-rm -fr $runtimeDir/supersonic*
-moveAllToRuntime
-setEnvToWeb chat
-setEnvToWeb headless

assembly/bin/supersonic-common.bat

@@ -0,0 +1,9 @@
+set "sbinDir=%~dp0"
+set "baseDir=%~dp0.."
+set "buildDir=%baseDir%\build"
+set "main_class=com.tencent.supersonic.StandaloneLauncher"
+set "python_path=python"
+set "pip_path=pip3"
+set "standalone_service=standalone"
+set "pyllm_service=pyllm"
+set "projectDir=%baseDir%\.."

assembly/bin/supersonic-common.sh

@@ -6,105 +6,19 @@ pip_path=${PIP_PATH:-"pip3"}
 
 sbinDir=$(cd "$(dirname "$0")"; pwd)
 baseDir=$(cd "$sbinDir/.." && pwd -P)
-runtimeDir=$baseDir/../runtime
+runtimeDir=$baseDir/runtime
 buildDir=$baseDir/build
+projectDir=$baseDir/..
 
 readonly CHAT_APP_NAME="supersonic_chat"
 readonly HEADLESS_APP_NAME="supersonic_headless"
 readonly PYLLM_APP_NAME="supersonic_pyllm"
 readonly STANDALONE_APP_NAME="supersonic_standalone"
+
 readonly CHAT_SERVICE="chat"
 readonly HEADLESS_SERVICE="headless"
 readonly PYLLM_SERVICE="pyllm"
 readonly STANDALONE_SERVICE="standalone"
+
 readonly PYLLM_HOST="127.0.0.1"
 readonly PYLLM_PORT="9092"
-
-function setEnvToWeb {
-   model_name=$1
-   json='{"env": "'$model_name'"}'
-   echo $json > ${runtimeDir}/supersonic-${model_name}/webapp/supersonic.config.json
-   echo $json > $baseDir/../launchers/${model_name}/target/classes/webapp/supersonic.config.json
-}
-
-function moveToRuntime {
-  model_name=$1
-  file="${buildDir}/supersonic-${model_name}.tar.gz"
-  if [ -f "$file" ]; then
-    tar -zxvf "$file" -C ${runtimeDir}
-    mv ${runtimeDir}/launchers-${model_name}-* ${runtimeDir}/supersonic-${model_name}
-    mkdir -p ${runtimeDir}/supersonic-${model_name}/webapp
-    cp -fr ${buildDir}/webapp/* ${runtimeDir}/supersonic-${model_name}/webapp
-  else
-    echo "File $file does not exist. Skipping the move to runtime."
-  fi
-}
-
-function moveAllToRuntime {
-  mkdir -p ${runtimeDir}
-  tar xvf  ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
-  mv ${buildDir}/supersonic-webapp ${buildDir}/webapp
-
-  moveToRuntime chat
-  moveToRuntime headless
-  moveToRuntime standalone
-  rm -fr  ${buildDir}/webapp
-}
-
-# run java service
-function runJavaService {
-  javaRunDir=${runtimeDir}/supersonic-${model_name}
-  local_app_name=$1
-  libDir=$javaRunDir/lib
-  confDir=$javaRunDir/conf
-
-  CLASSPATH=""
-  CLASSPATH=$CLASSPATH:$confDir
-
-  for jarPath in $libDir/*.jar; do
-   CLASSPATH=$CLASSPATH:$jarPath
-  done
-
-  export CLASSPATH
-  export LANG="zh_CN.UTF-8"
-
-  cd $javaRunDir
-  if [[ "$JAVA_HOME" == "" ]]; then
-    JAVA_HOME=$(ls /usr/jdk64/jdk* -d 2>/dev/null | xargs | awk '{print "'$local_app_name'"}')
-  fi
-  export PATH=$JAVA_HOME/bin:$PATH
-  command="-Dfile.encoding="UTF-8"  -Duser.language="Zh" -Duser.region="CN" -Duser.timezone="GMT+08" -Dapp_name=${local_app_name} -Xms1024m -Xmx2048m "$main_class
-
-  mkdir -p $javaRunDir/logs
-  if [[ "$is_test" == "true" ]]; then
-    java -Dspring.profiles.active="dev" $command >/dev/null 2>$javaRunDir/logs/error.log &
-  else
-    java  $command $javaRunDir >/dev/null 2>$javaRunDir/logs/error.log &
-  fi
-}
-
-# run python service
-function runPythonService {
-  pythonRunDir=${runtimeDir}/supersonic-${model_name}/pyllm
-  cd $pythonRunDir
-  nohup ${python_path} supersonic_pyllm.py  > $pythonRunDir/pyllm.log  2>&1   &
-  # add health check
-  for i in {1..10}
-  do
-    echo "pyllm health check attempt $i..."
-    response=$(curl -s http://${PYLLM_HOST}:${PYLLM_PORT}/health)
-    echo "pyllm health check response: $response"
-    status_ok="Healthy"
-    if [[ $response == *$status_ok* ]] ; then
-      echo "pyllm Health check passed."
-      break
-    else
-      if [ "$i" -eq 10 ]; then
-        echo "pyllm Health check failed after 10 attempts."
-        echo "May still downloading model files. Please check pyllm.log in runtime directory."
-      fi
-      echo "Retrying after 5 seconds..."
-      sleep 5
-    fi
-  done
-}

assembly/bin/supersonic-daemon.bat

@@ -1,118 +1,102 @@
 @echo off
 setlocal
 chcp 65001
-set "sbinDir=%~dp0"
-set "baseDir=%~dp0.."
-set "runtimeDir=%baseDir%\..\runtime"
-set "buildDir=%baseDir%\build"
-set "main_class=com.tencent.supersonic.StandaloneLauncher"
-set "python_path=python"
-set "pip_path=pip3"
-set "standalone_service=standalone"
-set "pyllm_service=pyllm"
 
-set "javaRunDir=%runtimeDir%\supersonic-standalone"
-set "pythonRunDir=%runtimeDir%\supersonic-standalone\pyllm"
+call supersonic-common.bat %*
+call %sbinDir%/../conf/supersonic-env.bat %*
 
 set "command=%~1"
 set "service=%~2"
-
 if "%service%"=="" (
    set "service=%standalone_service%"
 )
-
+set "model_name=%service%"
 IF "%service%"=="pyllm" (
-  SET "llmProxy=PythonLLMProxy"
+  set "llmProxy=PythonLLMProxy"
+  set "model_name=%standalone_service%"
 )
 
-call :BUILD_RUNTIME
+cd %baseDir%
 
 if "%command%"=="restart" (
-   call :STOP
-   call :START
+   call :stop
+   call :start
    goto :EOF
 ) else if "%command%"=="start" (
-   call :START
+   call :start
    goto :EOF
 ) else if "%command%"=="stop" (
-  call :STOP
-  goto :EOF
+   call :stop
+   goto :EOF
 ) else if "%command%"=="reload" (
-  call :RELOAD_EXAMPLE
-  goto :EOF
+   call :reloadExamples
+   goto :EOF
 ) else (
    echo "Use command {start|stop|restart} to run."
    goto :EOF
 )
 
-:START
-    if "%service%"=="%pyllm_service%" (
-         call :START_PYTHON
-         call :START_JAVA
+
+: start
+   if "%service%"=="%pyllm_service%" (
+         call :runPythonService
+         call :runJavaService
          goto :EOF
-    )
-    call :START_JAVA
-    goto :EOF
-
-:STOP
-    call :STOP_PYTHON
-    call :STOP_JAVA
-    goto :EOF
-
-:START_PYTHON
-   echo 'python service starting, see logs in pyllm/pyllm.log'
-   cd "%pythonRunDir%"
-   start /B %python_path% supersonic_pyllm.py  > %pythonRunDir%\pyllm.log 2>&1
-   timeout /t 10 >nul
-   echo 'python service started'
+   )
+   call :runJavaService
    goto :EOF
 
-:START_JAVA
-  echo 'java service starting, see logs in logs/'
-   cd "%javaRunDir%"
-   if not exist "%runtimeDir%\supersonic-standalone\logs" mkdir "%runtimeDir%\supersonic-standalone\logs"
-   set "libDir=%runtimeDir%\supersonic-standalone\lib"
-   set "confDir=%runtimeDir%\supersonic-standalone\conf"
-   set "webDir=%runtimeDir%\supersonic-standalone\webapp"
-   set "classpath=%confDir%;%webDir%;%libDir%\*"
+
+: stop
+   call :stopPythonService
+   call :stopJavaService
+   goto :EOF
+
+
+: reloadExamples
+   set "pythonRunDir=%baseDir%\pyllm"
+   cd "%pythonRunDir%\sql"
+   start  %python_path% examples_reload_run.py
+   goto :EOF
+
+
+: runJavaService
+   echo 'java service starting, see logs in logs/'
+   set "libDir=%baseDir%\lib"
+   set "confDir=%baseDir%\conf"
+   set "webDir=%baseDir%\webapp"
+   set "logDir=%baseDir%\logs"
+   set "classpath=%baseDir%;%webDir%;%libDir%\*;%confDir%"
    set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Xms1024m -Xmx2048m -cp %CLASSPATH% %MAIN_CLASS%"
+   if not exist %logDir% mkdir %logDir%
    start /B java %java-command% >nul 2>&1
    timeout /t 10 >nul
    echo 'java service started'
    goto :EOF
 
-:STOP_PYTHON
+
+: runPythonService
+   echo 'python service starting, see logs in pyllm\pyllm.log'
+   set "pythonRunDir=%baseDir%\pyllm"
+   start /B %python_path% %pythonRunDir%\supersonic_pyllm.py  > %pythonRunDir%\pyllm.log 2>&1
+   timeout /t 10 >nul
+   echo 'python service started'
+   goto :EOF
+
+
+: stopPythonService
    for /f "tokens=2" %%i in ('tasklist ^| findstr /i "python"') do (
            taskkill /PID %%i /F
            echo "python service (PID = %%i) is killed."
    )
    goto :EOF
 
-:STOP_JAVA
+
+: stopJavaService
    for /f "tokens=2" %%i in ('tasklist ^| findstr /i "java"') do (
             taskkill /PID %%i /F
             echo "java service (PID = %%i) is killed."
    )
    goto :EOF
 
-:RELOAD_EXAMPLE
-   cd "%runtimeDir%\supersonic-standalone\pyllm\sql"
-   start  %python_path% examples_reload_run.py
-   goto :EOF
-
-:BUILD_RUNTIME
-  rem 6. reset runtime
-  if exist "%runtimeDir%" goto :EOF
-  mkdir "%runtimeDir%"
-  tar -zxvf "%buildDir%\supersonic-standalone.tar.gz" -C "%runtimeDir%"
-  for /d %%f in ("%runtimeDir%\launchers-standalone-*") do (
-      move "%%f" "%runtimeDir%\supersonic-standalone"
-  )
-
-  rem 7. copy webapp to runtime
-  tar -zxvf "%buildDir%\supersonic-webapp.tar.gz" -C "%buildDir%"
-  if not exist "%runtimeDir%\supersonic-standalone\webapp" mkdir "%runtimeDir%\supersonic-standalone\webapp"
-  xcopy /s /e /h /y "%buildDir%\supersonic-webapp\*" "%runtimeDir%\supersonic-standalone\webapp"
-  if not exist "%runtimeDir%\supersonic-standalone\conf\webapp" mkdir "%runtimeDir%\supersonic-standalone\conf\webapp"
-  xcopy /s /e /h /y "%runtimeDir%\supersonic-standalone\webapp\*" "%runtimeDir%\supersonic-standalone\conf\webapp"
-  rd /s /q "%buildDir%\supersonic-webapp"
+endlocal

assembly/bin/supersonic-daemon.sh

@@ -1,16 +1,11 @@
 #!/usr/bin/env bash
 
-set -x
 sbinDir=$(cd "$(dirname "$0")"; pwd)
-chmod +x $sbinDir/supersonic-common.sh
 source $sbinDir/supersonic-common.sh
 
-# 1.init environment parameters
-if [ ! -d "$runtimeDir" ]; then
-    echo "the runtime dir does not exist move all to runtime"
-    moveAllToRuntime
-fi
-set +x
+set -a
+source $sbinDir/../conf/supersonic-env.sh
+set +a
 
 command=$1
 service=$2
@@ -18,44 +13,93 @@ if [ -z "$service"  ]; then
   service=${STANDALONE_SERVICE}
 fi
 
-app_name=$STANDALONE_APP_NAME
-main_class="com.tencent.supersonic.StandaloneLauncher"
 model_name=$service
-
 if [ "$service" == "pyllm" ]; then
   model_name=${STANDALONE_SERVICE}
   export llmProxy=PythonLLMProxy
 fi
-
 cd $baseDir
 
-# 2.set main class
 function setMainClass {
   if [ "$service" == $CHAT_SERVICE ]; then
     main_class="com.tencent.supersonic.ChatLauncher"
   elif [ "$service" == $HEADLESS_SERVICE ]; then
     main_class="com.tencent.supersonic.HeadlessLauncher"
+  else
+    main_class="com.tencent.supersonic.StandaloneLauncher"
   fi
 }
-setMainClass
-# 3.set app name
+
 function setAppName {
   if [ "$service" == $CHAT_SERVICE ]; then
     app_name=$CHAT_APP_NAME
   elif [ "$service" == $HEADLESS_SERVICE ]; then
     app_name=$HEADLESS_APP_NAME
-  elif [ "$service" == $PYLLM_SERVICE ]; then
-    app_name=$PYLLM_APP_NAME
+  else
+    app_name=$STANDALONE_APP_NAME
   fi
 }
-setAppName
 
 function reloadExamples {
-  pythonRunDir=${runtimeDir}/supersonic-${model_name}/pyllm
-  cd $pythonRunDir/sql
+  cd $baseDir/pyllm/sql
   ${python_path} examples_reload_run.py
 }
 
+function runJavaService {
+  javaRunDir=$baseDir
+  local_app_name=$1
+  libDir=$baseDir/lib
+  confDir=$baseDir/conf
+
+  CLASSPATH=""
+  CLASSPATH=$CLASSPATH:$confDir
+
+  for jarPath in $libDir/*.jar; do
+   CLASSPATH=$CLASSPATH:$jarPath
+  done
+
+  export CLASSPATH
+  export LANG="zh_CN.UTF-8"
+
+  cd $javaRunDir
+  if [[ "$JAVA_HOME" == "" ]]; then
+    JAVA_HOME=$(ls /usr/jdk64/jdk* -d 2>/dev/null | xargs | awk '{print "'$local_app_name'"}')
+  fi
+  export PATH=$JAVA_HOME/bin:$PATH
+  command="-Dfile.encoding="UTF-8"  -Duser.language="Zh" -Duser.region="CN" -Duser.timezone="GMT+08" -Dapp_name=${local_app_name} -Xms1024m -Xmx2048m "$main_class
+
+  mkdir -p $javaRunDir/logs
+  if [[ "$is_test" == "true" ]]; then
+    java -Dspring.profiles.active="dev" $command >/dev/null 2>$javaRunDir/logs/error.log &
+  else
+    java  $command $javaRunDir >/dev/null 2>$javaRunDir/logs/error.log &
+  fi
+}
+
+function runPythonService {
+  pythonRunDir=$baseDir/pyllm
+  cd $pythonRunDir
+  nohup ${python_path} supersonic_pyllm.py  > $pythonRunDir/pyllm.log  2>&1   &
+  # add health check
+  for i in {1..10}
+  do
+    echo "pyllm health check attempt $i..."
+    response=$(curl -s http://${PYLLM_HOST}:${PYLLM_PORT}/health)
+    echo "pyllm health check response: $response"
+    status_ok="Healthy"
+    if [[ $response == *$status_ok* ]] ; then
+      echo "pyllm Health check passed."
+      break
+    else
+      if [ "$i" -eq 10 ]; then
+        echo "pyllm Health check failed after 10 attempts."
+        echo "May still downloading model files. Please check pyllm.log in runtime directory."
+      fi
+      echo "Retrying after 5 seconds..."
+      sleep 5
+    fi
+  done
+}
 
 function start()
 {
@@ -93,18 +137,16 @@ function reload()
   fi
 }
 
-# 4. execute command operation
+setMainClass
+setAppName
 case "$command" in
   start)
         if [ "$service" == $PYLLM_SERVICE ]; then
-          echo  "Starting $app_name"
-          start $app_name
-          echo  "Starting $STANDALONE_APP_NAME"
-          start $STANDALONE_APP_NAME
-        else
-          echo  "Starting $app_name"
-          start $app_name
+          echo  "Starting $PYLLM_APP_NAME"
+          start $PYLLM_APP_NAME
         fi
+        echo  "Starting ${app_name}"
+        start ${app_name}
         echo  "Start success"
         ;;
   stop)
@@ -121,20 +163,15 @@ case "$command" in
         ;;
   restart)
         if [ "$service" == $PYLLM_SERVICE ]; then
-          echo  "Stopping ${app_name}"
-          stop ${app_name}
-          echo  "Stopping ${STANDALONE_APP_NAME}"
-          stop $STANDALONE_APP_NAME
-          echo  "Starting ${app_name}"
-          start ${app_name}
-          echo  "Starting ${STANDALONE_APP_NAME}"
-          start $STANDALONE_APP_NAME
-        else
-          echo  "Stopping ${app_name}"
-          stop ${app_name}
-          echo  "Starting ${app_name}"
-          start ${app_name}
+          echo  "Stopping $PYLLM_APP_NAME"
+          stop $PYLLM_APP_NAME
+          echo  "Starting $PYLLM_APP_NAME"
+          start $PYLLM_APP_NAME
         fi
+        echo  "Stopping ${app_name}"
+        stop ${app_name}
+        echo  "Starting ${app_name}"
+        start ${app_name}
         echo  "Restart success"
         ;;
   *)

assembly/build/build.xml

@@ -21,11 +21,17 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/../../chat/python</directory>
+            <directory>${project.basedir}/../../headless/python</directory>
             <outputDirectory>pyllm</outputDirectory>
             <fileMode>0777</fileMode>
             <directoryMode>0755</directoryMode>
         </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/../../assembly/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <fileMode>0777</fileMode>
+            <directoryMode>0755</directoryMode>
+        </fileSet>
     </fileSets>
 
     <dependencySets>

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java

@@ -2,8 +2,8 @@ package com.tencent.supersonic.auth.api.authentication.utils;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
-import com.tencent.supersonic.common.pojo.SysParameter;
-import com.tencent.supersonic.common.service.SysParameterService;
+import com.tencent.supersonic.common.pojo.SystemConfig;
+import com.tencent.supersonic.common.service.SystemConfigService;
 import com.tencent.supersonic.common.util.ContextUtils;
 import org.springframework.util.CollectionUtils;
 
@@ -20,10 +20,10 @@ public final class UserHolder {
 
     public static User findUser(HttpServletRequest request, HttpServletResponse response) {
         User user = REPO.findUser(request, response);
-        SysParameterService sysParameterService = ContextUtils.getBean(SysParameterService.class);
-        SysParameter sysParameter = sysParameterService.getSysParameter();
-        if (!CollectionUtils.isEmpty(sysParameter.getAdmins())
-                && sysParameter.getAdmins().contains(user.getName())) {
+        SystemConfigService sysParameterService = ContextUtils.getBean(SystemConfigService.class);
+        SystemConfig systemConfig = sysParameterService.getSystemConfig();
+        if (!CollectionUtils.isEmpty(systemConfig.getAdmins())
+                && systemConfig.getAdmins().contains(user.getName())) {
             user.setIsAdmin(1);
         }
         return user;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java

@@ -6,8 +6,8 @@ import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.auth.authentication.utils.ComponentFactory;
-import com.tencent.supersonic.common.pojo.SysParameter;
-import com.tencent.supersonic.common.service.SysParameterService;
+import com.tencent.supersonic.common.pojo.SystemConfig;
+import com.tencent.supersonic.common.service.SystemConfigService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import javax.servlet.http.HttpServletRequest;
@@ -18,9 +18,9 @@ import java.util.Set;
 @Service
 public class UserServiceImpl implements UserService {
 
-    private SysParameterService sysParameterService;
+    private SystemConfigService sysParameterService;
 
-    public UserServiceImpl(SysParameterService sysParameterService) {
+    public UserServiceImpl(SystemConfigService sysParameterService) {
         this.sysParameterService = sysParameterService;
     }
 
@@ -28,9 +28,9 @@ public class UserServiceImpl implements UserService {
     public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
         User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
         if (user != null) {
-            SysParameter sysParameter = sysParameterService.getSysParameter();
-            if (!CollectionUtils.isEmpty(sysParameter.getAdmins())
-                    && sysParameter.getAdmins().contains(user.getName())) {
+            SystemConfig systemConfig = sysParameterService.getSystemConfig();
+            if (!CollectionUtils.isEmpty(systemConfig.getAdmins())
+                    && systemConfig.getAdmins().contains(user.getName())) {
                 user.setIsAdmin(1);
             }
         }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SchemaMapInfo.java

@@ -1,33 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import com.google.common.collect.Lists;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class SchemaMapInfo {
-
-    private Map<Long, List<SchemaElementMatch>> viewElementMatches = new HashMap<>();
-
-    public Set<Long> getMatchedViewInfos() {
-        return viewElementMatches.keySet();
-    }
-
-    public List<SchemaElementMatch> getMatchedElements(Long view) {
-        return viewElementMatches.getOrDefault(view, Lists.newArrayList());
-    }
-
-    public Map<Long, List<SchemaElementMatch>> getViewElementMatches() {
-        return viewElementMatches;
-    }
-
-    public void setViewElementMatches(Map<Long, List<SchemaElementMatch>> viewElementMatches) {
-        this.viewElementMatches = viewElementMatches;
-    }
-
-    public void setMatchedElements(Long view, List<SchemaElementMatch> elementMatches) {
-        viewElementMatches.put(view, elementMatches);
-    }
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticSchema.java

@@ -1,157 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import com.tencent.supersonic.headless.api.pojo.SchemaElement;
-import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import org.springframework.util.CollectionUtils;
-
-public class SemanticSchema implements Serializable {
-
-    private List<ViewSchema> viewSchemaList;
-
-    public SemanticSchema(List<ViewSchema> viewSchemaList) {
-        this.viewSchemaList = viewSchemaList;
-    }
-
-    public void add(ViewSchema schema) {
-        viewSchemaList.add(schema);
-    }
-
-    public SchemaElement getElement(SchemaElementType elementType, long elementID) {
-        Optional<SchemaElement> element = Optional.empty();
-
-        switch (elementType) {
-            case ENTITY:
-                element = getElementsById(elementID, getEntities());
-                break;
-            case VIEW:
-                element = getElementsById(elementID, getViews());
-                break;
-            case METRIC:
-                element = getElementsById(elementID, getMetrics());
-                break;
-            case DIMENSION:
-                element = getElementsById(elementID, getDimensions());
-                break;
-            case VALUE:
-                element = getElementsById(elementID, getDimensionValues());
-                break;
-            default:
-        }
-
-        if (element.isPresent()) {
-            return element.get();
-        } else {
-            return null;
-        }
-    }
-
-    public Map<Long, String> getViewIdToName() {
-        return viewSchemaList.stream()
-                .collect(Collectors.toMap(a -> a.getView().getId(), a -> a.getView().getName(), (k1, k2) -> k1));
-    }
-
-    public List<SchemaElement> getDimensionValues() {
-        List<SchemaElement> dimensionValues = new ArrayList<>();
-        viewSchemaList.stream().forEach(d -> dimensionValues.addAll(d.getDimensionValues()));
-        return dimensionValues;
-    }
-
-    public List<SchemaElement> getDimensions() {
-        List<SchemaElement> dimensions = new ArrayList<>();
-        viewSchemaList.stream().forEach(d -> dimensions.addAll(d.getDimensions()));
-        return dimensions;
-    }
-
-    public List<SchemaElement> getDimensions(Long viewId) {
-        List<SchemaElement> dimensions = getDimensions();
-        return getElementsByViewId(viewId, dimensions);
-    }
-
-    public SchemaElement getDimension(Long id) {
-        List<SchemaElement> dimensions = getDimensions();
-        Optional<SchemaElement> dimension = getElementsById(id, dimensions);
-        return dimension.orElse(null);
-    }
-
-    public List<SchemaElement> getTags() {
-        List<SchemaElement> tags = new ArrayList<>();
-        viewSchemaList.stream().forEach(d -> tags.addAll(d.getTags()));
-        return tags;
-    }
-
-    public List<SchemaElement> getTags(Long viewId) {
-        List<SchemaElement> tags = new ArrayList<>();
-        viewSchemaList.stream().filter(schemaElement ->
-                        viewId.equals(schemaElement.getView().getView()))
-                .forEach(d -> tags.addAll(d.getTags()));
-        return tags;
-    }
-
-    public List<SchemaElement> getMetrics() {
-        List<SchemaElement> metrics = new ArrayList<>();
-        viewSchemaList.stream().forEach(d -> metrics.addAll(d.getMetrics()));
-        return metrics;
-    }
-
-    public List<SchemaElement> getMetrics(Long viewId) {
-        List<SchemaElement> metrics = getMetrics();
-        return getElementsByViewId(viewId, metrics);
-    }
-
-    public List<SchemaElement> getEntities() {
-        List<SchemaElement> entities = new ArrayList<>();
-        viewSchemaList.stream().forEach(d -> entities.add(d.getEntity()));
-        return entities;
-    }
-
-    public List<SchemaElement> getEntities(Long viewId) {
-        List<SchemaElement> entities = getEntities();
-        return getElementsByViewId(viewId, entities);
-    }
-
-    private List<SchemaElement> getElementsByViewId(Long viewId, List<SchemaElement> elements) {
-        return elements.stream()
-                .filter(schemaElement -> viewId.equals(schemaElement.getView()))
-                .collect(Collectors.toList());
-    }
-
-    private Optional<SchemaElement> getElementsById(Long id, List<SchemaElement> elements) {
-        return elements.stream()
-                .filter(schemaElement -> id.equals(schemaElement.getId()))
-                .findFirst();
-    }
-
-    public SchemaElement getView(Long viewId) {
-        List<SchemaElement> views = getViews();
-        return getElementsById(viewId, views).orElse(null);
-    }
-
-    public List<SchemaElement> getViews() {
-        List<SchemaElement> views = new ArrayList<>();
-        viewSchemaList.stream().forEach(d -> views.add(d.getView()));
-        return views;
-    }
-
-    public Map<String, String> getBizNameToName(Long viewId) {
-        List<SchemaElement> allElements = new ArrayList<>();
-        allElements.addAll(getDimensions(viewId));
-        allElements.addAll(getMetrics(viewId));
-        return allElements.stream()
-                .collect(Collectors.toMap(SchemaElement::getBizName, SchemaElement::getName, (k1, k2) -> k1));
-    }
-
-    public Map<Long, ViewSchema> getViewSchemaMap() {
-        if (CollectionUtils.isEmpty(viewSchemaList)) {
-            return new HashMap<>();
-        }
-        return viewSchemaList.stream().collect(Collectors.toMap(viewSchema
-                -> viewSchema.getView().getView(), viewSchema -> viewSchema));
-    }
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatConfigBaseReq.java

@@ -16,16 +16,6 @@ public class ChatConfigBaseReq {
 
     private Long modelId;
 
-    /**
-     * the chatDetailConfig about the model
-     */
-    private ChatDetailConfigReq chatDetailConfig;
-
-    /**
-     * the chatAggConfig about the model
-     */
-    private ChatAggConfigReq chatAggConfig;
-
 
     /**
      * the recommended questions about the model

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatExecuteReq.java

@@ -0,0 +1,21 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatExecuteReq {
+    private User user;
+    private Long queryId;
+    private Integer chatId;
+    private int parseId;
+    private String queryText;
+    private boolean saveAnswer;
+
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatParseReq.java

@@ -1,15 +1,19 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.headless.api.pojo.SchemaMapInfo;
+import com.tencent.supersonic.headless.api.pojo.request.QueryFilters;
 import lombok.Data;
 
 @Data
-public class QueryReq {
+public class ChatParseReq {
     private String queryText;
     private Integer chatId;
-    private Long viewId;
+    private Integer agentId;
+    private Integer topN = 10;
     private User user;
     private QueryFilters queryFilters;
     private boolean saveAnswer = true;
-    private Integer agentId;
+    private SchemaMapInfo mapInfo = new SchemaMapInfo();
+
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatQueryDataReq.java

@@ -0,0 +1,22 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.DateConf;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.request.QueryFilter;
+import lombok.Data;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Data
+public class ChatQueryDataReq {
+    private User user;
+    private Set<SchemaElement> metrics = new HashSet<>();
+    private Set<SchemaElement> dimensions = new HashSet<>();
+    private Set<QueryFilter> dimensionFilters = new HashSet<>();
+    private Set<QueryFilter> metricFilters = new HashSet<>();
+    private DateConf dateInfo;
+    private Long queryId;
+    private Integer parseId;
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/PluginQueryReq.java

@@ -13,7 +13,7 @@ public class PluginQueryReq {
 
     private String type;
 
-    private String view;
+    private String dataSet;
 
     private String pattern;
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/SimilarQueryReq.java

@@ -18,7 +18,7 @@ public class SimilarQueryReq {
 
     private String queryText;
 
-    private Long viewId;
+    private Long dataSetId;
 
     private Integer agentId;
 

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java

@@ -1,23 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo.response;
-
-import com.google.common.collect.Lists;
-import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import lombok.Data;
-import java.util.List;
-
-@Data
-public class ParseResp {
-    private Integer chatId;
-    private String queryText;
-    private Long queryId;
-    private ParseState state;
-    private List<SemanticParseInfo> selectedParses = Lists.newArrayList();
-    private ParseTimeCostDO parseTimeCost = new ParseTimeCostDO();
-
-    public enum ParseState {
-        COMPLETED,
-        PENDING,
-        FAILED
-    }
-
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java

@@ -1,10 +1,12 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.response.QueryResult;
 import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
+
 @Data
 public class QueryResp {
 
@@ -18,5 +20,4 @@ public class QueryResp {
     private List<SemanticParseInfo> parseInfos;
     private List<SimilarQueryRecallResp> similarQueries;
 
-
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java

@@ -10,8 +10,6 @@ public class SimilarQueryRecallResp {
 
     private Long queryId;
 
-    private Integer parseId;
-
     private String queryText;
 
 }

chat/core/pom.xml

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>chat</artifactId>
-        <groupId>com.tencent.supersonic</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>chat-core</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>${org.testng.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>${commons.compress.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>${alibaba.druid.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>headless-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>headless-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>chat-api</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.xkzhangsan</groupId>
-            <artifactId>xk-time</artifactId>
-            <version>${xk.time.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>${mockito-inline.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>headless-server</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>

chat/core/src/main/java/com/tencent/supersonic/chat/core/config/OptimizationConfig.java

@@ -1,175 +0,0 @@
-package com.tencent.supersonic.chat.core.config;
-
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.SqlGenerationMode;
-import com.tencent.supersonic.common.service.SysParameterService;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Data
-@Slf4j
-public class OptimizationConfig {
-
-    @Value("${one.detection.size:8}")
-    private Integer oneDetectionSize;
-
-    @Value("${one.detection.max.size:20}")
-    private Integer oneDetectionMaxSize;
-
-    @Value("${metric.dimension.min.threshold:0.3}")
-    private Double metricDimensionMinThresholdConfig;
-
-    @Value("${metric.dimension.threshold:0.3}")
-    private Double metricDimensionThresholdConfig;
-
-    @Value("${dimension.value.threshold:0.5}")
-    private Double dimensionValueThresholdConfig;
-
-    @Value("${long.text.threshold:0.8}")
-    private Double longTextThreshold;
-
-    @Value("${short.text.threshold:0.5}")
-    private Double shortTextThreshold;
-
-    @Value("${query.text.length.threshold:10}")
-    private Integer queryTextLengthThreshold;
-    @Value("${embedding.mapper.word.min:4}")
-    private int embeddingMapperWordMin;
-
-    @Value("${embedding.mapper.word.max:5}")
-    private int embeddingMapperWordMax;
-
-    @Value("${embedding.mapper.batch:50}")
-    private int embeddingMapperBatch;
-
-    @Value("${embedding.mapper.number:5}")
-    private int embeddingMapperNumber;
-
-    @Value("${embedding.mapper.round.number:10}")
-    private int embeddingMapperRoundNumber;
-
-    @Value("${embedding.mapper.distance.threshold:0.01}")
-    private Double embeddingMapperDistanceThreshold;
-
-    @Value("${s2SQL.linking.value.switch:true}")
-    private boolean useLinkingValueSwitch;
-
-    @Value("${s2SQL.generation:TWO_PASS_AUTO_COT}")
-    private SqlGenerationMode sqlGenerationMode;
-
-    @Value("${s2SQL.use.switch:true}")
-    private boolean useS2SqlSwitch;
-
-    @Value("${text2sql.example.num:15}")
-    private int text2sqlExampleNum;
-
-    @Value("${text2sql.fewShots.num:10}")
-    private int text2sqlFewShotsNum;
-
-    @Value("${text2sql.self.consistency.num:5}")
-    private int text2sqlSelfConsistencyNum;
-
-    @Value("${parse.show.count:3}")
-    private Integer parseShowCount;
-
-    @Autowired
-    private SysParameterService sysParameterService;
-
-    public Integer getOneDetectionSize() {
-        return convertValue("one.detection.size", Integer.class, oneDetectionSize);
-    }
-
-    public Integer getOneDetectionMaxSize() {
-        return convertValue("one.detection.max.size", Integer.class, oneDetectionMaxSize);
-    }
-
-    public Double getMetricDimensionMinThresholdConfig() {
-        return convertValue("metric.dimension.min.threshold", Double.class, metricDimensionMinThresholdConfig);
-    }
-
-    public Double getMetricDimensionThresholdConfig() {
-        return convertValue("metric.dimension.threshold", Double.class, metricDimensionThresholdConfig);
-    }
-
-    public Double getDimensionValueThresholdConfig() {
-        return convertValue("dimension.value.threshold", Double.class, dimensionValueThresholdConfig);
-    }
-
-    public Double getLongTextThreshold() {
-        return convertValue("long.text.threshold", Double.class, longTextThreshold);
-    }
-
-    public Double getShortTextThreshold() {
-        return convertValue("short.text.threshold", Double.class, shortTextThreshold);
-    }
-
-    public Integer getQueryTextLengthThreshold() {
-        return convertValue("query.text.length.threshold", Integer.class, queryTextLengthThreshold);
-    }
-
-    public boolean isUseS2SqlSwitch() {
-        return convertValue("use.s2SQL.switch", Boolean.class, useS2SqlSwitch);
-    }
-
-    public Integer getEmbeddingMapperWordMin() {
-        return convertValue("embedding.mapper.word.min", Integer.class, embeddingMapperWordMin);
-    }
-
-    public Integer getEmbeddingMapperWordMax() {
-        return convertValue("embedding.mapper.word.max", Integer.class, embeddingMapperWordMax);
-    }
-
-    public Integer getEmbeddingMapperBatch() {
-        return convertValue("embedding.mapper.batch", Integer.class, embeddingMapperBatch);
-    }
-
-    public Integer getEmbeddingMapperNumber() {
-        return convertValue("embedding.mapper.number", Integer.class, embeddingMapperNumber);
-    }
-
-    public Integer getEmbeddingMapperRoundNumber() {
-        return convertValue("embedding.mapper.round.number", Integer.class, embeddingMapperRoundNumber);
-    }
-
-    public Double getEmbeddingMapperDistanceThreshold() {
-        return convertValue("embedding.mapper.distance.threshold", Double.class, embeddingMapperDistanceThreshold);
-    }
-
-    public boolean isUseLinkingValueSwitch() {
-        return convertValue("s2SQL.linking.value.switch", Boolean.class, useLinkingValueSwitch);
-    }
-
-    public SqlGenerationMode getSqlGenerationMode() {
-        return convertValue("s2SQL.generation", SqlGenerationMode.class, sqlGenerationMode);
-    }
-
-    public Integer getParseShowCount() {
-        return convertValue("parse.show.count", Integer.class, parseShowCount);
-    }
-
-    public <T> T convertValue(String paramName, Class<T> targetType, T defaultValue) {
-        try {
-            String value = sysParameterService.getSysParameter().getParameterByName(paramName);
-            if (StringUtils.isBlank(value)) {
-                return defaultValue;
-            }
-            if (targetType == Double.class) {
-                return targetType.cast(Double.parseDouble(value));
-            } else if (targetType == Integer.class) {
-                return targetType.cast(Integer.parseInt(value));
-            } else if (targetType == Boolean.class) {
-                return targetType.cast(Boolean.parseBoolean(value));
-            } else if (targetType == SqlGenerationMode.class) {
-                return targetType.cast(SqlGenerationMode.valueOf(value));
-            }
-        } catch (Exception e) {
-            log.error("convertValue", e);
-        }
-        return defaultValue;
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/BaseMapper.java

@@ -1,99 +0,0 @@
-package com.tencent.supersonic.chat.core.mapper;
-
-import com.tencent.supersonic.headless.api.pojo.SchemaElement;
-import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
-import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
-import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
-import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.ViewSchema;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-
-@Slf4j
-public abstract class BaseMapper implements SchemaMapper {
-
-    @Override
-    public void map(QueryContext queryContext) {
-
-        String simpleName = this.getClass().getSimpleName();
-        long startTime = System.currentTimeMillis();
-        log.debug("before {},mapInfo:{}", simpleName, queryContext.getMapInfo().getViewElementMatches());
-
-        try {
-            doMap(queryContext);
-        } catch (Exception e) {
-            log.error("work error", e);
-        }
-
-        long cost = System.currentTimeMillis() - startTime;
-        log.debug("after {},cost:{},mapInfo:{}", simpleName, cost, queryContext.getMapInfo().getViewElementMatches());
-    }
-
-    public abstract void doMap(QueryContext queryContext);
-
-    public void addToSchemaMap(SchemaMapInfo schemaMap, Long modelId, SchemaElementMatch newElementMatch) {
-        Map<Long, List<SchemaElementMatch>> modelElementMatches = schemaMap.getViewElementMatches();
-        List<SchemaElementMatch> schemaElementMatches = modelElementMatches.putIfAbsent(modelId, new ArrayList<>());
-        if (schemaElementMatches == null) {
-            schemaElementMatches = modelElementMatches.get(modelId);
-        }
-        //remove duplication
-        AtomicBoolean needAddNew = new AtomicBoolean(true);
-        schemaElementMatches.removeIf(
-                existElementMatch -> {
-                    SchemaElement existElement = existElementMatch.getElement();
-                    SchemaElement newElement = newElementMatch.getElement();
-                    if (existElement.equals(newElement)) {
-                        if (newElementMatch.getSimilarity() > existElementMatch.getSimilarity()) {
-                            return true;
-                        } else {
-                            needAddNew.set(false);
-                        }
-                    }
-                    return false;
-                }
-        );
-        if (needAddNew.get()) {
-            schemaElementMatches.add(newElementMatch);
-        }
-    }
-
-    public SchemaElement getSchemaElement(Long viewId, SchemaElementType elementType, Long elementID,
-            SemanticSchema semanticSchema) {
-        SchemaElement element = new SchemaElement();
-        ViewSchema viewSchema = semanticSchema.getViewSchemaMap().get(viewId);
-        if (Objects.isNull(viewSchema)) {
-            return null;
-        }
-        SchemaElement elementDb = viewSchema.getElement(elementType, elementID);
-        if (Objects.isNull(elementDb)) {
-            log.info("element is null, elementType:{},elementID:{}", elementType, elementID);
-            return null;
-        }
-        BeanUtils.copyProperties(elementDb, element);
-        element.setAlias(getAlias(elementDb));
-        return element;
-    }
-
-    public List<String> getAlias(SchemaElement element) {
-        if (!SchemaElementType.VALUE.equals(element.getType())) {
-            return element.getAlias();
-        }
-        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(element.getAlias()) && StringUtils.isNotEmpty(
-                element.getName())) {
-            return element.getAlias().stream()
-                    .filter(aliasItem -> aliasItem.contains(element.getName()))
-                    .collect(Collectors.toList());
-        }
-        return element.getAlias();
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/HanlpDictMatchStrategy.java

@@ -1,119 +0,0 @@
-package com.tencent.supersonic.chat.core.mapper;
-
-import com.tencent.supersonic.chat.core.config.OptimizationConfig;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.headless.api.pojo.response.S2Term;
-import com.tencent.supersonic.headless.core.knowledge.HanlpMapResult;
-import com.tencent.supersonic.headless.server.service.KnowledgeService;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * HanlpDictMatchStrategy uses <a href="https://www.hanlp.com/">HanLP</a> to
- * match schema elements. It currently supports prefix and suffix matching
- * against names, values and aliases.
- */
-@Service
-@Slf4j
-public class HanlpDictMatchStrategy extends BaseMatchStrategy<HanlpMapResult> {
-
-    @Autowired
-    private MapperHelper mapperHelper;
-
-    @Autowired
-    private OptimizationConfig optimizationConfig;
-
-    @Autowired
-    private KnowledgeService knowledgeService;
-
-    @Override
-    public Map<MatchText, List<HanlpMapResult>> match(QueryContext queryContext, List<S2Term> terms,
-            Set<Long> detectViewIds) {
-        String text = queryContext.getQueryText();
-        if (Objects.isNull(terms) || StringUtils.isEmpty(text)) {
-            return null;
-        }
-
-        log.debug("retryCount:{},terms:{},,detectModelIds:{}", terms, detectViewIds);
-
-        List<HanlpMapResult> detects = detect(queryContext, terms, detectViewIds);
-        Map<MatchText, List<HanlpMapResult>> result = new HashMap<>();
-
-        result.put(MatchText.builder().regText(text).detectSegment(text).build(), detects);
-        return result;
-    }
-
-    @Override
-    public boolean needDelete(HanlpMapResult oneRoundResult, HanlpMapResult existResult) {
-        return getMapKey(oneRoundResult).equals(getMapKey(existResult))
-                && existResult.getDetectWord().length() < oneRoundResult.getDetectWord().length();
-    }
-
-    public void detectByStep(QueryContext queryContext, Set<HanlpMapResult> existResults, Set<Long> detectViewIds,
-            String detectSegment, int offset) {
-        // step1. pre search
-        Integer oneDetectionMaxSize = optimizationConfig.getOneDetectionMaxSize();
-        LinkedHashSet<HanlpMapResult> hanlpMapResults = knowledgeService.prefixSearch(detectSegment,
-                oneDetectionMaxSize, detectViewIds).stream().collect(Collectors.toCollection(LinkedHashSet::new));
-        // step2. suffix search
-        LinkedHashSet<HanlpMapResult> suffixHanlpMapResults = knowledgeService.suffixSearch(detectSegment,
-                oneDetectionMaxSize, detectViewIds).stream().collect(Collectors.toCollection(LinkedHashSet::new));
-
-        hanlpMapResults.addAll(suffixHanlpMapResults);
-
-        if (CollectionUtils.isEmpty(hanlpMapResults)) {
-            return;
-        }
-        // step3. merge pre/suffix result
-        hanlpMapResults = hanlpMapResults.stream().sorted((a, b) -> -(b.getName().length() - a.getName().length()))
-                .collect(Collectors.toCollection(LinkedHashSet::new));
-
-        // step4. filter by similarity
-        hanlpMapResults = hanlpMapResults.stream()
-                .filter(term -> mapperHelper.getSimilarity(detectSegment, term.getName())
-                        >= mapperHelper.getThresholdMatch(term.getNatures()))
-                .filter(term -> CollectionUtils.isNotEmpty(term.getNatures()))
-                .collect(Collectors.toCollection(LinkedHashSet::new));
-
-        log.info("after isSimilarity parseResults:{}", hanlpMapResults);
-
-        hanlpMapResults = hanlpMapResults.stream().map(parseResult -> {
-            parseResult.setOffset(offset);
-            parseResult.setSimilarity(mapperHelper.getSimilarity(detectSegment, parseResult.getName()));
-            return parseResult;
-        }).collect(Collectors.toCollection(LinkedHashSet::new));
-
-        // step5. take only one dimension or 10 metric/dimension value per rond.
-        List<HanlpMapResult> dimensionMetrics = hanlpMapResults.stream()
-                .filter(entry -> mapperHelper.existDimensionValues(entry.getNatures()))
-                .collect(Collectors.toList())
-                .stream()
-                .limit(1)
-                .collect(Collectors.toList());
-
-        Integer oneDetectionSize = optimizationConfig.getOneDetectionSize();
-        List<HanlpMapResult> oneRoundResults = hanlpMapResults.stream().limit(oneDetectionSize)
-                .collect(Collectors.toList());
-
-        if (CollectionUtils.isNotEmpty(dimensionMetrics)) {
-            oneRoundResults = dimensionMetrics;
-        }
-        // step6. select mapResul in one round
-        selectResultInOneRound(existResults, oneRoundResults);
-    }
-
-    public String getMapKey(HanlpMapResult a) {
-        return a.getName() + Constants.UNDERLINE + String.join(Constants.UNDERLINE, a.getNatures());
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/JavaLLMProxy.java

@@ -1,66 +0,0 @@
-package com.tencent.supersonic.chat.core.parser;
-
-import com.tencent.supersonic.chat.core.parser.plugin.function.FunctionPromptGenerator;
-import com.tencent.supersonic.chat.core.parser.plugin.function.FunctionReq;
-import com.tencent.supersonic.chat.core.parser.plugin.function.FunctionResp;
-import com.tencent.supersonic.chat.core.parser.sql.llm.OutputFormat;
-import com.tencent.supersonic.chat.core.parser.sql.llm.SqlGeneration;
-import com.tencent.supersonic.chat.core.parser.sql.llm.SqlGenerationFactory;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.SqlGenerationMode;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-import com.tencent.supersonic.common.util.ContextUtils;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.Objects;
-
-/**
- * LLMProxy based on langchain4j Java version.
- */
-@Slf4j
-@Component
-public class JavaLLMProxy implements LLMProxy {
-
-    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
-
-    @Override
-    public boolean isSkip(QueryContext queryContext) {
-        ChatLanguageModel chatLanguageModel = ContextUtils.getBean(ChatLanguageModel.class);
-        if (Objects.isNull(chatLanguageModel)) {
-            log.warn("chatLanguageModel is null, skip :{}", JavaLLMProxy.class.getName());
-            return true;
-        }
-        return false;
-    }
-
-    public LLMResp query2sql(LLMReq llmReq, Long viewId) {
-
-        SqlGeneration sqlGeneration = SqlGenerationFactory.get(
-                SqlGenerationMode.getMode(llmReq.getSqlGenerationMode()));
-        String modelName = llmReq.getSchema().getViewName();
-        LLMResp result = sqlGeneration.generation(llmReq, viewId);
-        result.setQuery(llmReq.getQueryText());
-        result.setModelName(modelName);
-        return result;
-    }
-
-    @Override
-    public FunctionResp requestFunction(FunctionReq functionReq) {
-
-        FunctionPromptGenerator promptGenerator = ContextUtils.getBean(FunctionPromptGenerator.class);
-
-        ChatLanguageModel chatLanguageModel = ContextUtils.getBean(ChatLanguageModel.class);
-        String functionCallPrompt = promptGenerator.generateFunctionCallPrompt(functionReq.getQueryText(),
-                functionReq.getPluginConfigs());
-        keyPipelineLog.info("functionCallPrompt:{}", functionCallPrompt);
-        String response = chatLanguageModel.generate(functionCallPrompt);
-        keyPipelineLog.info("functionCall response:{}", response);
-        return OutputFormat.functionCallParse(response);
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/LLMProxy.java

@@ -1,22 +0,0 @@
-package com.tencent.supersonic.chat.core.parser;
-
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.parser.plugin.function.FunctionReq;
-import com.tencent.supersonic.chat.core.parser.plugin.function.FunctionResp;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-
-/**
- * LLMProxy encapsulates functions performed by LLMs so that multiple
- * orchestration frameworks (e.g. LangChain in python, LangChain4j in java)
- * could be used.
- */
-public interface LLMProxy {
-
-    boolean isSkip(QueryContext queryContext);
-
-    LLMResp query2sql(LLMReq llmReq, Long viewId);
-
-    FunctionResp requestFunction(FunctionReq functionReq);
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/PythonLLMProxy.java

@@ -1,104 +0,0 @@
-package com.tencent.supersonic.chat.core.parser;
-
-import com.alibaba.fastjson.JSON;
-import com.tencent.supersonic.chat.core.config.LLMParserConfig;
-import com.tencent.supersonic.chat.core.parser.plugin.function.FunctionCallConfig;
-import com.tencent.supersonic.chat.core.parser.plugin.function.FunctionReq;
-import com.tencent.supersonic.chat.core.parser.plugin.function.FunctionResp;
-import com.tencent.supersonic.chat.core.parser.sql.llm.OutputFormat;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.JsonUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-
-/**
- * PythonLLMProxy sends requests to LangChain-based python service.
- */
-@Slf4j
-@Component
-public class PythonLLMProxy implements LLMProxy {
-
-    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
-
-    @Override
-    public boolean isSkip(QueryContext queryContext) {
-        LLMParserConfig llmParserConfig = ContextUtils.getBean(LLMParserConfig.class);
-        if (StringUtils.isEmpty(llmParserConfig.getUrl())) {
-            log.warn("llmParserUrl is empty, skip :{}", PythonLLMProxy.class.getName());
-            return true;
-        }
-        return false;
-    }
-
-    public LLMResp query2sql(LLMReq llmReq, Long viewId) {
-        long startTime = System.currentTimeMillis();
-        log.info("requestLLM request, viewId:{},llmReq:{}", viewId, llmReq);
-        keyPipelineLog.info("viewId:{},llmReq:{}", viewId, llmReq);
-        try {
-            LLMParserConfig llmParserConfig = ContextUtils.getBean(LLMParserConfig.class);
-
-            URL url = new URL(new URL(llmParserConfig.getUrl()), llmParserConfig.getQueryToSqlPath());
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            HttpEntity<String> entity = new HttpEntity<>(JsonUtil.toString(llmReq), headers);
-            RestTemplate restTemplate = ContextUtils.getBean(RestTemplate.class);
-            ResponseEntity<LLMResp> responseEntity = restTemplate.exchange(url.toString(), HttpMethod.POST, entity,
-                    LLMResp.class);
-
-            LLMResp llmResp = responseEntity.getBody();
-            log.info("requestLLM response,cost:{}, questUrl:{} \n entity:{} \n body:{}",
-                    System.currentTimeMillis() - startTime, url, entity, llmResp);
-            keyPipelineLog.info("LLMResp:{}", llmResp);
-
-            if (MapUtils.isEmpty(llmResp.getSqlRespMap())) {
-                llmResp.setSqlRespMap(OutputFormat.buildSqlRespMap(new ArrayList<>(), llmResp.getSqlWeight()));
-            }
-            return llmResp;
-        } catch (Exception e) {
-            log.error("requestLLM error", e);
-        }
-        return null;
-    }
-
-    public FunctionResp requestFunction(FunctionReq functionReq) {
-        FunctionCallConfig functionCallInfoConfig = ContextUtils.getBean(FunctionCallConfig.class);
-        String url = functionCallInfoConfig.getUrl() + functionCallInfoConfig.getPluginSelectPath();
-        HttpHeaders headers = new HttpHeaders();
-        long startTime = System.currentTimeMillis();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        HttpEntity<String> entity = new HttpEntity<>(JSON.toJSONString(functionReq), headers);
-        URI requestUrl = UriComponentsBuilder.fromHttpUrl(url).build().encode().toUri();
-        RestTemplate restTemplate = ContextUtils.getBean(RestTemplate.class);
-        try {
-            log.info("requestFunction functionReq:{}", JsonUtil.toString(functionReq));
-            keyPipelineLog.info("requestFunction functionReq:{}", JsonUtil.toString(functionReq));
-            ResponseEntity<FunctionResp> responseEntity = restTemplate.exchange(requestUrl, HttpMethod.POST, entity,
-                    FunctionResp.class);
-            log.info("requestFunction responseEntity:{},cost:{}", responseEntity,
-                    System.currentTimeMillis() - startTime);
-            keyPipelineLog.info("response:{}", responseEntity.getBody());
-            return responseEntity.getBody();
-        } catch (Exception e) {
-            log.error("requestFunction error", e);
-        }
-        return null;
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/SatisfactionChecker.java

@@ -1,49 +0,0 @@
-package com.tencent.supersonic.chat.core.parser;
-
-
-import com.tencent.supersonic.chat.core.query.SemanticQuery;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.core.config.OptimizationConfig;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMSqlQuery;
-import com.tencent.supersonic.common.util.ContextUtils;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * This checker can be used by semantic parsers to check if query intent
- * has already been satisfied by current candidate queries. If so, current
- * parser could be skipped.
- */
-@Slf4j
-public class SatisfactionChecker {
-
-    // check all the parse info in candidate
-    public static boolean isSkip(QueryContext queryContext) {
-        for (SemanticQuery query : queryContext.getCandidateQueries()) {
-            if (query.getQueryMode().equals(LLMSqlQuery.QUERY_MODE)) {
-                continue;
-            }
-            if (checkThreshold(queryContext.getQueryText(), query.getParseInfo())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean checkThreshold(String queryText, SemanticParseInfo semanticParseInfo) {
-        int queryTextLength = queryText.replaceAll(" ", "").length();
-        double degree = semanticParseInfo.getScore() / queryTextLength;
-        OptimizationConfig optimizationConfig = ContextUtils.getBean(OptimizationConfig.class);
-        if (queryTextLength > optimizationConfig.getQueryTextLengthThreshold()) {
-            if (degree < optimizationConfig.getLongTextThreshold()) {
-                return false;
-            }
-        } else if (degree < optimizationConfig.getShortTextThreshold()) {
-            return false;
-        }
-        log.info("queryMode:{}, degree:{}, parse info:{}",
-                semanticParseInfo.getQueryMode(), degree, semanticParseInfo);
-        return true;
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/SemanticParser.java

@@ -1,15 +0,0 @@
-package com.tencent.supersonic.chat.core.parser;
-
-
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.pojo.ChatContext;
-
-/**
- * A semantic parser understands user queries and extracts semantic information.
- * It could leverage either rule-based or LLM-based approach to identify query intent
- * and extract related semantic items from the query.
- */
-public interface SemanticParser {
-
-    void parse(QueryContext queryContext, ChatContext chatContext);
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/PluginParser.java

@@ -1,123 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.plugin;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
-import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
-import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
-import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
-import com.tencent.supersonic.chat.core.parser.SemanticParser;
-import com.tencent.supersonic.chat.core.plugin.Plugin;
-import com.tencent.supersonic.chat.core.plugin.PluginManager;
-import com.tencent.supersonic.chat.core.plugin.PluginParseResult;
-import com.tencent.supersonic.chat.core.plugin.PluginRecallResult;
-import com.tencent.supersonic.chat.core.pojo.ChatContext;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.query.QueryManager;
-import com.tencent.supersonic.chat.core.query.SemanticQuery;
-import com.tencent.supersonic.chat.core.query.plugin.PluginSemanticQuery;
-import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
-import org.springframework.util.CollectionUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-
-/**
- * PluginParser defines the basic process and common methods for recalling plugins.
- */
-public abstract class PluginParser implements SemanticParser {
-
-    @Override
-    public void parse(QueryContext queryContext, ChatContext chatContext) {
-        for (SemanticQuery semanticQuery : queryContext.getCandidateQueries()) {
-            if (queryContext.getQueryText().length() <= semanticQuery.getParseInfo().getScore()
-                    && (QueryManager.getPluginQueryModes().contains(semanticQuery.getQueryMode()))) {
-                return;
-            }
-        }
-        if (!checkPreCondition(queryContext)) {
-            return;
-        }
-        PluginRecallResult pluginRecallResult = recallPlugin(queryContext);
-        if (pluginRecallResult == null) {
-            return;
-        }
-        buildQuery(queryContext, pluginRecallResult);
-    }
-
-    public abstract boolean checkPreCondition(QueryContext queryContext);
-
-    public abstract PluginRecallResult recallPlugin(QueryContext queryContext);
-
-    public void buildQuery(QueryContext queryContext, PluginRecallResult pluginRecallResult) {
-        Plugin plugin = pluginRecallResult.getPlugin();
-        Set<Long> viewIds = pluginRecallResult.getViewIds();
-        if (plugin.isContainsAllModel()) {
-            viewIds = Sets.newHashSet(-1L);
-        }
-        for (Long viewId : viewIds) {
-            PluginSemanticQuery pluginQuery = QueryManager.createPluginQuery(plugin.getType());
-            SemanticParseInfo semanticParseInfo = buildSemanticParseInfo(viewId, plugin,
-                    queryContext, pluginRecallResult.getDistance());
-            semanticParseInfo.setQueryMode(pluginQuery.getQueryMode());
-            semanticParseInfo.setScore(pluginRecallResult.getScore());
-            pluginQuery.setParseInfo(semanticParseInfo);
-            queryContext.getCandidateQueries().add(pluginQuery);
-        }
-    }
-
-    protected List<Plugin> getPluginList(QueryContext queryContext) {
-        return PluginManager.getPluginAgentCanSupport(queryContext);
-    }
-
-    protected SemanticParseInfo buildSemanticParseInfo(Long viewId, Plugin plugin,
-                                                       QueryContext queryContext, double distance) {
-        List<SchemaElementMatch> schemaElementMatches = queryContext.getMapInfo().getMatchedElements(viewId);
-        QueryFilters queryFilters = queryContext.getQueryFilters();
-        if (viewId == null && !CollectionUtils.isEmpty(plugin.getViewList())) {
-            viewId = plugin.getViewList().get(0);
-        }
-        if (schemaElementMatches == null) {
-            schemaElementMatches = Lists.newArrayList();
-        }
-        SemanticParseInfo semanticParseInfo = new SemanticParseInfo();
-        semanticParseInfo.setElementMatches(schemaElementMatches);
-        semanticParseInfo.setView(queryContext.getSemanticSchema().getView(viewId));
-        Map<String, Object> properties = new HashMap<>();
-        PluginParseResult pluginParseResult = new PluginParseResult();
-        pluginParseResult.setPlugin(plugin);
-        pluginParseResult.setQueryFilters(queryFilters);
-        pluginParseResult.setDistance(distance);
-        pluginParseResult.setQueryText(queryContext.getQueryText());
-        properties.put(Constants.CONTEXT, pluginParseResult);
-        properties.put("type", "plugin");
-        properties.put("name", plugin.getName());
-        semanticParseInfo.setProperties(properties);
-        semanticParseInfo.setScore(distance);
-        fillSemanticParseInfo(semanticParseInfo);
-        return semanticParseInfo;
-    }
-
-    private void fillSemanticParseInfo(SemanticParseInfo semanticParseInfo) {
-        List<SchemaElementMatch> schemaElementMatches = semanticParseInfo.getElementMatches();
-        if (CollectionUtils.isEmpty(schemaElementMatches)) {
-            return;
-        }
-        schemaElementMatches.stream().filter(schemaElementMatch ->
-                        SchemaElementType.VALUE.equals(schemaElementMatch.getElement().getType())
-                                || SchemaElementType.ID.equals(schemaElementMatch.getElement().getType()))
-                .forEach(schemaElementMatch -> {
-                    QueryFilter queryFilter = new QueryFilter();
-                    queryFilter.setValue(schemaElementMatch.getWord());
-                    queryFilter.setElementID(schemaElementMatch.getElement().getId());
-                    queryFilter.setName(schemaElementMatch.getElement().getName());
-                    queryFilter.setOperator(FilterOperatorEnum.EQUALS);
-                    queryFilter.setBizName(schemaElementMatch.getElement().getBizName());
-                    semanticParseInfo.getDimensionFilters().add(queryFilter);
-                });
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/FunctionCallConfig.java

@@ -1,15 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.plugin.function;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Data
-public class FunctionCallConfig {
-    @Value("${functionCall.url:}")
-    private String url;
-
-    @Value("${funtionCall.plugin.select.path:/plugin_selection}")
-    private String pluginSelectPath;
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/FunctionCallParser.java

@@ -1,127 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.plugin.function;
-
-import com.tencent.supersonic.chat.core.parser.PythonLLMProxy;
-import com.tencent.supersonic.chat.core.parser.plugin.ParseMode;
-import com.tencent.supersonic.chat.core.parser.plugin.PluginParser;
-import com.tencent.supersonic.chat.core.plugin.Plugin;
-import com.tencent.supersonic.chat.core.plugin.PluginManager;
-import com.tencent.supersonic.chat.core.plugin.PluginParseConfig;
-import com.tencent.supersonic.chat.core.plugin.PluginRecallResult;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMSqlQuery;
-import com.tencent.supersonic.chat.core.utils.ComponentFactory;
-import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.JsonUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * FunctionCallParser is an implementation of a recall plugin based on FunctionCall
- */
-@Slf4j
-public class FunctionCallParser extends PluginParser {
-
-    @Override
-    public boolean checkPreCondition(QueryContext queryContext) {
-        FunctionCallConfig functionCallConfig = ContextUtils.getBean(FunctionCallConfig.class);
-        String functionUrl = functionCallConfig.getUrl();
-        if (StringUtils.isBlank(functionUrl) && ComponentFactory.getLLMProxy() instanceof PythonLLMProxy) {
-            log.info("functionUrl:{}, skip function parser, queryText:{}", functionUrl,
-                    queryContext.getQueryText());
-            return false;
-        }
-        List<Plugin> plugins = getPluginList(queryContext);
-        return !CollectionUtils.isEmpty(plugins);
-    }
-
-    @Override
-    public PluginRecallResult recallPlugin(QueryContext queryContext) {
-        FunctionResp functionResp = functionCall(queryContext);
-        if (skipFunction(functionResp)) {
-            return null;
-        }
-        log.info("requestFunction result:{}", functionResp.getToolSelection());
-        String toolSelection = functionResp.getToolSelection();
-        Plugin plugin = queryContext.getNameToPlugin().get(toolSelection);
-        if (Objects.isNull(plugin)) {
-            log.info("pluginOptional is not exist:{}, skip the parse", toolSelection);
-            return null;
-        }
-        plugin.setParseMode(ParseMode.FUNCTION_CALL);
-        Pair<Boolean, Set<Long>> pluginResolveResult = PluginManager.resolve(plugin, queryContext);
-        if (pluginResolveResult.getLeft()) {
-            Set<Long> viewList = pluginResolveResult.getRight();
-            if (CollectionUtils.isEmpty(viewList)) {
-                return null;
-            }
-            double score = queryContext.getQueryText().length();
-            return PluginRecallResult.builder().plugin(plugin).viewIds(viewList).score(score).build();
-        }
-        return null;
-    }
-
-    public FunctionResp functionCall(QueryContext queryContext) {
-        List<PluginParseConfig> pluginToFunctionCall =
-                getPluginToFunctionCall(queryContext.getViewId(), queryContext);
-        if (CollectionUtils.isEmpty(pluginToFunctionCall)) {
-            log.info("function call parser, plugin is empty, skip");
-            return null;
-        }
-        FunctionResp functionResp = new FunctionResp();
-        if (pluginToFunctionCall.size() == 1) {
-            functionResp.setToolSelection(pluginToFunctionCall.iterator().next().getName());
-        } else {
-            FunctionReq functionReq = FunctionReq.builder()
-                    .queryText(queryContext.getQueryText())
-                    .pluginConfigs(pluginToFunctionCall).build();
-            functionResp = ComponentFactory.getLLMProxy().requestFunction(functionReq);
-        }
-        return functionResp;
-    }
-
-    private boolean skipFunction(FunctionResp functionResp) {
-        return Objects.isNull(functionResp) || StringUtils.isBlank(functionResp.getToolSelection());
-    }
-
-    private List<PluginParseConfig> getPluginToFunctionCall(Long modelId, QueryContext queryContext) {
-        log.info("user decide Model:{}", modelId);
-        List<Plugin> plugins = getPluginList(queryContext);
-        List<PluginParseConfig> functionDOList = plugins.stream().filter(plugin -> {
-            if (LLMSqlQuery.QUERY_MODE.equalsIgnoreCase(plugin.getType())) {
-                return false;
-            }
-            if (plugin.getParseModeConfig() == null) {
-                return false;
-            }
-            PluginParseConfig pluginParseConfig = JsonUtil.toObject(plugin.getParseModeConfig(),
-                    PluginParseConfig.class);
-            if (StringUtils.isBlank(pluginParseConfig.getName())) {
-                return false;
-            }
-            Pair<Boolean, Set<Long>> pluginResolverResult = PluginManager.resolve(plugin, queryContext);
-            log.info("plugin [{}-{}] resolve: {}", plugin.getId(), plugin.getName(), pluginResolverResult);
-            if (!pluginResolverResult.getLeft()) {
-                return false;
-            } else {
-                Set<Long> resolveModel = pluginResolverResult.getRight();
-                if (modelId != null && modelId > 0) {
-                    if (plugin.isContainsAllModel()) {
-                        return true;
-                    }
-                    return resolveModel.contains(modelId);
-                }
-                return true;
-            }
-        }).map(o -> JsonUtil.toObject(o.getParseModeConfig(), PluginParseConfig.class)).collect(Collectors.toList());
-        log.info("PluginToFunctionCall: {}", JsonUtil.toString(functionDOList));
-        return functionDOList;
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/FunctionFiled.java

@@ -1,13 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.plugin.function;
-
-
-import lombok.Data;
-
-@Data
-public class FunctionFiled {
-
-    private String type;
-
-    private String description;
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/FunctionPromptGenerator.java

@@ -1,44 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.plugin.function;
-
-import com.tencent.supersonic.chat.core.parser.sql.llm.InputFormat;
-import com.tencent.supersonic.chat.core.plugin.PluginParseConfig;
-import java.util.List;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class FunctionPromptGenerator {
-
-    public String generateFunctionCallPrompt(String queryText, List<PluginParseConfig> toolConfigList) {
-        List<String> toolExplainList = toolConfigList.stream()
-                .map(this::constructPluginPrompt)
-                .collect(Collectors.toList());
-        String functionList = String.join(InputFormat.SEPERATOR, toolExplainList);
-        return constructTaskPrompt(queryText, functionList);
-    }
-
-    public String constructPluginPrompt(PluginParseConfig parseConfig) {
-        String toolName = parseConfig.getName();
-        String toolDescription = parseConfig.getDescription();
-        List<String> toolExamples = parseConfig.getExamples();
-
-        StringBuilder prompt = new StringBuilder();
-        prompt.append("【工具名称】\n").append(toolName).append("\n");
-        prompt.append("【工具描述】\n").append(toolDescription).append("\n");
-        prompt.append("【工具适用问题示例】\n");
-        for (String example : toolExamples) {
-            prompt.append(example).append("\n");
-        }
-        return prompt.toString();
-    }
-
-    public String constructTaskPrompt(String queryText, String functionList) {
-        String instruction = String.format("问题为:%s\n请根据问题和工具的描述，选择对应的工具，完成任务。"
-                + "请注意，只能选择1个工具。请一步一步地分析选择工具的原因(每个工具的【工具适用问题示例】是选择的重要参考依据)，"
-                + "并给出最终选择，输出格式为json,key为’分析过程‘, ’选择工具‘", queryText);
-
-        return String.format("工具选择如下:\n\n%s\n\n【任务说明】\n%s", functionList, instruction);
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/FunctionReq.java

@@ -1,17 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.plugin.function;
-
-import com.tencent.supersonic.chat.core.plugin.PluginParseConfig;
-import java.util.List;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class FunctionReq {
-
-    private String queryText;
-
-    private List<PluginParseConfig> pluginConfigs;
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/FunctionResp.java

@@ -1,10 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.plugin.function;
-
-import lombok.Data;
-
-@Data
-public class FunctionResp {
-
-    private String toolSelection;
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/Parameters.java

@@ -1,17 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.plugin.function;
-
-import lombok.Data;
-import java.util.List;
-import java.util.Map;
-
-@Data
-public class Parameters {
-
-    //default: object
-    private String type = "object";
-
-    private Map<String, FunctionFiled> properties;
-
-    private List<String> required;
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/HeuristicViewResolver.java

@@ -1,138 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
-import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
-import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.query.SemanticQuery;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@Slf4j
-public class HeuristicViewResolver implements ViewResolver {
-
-    protected static Long selectViewBySchemaElementMatchScore(Map<Long, SemanticQuery> viewQueryModes,
-            SchemaMapInfo schemaMap) {
-        //view count priority
-        Long viewIdByViewCount = getViewIdByMatchViewScore(schemaMap);
-        if (Objects.nonNull(viewIdByViewCount)) {
-            log.info("selectView by view count:{}", viewIdByViewCount);
-            return viewIdByViewCount;
-        }
-
-        Map<Long, ViewMatchResult> viewTypeMap = getViewTypeMap(schemaMap);
-        if (viewTypeMap.size() == 1) {
-            Long viewSelect = new ArrayList<>(viewTypeMap.entrySet()).get(0).getKey();
-            if (viewQueryModes.containsKey(viewSelect)) {
-                log.info("selectView with only one View [{}]", viewSelect);
-                return viewSelect;
-            }
-        } else {
-            Map.Entry<Long, ViewMatchResult> maxView = viewTypeMap.entrySet().stream()
-                    .filter(entry -> viewQueryModes.containsKey(entry.getKey()))
-                    .sorted((o1, o2) -> {
-                        int difference = o2.getValue().getCount() - o1.getValue().getCount();
-                        if (difference == 0) {
-                            return (int) ((o2.getValue().getMaxSimilarity()
-                                    - o1.getValue().getMaxSimilarity()) * 100);
-                        }
-                        return difference;
-                    }).findFirst().orElse(null);
-            if (maxView != null) {
-                log.info("selectView with multiple Views [{}]", maxView.getKey());
-                return maxView.getKey();
-            }
-        }
-        return null;
-    }
-
-    private static Long getViewIdByMatchViewScore(SchemaMapInfo schemaMap) {
-        Map<Long, List<SchemaElementMatch>> viewElementMatches = schemaMap.getViewElementMatches();
-        // calculate view match score, matched element gets 1.0 point, and inherit element gets 0.5 point
-        Map<Long, Double> viewIdToViewScore = new HashMap<>();
-        if (Objects.nonNull(viewElementMatches)) {
-            for (Entry<Long, List<SchemaElementMatch>> viewElementMatch : viewElementMatches.entrySet()) {
-                Long viewId = viewElementMatch.getKey();
-                List<Double> viewMatchesScore = viewElementMatch.getValue().stream()
-                        .filter(elementMatch -> elementMatch.getSimilarity() >= 1)
-                        .filter(elementMatch -> SchemaElementType.VIEW.equals(elementMatch.getElement().getType()))
-                        .map(elementMatch -> elementMatch.isInherited() ? 0.5 : 1.0).collect(Collectors.toList());
-
-                if (!CollectionUtils.isEmpty(viewMatchesScore)) {
-                    // get sum of view match score
-                    double score = viewMatchesScore.stream().mapToDouble(Double::doubleValue).sum();
-                    viewIdToViewScore.put(viewId, score);
-                }
-            }
-            Entry<Long, Double> maxViewScore = viewIdToViewScore.entrySet().stream()
-                    .max(Comparator.comparingDouble(Entry::getValue)).orElse(null);
-            log.info("maxViewCount:{},viewIdToViewCount:{}", maxViewScore, viewIdToViewScore);
-            if (Objects.nonNull(maxViewScore)) {
-                return maxViewScore.getKey();
-            }
-        }
-        return null;
-    }
-
-    public static Map<Long, ViewMatchResult> getViewTypeMap(SchemaMapInfo schemaMap) {
-        Map<Long, ViewMatchResult> viewCount = new HashMap<>();
-        for (Map.Entry<Long, List<SchemaElementMatch>> entry : schemaMap.getViewElementMatches().entrySet()) {
-            List<SchemaElementMatch> schemaElementMatches = schemaMap.getMatchedElements(entry.getKey());
-            if (schemaElementMatches != null && schemaElementMatches.size() > 0) {
-                if (!viewCount.containsKey(entry.getKey())) {
-                    viewCount.put(entry.getKey(), new ViewMatchResult());
-                }
-                ViewMatchResult viewMatchResult = viewCount.get(entry.getKey());
-                Set<SchemaElementType> schemaElementTypes = new HashSet<>();
-                schemaElementMatches.stream()
-                        .forEach(schemaElementMatch -> schemaElementTypes.add(
-                                schemaElementMatch.getElement().getType()));
-                SchemaElementMatch schemaElementMatchMax = schemaElementMatches.stream()
-                        .sorted((o1, o2) ->
-                                ((int) ((o2.getSimilarity() - o1.getSimilarity()) * 100))
-                        ).findFirst().orElse(null);
-                if (schemaElementMatchMax != null) {
-                    viewMatchResult.setMaxSimilarity(schemaElementMatchMax.getSimilarity());
-                }
-                viewMatchResult.setCount(schemaElementTypes.size());
-
-            }
-        }
-        return viewCount;
-    }
-
-    public Long resolve(QueryContext queryContext, Set<Long> agentViewIds) {
-        SchemaMapInfo mapInfo = queryContext.getMapInfo();
-        Set<Long> matchedViews = mapInfo.getMatchedViewInfos();
-        Long viewId = queryContext.getViewId();
-        if (Objects.nonNull(viewId) && viewId > 0) {
-            if (CollectionUtils.isEmpty(agentViewIds) || agentViewIds.contains(viewId)) {
-                return viewId;
-            }
-            return null;
-        }
-        if (CollectionUtils.isNotEmpty(agentViewIds)) {
-            matchedViews.retainAll(agentViewIds);
-        }
-        Map<Long, SemanticQuery> viewQueryModes = new HashMap<>();
-        for (Long viewIds : matchedViews) {
-            viewQueryModes.put(viewIds, null);
-        }
-        if (viewQueryModes.size() == 1) {
-            return viewQueryModes.keySet().stream().findFirst().get();
-        }
-        return selectViewBySchemaElementMatchScore(viewQueryModes, mapInfo);
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMSqlParser.java

@@ -1,75 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.core.agent.NL2SQLTool;
-import com.tencent.supersonic.chat.core.parser.SemanticParser;
-import com.tencent.supersonic.chat.core.pojo.ChatContext;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.ElementValue;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMSqlResp;
-import com.tencent.supersonic.common.util.ContextUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.MapUtils;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-@Slf4j
-public class LLMSqlParser implements SemanticParser {
-
-    @Override
-    public void parse(QueryContext queryCtx, ChatContext chatCtx) {
-        LLMRequestService requestService = ContextUtils.getBean(LLMRequestService.class);
-        //1.determine whether to skip this parser.
-        if (requestService.isSkip(queryCtx)) {
-            return;
-        }
-        try {
-            //2.get modelId from queryCtx and chatCtx.
-            Long viewId = requestService.getViewId(queryCtx);
-            if (viewId == null) {
-                return;
-            }
-            //3.get agent tool and determine whether to skip this parser.
-            NL2SQLTool commonAgentTool = requestService.getParserTool(queryCtx, viewId);
-            if (Objects.isNull(commonAgentTool)) {
-                log.info("no tool in this agent, skip {}", LLMSqlParser.class);
-                return;
-            }
-            //4.construct a request, call the API for the large model, and retrieve the results.
-            List<ElementValue> linkingValues = requestService.getValueList(queryCtx, viewId);
-            SemanticSchema semanticSchema = queryCtx.getSemanticSchema();
-            LLMReq llmReq = requestService.getLlmReq(queryCtx, viewId, semanticSchema, linkingValues);
-            LLMResp llmResp = requestService.requestLLM(llmReq, viewId);
-
-            if (Objects.isNull(llmResp)) {
-                return;
-            }
-            //5. deduplicate the SQL result list and build parserInfo
-            LLMResponseService responseService = ContextUtils.getBean(LLMResponseService.class);
-            Map<String, LLMSqlResp> deduplicationSqlResp = responseService.getDeduplicationSqlResp(llmResp);
-            ParseResult parseResult = ParseResult.builder()
-                    .viewId(viewId)
-                    .commonAgentTool(commonAgentTool)
-                    .llmReq(llmReq)
-                    .llmResp(llmResp)
-                    .linkingValues(linkingValues)
-                    .build();
-
-            if (MapUtils.isEmpty(deduplicationSqlResp)) {
-                responseService.addParseInfo(queryCtx, parseResult, llmResp.getSqlOutput(), 1D);
-            } else {
-                deduplicationSqlResp.forEach((sql, sqlResp) -> {
-                    responseService.addParseInfo(queryCtx, parseResult, sql, sqlResp.getSqlWeight());
-                });
-            }
-
-        } catch (Exception e) {
-            log.error("parse", e);
-        }
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/OnePassSCSqlGeneration.java

@@ -1,90 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-
-import com.tencent.supersonic.chat.core.config.OptimizationConfig;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.SqlGenerationMode;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-import com.tencent.supersonic.common.util.JsonUtil;
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.input.Prompt;
-import dev.langchain4j.model.input.PromptTemplate;
-import dev.langchain4j.model.output.Response;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-
-@Service
-@Slf4j
-public class OnePassSCSqlGeneration implements SqlGeneration, InitializingBean {
-
-    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
-    @Autowired
-    private ChatLanguageModel chatLanguageModel;
-
-    @Autowired
-    private SqlExamplarLoader sqlExamplarLoader;
-
-    @Autowired
-    private OptimizationConfig optimizationConfig;
-
-    @Autowired
-    private SqlPromptGenerator sqlPromptGenerator;
-
-    @Override
-    public LLMResp generation(LLMReq llmReq, Long viewId) {
-        //1.retriever sqlExamples and generate exampleListPool
-        keyPipelineLog.info("viewId:{},llmReq:{}", viewId, llmReq);
-
-        List<Map<String, String>> sqlExamples = sqlExamplarLoader.retrieverSqlExamples(llmReq.getQueryText(),
-                optimizationConfig.getText2sqlExampleNum());
-
-        List<List<Map<String, String>>> exampleListPool = sqlPromptGenerator.getExampleCombos(sqlExamples,
-                optimizationConfig.getText2sqlFewShotsNum(), optimizationConfig.getText2sqlSelfConsistencyNum());
-
-        //2.generator linking and sql prompt by sqlExamples,and parallel generate response.
-        List<String> linkingSqlPromptPool = sqlPromptGenerator.generatePromptPool(llmReq, exampleListPool, true);
-        List<String> llmResults = new CopyOnWriteArrayList<>();
-        linkingSqlPromptPool.parallelStream().forEach(linkingSqlPrompt -> {
-                    Prompt prompt = PromptTemplate.from(JsonUtil.toString(linkingSqlPrompt))
-                            .apply(new HashMap<>());
-                    keyPipelineLog.info("request prompt:{}", prompt.toSystemMessage());
-                    Response<AiMessage> response = chatLanguageModel.generate(prompt.toSystemMessage());
-                    String result = response.content().text();
-                    llmResults.add(result);
-                    keyPipelineLog.info("model response:{}", result);
-                }
-        );
-        //3.format response.
-        List<String> schemaLinkingResults = llmResults.stream()
-                .map(llmResult -> OutputFormat.getSchemaLinks(llmResult)).collect(Collectors.toList());
-        List<String> candidateSortedList = OutputFormat.formatList(schemaLinkingResults);
-        Pair<String, Map<String, Double>> linkingMap = OutputFormat.selfConsistencyVote(candidateSortedList);
-        List<String> sqlList = llmResults.stream()
-                .map(llmResult -> OutputFormat.getSql(llmResult)).collect(Collectors.toList());
-
-        Pair<String, Map<String, Double>> sqlMapPair = OutputFormat.selfConsistencyVote(sqlList);
-        keyPipelineLog.info("linkingMap:{} sqlMap:{}", linkingMap, sqlMapPair.getRight());
-
-        LLMResp result = new LLMResp();
-        result.setQuery(llmReq.getQueryText());
-        result.setSqlRespMap(OutputFormat.buildSqlRespMap(sqlExamples, sqlMapPair.getRight()));
-        return result;
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.ONE_PASS_AUTO_COT_SELF_CONSISTENCY, this);
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/OnePassSqlGeneration.java

@@ -1,75 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-
-import com.tencent.supersonic.chat.core.config.OptimizationConfig;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.SqlGenerationMode;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMSqlResp;
-import com.tencent.supersonic.common.util.JsonUtil;
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.input.Prompt;
-import dev.langchain4j.model.input.PromptTemplate;
-import dev.langchain4j.model.output.Response;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-@Slf4j
-public class OnePassSqlGeneration implements SqlGeneration, InitializingBean {
-
-    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
-    @Autowired
-    private ChatLanguageModel chatLanguageModel;
-
-    @Autowired
-    private SqlExamplarLoader sqlExampleLoader;
-
-    @Autowired
-    private OptimizationConfig optimizationConfig;
-
-    @Autowired
-    private SqlPromptGenerator sqlPromptGenerator;
-
-    @Override
-    public LLMResp generation(LLMReq llmReq, Long viewId) {
-        //1.retriever sqlExamples
-        keyPipelineLog.info("viewId:{},llmReq:{}", viewId, llmReq);
-        List<Map<String, String>> sqlExamples = sqlExampleLoader.retrieverSqlExamples(llmReq.getQueryText(),
-                optimizationConfig.getText2sqlExampleNum());
-
-        //2.generator linking and sql prompt by sqlExamples,and generate response.
-        String promptStr = sqlPromptGenerator.generatorLinkingAndSqlPrompt(llmReq, sqlExamples);
-
-        Prompt prompt = PromptTemplate.from(JsonUtil.toString(promptStr)).apply(new HashMap<>());
-        keyPipelineLog.info("request prompt:{}", prompt.toSystemMessage());
-        Response<AiMessage> response = chatLanguageModel.generate(prompt.toSystemMessage());
-        String result = response.content().text();
-        keyPipelineLog.info("model response:{}", result);
-        //3.format response.
-        String schemaLinkStr = OutputFormat.getSchemaLinks(response.content().text());
-        String sql = OutputFormat.getSql(response.content().text());
-        Map<String, LLMSqlResp> sqlRespMap = new HashMap<>();
-        sqlRespMap.put(sql, LLMSqlResp.builder().sqlWeight(1D).fewShots(sqlExamples).build());
-        keyPipelineLog.info("schemaLinkStr:{},sqlRespMap:{}", schemaLinkStr, sqlRespMap);
-
-        LLMResp llmResp = new LLMResp();
-        llmResp.setQuery(llmReq.getQueryText());
-        llmResp.setSqlRespMap(sqlRespMap);
-        return llmResp;
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.ONE_PASS_AUTO_COT, this);
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/ParseResult.java

@@ -1,32 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-import com.tencent.supersonic.chat.core.agent.NL2SQLTool;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.ElementValue;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ParseResult {
-
-    private Long viewId;
-
-    private LLMReq llmReq;
-
-    private LLMResp llmResp;
-
-    private QueryReq request;
-
-    private NL2SQLTool commonAgentTool;
-
-    private List<ElementValue> linkingValues;
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/SqlGeneration.java

@@ -1,20 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-
-/**
- * Sql Generation interface, generating SQL using a large model.
- */
-public interface SqlGeneration {
-
-    /***
-     * generate llmResp (sql, schemaLink, prompt, etc.) through LLMReq.
-     * @param llmReq
-     * @param viewId
-     * @return
-     */
-    LLMResp generation(LLMReq llmReq, Long viewId);
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/SqlGenerationFactory.java

@@ -1,19 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.SqlGenerationMode;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class SqlGenerationFactory {
-
-    private static Map<SqlGenerationMode, SqlGeneration> sqlGenerationMap = new ConcurrentHashMap<>();
-
-    public static SqlGeneration get(SqlGenerationMode strategyType) {
-        return sqlGenerationMap.get(strategyType);
-    }
-
-    public static void addSqlGenerationForFactory(SqlGenerationMode strategy, SqlGeneration sqlGeneration) {
-        sqlGenerationMap.put(strategy, sqlGeneration);
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/TwoPassSCSqlGeneration.java

@@ -1,92 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-
-import com.tencent.supersonic.chat.core.config.OptimizationConfig;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.SqlGenerationMode;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-import com.tencent.supersonic.common.util.JsonUtil;
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.input.Prompt;
-import dev.langchain4j.model.input.PromptTemplate;
-import dev.langchain4j.model.output.Response;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-@Service
-public class TwoPassSCSqlGeneration implements SqlGeneration, InitializingBean {
-
-    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
-    @Autowired
-    private ChatLanguageModel chatLanguageModel;
-
-    @Autowired
-    private SqlExamplarLoader sqlExamplarLoader;
-
-    @Autowired
-    private OptimizationConfig optimizationConfig;
-
-    @Autowired
-    private SqlPromptGenerator sqlPromptGenerator;
-
-    @Override
-    public LLMResp generation(LLMReq llmReq, Long viewId) {
-        //1.retriever sqlExamples and generate exampleListPool
-        keyPipelineLog.info("viewId:{},llmReq:{}", viewId, llmReq);
-        List<Map<String, String>> sqlExamples = sqlExamplarLoader.retrieverSqlExamples(llmReq.getQueryText(),
-                optimizationConfig.getText2sqlExampleNum());
-
-        List<List<Map<String, String>>> exampleListPool = sqlPromptGenerator.getExampleCombos(sqlExamples,
-                optimizationConfig.getText2sqlFewShotsNum(), optimizationConfig.getText2sqlSelfConsistencyNum());
-
-        //2.generator linking prompt,and parallel generate response.
-        List<String> linkingPromptPool = sqlPromptGenerator.generatePromptPool(llmReq, exampleListPool, false);
-        List<String> linkingResults = new CopyOnWriteArrayList<>();
-        linkingPromptPool.parallelStream().forEach(
-                linkingPrompt -> {
-                    Prompt prompt = PromptTemplate.from(JsonUtil.toString(linkingPrompt)).apply(new HashMap<>());
-                    keyPipelineLog.info("step one request prompt:{}", prompt.toSystemMessage());
-                    Response<AiMessage> linkingResult = chatLanguageModel.generate(prompt.toSystemMessage());
-                    String result = linkingResult.content().text();
-                    keyPipelineLog.info("step one model response:{}", result);
-                    linkingResults.add(OutputFormat.getSchemaLink(result));
-                }
-        );
-        List<String> sortedList = OutputFormat.formatList(linkingResults);
-        Pair<String, Map<String, Double>> linkingMap = OutputFormat.selfConsistencyVote(sortedList);
-        //3.generator sql prompt,and parallel generate response.
-        List<String> sqlPromptPool = sqlPromptGenerator.generateSqlPromptPool(llmReq, sortedList, exampleListPool);
-        List<String> sqlTaskPool = new CopyOnWriteArrayList<>();
-        sqlPromptPool.parallelStream().forEach(sqlPrompt -> {
-            Prompt linkingPrompt = PromptTemplate.from(JsonUtil.toString(sqlPrompt)).apply(new HashMap<>());
-            keyPipelineLog.info("step two request prompt:{}", linkingPrompt.toSystemMessage());
-            Response<AiMessage> sqlResult = chatLanguageModel.generate(linkingPrompt.toSystemMessage());
-            String result = sqlResult.content().text();
-            keyPipelineLog.info("step two model response:{}", result);
-            sqlTaskPool.add(result);
-        });
-        //4.format response.
-        Pair<String, Map<String, Double>> sqlMapPair = OutputFormat.selfConsistencyVote(sqlTaskPool);
-        keyPipelineLog.info("linkingMap:{} sqlMap:{}", linkingMap, sqlMapPair.getRight());
-
-        LLMResp llmResp = new LLMResp();
-        llmResp.setQuery(llmReq.getQueryText());
-        llmResp.setSqlRespMap(OutputFormat.buildSqlRespMap(sqlExamples, sqlMapPair.getRight()));
-        return llmResp;
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.TWO_PASS_AUTO_COT_SELF_CONSISTENCY, this);
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/TwoPassSqlGeneration.java

@@ -1,76 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-
-import com.tencent.supersonic.chat.core.config.OptimizationConfig;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.SqlGenerationMode;
-import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMResp;
-import com.tencent.supersonic.common.util.JsonUtil;
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.input.Prompt;
-import dev.langchain4j.model.input.PromptTemplate;
-import dev.langchain4j.model.output.Response;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-@Slf4j
-public class TwoPassSqlGeneration implements SqlGeneration, InitializingBean {
-
-    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
-    @Autowired
-    private ChatLanguageModel chatLanguageModel;
-
-    @Autowired
-    private SqlExamplarLoader sqlExamplarLoader;
-
-    @Autowired
-    private OptimizationConfig optimizationConfig;
-
-    @Autowired
-    private SqlPromptGenerator sqlPromptGenerator;
-
-    @Override
-    public LLMResp generation(LLMReq llmReq, Long viewId) {
-        keyPipelineLog.info("viewId:{},llmReq:{}", viewId, llmReq);
-        List<Map<String, String>> sqlExamples = sqlExamplarLoader.retrieverSqlExamples(llmReq.getQueryText(),
-                optimizationConfig.getText2sqlExampleNum());
-
-        String linkingPromptStr = sqlPromptGenerator.generateLinkingPrompt(llmReq, sqlExamples);
-
-        Prompt prompt = PromptTemplate.from(JsonUtil.toString(linkingPromptStr)).apply(new HashMap<>());
-        keyPipelineLog.info("step one request prompt:{}", prompt.toSystemMessage());
-        Response<AiMessage> response = chatLanguageModel.generate(prompt.toSystemMessage());
-        keyPipelineLog.info("step one model response:{}", response.content().text());
-        String schemaLinkStr = OutputFormat.getSchemaLink(response.content().text());
-        String generateSqlPrompt = sqlPromptGenerator.generateSqlPrompt(llmReq, schemaLinkStr, sqlExamples);
-
-        Prompt sqlPrompt = PromptTemplate.from(JsonUtil.toString(generateSqlPrompt)).apply(new HashMap<>());
-        keyPipelineLog.info("step two request prompt:{}", sqlPrompt.toSystemMessage());
-        Response<AiMessage> sqlResult = chatLanguageModel.generate(sqlPrompt.toSystemMessage());
-        String result = sqlResult.content().text();
-        keyPipelineLog.info("step two model response:{}", result);
-        Map<String, Double> sqlMap = new HashMap<>();
-        sqlMap.put(result, 1D);
-        keyPipelineLog.info("schemaLinkStr:{},sqlMap:{}", schemaLinkStr, sqlMap);
-
-        LLMResp llmResp = new LLMResp();
-        llmResp.setQuery(llmReq.getQueryText());
-        llmResp.setSqlRespMap(OutputFormat.buildSqlRespMap(sqlExamples, sqlMap));
-        return llmResp;
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        SqlGenerationFactory.addSqlGenerationForFactory(SqlGenerationMode.TWO_PASS_AUTO_COT, this);
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/ViewMatchResult.java

@@ -1,9 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-import lombok.Data;
-
-@Data
-public class ViewMatchResult {
-    private Integer count = 0;
-    private double maxSimilarity;
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/ViewResolver.java

@@ -1,12 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.llm;
-
-
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-
-import java.util.Set;
-
-public interface ViewResolver {
-
-    Long resolve(QueryContext queryContext, Set<Long> restrictiveModels);
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/rule/AgentCheckParser.java

@@ -1,88 +0,0 @@
-package com.tencent.supersonic.chat.core.parser.sql.rule;
-
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import com.tencent.supersonic.chat.core.agent.Agent;
-import com.tencent.supersonic.chat.core.agent.AgentToolType;
-import com.tencent.supersonic.chat.core.agent.RuleParserTool;
-import com.tencent.supersonic.chat.core.parser.SemanticParser;
-import com.tencent.supersonic.chat.core.pojo.ChatContext;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.core.query.QueryManager;
-import com.tencent.supersonic.chat.core.query.SemanticQuery;
-import com.tencent.supersonic.common.pojo.enums.QueryType;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Slf4j
-public class AgentCheckParser implements SemanticParser {
-
-    @Override
-    public void parse(QueryContext queryContext, ChatContext chatContext) {
-        List<SemanticQuery> queries = queryContext.getCandidateQueries();
-        log.info("query size before agent filter:{}", queryContext.getCandidateQueries().size());
-        filterQueries(queryContext, queries);
-        log.info("query size after agent filter: {}", queryContext.getCandidateQueries().size());
-    }
-
-    private void filterQueries(QueryContext queryContext, List<SemanticQuery> queries) {
-        Agent agent = queryContext.getAgent();
-        if (agent == null) {
-            return;
-        }
-        List<RuleParserTool> queryTools = getRuleTools(agent);
-        if (CollectionUtils.isEmpty(queryTools)) {
-            queryContext.setCandidateQueries(Lists.newArrayList());
-            return;
-        }
-        log.info("agent name :{}, queries resolved: {}", agent.getName(),
-                queries.stream().map(SemanticQuery::getQueryMode).collect(Collectors.toList()));
-        queries.removeIf(query -> {
-            for (RuleParserTool tool : queryTools) {
-                if (CollectionUtils.isNotEmpty(tool.getQueryModes())
-                        && !tool.getQueryModes().contains(query.getQueryMode())) {
-                    return true;
-                }
-                if (CollectionUtils.isNotEmpty(tool.getQueryTypes())) {
-                    if (QueryManager.isTagQuery(query.getQueryMode())) {
-                        if (!tool.getQueryTypes().contains(QueryType.TAG.name())) {
-                            return true;
-                        }
-                    }
-                    if (QueryManager.isMetricQuery(query.getQueryMode())) {
-                        if (!tool.getQueryTypes().contains(QueryType.METRIC.name())) {
-                            return true;
-                        }
-                    }
-                }
-                if (CollectionUtils.isEmpty(tool.getViewIds())) {
-                    return true;
-                }
-                if (tool.isContainsAllModel()) {
-                    return false;
-                }
-                return !tool.getViewIds().contains(query.getParseInfo().getViewId());
-            }
-            return true;
-        });
-        queryContext.setCandidateQueries(queries);
-        log.info("agent name :{}, rule queries witch can be supported by agent :{}", agent.getName(),
-                queries.stream().map(SemanticQuery::getQueryMode).collect(Collectors.toList()));
-    }
-
-    private static List<RuleParserTool> getRuleTools(Agent agent) {
-        if (agent == null) {
-            return Lists.newArrayList();
-        }
-        List<String> tools = agent.getTools(AgentToolType.NL2SQL_RULE);
-        if (CollectionUtils.isEmpty(tools)) {
-            return Lists.newArrayList();
-        }
-        return tools.stream().map(tool -> JSONObject.parseObject(tool, RuleParserTool.class))
-                .collect(Collectors.toList());
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/pojo/QueryContext.java

@@ -1,61 +0,0 @@
-package com.tencent.supersonic.chat.core.pojo;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
-import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
-import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp;
-import com.tencent.supersonic.chat.core.agent.Agent;
-import com.tencent.supersonic.chat.core.config.OptimizationConfig;
-import com.tencent.supersonic.chat.core.plugin.Plugin;
-import com.tencent.supersonic.chat.core.query.SemanticQuery;
-import com.tencent.supersonic.common.util.ContextUtils;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class QueryContext {
-
-    private String queryText;
-    private Integer chatId;
-    private Long viewId;
-    private User user;
-    private boolean saveAnswer = true;
-    private Integer agentId;
-    private QueryFilters queryFilters;
-    private List<SemanticQuery> candidateQueries = new ArrayList<>();
-    private SchemaMapInfo mapInfo = new SchemaMapInfo();
-    @JsonIgnore
-    private SemanticSchema semanticSchema;
-    @JsonIgnore
-    private Agent agent;
-    @JsonIgnore
-    private Map<Long, ChatConfigRichResp> modelIdToChatRichConfig;
-    @JsonIgnore
-    private Map<String, Plugin> nameToPlugin;
-    @JsonIgnore
-    private List<Plugin> pluginList;
-
-    public List<SemanticQuery> getCandidateQueries() {
-        OptimizationConfig optimizationConfig = ContextUtils.getBean(OptimizationConfig.class);
-        Integer parseShowCount = optimizationConfig.getParseShowCount();
-        candidateQueries = candidateQueries.stream()
-                .sorted(Comparator.comparing(semanticQuery -> semanticQuery.getParseInfo().getScore(),
-                        Comparator.reverseOrder()))
-                .limit(parseShowCount)
-                .collect(Collectors.toList());
-        return candidateQueries;
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/LLMSemanticQuery.java

@@ -1,8 +0,0 @@
-package com.tencent.supersonic.chat.core.query.llm;
-
-import com.tencent.supersonic.chat.core.query.BaseSemanticQuery;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public abstract class LLMSemanticQuery extends BaseSemanticQuery {
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/analytics/LLMAnswerReq.java

@@ -1,13 +0,0 @@
-package com.tencent.supersonic.chat.core.query.llm.analytics;
-
-
-import lombok.Data;
-
-@Data
-public class LLMAnswerReq {
-
-    private String queryText;
-
-    private String pluginOutput;
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/analytics/LLMAnswerResp.java

@@ -1,10 +0,0 @@
-package com.tencent.supersonic.chat.core.query.llm.analytics;
-
-
-import lombok.Data;
-
-@Data
-public class LLMAnswerResp {
-    private String assistantMessage;
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/analytics/MetricAnalyzeQuery.java

@@ -1,152 +0,0 @@
-package com.tencent.supersonic.chat.core.query.llm.analytics;
-
-import com.google.common.collect.Lists;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.headless.api.pojo.SchemaElement;
-import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
-import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
-import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
-import com.tencent.supersonic.chat.api.pojo.response.QueryState;
-import com.tencent.supersonic.chat.core.config.OptimizationConfig;
-import com.tencent.supersonic.chat.core.query.semantic.SemanticInterpreter;
-import com.tencent.supersonic.chat.core.query.QueryManager;
-import com.tencent.supersonic.chat.core.query.llm.LLMSemanticQuery;
-import com.tencent.supersonic.chat.core.utils.ComponentFactory;
-import com.tencent.supersonic.chat.core.utils.QueryReqBuilder;
-import com.tencent.supersonic.common.pojo.Aggregator;
-import com.tencent.supersonic.common.pojo.QueryColumn;
-import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
-import com.tencent.supersonic.common.pojo.enums.QueryType;
-import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.calcite.sql.parser.SqlParseException;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-@Slf4j
-@Component
-public class MetricAnalyzeQuery extends LLMSemanticQuery {
-
-
-    public static final String QUERY_MODE = "METRIC_INTERPRET";
-
-    public MetricAnalyzeQuery() {
-        QueryManager.register(this);
-    }
-
-    @Override
-    public String getQueryMode() {
-        return QUERY_MODE;
-    }
-
-    @Override
-    public QueryResult execute(User user) throws SqlParseException {
-        QueryStructReq queryStructReq = convertQueryStruct();
-        SemanticInterpreter semanticInterpreter = ComponentFactory.getSemanticLayer();
-
-        OptimizationConfig optimizationConfig = ContextUtils.getBean(OptimizationConfig.class);
-        if (optimizationConfig.isUseS2SqlSwitch()) {
-            queryStructReq.setS2SQL(parseInfo.getSqlInfo().getS2SQL());
-            queryStructReq.setS2SQL(parseInfo.getSqlInfo().getQuerySQL());
-        }
-
-        SemanticQueryResp semanticQueryResp = semanticInterpreter.queryByStruct(queryStructReq, user);
-        String text = generateTableText(semanticQueryResp);
-        Map<String, Object> properties = parseInfo.getProperties();
-        Map<String, String> replacedMap = new HashMap<>();
-        String textReplaced = replaceText((String) properties.get("queryText"),
-                parseInfo.getElementMatches(), replacedMap);
-        String answer = replaceAnswer(fetchInterpret(textReplaced, text), replacedMap);
-        QueryResult queryResult = new QueryResult();
-        List<QueryColumn> queryColumns = Lists.newArrayList(new QueryColumn("结果", "string", "answer"));
-        Map<String, Object> result = new HashMap<>();
-        result.put("answer", answer);
-        List<Map<String, Object>> resultList = Lists.newArrayList();
-        resultList.add(result);
-        queryResult.setQueryResults(resultList);
-        queryResult.setQueryColumns(queryColumns);
-        queryResult.setQueryMode(getQueryMode());
-        queryResult.setQueryState(QueryState.SUCCESS);
-        return queryResult;
-    }
-
-    @Override
-    public void initS2Sql(SemanticSchema semanticSchema, User user) {
-        initS2SqlByStruct(semanticSchema);
-    }
-
-    protected QueryStructReq convertQueryStruct() {
-        QueryStructReq queryStructReq = QueryReqBuilder.buildStructReq(parseInfo);
-        fillAggregator(queryStructReq, parseInfo.getMetrics());
-        queryStructReq.setQueryType(QueryType.TAG);
-        return queryStructReq;
-    }
-
-    private String replaceText(String text, List<SchemaElementMatch> schemaElementMatches,
-            Map<String, String> replacedMap) {
-        if (CollectionUtils.isEmpty(schemaElementMatches)) {
-            return text;
-        }
-        List<SchemaElementMatch> valueSchemaElementMatches = schemaElementMatches.stream()
-                .filter(schemaElementMatch ->
-                        SchemaElementType.VALUE.equals(schemaElementMatch.getElement().getType())
-                                || SchemaElementType.ID.equals(schemaElementMatch.getElement().getType()))
-                .collect(Collectors.toList());
-        for (SchemaElementMatch schemaElementMatch : valueSchemaElementMatches) {
-            String detectWord = schemaElementMatch.getDetectWord();
-            if (StringUtils.isBlank(detectWord)) {
-                continue;
-            }
-            text = text.replace(detectWord, "xxx");
-            replacedMap.put("xxx", detectWord);
-        }
-        return text;
-    }
-
-    private void fillAggregator(QueryStructReq queryStructReq, Set<SchemaElement> schemaElements) {
-        queryStructReq.getAggregators().clear();
-        for (SchemaElement schemaElement : schemaElements) {
-            Aggregator aggregator = new Aggregator();
-            aggregator.setColumn(schemaElement.getBizName());
-            aggregator.setFunc(AggOperatorEnum.SUM);
-            aggregator.setNameCh(schemaElement.getName());
-            queryStructReq.getAggregators().add(aggregator);
-        }
-    }
-
-    private String replaceAnswer(String text, Map<String, String> replacedMap) {
-        for (String key : replacedMap.keySet()) {
-            text = text.replaceAll(key, replacedMap.get(key));
-        }
-        return text;
-    }
-
-    public static String generateTableText(SemanticQueryResp result) {
-        StringBuilder tableBuilder = new StringBuilder();
-        for (QueryColumn column : result.getColumns()) {
-            tableBuilder.append(column.getName()).append("\t");
-        }
-        tableBuilder.append("\n");
-        for (Map<String, Object> row : result.getResultList()) {
-            for (QueryColumn column : result.getColumns()) {
-                tableBuilder.append(row.get(column.getNameEn())).append("\t");
-            }
-            tableBuilder.append("\n");
-        }
-        return tableBuilder.toString();
-    }
-
-    public String fetchInterpret(String queryText, String dataText) {
-        return "";
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/s2sql/LLMSqlQuery.java

@@ -1,72 +0,0 @@
-package com.tencent.supersonic.chat.core.query.llm.s2sql;
-
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.core.query.semantic.SemanticInterpreter;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
-import com.tencent.supersonic.chat.api.pojo.response.QueryState;
-import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
-import com.tencent.supersonic.chat.core.utils.ComponentFactory;
-import com.tencent.supersonic.chat.core.utils.QueryReqBuilder;
-import com.tencent.supersonic.chat.core.query.QueryManager;
-import com.tencent.supersonic.chat.core.query.llm.LLMSemanticQuery;
-import com.tencent.supersonic.common.pojo.QueryColumn;
-import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-@Slf4j
-@Component
-public class LLMSqlQuery extends LLMSemanticQuery {
-
-    public static final String QUERY_MODE = "LLM_S2SQL";
-    protected SemanticInterpreter semanticInterpreter = ComponentFactory.getSemanticLayer();
-
-    public LLMSqlQuery() {
-        QueryManager.register(this);
-    }
-
-    @Override
-    public String getQueryMode() {
-        return QUERY_MODE;
-    }
-
-    @Override
-    public QueryResult execute(User user) {
-
-        long startTime = System.currentTimeMillis();
-        String querySql = parseInfo.getSqlInfo().getCorrectS2SQL();
-        QuerySqlReq querySQLReq = QueryReqBuilder.buildS2SQLReq(querySql, parseInfo.getViewId());
-        SemanticQueryResp queryResp = semanticInterpreter.queryByS2SQL(querySQLReq, user);
-
-        log.info("queryByS2SQL cost:{},querySql:{}", System.currentTimeMillis() - startTime, querySql);
-
-        QueryResult queryResult = new QueryResult();
-        if (Objects.nonNull(queryResp)) {
-            queryResult.setQueryAuthorization(queryResp.getQueryAuthorization());
-        }
-        String resultQql = queryResp == null ? null : queryResp.getSql();
-        List<Map<String, Object>> resultList = queryResp == null ? new ArrayList<>() : queryResp.getResultList();
-        List<QueryColumn> columns = queryResp == null ? new ArrayList<>() : queryResp.getColumns();
-        queryResult.setQuerySql(resultQql);
-        queryResult.setQueryResults(resultList);
-        queryResult.setQueryColumns(columns);
-        queryResult.setQueryMode(QUERY_MODE);
-        queryResult.setQueryState(QueryState.SUCCESS);
-
-        parseInfo.setProperties(null);
-        return queryResult;
-    }
-
-    @Override
-    public void initS2Sql(SemanticSchema semanticSchema, User user) {
-        SqlInfo sqlInfo = parseInfo.getSqlInfo();
-        sqlInfo.setCorrectS2SQL(sqlInfo.getS2SQL());
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/plugin/webservice/WebServiceResp.java

@@ -1,14 +0,0 @@
-package com.tencent.supersonic.chat.core.query.plugin.webservice;
-
-import com.tencent.supersonic.chat.core.query.plugin.WebBase;
-import lombok.Data;
-
-
-@Data
-public class WebServiceResp {
-
-    private WebBase webBase;
-
-    private Object result;
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricModelQuery.java

@@ -1,31 +0,0 @@
-package com.tencent.supersonic.chat.core.query.rule.metric;
-
-import static com.tencent.supersonic.chat.core.query.rule.QueryMatchOption.OptionType.OPTIONAL;
-import static com.tencent.supersonic.chat.core.query.rule.QueryMatchOption.RequireNumberType.AT_MOST;
-
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
-import org.springframework.stereotype.Component;
-@Component
-public class MetricModelQuery extends MetricSemanticQuery {
-
-    public static final String QUERY_MODE = "METRIC_MODEL";
-
-    public MetricModelQuery() {
-        super();
-        queryMatcher.addOption(SchemaElementType.VIEW, OPTIONAL, AT_MOST, 1);
-    }
-
-    @Override
-    public String getQueryMode() {
-        return QUERY_MODE;
-    }
-
-    @Override
-    public QueryResult execute(User user) {
-        QueryResult queryResult = super.execute(user);
-        return queryResult;
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/tag/TagDetailQuery.java

@@ -1,26 +0,0 @@
-package com.tencent.supersonic.chat.core.query.rule.tag;
-
-import static com.tencent.supersonic.headless.api.pojo.SchemaElementType.DIMENSION;
-import static com.tencent.supersonic.headless.api.pojo.SchemaElementType.ID;
-import static com.tencent.supersonic.chat.core.query.rule.QueryMatchOption.RequireNumberType.AT_LEAST;
-import static com.tencent.supersonic.chat.core.query.rule.QueryMatchOption.OptionType.REQUIRED;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class TagDetailQuery extends TagSemanticQuery {
-
-    public static final String QUERY_MODE = "TAG_DETAIL";
-
-    public TagDetailQuery() {
-        super();
-        queryMatcher.addOption(DIMENSION, REQUIRED, AT_LEAST, 1)
-                .addOption(ID, REQUIRED, AT_LEAST, 1);
-    }
-
-    @Override
-    public String getQueryMode() {
-        return QUERY_MODE;
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/tag/TagFilterQuery.java

@@ -1,27 +0,0 @@
-package com.tencent.supersonic.chat.core.query.rule.tag;
-
-import static com.tencent.supersonic.headless.api.pojo.SchemaElementType.VALUE;
-import static com.tencent.supersonic.chat.core.query.rule.QueryMatchOption.OptionType.REQUIRED;
-import static com.tencent.supersonic.chat.core.query.rule.QueryMatchOption.RequireNumberType.AT_LEAST;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-
-@Slf4j
-@Component
-public class TagFilterQuery extends TagListQuery {
-
-    public static final String QUERY_MODE = "TAG_LIST_FILTER";
-
-    public TagFilterQuery() {
-        super();
-        queryMatcher.addOption(VALUE, REQUIRED, AT_LEAST, 1);
-    }
-
-    @Override
-    public String getQueryMode() {
-        return QUERY_MODE;
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/tag/TagIdQuery.java

@@ -1,24 +0,0 @@
-package com.tencent.supersonic.chat.core.query.rule.tag;
-
-import static com.tencent.supersonic.headless.api.pojo.SchemaElementType.ID;
-import static com.tencent.supersonic.chat.core.query.rule.QueryMatchOption.OptionType.REQUIRED;
-import static com.tencent.supersonic.chat.core.query.rule.QueryMatchOption.RequireNumberType.AT_LEAST;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class TagIdQuery extends TagListQuery {
-
-    public static final String QUERY_MODE = "TAG_ID";
-
-    public TagIdQuery() {
-        super();
-        queryMatcher.addOption(ID, REQUIRED, AT_LEAST, 1);
-    }
-
-    @Override
-    public String getQueryMode() {
-        return QUERY_MODE;
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/semantic/BaseSemanticInterpreter.java

@@ -1,68 +0,0 @@
-package com.tencent.supersonic.chat.core.query.semantic;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.tencent.supersonic.chat.api.pojo.ViewSchema;
-import com.tencent.supersonic.headless.api.pojo.response.ViewSchemaResp;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-@Slf4j
-public abstract class BaseSemanticInterpreter implements SemanticInterpreter {
-
-    protected final Cache<String, List<ViewSchemaResp>> viewSchemaCache =
-            CacheBuilder.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS).build();
-
-    @SneakyThrows
-    public List<ViewSchemaResp> fetchViewSchema(List<Long> ids, Boolean cacheEnable) {
-        if (cacheEnable) {
-            return viewSchemaCache.get(String.valueOf(ids), () -> {
-                List<ViewSchemaResp> data = doFetchViewSchema(ids);
-                viewSchemaCache.put(String.valueOf(ids), data);
-                return data;
-            });
-        }
-        return doFetchViewSchema(ids);
-    }
-
-    @Override
-    public ViewSchema getViewSchema(Long viewId, Boolean cacheEnable) {
-        List<Long> ids = new ArrayList<>();
-        ids.add(viewId);
-        List<ViewSchemaResp> viewSchemaResps = fetchViewSchema(ids, cacheEnable);
-        if (!CollectionUtils.isEmpty(viewSchemaResps)) {
-            Optional<ViewSchemaResp> viewSchemaResp = viewSchemaResps.stream()
-                    .filter(d -> d.getId().equals(viewId)).findFirst();
-            if (viewSchemaResp.isPresent()) {
-                ViewSchemaResp viewSchema = viewSchemaResp.get();
-                return ViewSchemaBuilder.build(viewSchema);
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public List<ViewSchema> getViewSchema() {
-        return getViewSchema(new ArrayList<>());
-    }
-
-    @Override
-    public List<ViewSchema> getViewSchema(List<Long> ids) {
-        List<ViewSchema> domainSchemaList = new ArrayList<>();
-
-        for (ViewSchemaResp resp : fetchViewSchema(ids, true)) {
-            domainSchemaList.add(ViewSchemaBuilder.build(resp));
-        }
-
-        return domainSchemaList;
-    }
-
-    protected abstract List<ViewSchemaResp> doFetchViewSchema(List<Long> ids);
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/semantic/LocalSemanticInterpreter.java

@@ -1,113 +0,0 @@
-package com.tencent.supersonic.chat.core.query.semantic;
-
-import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
-import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.pojo.request.ViewFilterReq;
-import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
-import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
-import com.tencent.supersonic.headless.api.pojo.response.ExplainResp;
-import com.tencent.supersonic.headless.api.pojo.response.ItemResp;
-import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
-import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.api.pojo.response.ViewResp;
-import com.tencent.supersonic.headless.api.pojo.response.ViewSchemaResp;
-import com.tencent.supersonic.headless.server.service.DimensionService;
-import com.tencent.supersonic.headless.server.service.MetricService;
-import com.tencent.supersonic.headless.server.service.QueryService;
-import com.tencent.supersonic.headless.server.service.SchemaService;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-public class LocalSemanticInterpreter extends BaseSemanticInterpreter {
-
-    private SchemaService schemaService;
-    private DimensionService dimensionService;
-    private MetricService metricService;
-    private QueryService queryService;
-
-    @SneakyThrows
-    @Override
-    public SemanticQueryResp queryByStruct(QueryStructReq queryStructReq, User user) {
-        if (StringUtils.isNotBlank(queryStructReq.getCorrectS2SQL())) {
-            QuerySqlReq querySqlReq = new QuerySqlReq();
-            querySqlReq.setSql(queryStructReq.getCorrectS2SQL());
-            querySqlReq.setViewId(queryStructReq.getViewId());
-            querySqlReq.setParams(new ArrayList<>());
-            return queryByS2SQL(querySqlReq, user);
-        }
-        queryService = ContextUtils.getBean(QueryService.class);
-        return queryService.queryByReq(queryStructReq, user);
-    }
-
-    @Override
-    @SneakyThrows
-    public SemanticQueryResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) {
-        queryService = ContextUtils.getBean(QueryService.class);
-        return queryService.queryByReq(queryMultiStructReq, user);
-    }
-
-    @Override
-    @SneakyThrows
-    public SemanticQueryResp queryByS2SQL(QuerySqlReq querySqlReq, User user) {
-        queryService = ContextUtils.getBean(QueryService.class);
-        SemanticQueryResp object = queryService.queryByReq(querySqlReq, user);
-        return JsonUtil.toObject(JsonUtil.toString(object), SemanticQueryResp.class);
-    }
-
-    @Override
-    public List<ViewSchemaResp> doFetchViewSchema(List<Long> ids) {
-        ViewFilterReq filter = new ViewFilterReq();
-        filter.setViewIds(ids);
-        schemaService = ContextUtils.getBean(SchemaService.class);
-        return schemaService.fetchViewSchema(filter);
-    }
-
-    @Override
-    public List<DomainResp> getDomainList(User user) {
-        schemaService = ContextUtils.getBean(SchemaService.class);
-        return schemaService.getDomainList(user);
-    }
-
-    @Override
-    public List<ViewResp> getViewList(Long domainId) {
-        schemaService = ContextUtils.getBean(SchemaService.class);
-        return schemaService.getViewList(domainId);
-    }
-
-    @Override
-    public <T> ExplainResp explain(ExplainSqlReq<T> explainSqlReq, User user) throws Exception {
-        queryService = ContextUtils.getBean(QueryService.class);
-        return queryService.explain(explainSqlReq, user);
-    }
-
-    @Override
-    public PageInfo<DimensionResp> getDimensionPage(PageDimensionReq pageDimensionCmd) {
-        dimensionService = ContextUtils.getBean(DimensionService.class);
-        return dimensionService.queryDimension(pageDimensionCmd);
-    }
-
-    @Override
-    public PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricReq, User user) {
-        metricService = ContextUtils.getBean(MetricService.class);
-        return metricService.queryMetric(pageMetricReq, user);
-    }
-
-    @Override
-    public List<ItemResp> getDomainViewTree() {
-        return schemaService.getDomainViewTree();
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/semantic/RemoteSemanticInterpreter.java

@@ -1,267 +0,0 @@
-package com.tencent.supersonic.chat.core.query.semantic;
-
-import com.github.pagehelper.PageInfo;
-import com.google.gson.Gson;
-import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.core.config.DefaultSemanticConfig;
-import com.tencent.supersonic.common.pojo.ResultData;
-import com.tencent.supersonic.common.pojo.enums.ReturnCode;
-import com.tencent.supersonic.common.pojo.exception.CommonException;
-import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.util.S2ThreadContext;
-import com.tencent.supersonic.common.util.ThreadContext;
-import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
-import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
-import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
-import com.tencent.supersonic.headless.api.pojo.response.ExplainResp;
-import com.tencent.supersonic.headless.api.pojo.response.ItemResp;
-import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
-import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.api.pojo.response.ViewResp;
-import com.tencent.supersonic.headless.api.pojo.response.ViewSchemaResp;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.BeanUtils;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
-
-import static com.tencent.supersonic.common.pojo.Constants.LIST_LOWER;
-import static com.tencent.supersonic.common.pojo.Constants.PAGESIZE_LOWER;
-import static com.tencent.supersonic.common.pojo.Constants.TOTAL_LOWER;
-
-@Slf4j
-public class RemoteSemanticInterpreter extends BaseSemanticInterpreter {
-
-    private S2ThreadContext s2ThreadContext;
-
-    private AuthenticationConfig authenticationConfig;
-
-    private ParameterizedTypeReference<ResultData<SemanticQueryResp>> structTypeRef =
-            new ParameterizedTypeReference<ResultData<SemanticQueryResp>>() {
-            };
-
-    private ParameterizedTypeReference<ResultData<ExplainResp>> explainTypeRef =
-            new ParameterizedTypeReference<ResultData<ExplainResp>>() {
-            };
-
-    @Override
-    public SemanticQueryResp queryByStruct(QueryStructReq queryStructReq, User user) {
-        if (StringUtils.isNotBlank(queryStructReq.getCorrectS2SQL())) {
-            QuerySqlReq querySqlReq = new QuerySqlReq();
-            querySqlReq.setSql(queryStructReq.getCorrectS2SQL());
-            querySqlReq.setModelIds(queryStructReq.getModelIdSet());
-            querySqlReq.setParams(new ArrayList<>());
-            return queryByS2SQL(querySqlReq, user);
-        }
-
-        DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
-        return searchByRestTemplate(
-                defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getSearchByStructPath(),
-                new Gson().toJson(queryStructReq));
-    }
-
-    @Override
-    public SemanticQueryResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) {
-        DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
-        return searchByRestTemplate(
-                defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getSearchByMultiStructPath(),
-                new Gson().toJson(queryMultiStructReq));
-    }
-
-    @Override
-    public SemanticQueryResp queryByS2SQL(QuerySqlReq querySqlReq, User user) {
-        DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
-        return searchByRestTemplate(defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getSearchBySqlPath(),
-                new Gson().toJson(querySqlReq));
-    }
-
-    public SemanticQueryResp searchByRestTemplate(String url, String jsonReq) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        fillToken(headers);
-        URI requestUrl = UriComponentsBuilder.fromHttpUrl(url).build().encode().toUri();
-        HttpEntity<String> entity = new HttpEntity<>(jsonReq, headers);
-        log.info("url:{},searchByRestTemplate:{}", url, entity.getBody());
-        ResultData<SemanticQueryResp> responseBody;
-        try {
-            RestTemplate restTemplate = ContextUtils.getBean(RestTemplate.class);
-
-            ResponseEntity<ResultData<SemanticQueryResp>> responseEntity = restTemplate.exchange(
-                    requestUrl, HttpMethod.POST, entity, structTypeRef);
-            responseBody = responseEntity.getBody();
-            log.info("ApiResponse<QueryResultWithColumns> responseBody:{}", responseBody);
-            SemanticQueryResp schemaResp = new SemanticQueryResp();
-            if (ReturnCode.SUCCESS.getCode() == responseBody.getCode()) {
-                SemanticQueryResp data = responseBody.getData();
-                schemaResp.setColumns(data.getColumns());
-                schemaResp.setResultList(data.getResultList());
-                schemaResp.setSql(data.getSql());
-                schemaResp.setQueryAuthorization(data.getQueryAuthorization());
-                return schemaResp;
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("search headless interface error,url:" + url, e);
-        }
-        throw new CommonException(responseBody.getCode(), responseBody.getMsg());
-    }
-
-    @Override
-    public List<DomainResp> getDomainList(User user) {
-        DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
-        Object domainDescListObject = fetchHttpResult(
-                defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getFetchDomainListPath(),
-                null, HttpMethod.GET);
-        return JsonUtil.toList(JsonUtil.toString(domainDescListObject), DomainResp.class);
-    }
-
-    @Override
-    public <T> ExplainResp explain(ExplainSqlReq<T> explainResp, User user) throws Exception {
-        DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
-        String semanticUrl = defaultSemanticConfig.getSemanticUrl();
-        String explainPath = defaultSemanticConfig.getExplainPath();
-        URL url = new URL(new URL(semanticUrl), explainPath);
-        return explain(url.toString(), JsonUtil.toString(explainResp));
-    }
-
-    public ExplainResp explain(String url, String jsonReq) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        fillToken(headers);
-        URI requestUrl = UriComponentsBuilder.fromHttpUrl(url).build().encode().toUri();
-        HttpEntity<String> entity = new HttpEntity<>(jsonReq, headers);
-        log.info("url:{},explain:{}", url, entity.getBody());
-        ResultData<ExplainResp> responseBody;
-        try {
-            RestTemplate restTemplate = ContextUtils.getBean(RestTemplate.class);
-
-            ResponseEntity<ResultData<ExplainResp>> responseEntity = restTemplate.exchange(
-                    requestUrl, HttpMethod.POST, entity, explainTypeRef);
-            log.info("ApiResponse<ExplainResp> responseBody:{}", responseEntity);
-            responseBody = responseEntity.getBody();
-            if (Objects.nonNull(responseBody.getData())) {
-                return responseBody.getData();
-            }
-            return null;
-        } catch (Exception e) {
-            throw new RuntimeException("explain interface error,url:" + url, e);
-        }
-    }
-
-    public Object fetchHttpResult(String url, String bodyJson, HttpMethod httpMethod) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        fillToken(headers);
-        URI requestUrl = UriComponentsBuilder.fromHttpUrl(url).build().encode().toUri();
-        ParameterizedTypeReference<ResultData<Object>> responseTypeRef =
-                new ParameterizedTypeReference<ResultData<Object>>() {
-                };
-        HttpEntity<String> entity = new HttpEntity<>(JsonUtil.toString(bodyJson), headers);
-        try {
-            RestTemplate restTemplate = ContextUtils.getBean(RestTemplate.class);
-            ResponseEntity<ResultData<Object>> responseEntity = restTemplate.exchange(requestUrl,
-                    httpMethod, entity, responseTypeRef);
-            ResultData<Object> responseBody = responseEntity.getBody();
-            log.debug("ApiResponse<fetchModelSchema> responseBody:{}", responseBody);
-            if (ReturnCode.SUCCESS.getCode() == responseBody.getCode()) {
-                Object data = responseBody.getData();
-                return data;
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("fetchModelSchema interface error", e);
-        }
-        throw new RuntimeException("fetchModelSchema interface error");
-    }
-
-    public void fillToken(HttpHeaders headers) {
-        s2ThreadContext = ContextUtils.getBean(S2ThreadContext.class);
-        authenticationConfig = ContextUtils.getBean(AuthenticationConfig.class);
-        ThreadContext threadContext = s2ThreadContext.get();
-        if (Objects.nonNull(threadContext) && Strings.isNotEmpty(threadContext.getToken())) {
-            if (Objects.nonNull(authenticationConfig) && Strings.isNotEmpty(
-                    authenticationConfig.getTokenHttpHeaderKey())) {
-                headers.set(authenticationConfig.getTokenHttpHeaderKey(), threadContext.getToken());
-            }
-        } else {
-            log.debug("threadContext is null:{}", Objects.isNull(threadContext));
-        }
-    }
-
-    @Override
-    public PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricCmd, User user) {
-        String body = JsonUtil.toString(pageMetricCmd);
-        DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
-        log.info("url:{}", defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getFetchMetricPagePath());
-        Object dimensionListObject = fetchHttpResult(
-                defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getFetchMetricPagePath(),
-                body, HttpMethod.POST);
-        LinkedHashMap map = (LinkedHashMap) dimensionListObject;
-        PageInfo<Object> metricDescObjectPageInfo = generatePageInfo(map);
-        PageInfo<MetricResp> metricDescPageInfo = new PageInfo<>();
-        BeanUtils.copyProperties(metricDescObjectPageInfo, metricDescPageInfo);
-        metricDescPageInfo.setList(metricDescPageInfo.getList());
-        return metricDescPageInfo;
-    }
-
-    @Override
-    public PageInfo<DimensionResp> getDimensionPage(PageDimensionReq pageDimensionCmd) {
-        String body = JsonUtil.toString(pageDimensionCmd);
-        DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
-        Object dimensionListObject = fetchHttpResult(
-                defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getFetchDimensionPagePath(),
-                body, HttpMethod.POST);
-        LinkedHashMap map = (LinkedHashMap) dimensionListObject;
-        PageInfo<Object> dimensionDescObjectPageInfo = generatePageInfo(map);
-        PageInfo<DimensionResp> dimensionDescPageInfo = new PageInfo<>();
-        BeanUtils.copyProperties(dimensionDescObjectPageInfo, dimensionDescPageInfo);
-        dimensionDescPageInfo.setList(dimensionDescPageInfo.getList());
-        return dimensionDescPageInfo;
-    }
-
-    private PageInfo<Object> generatePageInfo(LinkedHashMap map) {
-        PageInfo<Object> pageInfo = new PageInfo<>();
-        pageInfo.setList((List<Object>) map.get(LIST_LOWER));
-        Integer total = (Integer) map.get(TOTAL_LOWER);
-        pageInfo.setTotal(total);
-        Integer pageSize = (Integer) map.get(PAGESIZE_LOWER);
-        pageInfo.setPageSize(pageSize);
-        pageInfo.setPages((int) Math.ceil((double) total / pageSize));
-        return pageInfo;
-    }
-
-    @Override
-    protected List<ViewSchemaResp> doFetchViewSchema(List<Long> ids) {
-        return null;
-    }
-
-    @Override
-    public List<ItemResp> getDomainViewTree() {
-        return null;
-    }
-
-    @Override
-    public List<ViewResp> getViewList(Long domainId) {
-        return null;
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/semantic/SemanticInterpreter.java

@@ -1,62 +0,0 @@
-package com.tencent.supersonic.chat.core.query.semantic;
-
-import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.api.pojo.ViewSchema;
-import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
-import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
-import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
-import com.tencent.supersonic.headless.api.pojo.response.ExplainResp;
-import com.tencent.supersonic.headless.api.pojo.response.ItemResp;
-import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
-import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.api.pojo.response.ViewResp;
-import com.tencent.supersonic.headless.api.pojo.response.ViewSchemaResp;
-
-import java.util.List;
-
-/**
- * A semantic layer provides a simplified and consistent view of data from multiple sources.
- * It abstracts away the complexity of the underlying data sources and provides a unified view
- * of the data that is easier to understand and use.
- * <p>
- * The interface defines methods for getting metadata as well as querying data in the semantic layer.
- * Implementations of this interface should provide concrete implementations that interact with the
- * underlying data sources and return results in a consistent format. Or it can be implemented
- * as proxy to a remote semantic service.
- * </p>
- */
-public interface SemanticInterpreter {
-
-    SemanticQueryResp queryByStruct(QueryStructReq queryStructReq, User user);
-
-    SemanticQueryResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user);
-
-    SemanticQueryResp queryByS2SQL(QuerySqlReq querySQLReq, User user);
-
-    List<ViewSchema> getViewSchema();
-
-    List<ViewSchema> getViewSchema(List<Long> ids);
-
-    ViewSchema getViewSchema(Long model, Boolean cacheEnable);
-
-    PageInfo<DimensionResp> getDimensionPage(PageDimensionReq pageDimensionReq);
-
-    PageInfo<MetricResp> getMetricPage(PageMetricReq pageDimensionReq, User user);
-
-    List<DomainResp> getDomainList(User user);
-
-    <T> ExplainResp explain(ExplainSqlReq<T> explainSqlReq, User user) throws Exception;
-
-    List<ViewSchemaResp> fetchViewSchema(List<Long> ids, Boolean cacheEnable);
-
-    List<ViewResp> getViewList(Long domainId);
-
-    List<ItemResp> getDomainViewTree();
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/semantic/ViewSchemaBuilder.java

@@ -1,158 +0,0 @@
-package com.tencent.supersonic.chat.core.query.semantic;
-
-import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.api.pojo.RelatedSchemaElement;
-import com.tencent.supersonic.headless.api.pojo.SchemaElement;
-import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
-import com.tencent.supersonic.headless.api.pojo.SchemaValueMap;
-import com.tencent.supersonic.chat.api.pojo.ViewSchema;
-import com.tencent.supersonic.headless.api.pojo.DimValueMap;
-import com.tencent.supersonic.headless.api.pojo.RelateDimension;
-import com.tencent.supersonic.headless.api.pojo.SchemaItem;
-import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
-import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp;
-import com.tencent.supersonic.headless.api.pojo.response.ViewSchemaResp;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class ViewSchemaBuilder {
-
-    public static ViewSchema build(ViewSchemaResp resp) {
-        ViewSchema viewSchema = new ViewSchema();
-        viewSchema.setQueryConfig(resp.getQueryConfig());
-        SchemaElement model = SchemaElement.builder()
-                .view(resp.getId())
-                .id(resp.getId())
-                .name(resp.getName())
-                .bizName(resp.getBizName())
-                .type(SchemaElementType.VIEW)
-                .build();
-        viewSchema.setView(model);
-
-        Set<SchemaElement> metrics = new HashSet<>();
-        for (MetricSchemaResp metric : resp.getMetrics()) {
-
-            List<String> alias = SchemaItem.getAliasList(metric.getAlias());
-
-            SchemaElement metricToAdd = SchemaElement.builder()
-                    .view(resp.getId())
-                    .model(metric.getModelId())
-                    .id(metric.getId())
-                    .name(metric.getName())
-                    .bizName(metric.getBizName())
-                    .type(SchemaElementType.METRIC)
-                    .useCnt(metric.getUseCnt())
-                    .alias(alias)
-                    .relatedSchemaElements(getRelateSchemaElement(metric))
-                    .defaultAgg(metric.getDefaultAgg())
-                    .build();
-            metrics.add(metricToAdd);
-
-        }
-        viewSchema.getMetrics().addAll(metrics);
-
-        Set<SchemaElement> dimensions = new HashSet<>();
-        Set<SchemaElement> dimensionValues = new HashSet<>();
-        Set<SchemaElement> tags = new HashSet<>();
-        for (DimSchemaResp dim : resp.getDimensions()) {
-
-            List<String> alias = SchemaItem.getAliasList(dim.getAlias());
-            Set<String> dimValueAlias = new HashSet<>();
-            List<DimValueMap> dimValueMaps = dim.getDimValueMaps();
-            List<SchemaValueMap> schemaValueMaps = new ArrayList<>();
-            if (!CollectionUtils.isEmpty(dimValueMaps)) {
-
-                for (DimValueMap dimValueMap : dimValueMaps) {
-                    if (Strings.isNotEmpty(dimValueMap.getBizName())) {
-                        dimValueAlias.add(dimValueMap.getBizName());
-                    }
-                    if (!CollectionUtils.isEmpty(dimValueMap.getAlias())) {
-                        dimValueAlias.addAll(dimValueMap.getAlias());
-                    }
-                    SchemaValueMap schemaValueMap = new SchemaValueMap();
-                    BeanUtils.copyProperties(dimValueMap, schemaValueMap);
-                    schemaValueMaps.add(schemaValueMap);
-                }
-
-            }
-            SchemaElement dimToAdd = SchemaElement.builder()
-                    .view(resp.getId())
-                    .model(dim.getModelId())
-                    .id(dim.getId())
-                    .name(dim.getName())
-                    .bizName(dim.getBizName())
-                    .type(SchemaElementType.DIMENSION)
-                    .useCnt(dim.getUseCnt())
-                    .alias(alias)
-                    .schemaValueMaps(schemaValueMaps)
-                    .build();
-            dimensions.add(dimToAdd);
-
-            SchemaElement dimValueToAdd = SchemaElement.builder()
-                    .view(resp.getId())
-                    .model(dim.getModelId())
-                    .id(dim.getId())
-                    .name(dim.getName())
-                    .bizName(dim.getBizName())
-                    .type(SchemaElementType.VALUE)
-                    .useCnt(dim.getUseCnt())
-                    .alias(new ArrayList<>(Arrays.asList(dimValueAlias.toArray(new String[0]))))
-                    .build();
-            dimensionValues.add(dimValueToAdd);
-            if (dim.getIsTag() == 1) {
-                SchemaElement tagToAdd = SchemaElement.builder()
-                        .view(resp.getId())
-                        .model(dim.getModelId())
-                        .id(dim.getId())
-                        .name(dim.getName())
-                        .bizName(dim.getBizName())
-                        .type(SchemaElementType.TAG)
-                        .useCnt(dim.getUseCnt())
-                        .alias(alias)
-                        .schemaValueMaps(schemaValueMaps)
-                        .build();
-                tags.add(tagToAdd);
-            }
-        }
-        viewSchema.getDimensions().addAll(dimensions);
-        viewSchema.getDimensionValues().addAll(dimensionValues);
-        viewSchema.getTags().addAll(tags);
-
-        DimSchemaResp dim = resp.getPrimaryKey();
-        if (dim != null) {
-            SchemaElement entity = SchemaElement.builder()
-                    .view(resp.getId())
-                    .model(dim.getModelId())
-                    .id(dim.getId())
-                    .name(dim.getName())
-                    .bizName(dim.getBizName())
-                    .type(SchemaElementType.ENTITY)
-                    .useCnt(dim.getUseCnt())
-                    .alias(dim.getEntityAlias())
-                    .build();
-            viewSchema.setEntity(entity);
-        }
-        return viewSchema;
-    }
-
-    private static List<RelatedSchemaElement> getRelateSchemaElement(MetricSchemaResp metricSchemaResp) {
-        RelateDimension relateDimension = metricSchemaResp.getRelateDimension();
-        if (relateDimension == null || CollectionUtils.isEmpty(relateDimension.getDrillDownDimensions())) {
-            return Lists.newArrayList();
-        }
-        return relateDimension.getDrillDownDimensions().stream().map(dimension -> {
-            RelatedSchemaElement relateSchemaElement = new RelatedSchemaElement();
-            BeanUtils.copyProperties(dimension, relateSchemaElement);
-            return relateSchemaElement;
-        }).collect(Collectors.toList());
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/ComponentFactory.java

@@ -1,58 +0,0 @@
-package com.tencent.supersonic.chat.core.utils;
-
-import com.tencent.supersonic.chat.core.query.semantic.SemanticInterpreter;
-import com.tencent.supersonic.chat.core.parser.JavaLLMProxy;
-import com.tencent.supersonic.chat.core.parser.LLMProxy;
-import com.tencent.supersonic.chat.core.parser.sql.llm.ViewResolver;
-import com.tencent.supersonic.common.util.ContextUtils;
-import java.util.Map;
-import java.util.Objects;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.io.support.SpringFactoriesLoader;
-
-@Slf4j
-public class ComponentFactory {
-
-    private static SemanticInterpreter semanticInterpreter;
-    private static LLMProxy llmProxy;
-    private static ViewResolver modelResolver;
-
-    public static SemanticInterpreter getSemanticLayer() {
-        if (Objects.isNull(semanticInterpreter)) {
-            semanticInterpreter = init(SemanticInterpreter.class);
-        }
-        return semanticInterpreter;
-    }
-
-    public static LLMProxy getLLMProxy() {
-        //1.Preferentially retrieve from environment variables
-        String llmProxyEnv = System.getenv("llmProxy");
-        if (StringUtils.isNotBlank(llmProxyEnv)) {
-            Map<String, LLMProxy> implementations = ContextUtils.getBeansOfType(LLMProxy.class);
-            llmProxy = implementations.entrySet().stream()
-                    .filter(entry -> entry.getKey().equalsIgnoreCase(llmProxyEnv))
-                    .map(Map.Entry::getValue)
-                    .findFirst()
-                    .orElse(null);
-        }
-        //2.default JavaLLMProxy
-        if (Objects.isNull(llmProxy)) {
-            llmProxy = ContextUtils.getBean(JavaLLMProxy.class);
-        }
-        log.info("llmProxy:{}", llmProxy);
-        return llmProxy;
-    }
-
-    public static ViewResolver getModelResolver() {
-        if (Objects.isNull(modelResolver)) {
-            modelResolver = init(ViewResolver.class);
-        }
-        return modelResolver;
-    }
-
-    private static <T> T init(Class<T> factoryType) {
-        return SpringFactoriesLoader.loadFactories(factoryType,
-                Thread.currentThread().getContextClassLoader()).get(0);
-    }
-}

chat/pom.xml

@@ -6,7 +6,6 @@
     <packaging>pom</packaging>
     <modules>
         <module>api</module>
-        <module>core</module>
         <module>server</module>
     </modules>
 

chat/python/instances/llm_instance.py

@@ -1,21 +0,0 @@
-# -*- coding:utf-8 -*-
-from langchain import llms
-
-import os
-import sys
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from config.config_parse import LLM_PROVIDER_NAME, llm_config_dict
-
-
-def get_llm_provider(llm_provider_name: str, llm_config_dict: dict):
-    if llm_provider_name in llms.type_to_cls_dict:
-        llm_provider = llms.type_to_cls_dict[llm_provider_name]
-        llm = llm_provider(**llm_config_dict)
-        return llm
-    else:
-        raise Exception("llm_provider_name is not supported: {}".format(llm_provider_name))
-
-
-llm = get_llm_provider(LLM_PROVIDER_NAME, llm_config_dict)

chat/python/services/plugin_call/run.py

@@ -1,28 +0,0 @@
-# -*- coding:utf-8 -*-
-
-import os
-import sys
-from typing import Any, List, Mapping, Union
-
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
-from plugin_call.prompt_construct import (
-    construct_plugin_pool_prompt,
-    construct_task_prompt,
-    plugin_selection_output_parse,
-)
-from instances.llm_instance import llm
-
-
-def plugin_selection_run(
-    query_text: str, plugin_configs: List[Mapping[str, Any]]
-) -> Union[Mapping[str, str], None]:
-
-    tools_prompt = construct_plugin_pool_prompt(plugin_configs)
-
-    task_prompt = construct_task_prompt(query_text, tools_prompt)
-    llm_output = llm(task_prompt)
-    parsed_output = plugin_selection_output_parse(llm_output)
-
-    return parsed_output

chat/server/pom.xml

@@ -11,19 +11,10 @@
 
     <artifactId>chat-server</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.tencent.supersonic</groupId>
             <artifactId>auth-api</artifactId>
@@ -36,13 +27,7 @@
         </dependency>
         <dependency>
             <groupId>com.tencent.supersonic</groupId>
-            <artifactId>headless-core</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>chat-core</artifactId>
+            <artifactId>headless-server</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
@@ -51,12 +36,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>${mockito-inline.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java

@@ -1,8 +1,10 @@
-package com.tencent.supersonic.chat.core.agent;
+package com.tencent.supersonic.chat.server.agent;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.tencent.supersonic.headless.api.pojo.LLMConfig;
 import com.tencent.supersonic.common.pojo.RecordInfo;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
@@ -29,6 +31,8 @@ public class Agent extends RecordInfo {
     private Integer status;
     private List<String> examples;
     private String agentConfig;
+    private LLMConfig llmConfig;
+    private MultiTurnConfig multiTurnConfig;
 
     public List<String> getTools(AgentToolType type) {
         Map map = JSONObject.parseObject(agentConfig, Map.class);
@@ -65,12 +69,33 @@ public class Agent extends RecordInfo {
                 .collect(Collectors.toList());
     }
 
-    public Set<Long> getViewIds(AgentToolType agentToolType) {
+    public boolean containsLLMParserTool() {
+        return !CollectionUtils.isEmpty(getParserTools(AgentToolType.NL2SQL_LLM));
+    }
+
+    public boolean containsRuleTool() {
+        return !CollectionUtils.isEmpty(getParserTools(AgentToolType.NL2SQL_RULE));
+    }
+
+    public boolean containsNL2SQLTool() {
+        return !CollectionUtils.isEmpty(getParserTools(AgentToolType.NL2SQL_LLM))
+                || !CollectionUtils.isEmpty(getParserTools(AgentToolType.NL2SQL_RULE));
+    }
+
+    public Set<Long> getDataSetIds() {
+        Set<Long> dataSetIds = getDataSetIds(null);
+        if (containsAllModel(dataSetIds)) {
+            return Sets.newHashSet();
+        }
+        return dataSetIds;
+    }
+
+    public Set<Long> getDataSetIds(AgentToolType agentToolType) {
         List<NL2SQLTool> commonAgentTools = getParserTools(agentToolType);
         if (CollectionUtils.isEmpty(commonAgentTools)) {
             return new HashSet<>();
         }
-        return commonAgentTools.stream().map(NL2SQLTool::getViewIds)
+        return commonAgentTools.stream().map(NL2SQLTool::getDataSetIds)
                 .filter(modelIds -> !CollectionUtils.isEmpty(modelIds))
                 .flatMap(Collection::stream)
                 .collect(Collectors.toSet());

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/AgentConfig.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.core.agent;
+package com.tencent.supersonic.chat.server.agent;
 
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/AgentTool.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.core.agent;
+package com.tencent.supersonic.chat.server.agent;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/AgentToolType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.core.agent;
+package com.tencent.supersonic.chat.server.agent;
 
 import java.util.HashMap;
 import java.util.Map;

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/LLMParserTool.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.core.agent;
+package com.tencent.supersonic.chat.server.agent;
 
 import lombok.Data;
 

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/MultiTurnConfig.java

@@ -0,0 +1,15 @@
+package com.tencent.supersonic.chat.server.agent;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MultiTurnConfig {
+
+    private boolean enableMultiTurn;
+
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/NL2SQLTool.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.core.agent;
+package com.tencent.supersonic.chat.server.agent;
 
 
 import lombok.AllArgsConstructor;
@@ -12,6 +12,6 @@ import java.util.List;
 @AllArgsConstructor
 public class NL2SQLTool extends AgentTool {
 
-    protected List<Long> viewIds;
+    protected List<Long> dataSetIds;
 
 }

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/PluginTool.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.core.agent;
+package com.tencent.supersonic.chat.server.agent;
 
 
 import lombok.Data;

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/RuleParserTool.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.core.agent;
+package com.tencent.supersonic.chat.server.agent;
 
 
 import lombok.Data;
@@ -15,7 +15,7 @@ public class RuleParserTool extends NL2SQLTool {
     private List<String> queryTypes;
 
     public boolean isContainsAllModel() {
-        return CollectionUtils.isNotEmpty(viewIds) && viewIds.contains(-1L);
+        return CollectionUtils.isNotEmpty(dataSetIds) && dataSetIds.contains(-1L);
     }
 
 }

chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/ChatExecutor.java

@@ -0,0 +1,10 @@
+package com.tencent.supersonic.chat.server.executor;
+
+import com.tencent.supersonic.chat.server.pojo.ChatExecuteContext;
+import com.tencent.supersonic.headless.api.pojo.response.QueryResult;
+
+public interface ChatExecutor {
+
+    QueryResult execute(ChatExecuteContext chatExecuteContext);
+
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/PluginExecutor.java

@@ -0,0 +1,22 @@
+package com.tencent.supersonic.chat.server.executor;
+
+import com.tencent.supersonic.chat.server.plugin.PluginQueryManager;
+import com.tencent.supersonic.chat.server.plugin.build.PluginSemanticQuery;
+import com.tencent.supersonic.chat.server.pojo.ChatExecuteContext;
+import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.response.QueryResult;
+
+public class PluginExecutor implements ChatExecutor {
+
+    @Override
+    public QueryResult execute(ChatExecuteContext chatExecuteContext) {
+        SemanticParseInfo parseInfo = chatExecuteContext.getParseInfo();
+        if (!PluginQueryManager.isPluginQuery(parseInfo.getQueryMode())) {
+            return null;
+        }
+        PluginSemanticQuery query = PluginQueryManager.getPluginQuery(parseInfo.getQueryMode());
+        query.setParseInfo(parseInfo);
+        return query.build();
+    }
+
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java

@@ -0,0 +1,43 @@
+package com.tencent.supersonic.chat.server.executor;
+
+import com.tencent.supersonic.chat.server.plugin.PluginQueryManager;
+import com.tencent.supersonic.chat.server.pojo.ChatExecuteContext;
+import com.tencent.supersonic.chat.server.util.ResultFormatter;
+import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.request.ExecuteQueryReq;
+import com.tencent.supersonic.headless.api.pojo.response.QueryResult;
+import com.tencent.supersonic.headless.server.service.ChatQueryService;
+import lombok.SneakyThrows;
+
+public class SqlExecutor implements ChatExecutor {
+
+    @SneakyThrows
+    @Override
+    public QueryResult execute(ChatExecuteContext chatExecuteContext) {
+        SemanticParseInfo parseInfo = chatExecuteContext.getParseInfo();
+        if (PluginQueryManager.isPluginQuery(parseInfo.getQueryMode())) {
+            return null;
+        }
+        ExecuteQueryReq executeQueryReq = buildExecuteReq(chatExecuteContext);
+        ChatQueryService chatQueryService = ContextUtils.getBean(ChatQueryService.class);
+        QueryResult queryResult = chatQueryService.performExecution(executeQueryReq);
+        String textResult = ResultFormatter.transform2TextNew(queryResult.getQueryColumns(),
+                queryResult.getQueryResults());
+        queryResult.setTextResult(textResult);
+        return queryResult;
+    }
+
+    private ExecuteQueryReq buildExecuteReq(ChatExecuteContext chatExecuteContext) {
+        SemanticParseInfo parseInfo = chatExecuteContext.getParseInfo();
+        return ExecuteQueryReq.builder()
+                .queryId(chatExecuteContext.getQueryId())
+                .chatId(chatExecuteContext.getChatId())
+                .queryText(chatExecuteContext.getQueryText())
+                .parseInfo(parseInfo)
+                .saveAnswer(chatExecuteContext.isSaveAnswer())
+                .user(chatExecuteContext.getUser())
+                .build();
+    }
+
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/listener/ApplicationStartedListener.java

@@ -1,87 +0,0 @@
-package com.tencent.supersonic.chat.server.listener;
-
-import com.tencent.supersonic.headless.core.knowledge.DictWord;
-import com.tencent.supersonic.chat.server.service.impl.SchemaService;
-import com.tencent.supersonic.chat.server.service.impl.WordService;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-import com.tencent.supersonic.headless.server.service.KnowledgeService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-@Order(2)
-public class ApplicationStartedListener implements CommandLineRunner {
-
-    @Autowired
-    private KnowledgeService knowledgeService;
-    @Autowired
-    private WordService wordService;
-    @Autowired
-    private SchemaService schemaService;
-
-    @Override
-    public void run(String... args) {
-        updateKnowledgeDimValue();
-    }
-
-    public Boolean updateKnowledgeDimValue() {
-        Boolean isOk = false;
-        try {
-            log.debug("ApplicationStartedInit start");
-
-            List<DictWord> dictWords = wordService.getAllDictWords();
-            wordService.setPreDictWords(dictWords);
-            knowledgeService.reloadAllData(dictWords);
-
-            log.debug("ApplicationStartedInit end");
-            isOk = true;
-        } catch (Exception e) {
-            log.error("ApplicationStartedInit error", e);
-        }
-        return isOk;
-    }
-
-    public Boolean updateKnowledgeDimValueAsync() {
-        CompletableFuture.supplyAsync(() -> {
-            updateKnowledgeDimValue();
-            return null;
-        });
-        return true;
-    }
-
-    /***
-     * reload knowledge task
-     */
-    @Scheduled(cron = "${reload.knowledge.corn:0 0/1 * * * ?}")
-    public void reloadKnowledge() {
-        log.debug("reloadKnowledge start");
-
-        try {
-            List<DictWord> dictWords = wordService.getAllDictWords();
-            List<DictWord> preDictWords = wordService.getPreDictWords();
-
-            if (CollectionUtils.isEqualCollection(dictWords, preDictWords)) {
-                log.debug("dictWords has not changed, reloadKnowledge end");
-                return;
-            }
-            log.info("dictWords has changed");
-            wordService.setPreDictWords(dictWords);
-            knowledgeService.updateOnlineKnowledge(wordService.getAllDictWords());
-            schemaService.getCache().refresh(SchemaService.ALL_CACHE);
-
-        } catch (Exception e) {
-            log.error("reloadKnowledge error", e);
-        }
-
-        log.debug("reloadKnowledge end");
-    }
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/ChatParser.java

@@ -0,0 +1,10 @@
+package com.tencent.supersonic.chat.server.parser;
+
+import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
+import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
+
+public interface ChatParser {
+
+    void parse(ChatParseContext chatParseContext, ParseResp parseResp);
+
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/MultiTurnParser.java

@@ -0,0 +1,154 @@
+package com.tencent.supersonic.chat.server.parser;
+
+import com.tencent.supersonic.chat.server.agent.MultiTurnConfig;
+import com.tencent.supersonic.chat.server.persistence.repository.ChatQueryRepository;
+import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
+import com.tencent.supersonic.chat.server.util.QueryReqConverter;
+import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch;
+import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
+import com.tencent.supersonic.headless.api.pojo.request.QueryReq;
+import com.tencent.supersonic.headless.api.pojo.response.MapResp;
+import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
+import com.tencent.supersonic.headless.core.utils.S2ChatModelProvider;
+import com.tencent.supersonic.headless.server.service.ChatQueryService;
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.input.Prompt;
+import dev.langchain4j.model.input.PromptTemplate;
+import dev.langchain4j.model.output.Response;
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.Collections;
+
+import static com.tencent.supersonic.chat.server.parser.ParserConfig.PARSER_MULTI_TURN_ENABLE;
+
+@Slf4j
+public class MultiTurnParser implements ChatParser {
+
+    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
+
+    private static final PromptTemplate promptTemplate = PromptTemplate.from(
+            "You are a data product manager experienced in data requirements."
+                    + "Your will be provided with current and history questions asked by a user,"
+                    + "along with their mapped schema elements(metric, dimension and value), "
+                    + "please try understanding the semantics and rewrite a question"
+                    + "(keep relevant entities, metrics, dimensions, values and date ranges)."
+                    + "Current Question: {{curtQuestion}} "
+                    + "Current Mapped Schema: {{curtSchema}} "
+                    + "History Question: {{histQuestion}} "
+                    + "History Mapped Schema: {{histSchema}} "
+                    + "Rewritten Question: ");
+
+    @Override
+    public void parse(ChatParseContext chatParseContext, ParseResp parseResp) {
+        ParserConfig parserConfig = ContextUtils.getBean(ParserConfig.class);
+        MultiTurnConfig agentMultiTurnConfig = chatParseContext.getAgent().getMultiTurnConfig();
+        Boolean globalMultiTurnConfig = Boolean.valueOf(parserConfig.getParameterValue(PARSER_MULTI_TURN_ENABLE));
+
+        Boolean multiTurnConfig = agentMultiTurnConfig != null
+                ? agentMultiTurnConfig.isEnableMultiTurn() : globalMultiTurnConfig;
+        if (!Boolean.TRUE.equals(multiTurnConfig)) {
+            return;
+        }
+
+        // derive mapping result of current question and parsing result of last question.
+        ChatQueryService chatQueryService = ContextUtils.getBean(ChatQueryService.class);
+        QueryReq queryReq = QueryReqConverter.buildText2SqlQueryReq(chatParseContext);
+        MapResp currentMapResult = chatQueryService.performMapping(queryReq);
+
+        List<ParseResp> historyParseResults = getHistoryParseResult(chatParseContext.getChatId(), 1);
+        if (historyParseResults.size() == 0) {
+            return;
+        }
+        ParseResp lastParseResult = historyParseResults.get(0);
+        Long dataId = lastParseResult.getSelectedParses().get(0).getDataSetId();
+
+        String curtMapStr = generateSchemaPrompt(currentMapResult.getMapInfo().getMatchedElements(dataId));
+        String histMapStr = generateSchemaPrompt(lastParseResult.getSelectedParses().get(0).getElementMatches());
+        String rewrittenQuery = rewriteQuery(RewriteContext.builder()
+                        .curtQuestion(currentMapResult.getQueryText())
+                        .histQuestion(lastParseResult.getQueryText())
+                        .curtSchema(curtMapStr)
+                        .histSchema(histMapStr)
+                        .llmConfig(queryReq.getLlmConfig())
+                        .build());
+        chatParseContext.setQueryText(rewrittenQuery);
+        log.info("Last Query: {} Current Query: {}, Rewritten Query: {}",
+                lastParseResult.getQueryText(), currentMapResult.getQueryText(), rewrittenQuery);
+    }
+
+    private String rewriteQuery(RewriteContext context) {
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("curtQuestion", context.getCurtQuestion());
+        variables.put("histQuestion", context.getHistQuestion());
+        variables.put("curtSchema", context.getCurtSchema());
+        variables.put("histSchema", context.getHistSchema());
+
+        Prompt prompt = promptTemplate.apply(variables);
+        keyPipelineLog.info("MultiTurnParser reqPrompt:{}", prompt.toSystemMessage());
+
+        ChatLanguageModel chatLanguageModel = S2ChatModelProvider.provide(context.getLlmConfig());
+        Response<AiMessage> response = chatLanguageModel.generate(prompt.toSystemMessage());
+
+        String result = response.content().text();
+        keyPipelineLog.info("MultiTurnParser modelResp:{}", result);
+        return response.content().text();
+    }
+
+    private String generateSchemaPrompt(List<SchemaElementMatch> elementMatches) {
+        List<String> metrics = new ArrayList<>();
+        List<String> dimensions = new ArrayList<>();
+        List<String> values = new ArrayList<>();
+
+        for (SchemaElementMatch match : elementMatches) {
+            if (match.getElement().getType().equals(SchemaElementType.METRIC)) {
+                metrics.add(match.getWord());
+            } else if (match.getElement().getType().equals(SchemaElementType.DIMENSION)) {
+                dimensions.add(match.getWord());
+            } else if (match.getElement().getType().equals(SchemaElementType.VALUE)) {
+                values.add(match.getWord());
+            }
+        }
+
+        StringBuilder prompt = new StringBuilder();
+        prompt.append(String.format("'metrics:':[%s]", String.join(",", metrics)));
+        prompt.append(",");
+        prompt.append(String.format("'dimensions:':[%s]", String.join(",", dimensions)));
+        prompt.append(",");
+        prompt.append(String.format("'values:':[%s]", String.join(",", values)));
+
+        return prompt.toString();
+    }
+
+    private List<ParseResp> getHistoryParseResult(int chatId, int multiNum) {
+        ChatQueryRepository chatQueryRepository = ContextUtils.getBean(ChatQueryRepository.class);
+        List<ParseResp> contextualParseInfoList = chatQueryRepository.getContextualParseInfo(chatId)
+                .stream().filter(p -> p.getState() != ParseResp.ParseState.FAILED).collect(Collectors.toList());
+
+        List<ParseResp> contextualList = contextualParseInfoList.subList(0,
+                Math.min(multiNum, contextualParseInfoList.size()));
+        Collections.reverse(contextualList);
+        return contextualList;
+    }
+
+    @Data
+    @Builder
+    public static class RewriteContext {
+        private String curtQuestion;
+        private String histQuestion;
+        private String curtSchema;
+        private String histSchema;
+        private LLMConfig llmConfig;
+    }
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2PluginParser.java

@@ -0,0 +1,25 @@
+package com.tencent.supersonic.chat.server.parser;
+
+import com.tencent.supersonic.chat.server.plugin.recognize.PluginRecognizer;
+import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
+import com.tencent.supersonic.chat.server.util.ComponentFactory;
+import com.tencent.supersonic.common.util.JsonUtil;
+import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
+import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+
+@Slf4j
+public class NL2PluginParser implements ChatParser {
+
+    private final List<PluginRecognizer> pluginRecognizers = ComponentFactory.getPluginRecognizers();
+
+    @Override
+    public void parse(ChatParseContext chatParseContext, ParseResp parseResp) {
+        pluginRecognizers.forEach(pluginRecognizer -> {
+            pluginRecognizer.recognize(chatParseContext, parseResp);
+            log.info("{} recallResult:{}", pluginRecognizer.getClass().getSimpleName(),
+                    JsonUtil.toString(parseResp));
+        });
+    }
+
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java

@@ -0,0 +1,98 @@
+package com.tencent.supersonic.chat.server.parser;
+
+import com.tencent.supersonic.chat.server.plugin.PluginQueryManager;
+import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
+import com.tencent.supersonic.chat.server.util.QueryReqConverter;
+import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.request.QueryFilter;
+import com.tencent.supersonic.headless.api.pojo.request.QueryReq;
+import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
+import com.tencent.supersonic.headless.server.service.ChatQueryService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Slf4j
+public class NL2SQLParser implements ChatParser {
+
+    @Override
+    public void parse(ChatParseContext chatParseContext, ParseResp parseResp) {
+        if (!chatParseContext.enableNL2SQL()) {
+            return;
+        }
+        if (checkSkip(parseResp)) {
+            return;
+        }
+        QueryReq queryReq = QueryReqConverter.buildText2SqlQueryReq(chatParseContext);
+
+        ChatQueryService chatQueryService = ContextUtils.getBean(ChatQueryService.class);
+        ParseResp text2SqlParseResp = chatQueryService.performParsing(queryReq);
+        if (!ParseResp.ParseState.FAILED.equals(text2SqlParseResp.getState())) {
+            parseResp.getSelectedParses().addAll(text2SqlParseResp.getSelectedParses());
+        }
+        parseResp.getParseTimeCost().setSqlTime(text2SqlParseResp.getParseTimeCost().getSqlTime());
+        formatParseResult(parseResp);
+    }
+
+    private boolean checkSkip(ParseResp parseResp) {
+        List<SemanticParseInfo> selectedParses = parseResp.getSelectedParses();
+        for (SemanticParseInfo semanticParseInfo : selectedParses) {
+            if (semanticParseInfo.getScore() >= parseResp.getQueryText().length()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void formatParseResult(ParseResp parseResp) {
+        List<SemanticParseInfo> selectedParses = parseResp.getSelectedParses();
+        for (SemanticParseInfo parseInfo : selectedParses) {
+            formatParseInfo(parseInfo);
+        }
+    }
+
+    private void formatParseInfo(SemanticParseInfo parseInfo) {
+        if (!PluginQueryManager.isPluginQuery(parseInfo.getQueryMode())) {
+            formatNL2SQLParseInfo(parseInfo);
+        }
+    }
+
+    private void formatNL2SQLParseInfo(SemanticParseInfo parseInfo) {
+        StringBuilder textBuilder = new StringBuilder();
+        textBuilder.append("**数据集:** ").append(parseInfo.getDataSet().getName()).append(" ");
+        Optional<SchemaElement> metric = parseInfo.getMetrics().stream().findFirst();
+        metric.ifPresent(schemaElement ->
+                textBuilder.append("**指标:** ").append(schemaElement.getName()).append(" "));
+        List<String> dimensionNames = parseInfo.getDimensions().stream()
+                .map(SchemaElement::getName).filter(Objects::nonNull).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(dimensionNames)) {
+            textBuilder.append("**维度:** ").append(String.join(",", dimensionNames));
+        }
+        textBuilder.append("\n\n**筛选条件:** \n");
+        if (parseInfo.getDateInfo() != null) {
+            textBuilder.append("**数据时间:** ").append(parseInfo.getDateInfo().getStartDate()).append("~")
+                    .append(parseInfo.getDateInfo().getEndDate()).append(" ");
+        }
+        if (!CollectionUtils.isEmpty(parseInfo.getDimensionFilters())
+                || CollectionUtils.isEmpty(parseInfo.getMetricFilters())) {
+            Set<QueryFilter> queryFilters = parseInfo.getDimensionFilters();
+            queryFilters.addAll(parseInfo.getMetricFilters());
+            for (QueryFilter queryFilter : queryFilters) {
+                textBuilder.append("**").append(queryFilter.getName()).append("**")
+                        .append(" ")
+                        .append(queryFilter.getOperator().getValue())
+                        .append(" ")
+                        .append(queryFilter.getValue())
+                        .append(" ");
+            }
+        }
+        parseInfo.setTextInfo(textBuilder.toString());
+    }
+
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/ParserConfig.java

@@ -0,0 +1,27 @@
+package com.tencent.supersonic.chat.server.parser;
+
+import com.google.common.collect.Lists;
+import com.tencent.supersonic.common.pojo.ParameterConfig;
+import com.tencent.supersonic.common.pojo.Parameter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("ChatParserConfig")
+@Slf4j
+public class ParserConfig extends ParameterConfig {
+
+    public static final Parameter PARSER_MULTI_TURN_ENABLE =
+            new Parameter("s2.parser.multi-turn.enable", "false",
+                    "是否开启多轮对话", "开启多轮对话将消耗更多token",
+                    "bool", "Parser相关配置");
+
+    @Override
+    public List<Parameter> getSysParameters() {
+        return Lists.newArrayList(
+                PARSER_MULTI_TURN_ENABLE
+        );
+    }
+
+}

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/AgentDO.java

@@ -1,10 +1,18 @@
 package com.tencent.supersonic.chat.server.persistence.dataobject;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
+@TableName("s2_agent")
 public class AgentDO {
     /**
      */
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -48,159 +56,8 @@ public class AgentDO {
      */
     private Integer enableSearch;
 
-    /**
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
+    private String llmConfig;
 
-    /**
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
+    private String multiTurnConfig;
 
-    /**
-     * @return name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    /**
-     * @return description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * @param description
-     */
-    public void setDescription(String description) {
-        this.description = description == null ? null : description.trim();
-    }
-
-    /**
-     * 0 offline, 1 online
-     * @return status 0 offline, 1 online
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * 0 offline, 1 online
-     * @param status 0 offline, 1 online
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * @return examples
-     */
-    public String getExamples() {
-        return examples;
-    }
-
-    /**
-     * @param examples
-     */
-    public void setExamples(String examples) {
-        this.examples = examples == null ? null : examples.trim();
-    }
-
-    /**
-     * @return config
-     */
-    public String getConfig() {
-        return config;
-    }
-
-    /**
-     * @param config
-     */
-    public void setConfig(String config) {
-        this.config = config == null ? null : config.trim();
-    }
-
-    /**
-     * @return created_by
-     */
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    /**
-     * @param createdBy
-     */
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy == null ? null : createdBy.trim();
-    }
-
-    /**
-     * @return created_at
-     */
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-
-    /**
-     * @param createdAt
-     */
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    /**
-     * @return updated_by
-     */
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    /**
-     * @param updatedBy
-     */
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
-    }
-
-    /**
-     * @return updated_at
-     */
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-
-    /**
-     * @param updatedAt
-     */
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    /**
-     * @return enable_search
-     */
-    public Integer getEnableSearch() {
-        return enableSearch;
-    }
-
-    /**
-     * @param enableSearch
-     */
-    public void setEnableSearch(Integer enableSearch) {
-        this.enableSearch = enableSearch;
-    }
 }

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/DimValueDO.java

@@ -1,14 +1,14 @@
 package com.tencent.supersonic.chat.server.persistence.dataobject;
 
 
-import com.tencent.supersonic.chat.core.config.DefaultMetric;
-import com.tencent.supersonic.chat.core.config.Dim4Dict;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.tencent.supersonic.headless.core.config.DefaultMetric;
+import com.tencent.supersonic.headless.core.config.Dim4Dict;
 import lombok.Data;
 import lombok.ToString;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 @Data
 @ToString

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/PluginDO.java

@@ -15,7 +15,7 @@ public class PluginDO {
 
     private String type;
 
-    private String view;
+    private String dataSet;
 
     private String pattern;
 

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/mapper/AgentDOMapper.java

@@ -1,71 +1,10 @@
 package com.tencent.supersonic.chat.server.persistence.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDO;
-import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDOExample;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 @Mapper
-public interface AgentDOMapper {
-    /**
-     *
-     * @mbg.generated
-     */
-    long countByExample(AgentDOExample example);
+public interface AgentDOMapper extends BaseMapper<AgentDO> {
 
-    /**
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int insert(AgentDO record);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int insertSelective(AgentDO record);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    List<AgentDO> selectByExample(AgentDOExample example);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    AgentDO selectByPrimaryKey(Integer id);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") AgentDO record, @Param("example") AgentDOExample example);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") AgentDO record, @Param("example") AgentDOExample example);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(AgentDO record);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(AgentDO record);
 }

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/mapper/ChatContextMapper.java

@@ -1,14 +0,0 @@
-package com.tencent.supersonic.chat.server.persistence.mapper;
-
-import com.tencent.supersonic.chat.server.persistence.dataobject.ChatContextDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ChatContextMapper {
-
-    ChatContextDO getContextByChatId(int chatId);
-
-    int updateContext(ChatContextDO contextDO);
-
-    int addContext(ChatContextDO contextDO);
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/mapper/ChatParseMapper.java

@@ -18,4 +18,6 @@ public interface ChatParseMapper {
 
     List<ChatParseDO> getParseInfoList(List<Long> questionIds);
 
+    List<ChatParseDO> getContextualParseInfo(Integer chatId);
+
 }

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/AgentRepository.java

@@ -1,18 +0,0 @@
-package com.tencent.supersonic.chat.server.persistence.repository;
-
-import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDO;
-
-import java.util.List;
-
-public interface AgentRepository {
-
-    List<AgentDO> getAgents();
-
-    void createAgent(AgentDO agentDO);
-
-    void updateAgent(AgentDO agentDO);
-
-    AgentDO getAgent(Integer id);
-
-    void deleteAgent(Integer id);
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/repository/ChatContextRepository.java

@@ -1,7 +1,6 @@
 package com.tencent.supersonic.chat.server.persistence.repository;
 
-
-import com.tencent.supersonic.chat.core.pojo.ChatContext;
+import com.tencent.supersonic.headless.core.pojo.ChatContext;
 
 public interface ChatContextRepository {