[improvement][headless] fix derived metric aggOption error (#679 )

[improvement][headless] fix derived metric case parse error (#678 )
[improvement][semantic-fe] fix update the metric list. (#677 )
2025-12-10 11:07:06 +00:00 · 2024-01-22 19:13:55 +08:00 · 2024-01-22 12:54:45 +08:00 · 2024-01-22 12:21:49 +08:00 · 2024-01-22 10:47:54 +08:00 · 2024-01-21 16:26:49 +08:00
1071 changed files with 24323 additions and 23059 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,31 @@
+name: supersonic CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+    - name: Cache Maven packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: Test with Maven
+      run: mvn test
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@
 - "Breaking Changes" describes any changes that may break existing functionality or cause
  compatibility issues with previous versions.

+## SuperSonic [0.8.4] - 2024-01-19
+
+### Added
+- support creating derived metrics.
+  - Support creating metrics using three methods: by measure, metric, and field expressions.
+- added support for postgresql data source.
+- code adjustment and abstract optimization for chat and headless.
+
+## SuperSonic [0.8.2] - 2023-12-18
+
+### Added
+- rewrite Python service with Java project, default to Java implementation.
+- support setting the SQL generation method for large models in the interface.
+- optimization of metric market experience.
+- optimization of semantic modeling canvas experience.
+- code structure adjustment and abstraction optimization for chat.
+
 ## SuperSonic [0.7.5] - 2023-10-13

 ### Added
--- a/README.md
+++ b/README.md
@@ -1,26 +1,28 @@
 [中文介绍](README_CN.md) | [文档中心](https://github.com/tencentmusic/supersonic/wiki)

+![Java CI](https://github.com/tencentmusic/supersonic/workflows/supersonic%20CI/badge.svg)
+
 # SuperSonic (超音数)

-**SuperSonic is an out-of-the-box yet highly extensible framework for building ChatBI**. 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 metrics/dimensions/entities, along with their meaning, context and relationships) on top of physical data models, and no data modification or copying is required. Meanwhile, SuperSonic is designed to be pluggable, allowing new functionalities to be added through plugins and core components to be integrated with other systems.
+**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) on top of physical data models, 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.

 <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 works exhibit promising results, their **reliability** is inadequate for real-world applications.  
+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.  

 From our perspective, the key to filling the real-world gap lies in three aspects: 
-1. Introduce a semantic layer encapsulating underlying data context(joins, formulas, etc) to reduce **complexity**.
-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 heuristic rules when necessary to improve **efficiency**(in terms of latency and cost).
+1. Integrate ChatBI with HeadlessBI encapsulating underlying data context (joins, keys, formulas, etc) to **reduce complexity**.
+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).

 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.

 ## Out-of-the-box Features

- Built-in CUI(Chat User Interface) for *business users* to enter data queries
- Built-in GUI(Graphical User Interface) for *analytics engineers* to build semantic models
+- 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 
@@ -49,7 +51,7 @@ The high-level architecture and main process flow is as follows:
 SuperSonic comes with sample semantic models as well as chat conversations that can be used as a starting point. Please follow the steps: 

 - Download the latest prebuilt binary from the [release page](https://github.com/tencentmusic/supersonic/releases)
- Run script "bin/supersonic-daemon.sh" to start services (one java process and one python process)
+- Run script "assembly/bin/supersonic-daemon.sh start" to start a standalone Java service
 - Visit http://localhost:9080 in the browser to start exploration

 ## Build and Development
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,6 +1,6 @@
-# 超音数（SuperSonic）
+# SuperSonic (超音数)

-**超音数是一个开箱即用且易于扩展的数据问答对话框架**。通过超音数的问答对话界面，用户能够使用自然语言查询数据，系统会选择合适的可视化图表呈现结果。超音数不需要修改或复制数据，只需要在物理数据模型之上构建逻辑语义模型（指标/维度/实体的定义，以及他们的业务含义、相互间关系等），即可开启数据问答体验。与此同时，超音数被设计为可插拔式的框架，允许以插件形式来扩展新功能，或者将核心组件与其他系统集成。
+**SuperSonic融合ChatBI和HeadlessBI打造新一代的数据分析平台**。通过SuperSonic的问答对话界面，用户能够使用自然语言查询数据，系统会选择合适的可视化图表呈现结果。SuperSonic不需要修改或复制数据，只需要在物理数据模型之上构建逻辑语义模型（指标/维度/实体的定义，以及他们的业务含义、相互间关系等），即可开启数据问答体验。与此同时，SuperSonic被设计为可插拔的框架，采用Java SPI机制来扩展定制功能。

 <img src="./docs/images/supersonic_demo.gif" height="100%" width="100%" align="center"/>

@@ -9,24 +9,24 @@
 大型语言模型（LLMs）如ChatGPT的出现正在重塑信息检索的方式。在数据分析领域，学术界和工业界主要关注利用深度学习模型将自然语言查询转换为SQL查询。虽然一些工作显示出有前景的结果，但它们的可靠性还达不到生产可用的要求。

 在我们看来，为了在实际场景发挥价值，有三个关键点：
-1. 引入语义模型层，封装底层数据的上下文（关联、公式等），降低SQL生成的**复杂度**。
+1. 融合HeadlessBI，通过统一语义层封装底层数据细节（关联、键值、公式等），降低SQL生成的**复杂度**。
 2. 通过一前一后的模式映射器和语义修正器，来缓解LLM常见的**幻觉**现象。
 3. 设计启发式的规则，在一些特定场景提升语义解析的**效率**。

-为了验证上述想法，我们开发了超音数项目，并将其应用在实际的内部产品中。与此同时，我们将超音数作为一个可扩展的框架开源，希望能够促进数据问答对话领域的进一步发展。
+为了验证上述想法，我们开发了SuperSonic项目，并将其应用在实际的内部产品中。与此同时，我们将SuperSonic作为一个可扩展的框架开源，希望能够促进数据问答对话领域的进一步发展。

 ## 开箱即用的特性

- 内置对话界面以便*业务用户*输入数据查询。
- 内置图形界面以便*分析工程师*构建语义模型。
- 内置图形界面以便*系统管理员*管理第三方插件和对话助理。
+- 内置ChatBI界面以便*业务用户*输入数据查询。
+- 内置HeadlessBI界面以便*分析工程师*构建语义模型。
+- 内置图形用户界面以便*系统管理员*管理第三方插件和对话助理。
 - 支持文本输入的联想和查询问题的推荐。
 - 支持多轮对话，根据语境自动切换上下文。
 - 支持四级权限控制：主题域级、模型级、列级、行级。

 ## 易于扩展的组件

-超音数的整体架构和主流程如下图所示：
+SuperSonic的整体架构和主流程如下图所示：

 <img src="./docs/images/supersonic_components.png" height="65%" width="65%" align="center"/> 

@@ -44,10 +44,10 @@

 ## 快速体验

-超音数自带样例的语义模型和问答对话，只需以下三步即可快速体验：
+SuperSonic自带样例的语义模型和问答对话，只需以下三步即可快速体验：

 - 从[release page](https://github.com/tencentmusic/supersonic/releases)下载预先构建好的发行包
- 运行 "bin/supersonic-daemon.sh"启动服务（一个Java进程和一个Python进程）
+- 运行 "assembly/bin/supersonic-daemon.sh start"启动standalone模式的Java服务
 - 在浏览器访问http://localhost:9080 开启探索

 ## 如何构建和部署
--- a/assembly/bin/supersonic-build.bat
+++ b/assembly/bin/supersonic-build.bat
@@ -6,11 +6,18 @@ set "baseDir=%~dp0.."
 set "buildDir=%baseDir%\build"
 set "runtimeDir=%baseDir%\..\runtime"
 set "pip_path=pip3"
+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
+)
+
 rem 2. move package to build
 echo f|xcopy "%baseDir%\..\launchers\standalone\target\*.tar.gz" "%buildDir%\supersonic-standalone.tar.gz"

@@ -19,6 +26,11 @@ 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
+)
+
 rem 4. copy webapp to java classpath
 cd "%buildDir%"
 tar -zxvf supersonic-webapp.tar.gz
@@ -26,16 +38,23 @@ move supersonic-webapp webapp
 move webapp ..\..\launchers\standalone\target\classes

 rem 5. build backend python modules
-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"
+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"
+)

 call :BUILD_RUNTIME

 :BUILD_RUNTIME
  rem 6. reset runtime
-  rd /s /q "%runtimeDir%"
+  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 (
--- a/assembly/bin/supersonic-build.sh
+++ b/assembly/bin/supersonic-build.sh
@@ -4,19 +4,22 @@ set -x
 sbinDir=$(cd "$(dirname "$0")"; pwd)
 chmod +x $sbinDir/supersonic-common.sh
 source $sbinDir/supersonic-common.sh
-
 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
+fi

 #2. move package to build
-cp $baseDir/../launchers/semantic/target/*.tar.gz ${buildDir}/supersonic-semantic.tar.gz
+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

@@ -26,23 +29,30 @@ cd ../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
 #4. copy webapp to java classpath
 cd $buildDir
 tar xvf supersonic-webapp.tar.gz
 mv supersonic-webapp webapp
-cp -fr webapp ../../launchers/semantic/target/classes
+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

 #5. build backend python modules
-echo "start installing python modules with pip: ${pip_path}"
-requirementPath=$baseDir/../chat/python/requirements.txt
-${pip_path} install -r ${requirementPath}
-echo "install python modules success"
+if [ "$service" == "pyllm" ]; then
+  echo "start installing python modules with pip: ${pip_path}"
+  requirementPath=$baseDir/../chat/python/requirements.txt
+  ${pip_path} install -r ${requirementPath}
+  echo "install python modules success"
+fi

 #6. reset runtime
-rm -fr $runtimeDir/*
+rm -fr $runtimeDir/supersonic*
 moveAllToRuntime
 setEnvToWeb chat
-setEnvToWeb semantic
+setEnvToWeb headless
--- a/assembly/bin/supersonic-common.sh
+++ b/assembly/bin/supersonic-common.sh
@@ -10,15 +10,15 @@ runtimeDir=$baseDir/../runtime
 buildDir=$baseDir/build

 readonly CHAT_APP_NAME="supersonic_chat"
-readonly SEMANTIC_APP_NAME="supersonic_semantic"
-readonly LLMPARSER_APP_NAME="supersonic_llmparser"
+readonly HEADLESS_APP_NAME="supersonic_headless"
+readonly PYLLM_APP_NAME="supersonic_pyllm"
 readonly STANDALONE_APP_NAME="supersonic_standalone"
 readonly CHAT_SERVICE="chat"
-readonly SEMANTIC_SERVICE="semantic"
-readonly LLMPARSER_SERVICE="llmparser"
+readonly HEADLESS_SERVICE="headless"
+readonly PYLLM_SERVICE="pyllm"
 readonly STANDALONE_SERVICE="standalone"
-readonly LLMPARSER_HOST="127.0.0.1"
-readonly LLMPARSER_PORT="9092"
+readonly PYLLM_HOST="127.0.0.1"
+readonly PYLLM_PORT="9092"

 function setEnvToWeb {
   model_name=$1
@@ -29,11 +29,15 @@ function setEnvToWeb {

 function moveToRuntime {
  model_name=$1
-  tar -zxvf ${buildDir}/supersonic-${model_name}.tar.gz  -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
+  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 {
@@ -42,7 +46,7 @@ function moveAllToRuntime {
  mv ${buildDir}/supersonic-webapp ${buildDir}/webapp

  moveToRuntime chat
-  moveToRuntime semantic
+  moveToRuntime headless
  moveToRuntime standalone
  rm -fr  ${buildDir}/webapp
 }
@@ -81,23 +85,23 @@ function runJavaService {

 # run python service
 function runPythonService {
-  pythonRunDir=${runtimeDir}/supersonic-${model_name}/llmparser
+  pythonRunDir=${runtimeDir}/supersonic-${model_name}/pyllm
  cd $pythonRunDir
-  nohup ${python_path} supersonic_llmparser.py  > $pythonRunDir/llmparser.log  2>&1   &
+  nohup ${python_path} supersonic_pyllm.py  > $pythonRunDir/pyllm.log  2>&1   &
  # add health check
  for i in {1..10}
  do
-    echo "llmparser health check attempt $i..."
-    response=$(curl -s http://${LLMPARSER_HOST}:${LLMPARSER_PORT}/health)
-    echo "llmparser health check response: $response"
+    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 "llmparser Health check passed."
+      echo "pyllm Health check passed."
      break
    else
      if [ "$i" -eq 10 ]; then
-        echo "llmparser Health check failed after 10 attempts."
-        echo "May still downloading model files. Please check llmparser.log in runtime directory."
+        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
--- a/assembly/bin/supersonic-daemon.bat
+++ b/assembly/bin/supersonic-daemon.bat
@@ -9,10 +9,10 @@ set "main_class=com.tencent.supersonic.StandaloneLauncher"
 set "python_path=python"
 set "pip_path=pip3"
 set "standalone_service=standalone"
-set "llmparser_service=llmparser"
+set "pyllm_service=pyllm"

 set "javaRunDir=%runtimeDir%\supersonic-standalone"
-set "pythonRunDir=%runtimeDir%\supersonic-standalone\llmparser"
+set "pythonRunDir=%runtimeDir%\supersonic-standalone\pyllm"

 set "command=%~1"
 set "service=%~2"
@@ -21,6 +21,10 @@ if "%service%"=="" (
   set "service=%standalone_service%"
 )

+IF "%service%"=="pyllm" (
+  SET "llmProxy=PythonLLMProxy"
+)
+
 call :BUILD_RUNTIME

 if "%command%"=="restart" (
@@ -42,27 +46,23 @@ if "%command%"=="restart" (
 )

 :START
-    if "%service%"=="%llmparser_service%" (
+    if "%service%"=="%pyllm_service%" (
         call :START_PYTHON
+         call :START_JAVA
         goto :EOF
    )
-    call :START_PYTHON
    call :START_JAVA
    goto :EOF

 :STOP
-    if "%service%"=="%llmparser_service%" (
-        call :STOP_PYTHON
-        goto :EOF
-    )
    call :STOP_PYTHON
    call :STOP_JAVA
    goto :EOF

 :START_PYTHON
-   echo 'python service starting, see logs in llmparser/llmparser.log'
+   echo 'python service starting, see logs in pyllm/pyllm.log'
   cd "%pythonRunDir%"
-   start /B %python_path% supersonic_llmparser.py  > %pythonRunDir%\llmparser.log 2>&1
+   start /B %python_path% supersonic_pyllm.py  > %pythonRunDir%\pyllm.log 2>&1
   timeout /t 10 >nul
   echo 'python service started'
   goto :EOF
@@ -71,9 +71,9 @@ if "%command%"=="restart" (
  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-%service%\lib"
-   set "confDir=%runtimeDir%\supersonic-%service%\conf"
-   set "webDir=%runtimeDir%\supersonic-%service%\webapp"
+   set "libDir=%runtimeDir%\supersonic-standalone\lib"
+   set "confDir=%runtimeDir%\supersonic-standalone\conf"
+   set "webDir=%runtimeDir%\supersonic-standalone\webapp"
   set "classpath=%confDir%;%webDir%;%libDir%\*"
   set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Xms1024m -Xmx2048m -cp %CLASSPATH% %MAIN_CLASS%"
   start /B java %java-command% >nul 2>&1
@@ -96,7 +96,7 @@ if "%command%"=="restart" (
   goto :EOF

 :RELOAD_EXAMPLE
-   cd "%runtimeDir%\supersonic-standalone\llmparser\sql"
+   cd "%runtimeDir%\supersonic-standalone\pyllm\sql"
   start  %python_path% examples_reload_run.py
   goto :EOF

--- a/assembly/bin/supersonic-daemon.sh
+++ b/assembly/bin/supersonic-daemon.sh
@@ -22,8 +22,9 @@ app_name=$STANDALONE_APP_NAME
 main_class="com.tencent.supersonic.StandaloneLauncher"
 model_name=$service

-if [ "$service" == "llmparser" ]; then
+if [ "$service" == "pyllm" ]; then
  model_name=${STANDALONE_SERVICE}
+  export llmProxy=PythonLLMProxy
 fi

 cd $baseDir
@@ -32,8 +33,8 @@ cd $baseDir
 function setMainClass {
  if [ "$service" == $CHAT_SERVICE ]; then
    main_class="com.tencent.supersonic.ChatLauncher"
-  elif [ "$service" == $SEMANTIC_SERVICE ]; then
-    main_class="com.tencent.supersonic.SemanticLauncher"
+  elif [ "$service" == $HEADLESS_SERVICE ]; then
+    main_class="com.tencent.supersonic.HeadlessLauncher"
  fi
 }
 setMainClass
@@ -41,16 +42,16 @@ setMainClass
 function setAppName {
  if [ "$service" == $CHAT_SERVICE ]; then
    app_name=$CHAT_APP_NAME
-  elif [ "$service" == $SEMANTIC_SERVICE ]; then
-    app_name=$SEMANTIC_APP_NAME
-  elif [ "$service" == $LLMPARSER_SERVICE ]; then
-    app_name=$LLMPARSER_APP_NAME
+  elif [ "$service" == $HEADLESS_SERVICE ]; then
+    app_name=$HEADLESS_APP_NAME
+  elif [ "$service" == $PYLLM_SERVICE ]; then
+    app_name=$PYLLM_APP_NAME
  fi
 }
 setAppName

 function reloadExamples {
-  pythonRunDir=${runtimeDir}/supersonic-${model_name}/llmparser
+  pythonRunDir=${runtimeDir}/supersonic-${model_name}/pyllm
  cd $pythonRunDir/sql
  ${python_path} examples_reload_run.py
 }
@@ -61,7 +62,7 @@ function start()
  local_app_name=$1
  pid=$(ps aux |grep ${local_app_name} | grep -v grep | awk '{print $2}')
  if [[ "$pid" == "" ]]; then
-    if [[ ${local_app_name} == $LLMPARSER_APP_NAME ]]; then
+    if [[ ${local_app_name} == $PYLLM_APP_NAME ]]; then
      runPythonService ${local_app_name}
    else
      runJavaService ${local_app_name}
@@ -87,7 +88,7 @@ function stop()

 function reload()
 {
-  if [[ $1 == $LLMPARSER_APP_NAME ]]; then
+  if [[ $1 == $PYLLM_APP_NAME ]]; then
    reloadExamples
  fi
 }
@@ -95,11 +96,11 @@ function reload()
 # 4. execute command operation
 case "$command" in
  start)
-        if [ "$service" == $STANDALONE_SERVICE ]; then
-          echo  "Starting $LLMPARSER_APP_NAME"
-          start $LLMPARSER_APP_NAME
+        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
@@ -107,15 +108,10 @@ case "$command" in
        echo  "Start success"
        ;;
  stop)
-        if [ "$service" == $STANDALONE_SERVICE ]; then
-          echo  "Stopping $LLMPARSER_APP_NAME"
-          stop $LLMPARSER_APP_NAME
-          echo  "Stopping $app_name"
-          stop $app_name
-        else
-          echo  "Stopping $app_name"
-          stop ${app_name}
-        fi
+        echo  "Stopping $app_name"
+        stop $app_name
+        echo  "Stopping $PYLLM_APP_NAME"
+        stop $PYLLM_APP_NAME
        echo  "Stop success"
        ;;
  reload)
@@ -124,15 +120,15 @@ case "$command" in
        echo  "Reload success"
        ;;
  restart)
-        if [ "$service" == $STANDALONE_SERVICE ]; then
+        if [ "$service" == $PYLLM_SERVICE ]; then
          echo  "Stopping ${app_name}"
          stop ${app_name}
-          echo  "Stopping ${LLMPARSER_APP_NAME}"
-          stop $LLMPARSER_APP_NAME
-          echo  "Starting ${LLMPARSER_APP_NAME}"
-          start $LLMPARSER_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}
--- a/assembly/build/build.xml
+++ b/assembly/build/build.xml
@@ -22,7 +22,7 @@
        </fileSet>
        <fileSet>
            <directory>${project.basedir}/../../chat/python</directory>
-            <outputDirectory>llmparser</outputDirectory>
+            <outputDirectory>pyllm</outputDirectory>
            <fileMode>0777</fileMode>
            <directoryMode>0755</directoryMode>
        </fileSet>
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java
@@ -7,6 +7,9 @@ import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import java.util.List;
 import java.util.Set;

+/**
+ * UserAdaptor defines some interfaces for obtaining user and organization information
+ */
 public interface UserAdaptor {

    List<String> getUserNames();
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/config/AuthenticationConfig.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/config/AuthenticationConfig.java
@@ -24,4 +24,13 @@ public class AuthenticationConfig {
    @Value("${authentication.token.http.header.key:Authorization}")
    private String tokenHttpHeaderKey;

+    @Value("${authentication.app.appId:appId}")
+    private String appId;
+
+    @Value("${authentication.app.timestamp:timestamp}")
+    private String timestamp;
+
+    @Value("${authentication.app.signature:signature}")
+    private String signature;
+
 }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/Organization.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/Organization.java
@@ -1,11 +1,15 @@
 package com.tencent.supersonic.auth.api.authentication.pojo;

 import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 import java.util.List;

@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class Organization {

    private String id;
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/User.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/User.java
@@ -28,6 +28,11 @@ public class User {
        return new User(1L, "admin", "admin", "admin@email", 1);
    }

+    public static User getAppUser(int appId) {
+        String name = String.format("app_%s", appId);
+        return new User(1L, name, name, "", 1);
+    }
+
    public String getDisplayName() {
        return StringUtils.isBlank(displayName) ? name : displayName;
    }
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java
@@ -4,11 +4,15 @@ import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;

+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Set;

 public interface UserService {

+    User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse);
+
    List<String> getUserNames();

    List<User> getUserList();
--- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java
+++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java
@@ -2,6 +2,11 @@ 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.util.ContextUtils;
+import org.springframework.util.CollectionUtils;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

@@ -14,7 +19,14 @@ public final class UserHolder {
    }

    public static User findUser(HttpServletRequest request, HttpServletResponse response) {
-        return REPO.findUser(request, 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())) {
+            user.setIsAdmin(1);
+        }
+        return user;
    }

 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java
@@ -16,6 +16,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

+/**
+ * DefaultUserAdaptor provides a default method to obtain user and organization information
+ */
 public class DefaultUserAdaptor implements UserAdaptor {

    private List<UserDO> getUserDOList() {
@@ -41,7 +44,17 @@ public class DefaultUserAdaptor implements UserAdaptor {

    @Override
    public List<Organization> getOrganizationTree() {
-        return Lists.newArrayList();
+        Organization superSonic = new Organization("1", "0",
+                "SuperSonic", "SuperSonic", Lists.newArrayList(), true);
+        Organization hr = new Organization("2", "1",
+                "Hr", "SuperSonic/Hr", Lists.newArrayList(), false);
+        Organization sales = new Organization("3", "1",
+                "Sales", "SuperSonic/Sales", Lists.newArrayList(), false);
+        Organization marketing = new Organization("4", "1",
+                "Marketing", "SuperSonic/Marketing", Lists.newArrayList(), false);
+        List<Organization> subOrganization = Lists.newArrayList(hr, sales, marketing);
+        superSonic.setSubOrganizations(subOrganization);
+        return Lists.newArrayList(superSonic);
    }

    private User convert(UserDO userDO) {
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java
@@ -5,16 +5,17 @@ import com.tencent.supersonic.auth.api.authentication.constant.UserConstants;
 import com.tencent.supersonic.auth.authentication.service.UserServiceImpl;
 import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 import com.tencent.supersonic.common.util.S2ThreadContext;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.catalina.connector.RequestFacade;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
 import org.springframework.web.servlet.HandlerInterceptor;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;


 public abstract class AuthenticationInterceptor implements HandlerInterceptor {
@@ -29,7 +30,6 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {

    protected S2ThreadContext s2ThreadContext;

-
    protected boolean isExcludedUri(String uri) {
        String excludePathStr = authenticationConfig.getExcludePath();
        if (Strings.isEmpty(excludePathStr)) {
@@ -59,6 +59,10 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
        return "true".equalsIgnoreCase(internal);
    }

+    protected boolean isAppRequest(HttpServletRequest request) {
+        String appId = request.getHeader(authenticationConfig.getAppId());
+        return StringUtils.isNotBlank(appId);
+    }

    protected void reflectSetparam(HttpServletRequest request, String key, String value) {
        try {
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java
@@ -10,12 +10,12 @@ import com.tencent.supersonic.common.pojo.exception.AccessException;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.S2ThreadContext;
 import com.tencent.supersonic.common.util.ThreadContext;
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.method.HandlerMethod;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;

@Slf4j
 public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor {
@@ -35,7 +35,10 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
            setFakerUser(request);
            return true;
        }
-
+        if (isAppRequest(request)) {
+            setFakerUser(request);
+            return true;
+        }
        if (handler instanceof HandlerMethod) {
            HandlerMethod handlerMethod = (HandlerMethod) handler;
            Method method = handlerMethod.getMethod();
@@ -76,5 +79,4 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
        s2ThreadContext.set(threadContext);
    }

-
 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java
@@ -20,7 +20,6 @@ public class UserRepositoryImpl implements UserRepository {
        this.userDOMapper = userDOMapper;
    }

-
    @Override
    public List<UserDO> getUserList() {
        return userDOMapper.selectByExample(new UserDOExample());
@@ -40,5 +39,4 @@ public class UserRepositoryImpl implements UserRepository {
        return userDOOptional.orElse(null);
    }

-
 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java
@@ -5,18 +5,18 @@ import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 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 java.util.List;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Set;

@RestController
@RequestMapping("/api/auth/user")
@@ -29,10 +29,9 @@ public class UserController {
        this.userService = userService;
    }

-
    @GetMapping("/getCurrentUser")
    public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
-        return UserHolder.findUser(httpServletRequest, httpServletResponse);
+        return userService.getCurrentUser(httpServletRequest, httpServletResponse);
    }

    @GetMapping("/getUserNames")
@@ -70,5 +69,4 @@ public class UserController {
        return userService.login(userCmd);
    }

-
 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java
@@ -4,15 +4,38 @@ import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 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 org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Set;

-import org.springframework.stereotype.Service;
-
@Service
 public class UserServiceImpl implements UserService {

+    private SysParameterService sysParameterService;
+
+    public UserServiceImpl(SysParameterService sysParameterService) {
+        this.sysParameterService = sysParameterService;
+    }
+
+    @Override
+    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())) {
+                user.setIsAdmin(1);
+            }
+        }
+        return user;
+    }

    @Override
    public List<String> getUserNames() {
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java
@@ -20,5 +20,4 @@ public class FakeUserStrategy implements UserStrategy {
        return User.getFakeUser();
    }

-
 }
--- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java
+++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java
@@ -58,7 +58,6 @@ public class UserTokenUtils {
        return generate(claims);
    }

-
    public User getUser(HttpServletRequest request) {
        String token = request.getHeader(authenticationConfig.getTokenHttpHeaderKey());
        final Claims claims = getClaims(token);
@@ -120,5 +119,4 @@ public class UserTokenUtils {
                .compact();
    }

-
 }
--- a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/application/AuthServiceImpl.java
+++ b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/application/AuthServiceImpl.java
@@ -1,6 +1,7 @@
-package com.tencent.supersonic.auth.authorization.application;
+package com.tencent.supersonic.auth.authorization.service;

 import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
@@ -75,7 +76,6 @@ public class AuthServiceImpl implements AuthService {
        jdbcTemplate.update("delete from s2_auth_groups where group_id = ?", group.getGroupId());
    }

-
    @Override
    public AuthorizedResourceResp queryAuthorizedResources(QueryAuthResReq req, User user) {
        Set<String> userOrgIds = userService.getUserAllOrgId(user.getName());
@@ -109,8 +109,11 @@ public class AuthServiceImpl implements AuthService {
            }
        }

-        if (req.getModelId() != null) {
-            List<AuthGroup> authGroups = authGroupsByModelId.get(req.getModelId());
+        if (!CollectionUtils.isEmpty(req.getModelIds())) {
+            List<AuthGroup> authGroups = Lists.newArrayList();
+            for (Long modelId : authGroupsByModelId.keySet()) {
+                authGroups.addAll(authGroupsByModelId.getOrDefault(modelId, Lists.newArrayList()));
+            }
            if (!CollectionUtils.isEmpty(authGroups)) {
                for (AuthGroup group : authGroups) {
                    if (group.getDimensionFilters() != null
--- a/chat/api/pom.xml
+++ b/chat/api/pom.xml
@@ -23,7 +23,7 @@
        </dependency>
        <dependency>
            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>semantic-api</artifactId>
+            <artifactId>headless-api</artifactId>
            <version>${project.version}</version>
            <scope>compile</scope>
        </dependency>
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/QueryContext.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/QueryContext.java
@@ -1,23 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import com.tencent.supersonic.chat.api.component.SemanticQuery;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-public class QueryContext {
-
-    private QueryReq request;
-    private List<SemanticQuery> candidateQueries = new ArrayList<>();
-    private SchemaMapInfo mapInfo = new SchemaMapInfo();
-    private SchemaModelClusterMapInfo modelClusterMapInfo = new SchemaModelClusterMapInfo();
-
-    public QueryContext(QueryReq request) {
-        this.request = request;
-    }
-}
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java
@@ -1,13 +1,13 @@
 package com.tencent.supersonic.chat.api.pojo;


+import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
 import com.tencent.supersonic.chat.api.pojo.response.EntityInfo;
-import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.pojo.ModelCluster;
 import com.tencent.supersonic.common.pojo.Order;
-import com.tencent.supersonic.common.pojo.QueryType;
+import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
 import com.tencent.supersonic.common.pojo.enums.FilterType;
 import lombok.Data;
@@ -42,7 +42,7 @@ public class SemanticParseInfo {
    private Map<String, Object> properties = new HashMap<>();
    private EntityInfo entityInfo;
    private SqlInfo sqlInfo = new SqlInfo();
-    private QueryType queryType = QueryType.OTHER;
+    private QueryType queryType = QueryType.ID;

    public String getModelClusterKey() {
        if (model == null) {
@@ -88,10 +88,11 @@ public class SemanticParseInfo {

    private Map<Long, Integer> getModelElementCountMap() {
        Map<Long, Integer> elementCountMap = new HashMap<>();
-        elementMatches.forEach(element -> {
-            int count = elementCountMap.getOrDefault(element.getElement().getModel(), 0);
-            elementCountMap.put(element.getElement().getModel(), count + 1);
-        });
+        elementMatches.stream().filter(element -> element.getElement().getModel() != null)
+                .forEach(element -> {
+                    int count = elementCountMap.getOrDefault(element.getElement().getModel(), 0);
+                    elementCountMap.put(element.getElement().getModel(), count + 1);
+                });
        return elementCountMap;
    }

--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticSchema.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticSchema.java
@@ -1,15 +1,15 @@
 package com.tencent.supersonic.chat.api.pojo;

-import org.springframework.util.CollectionUtils;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.springframework.util.CollectionUtils;

 public class SemanticSchema implements Serializable {

@@ -57,19 +57,19 @@ public class SemanticSchema implements Serializable {

        switch (elementType) {
            case ENTITY:
-                element = getElementsByName(name, getEntities());
+                element = getElementsByNameOrAlias(name, getEntities());
                break;
            case MODEL:
-                element = getElementsByName(name, getModels());
+                element = getElementsByNameOrAlias(name, getModels());
                break;
            case METRIC:
-                element = getElementsByName(name, getMetrics());
+                element = getElementsByNameOrAlias(name, getMetrics());
                break;
            case DIMENSION:
-                element = getElementsByName(name, getDimensions());
+                element = getElementsByNameOrAlias(name, getDimensions());
                break;
            case VALUE:
-                element = getElementsByName(name, getDimensionValues());
+                element = getElementsByNameOrAlias(name, getDimensionValues());
                break;
            default:
        }
@@ -117,7 +117,8 @@ public class SemanticSchema implements Serializable {

    public List<SchemaElement> getTags(Set<Long> modelIds) {
        List<SchemaElement> tags = new ArrayList<>();
-        modelSchemaList.stream().filter(schemaElement -> modelIds.contains(schemaElement.getModel()))
+        modelSchemaList.stream().filter(schemaElement ->
+                        modelIds.contains(schemaElement.getModel().getModel()))
                .forEach(d -> tags.addAll(d.getTags()));
        return tags;
    }
@@ -139,6 +140,11 @@ public class SemanticSchema implements Serializable {
        return entities;
    }

+    public List<SchemaElement> getEntities(Set<Long> modelIds) {
+        List<SchemaElement> entities = getEntities();
+        return getElementsByModelId(modelIds, entities);
+    }
+
    private List<SchemaElement> getElementsByModelId(Set<Long> modelIds, List<SchemaElement> elements) {
        return elements.stream()
                .filter(schemaElement -> modelIds.contains(schemaElement.getModel()))
@@ -151,10 +157,12 @@ public class SemanticSchema implements Serializable {
                .findFirst();
    }

-    private Optional<SchemaElement> getElementsByName(String name, List<SchemaElement> elements) {
+    private Optional<SchemaElement> getElementsByNameOrAlias(String name, List<SchemaElement> elements) {
        return elements.stream()
-                .filter(schemaElement -> name.equals(schemaElement.getName()))
-                .findFirst();
+                .filter(schemaElement ->
+                        name.equals(schemaElement.getName()) || (Objects.nonNull(schemaElement.getAlias())
+                                && schemaElement.getAlias().contains(name))
+                ).findFirst();
    }

    public List<SchemaElement> getModels() {
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/SimilarQueryReq.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/SimilarQueryReq.java
@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Builder
-public class SolvedQueryReq {
+public class SimilarQueryReq {

    private Long queryId;

--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatDefaultRichConfigResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ChatDefaultRichConfigResp.java
@@ -2,7 +2,7 @@ package com.tencent.supersonic.chat.api.pojo.response;


 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
-import com.tencent.supersonic.chat.api.pojo.request.ChatDefaultConfigReq;
+import com.tencent.supersonic.chat.api.pojo.request.ChatDefaultConfigReq.TimeMode;
 import com.tencent.supersonic.common.pojo.Constants;
 import lombok.Data;

@@ -26,6 +26,6 @@ public class ChatDefaultRichConfigResp {
     */
    private String period = Constants.DAY;

-    private ChatDefaultConfigReq.TimeMode timeMode;
+    private TimeMode timeMode;

 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java
@@ -12,7 +12,6 @@ public class ParseResp {
    private Long queryId;
    private ParseState state;
    private List<SemanticParseInfo> selectedParses = Lists.newArrayList();
-    private List<SemanticParseInfo> candidateParses = Lists.newArrayList();
    private ParseTimeCostDO parseTimeCost = new ParseTimeCostDO();

    public enum ParseState {
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryRecallResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryRecallResp.java
@@ -6,6 +6,6 @@ import java.util.List;

@Data
 public class QueryRecallResp {
-    private List<SolvedQueryRecallResp> solvedQueryRecallRespList;
+    private List<SimilarQueryRecallResp> solvedQueryRecallRespList;
    private Long queryTimeCost;
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java
@@ -1,9 +1,9 @@
 package com.tencent.supersonic.chat.api.pojo.response;

-import java.util.Date;
-import java.util.List;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import lombok.Data;
+import java.util.Date;
+import java.util.List;

@Data
 public class QueryResp {
@@ -16,4 +16,7 @@ public class QueryResp {
    private String queryText;
    private QueryResult queryResult;
    private List<SemanticParseInfo> parseInfos;
+    private List<SimilarQueryRecallResp> similarQueries;
+
+
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResult.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResult.java
@@ -1,11 +1,12 @@
 package com.tencent.supersonic.chat.api.pojo.response;

+import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.common.pojo.QueryAuthorization;
 import com.tencent.supersonic.common.pojo.QueryColumn;
+import lombok.Data;
 import java.util.List;
 import java.util.Map;
-import lombok.Data;

@Data
 public class QueryResult {
@@ -22,4 +23,5 @@ public class QueryResult {
    private Object response;
    private List<Map<String, Object>> queryResults;
    private Long queryTimeCost;
+    private List<SchemaElement> recommendedDimensions;
 }
--- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java
+++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SimilarQueryRecallResp.java
@@ -6,7 +6,7 @@ import lombok.Data;

@Data
@Builder
-public class SolvedQueryRecallResp {
+public class SimilarQueryRecallResp {

    private Long queryId;

--- a/chat/core/pom.xml
+++ b/chat/core/pom.xml
@@ -22,6 +22,69 @@
            <artifactId>spring-context</artifactId>
        </dependency>

+        <dependency>
+            <groupId>com.hankcs</groupId>
+            <artifactId>hanlp</artifactId>
+            <version>${hanlp.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client</artifactId>
+            <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-hdfs</artifactId>
+            <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
        <dependency>
            <groupId>org.testng</groupId>
            <artifactId>testng</artifactId>
@@ -40,11 +103,6 @@
            <scope>compile</scope>
        </dependency>

-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
@@ -77,32 +135,20 @@
        </dependency>
        <dependency>
            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>chat-knowledge</artifactId>
+            <artifactId>headless-api</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>semantic-api</artifactId>
+            <artifactId>headless-core</artifactId>
            <version>${project.version}</version>
        </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>semantic-query</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
        <dependency>
            <groupId>com.tencent.supersonic</groupId>
            <artifactId>chat-api</artifactId>
            <version>${project.version}</version>
            <scope>compile</scope>
        </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>semantic-query</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>

        <dependency>
            <groupId>com.github.xkzhangsan</groupId>
@@ -116,6 +162,12 @@
            <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>

--- a/chat/knowledge/src/main/java/com/hankcs/hanlp/collection/trie/bintrie/BaseNode.java
+++ b/chat/knowledge/src/main/java/com/hankcs/hanlp/collection/trie/bintrie/BaseNode.java
@@ -1,8 +1,8 @@
 package com.hankcs.hanlp.collection.trie.bintrie;

 import com.hankcs.hanlp.corpus.io.ByteArray;
+import com.tencent.supersonic.chat.core.knowledge.LoadRemoveService;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.knowledge.service.LoadRemoveService;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.ObjectInput;
--- a/chat/knowledge/src/main/java/com/hankcs/hanlp/dictionary/CoreDictionary.java
+++ b/chat/knowledge/src/main/java/com/hankcs/hanlp/dictionary/CoreDictionary.java
--- a/chat/knowledge/src/main/java/com/hankcs/hanlp/seg/WordBasedSegment.java
+++ b/chat/knowledge/src/main/java/com/hankcs/hanlp/seg/WordBasedSegment.java
--- a/chat/knowledge/src/main/java/com/hankcs/hanlp/seg/common/Term.java
+++ b/chat/knowledge/src/main/java/com/hankcs/hanlp/seg/common/Term.java
@@ -3,7 +3,7 @@ package com.hankcs.hanlp.seg.common;
 import com.hankcs.hanlp.corpus.tag.Nature;
 import com.hankcs.hanlp.dictionary.CoreDictionary;
 import com.hankcs.hanlp.dictionary.CustomDictionary;
-import com.tencent.supersonic.knowledge.utils.HanlpHelper;
+import com.tencent.supersonic.chat.core.utils.HanlpHelper;
 import lombok.Data;
 import lombok.ToString;

--- a/chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/AgentToolType.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/AgentToolType.java
@@ -1,8 +0,0 @@
-package com.tencent.supersonic.chat.agent.tool;
-
-public enum AgentToolType {
-    RULE,
-    LLM_S2SQL,
-    PLUGIN,
-    INTERPRET
-}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/LLMParserTool.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/LLMParserTool.java
@@ -1,12 +0,0 @@
-package com.tencent.supersonic.chat.agent.tool;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class LLMParserTool extends CommonAgentTool {
-
-    private List<String> exampleQuestions;
-
-}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/MetricInterpretTool.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/MetricInterpretTool.java
@@ -1,16 +0,0 @@
-package com.tencent.supersonic.chat.agent.tool;
-
-import com.tencent.supersonic.chat.parser.llm.interpret.MetricOption;
-import lombok.Data;
-
-import java.util.List;
-
-
-@Data
-public class MetricInterpretTool extends AgentTool {
-
-    private Long modelId;
-
-    private List<MetricOption> metricOptions;
-
-}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java
@@ -1,14 +0,0 @@
-package com.tencent.supersonic.chat.config;
-
-
-import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp;
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class EntityInternalDetail {
-
-    List<DimSchemaResp> dimensionList;
-    List<MetricSchemaResp> metricList;
-}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/Agent.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/Agent.java
@@ -1,16 +1,18 @@
-package com.tencent.supersonic.chat.agent;
+package com.tencent.supersonic.chat.core.agent;


 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.chat.agent.tool.AgentToolType;
 import com.tencent.supersonic.common.pojo.RecordInfo;
-import java.util.Objects;
-import lombok.Data;
-import org.springframework.util.CollectionUtils;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.Data;
+import org.springframework.util.CollectionUtils;

@Data
 public class Agent extends RecordInfo {
@@ -20,10 +22,13 @@ public class Agent extends RecordInfo {
    private String name;
    private String description;

-    //0 offline, 1 online
+    /**
+     * 0 offline, 1 online
+     */
    private Integer status;
    private List<String> examples;
    private String agentConfig;
+
    public List<String> getTools(AgentToolType type) {
        Map map = JSONObject.parseObject(agentConfig, Map.class);
        if (CollectionUtils.isEmpty(map) || map.get("tools") == null) {
@@ -46,4 +51,27 @@ public class Agent extends RecordInfo {
        return enableSearch != null && enableSearch == 1;
    }

+    public static boolean containsAllModel(Set<Long> detectModelIds) {
+        return !CollectionUtils.isEmpty(detectModelIds) && detectModelIds.contains(-1L);
+    }
+
+    public List<NL2SQLTool> getParserTools(AgentToolType agentToolType) {
+        List<String> tools = this.getTools(agentToolType);
+        if (CollectionUtils.isEmpty(tools)) {
+            return Lists.newArrayList();
+        }
+        return tools.stream().map(tool -> JSONObject.parseObject(tool, NL2SQLTool.class))
+                .collect(Collectors.toList());
+    }
+
+    public Set<Long> getModelIds(AgentToolType agentToolType) {
+        List<NL2SQLTool> commonAgentTools = getParserTools(agentToolType);
+        if (CollectionUtils.isEmpty(commonAgentTools)) {
+            return new HashSet<>();
+        }
+        return commonAgentTools.stream().map(NL2SQLTool::getModelIds)
+                .filter(modelIds -> !CollectionUtils.isEmpty(modelIds))
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+    }
 }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/AgentConfig.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/AgentConfig.java
@@ -1,7 +1,6 @@
-package com.tencent.supersonic.chat.agent;
+package com.tencent.supersonic.chat.core.agent;

 import com.google.common.collect.Lists;
-import com.tencent.supersonic.chat.agent.tool.AgentTool;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/AgentTool.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/AgentTool.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.agent.tool;
+package com.tencent.supersonic.chat.core.agent;

 import lombok.AllArgsConstructor;
 import lombok.Data;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/AgentToolType.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/AgentToolType.java
@@ -0,0 +1,8 @@
+package com.tencent.supersonic.chat.core.agent;
+
+public enum AgentToolType {
+    NL2SQL_RULE,
+    NL2SQL_LLM,
+    PLUGIN,
+    ANALYTICS
+}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/DataAnalyticsTool.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/DataAnalyticsTool.java
@@ -0,0 +1,11 @@
+package com.tencent.supersonic.chat.core.agent;
+
+import lombok.Data;
+
+
+@Data
+public class DataAnalyticsTool extends AgentTool {
+
+    private Long modelId;
+
+}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/LLMParserTool.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/LLMParserTool.java
@@ -0,0 +1,12 @@
+package com.tencent.supersonic.chat.core.agent;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LLMParserTool extends NL2SQLTool {
+
+    private List<String> exampleQuestions;
+
+}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/CommonAgentTool.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/CommonAgentTool.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.agent.tool;
+package com.tencent.supersonic.chat.core.agent;


 import java.util.List;
@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class CommonAgentTool extends AgentTool {
+public class NL2SQLTool extends AgentTool {

    protected List<Long> modelIds;

--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/PluginTool.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/PluginTool.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.agent.tool;
+package com.tencent.supersonic.chat.core.agent;


 import lombok.Data;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/RuleParserTool.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/agent/RuleParserTool.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.agent.tool;
+package com.tencent.supersonic.chat.core.agent;


 import lombok.Data;
@@ -7,7 +7,7 @@ import org.apache.commons.collections.CollectionUtils;
 import java.util.List;

@Data
-public class RuleQueryTool extends CommonAgentTool {
+public class RuleParserTool extends NL2SQLTool {


    private List<String> queryModes;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/AggregatorConfig.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/AggregatorConfig.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;

 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/DefaultMetric.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/DefaultMetric.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;

 import lombok.AllArgsConstructor;
 import lombok.Data;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/DefaultMetricInfo.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/DefaultMetricInfo.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;

 import com.tencent.supersonic.common.pojo.Constants;
 import lombok.Data;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/DefaultSemanticConfig.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/DefaultSemanticConfig.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.config;

 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/Dim4Dict.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/Dim4Dict.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;

 import java.util.List;
 import lombok.AllArgsConstructor;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityDetailData.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityDetailData.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;

 import java.util.List;
 import lombok.Data;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityInternalDetail.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityInternalDetail.java
@@ -0,0 +1,14 @@
+package com.tencent.supersonic.chat.core.config;
+
+
+import com.tencent.supersonic.headless.api.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class EntityInternalDetail {
+
+    List<DimSchemaResp> dimensionList;
+    List<MetricSchemaResp> metricList;
+}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/LLMParserConfig.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/LLMParserConfig.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;


 import lombok.Data;
@@ -16,10 +16,12 @@ public class LLMParserConfig {
    @Value("${query2sql.path:/query2sql}")
    private String queryToSqlPath;

-    @Value("${dimension.topn:5}")
+    @Value("${dimension.topn:10}")
    private Integer dimensionTopN;

-    @Value("${metric.topn:5}")
+    @Value("${metric.topn:10}")
    private Integer metricTopN;

+    @Value("${all.model:false}")
+    private Boolean allModel;
 }
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/LocalFileConfig.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/LocalFileConfig.java
@@ -1,6 +1,6 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.config;

-import com.tencent.supersonic.knowledge.utils.HanlpHelper;
+import com.tencent.supersonic.chat.core.utils.HanlpHelper;
 import java.io.FileNotFoundException;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/OptimizationConfig.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/OptimizationConfig.java
@@ -1,5 +1,6 @@
-package com.tencent.supersonic.chat.config;
+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;
@@ -57,10 +58,13 @@ public class OptimizationConfig {
    @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:10}")
+    @Value("${text2sql.example.num:15}")
    private int text2sqlExampleNum;

    @Value("${text2sql.fewShots.num:10}")
@@ -72,6 +76,9 @@ public class OptimizationConfig {
    @Value("${text2sql.collection.name:text2dsl_agent_collection}")
    private String text2sqlCollectionName;

+    @Value("${parse.show.count:3}")
+    private Integer parseShowCount;
+
    @Autowired
    private SysParameterService sysParameterService;

@@ -139,6 +146,14 @@ public class OptimizationConfig {
        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);
@@ -151,6 +166,8 @@ public class OptimizationConfig {
                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);
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/BaseSemanticCorrector.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/BaseSemanticCorrector.java
@@ -1,21 +1,14 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;

-import com.tencent.supersonic.chat.api.component.SemanticCorrector;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.knowledge.service.SchemaService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.CollectionUtils;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -23,6 +16,10 @@ 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.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.springframework.util.CollectionUtils;

 /**
 * basic semantic correction functionality, offering common methods and an
@@ -31,24 +28,23 @@ import java.util.stream.Collectors;
@Slf4j
 public abstract class BaseSemanticCorrector implements SemanticCorrector {

-    public void correct(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void correct(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
        try {
            if (StringUtils.isBlank(semanticParseInfo.getSqlInfo().getCorrectS2SQL())) {
                return;
            }
-            doCorrect(queryReq, semanticParseInfo);
+            doCorrect(queryContext, semanticParseInfo);
            log.info("sqlCorrection:{} sql:{}", this.getClass().getSimpleName(), semanticParseInfo.getSqlInfo());
        } catch (Exception e) {
            log.error(String.format("correct error,sqlInfo:%s", semanticParseInfo.getSqlInfo()), e);
        }
    }

+    public abstract void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo);

-    public abstract void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo);
+    protected Map<String, String> getFieldNameMap(QueryContext queryContext, Set<Long> modelIds) {

-    protected Map<String, String> getFieldNameMap(Set<Long> modelIds) {
-
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();

        List<SchemaElement> dbAllFields = new ArrayList<>();
        dbAllFields.addAll(semanticSchema.getMetrics());
@@ -101,12 +97,12 @@ public abstract class BaseSemanticCorrector implements SemanticCorrector {
        semanticParseInfo.getSqlInfo().setCorrectS2SQL(replaceFields);
    }

-    protected void addAggregateToMetric(SemanticParseInfo semanticParseInfo) {
+    protected void addAggregateToMetric(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
        //add aggregate to all metric
        String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
        Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();

-        List<SchemaElement> metrics = getMetricElements(modelIds);
+        List<SchemaElement> metrics = getMetricElements(queryContext, modelIds);

        Map<String, String> metricToAggregate = metrics.stream()
                .map(schemaElement -> {
@@ -114,7 +110,15 @@ public abstract class BaseSemanticCorrector implements SemanticCorrector {
                        schemaElement.setDefaultAgg(AggregateTypeEnum.SUM.name());
                    }
                    return schemaElement;
-                }).collect(Collectors.toMap(a -> a.getName(), a -> a.getDefaultAgg(), (k1, k2) -> k1));
+                }).flatMap(schemaElement -> {
+                    Set<String> elements = new HashSet<>();
+                    elements.add(schemaElement.getName());
+                    if (!CollectionUtils.isEmpty(schemaElement.getAlias())) {
+                        elements.addAll(schemaElement.getAlias());
+                    }
+                    return elements.stream().map(element -> Pair.of(element, schemaElement.getDefaultAgg())
+                    );
+                }).collect(Collectors.toMap(Pair::getLeft, Pair::getRight, (k1, k2) -> k1));

        if (CollectionUtils.isEmpty(metricToAggregate)) {
            return;
@@ -123,8 +127,8 @@ public abstract class BaseSemanticCorrector implements SemanticCorrector {
        semanticParseInfo.getSqlInfo().setCorrectS2SQL(aggregateSql);
    }

-    protected List<SchemaElement> getMetricElements(Set<Long> modelIds) {
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+    protected List<SchemaElement> getMetricElements(QueryContext queryContext, Set<Long> modelIds) {
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
        return semanticSchema.getMetrics(modelIds);
    }

--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/FromCorrector.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/FromCorrector.java
@@ -0,0 +1,21 @@
+package com.tencent.supersonic.chat.core.corrector;
+
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
+import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper;
+import lombok.extern.slf4j.Slf4j;
+/**
+ * Perform SQL corrections on the "From" section in S2SQL.
+ */
+@Slf4j
+public class FromCorrector extends BaseSemanticCorrector {
+
+    @Override
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
+        String modelName = semanticParseInfo.getModel().getName();
+        String correctSql = SqlParserReplaceHelper
+                .replaceTable(semanticParseInfo.getSqlInfo().getCorrectS2SQL(), modelName);
+        semanticParseInfo.getSqlInfo().setCorrectS2SQL(correctSql);
+    }
+
+}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/GroupByCorrector.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/GroupByCorrector.java
@@ -1,42 +1,39 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;

+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.knowledge.service.SchemaService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;

 /**
- * Perform SQL corrections on the "group by" section in S2SQL.
+ * Perform SQL corrections on the "Group by" section in S2SQL.
 */
@Slf4j
 public class GroupByCorrector extends BaseSemanticCorrector {

    @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {

-        addGroupByFields(semanticParseInfo);
+        addGroupByFields(queryContext, semanticParseInfo);

    }

-    private void addGroupByFields(SemanticParseInfo semanticParseInfo) {
+    private void addGroupByFields(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
        Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();

        //add dimension group by
        SqlInfo sqlInfo = semanticParseInfo.getSqlInfo();
        String correctS2SQL = sqlInfo.getCorrectS2SQL();
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
        //add alias field name
        Set<String> dimensions = semanticSchema.getDimensions(modelIds).stream()
                .flatMap(
@@ -77,15 +74,15 @@ public class GroupByCorrector extends BaseSemanticCorrector {
                .collect(Collectors.toSet());
        semanticParseInfo.getSqlInfo().setCorrectS2SQL(SqlParserAddHelper.addGroupBy(correctS2SQL, groupByFields));

-        addAggregate(semanticParseInfo);
+        addAggregate(queryContext, semanticParseInfo);
    }

-    private void addAggregate(SemanticParseInfo semanticParseInfo) {
+    private void addAggregate(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
        List<String> sqlGroupByFields = SqlParserSelectHelper.getGroupByFields(
                semanticParseInfo.getSqlInfo().getCorrectS2SQL());
        if (CollectionUtils.isEmpty(sqlGroupByFields)) {
            return;
        }
-        addAggregateToMetric(semanticParseInfo);
+        addAggregateToMetric(queryContext, semanticParseInfo);
    }
 }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/HavingCorrector.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/HavingCorrector.java
@@ -1,18 +1,14 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;

+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.knowledge.service.SchemaService;
-
-import java.util.Set;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
-
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import org.springframework.util.CollectionUtils;
@@ -24,20 +20,20 @@ import org.springframework.util.CollectionUtils;
 public class HavingCorrector extends BaseSemanticCorrector {

    @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {

        //add aggregate to all metric
-        addHaving(semanticParseInfo);
+        addHaving(queryContext, semanticParseInfo);

        //add having expression filed to select
        addHavingToSelect(semanticParseInfo);

    }

-    private void addHaving(SemanticParseInfo semanticParseInfo) {
+    private void addHaving(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
        Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();

-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();

        Set<String> metrics = semanticSchema.getMetrics(modelIds).stream()
                .map(schemaElement -> schemaElement.getName()).collect(Collectors.toSet());
@@ -62,5 +58,4 @@ public class HavingCorrector extends BaseSemanticCorrector {
        return;
    }

-
 }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/SchemaCorrector.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/SchemaCorrector.java
@@ -1,10 +1,10 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;

+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
-import com.tencent.supersonic.chat.parser.llm.s2sql.ParseResult;
-import com.tencent.supersonic.chat.query.llm.s2sql.LLMReq.ElementValue;
+import com.tencent.supersonic.chat.core.parser.sql.llm.ParseResult;
+import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.ElementValue;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.util.JsonUtil;
 import com.tencent.supersonic.common.util.jsqlparser.AggregateEnum;
@@ -24,7 +24,7 @@ import org.springframework.util.CollectionUtils;
 public class SchemaCorrector extends BaseSemanticCorrector {

    @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {

        correctAggFunction(semanticParseInfo);

@@ -34,7 +34,7 @@ public class SchemaCorrector extends BaseSemanticCorrector {

        updateFieldValueByLinkingValue(semanticParseInfo);

-        correctFieldName(semanticParseInfo);
+        correctFieldName(queryContext, semanticParseInfo);
    }

    private void correctAggFunction(SemanticParseInfo semanticParseInfo) {
@@ -50,8 +50,8 @@ public class SchemaCorrector extends BaseSemanticCorrector {
        sqlInfo.setCorrectS2SQL(replaceAlias);
    }

-    private void correctFieldName(SemanticParseInfo semanticParseInfo) {
-        Map<String, String> fieldNameMap = getFieldNameMap(semanticParseInfo.getModel().getModelIds());
+    private void correctFieldName(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
+        Map<String, String> fieldNameMap = getFieldNameMap(queryContext, semanticParseInfo.getModel().getModelIds());
        SqlInfo sqlInfo = semanticParseInfo.getSqlInfo();
        String sql = SqlParserReplaceHelper.replaceFields(sqlInfo.getCorrectS2SQL(), fieldNameMap);
        sqlInfo.setCorrectS2SQL(sql);
@@ -86,7 +86,6 @@ public class SchemaCorrector extends BaseSemanticCorrector {
        return parseResult.getLinkingValues();
    }

-
    private void updateFieldValueByLinkingValue(SemanticParseInfo semanticParseInfo) {
        List<ElementValue> linking = getLinkingValues(semanticParseInfo);
        if (CollectionUtils.isEmpty(linking)) {
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/SelectCorrector.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/SelectCorrector.java
@@ -1,7 +1,7 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;

+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +14,7 @@ import org.springframework.util.CollectionUtils;
 public class SelectCorrector extends BaseSemanticCorrector {

    @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
        String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
        List<String> aggregateFields = SqlParserSelectHelper.getAggregateFields(correctS2SQL);
        List<String> selectFields = SqlParserSelectHelper.getSelectFields(correctS2SQL);
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/SemanticCorrector.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/SemanticCorrector.java
@@ -1,7 +1,7 @@
-package com.tencent.supersonic.chat.api.component;
+package com.tencent.supersonic.chat.core.corrector;

+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;

 /**
 * A semantic corrector checks validity of extracted semantic information and
@@ -9,5 +9,5 @@ import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 */
 public interface SemanticCorrector {

-    void correct(QueryReq queryReq, SemanticParseInfo semanticParseInfo);
+    void correct(QueryContext queryContext, SemanticParseInfo semanticParseInfo);
 }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/WhereCorrector.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/WhereCorrector.java
@@ -1,20 +1,24 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;

+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaValueMap;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.chat.parser.llm.s2sql.S2SQLDateHelper;
+import com.tencent.supersonic.chat.core.parser.sql.llm.S2SqlDateHelper;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.StringUtil;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.knowledge.service.SchemaService;
+import java.util.HashMap;
+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 net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
@@ -23,13 +27,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.util.CollectionUtils;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 /**
 * Perform SQL corrections on the "Where" section in S2SQL.
 */
@@ -37,19 +34,19 @@ import java.util.stream.Collectors;
 public class WhereCorrector extends BaseSemanticCorrector {

    @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {

-        addDateIfNotExist(semanticParseInfo);
+        addDateIfNotExist(queryContext, semanticParseInfo);

        parserDateDiffFunction(semanticParseInfo);

-        addQueryFilter(queryReq, semanticParseInfo);
+        addQueryFilter(queryContext, semanticParseInfo);

-        updateFieldValueByTechName(semanticParseInfo);
+        updateFieldValueByTechName(queryContext, semanticParseInfo);
    }

-    private void addQueryFilter(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
-        String queryFilter = getQueryFilter(queryReq.getQueryFilters());
+    private void addQueryFilter(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
+        String queryFilter = getQueryFilter(queryContext.getQueryFilters());

        String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();

@@ -72,11 +69,11 @@ public class WhereCorrector extends BaseSemanticCorrector {
        semanticParseInfo.getSqlInfo().setCorrectS2SQL(correctS2SQL);
    }

-    private void addDateIfNotExist(SemanticParseInfo semanticParseInfo) {
+    private void addDateIfNotExist(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
        String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
        List<String> whereFields = SqlParserSelectHelper.getWhereFields(correctS2SQL);
        if (CollectionUtils.isEmpty(whereFields) || !TimeDimensionEnum.containsZhTimeDimension(whereFields)) {
-            String currentDate = S2SQLDateHelper.getReferenceDate(semanticParseInfo.getModelId());
+            String currentDate = S2SqlDateHelper.getReferenceDate(queryContext, semanticParseInfo.getModelId());
            if (StringUtils.isNotBlank(currentDate)) {
                correctS2SQL = SqlParserAddHelper.addParenthesisToWhere(correctS2SQL);
                correctS2SQL = SqlParserAddHelper.addWhere(
@@ -100,8 +97,8 @@ public class WhereCorrector extends BaseSemanticCorrector {
                .collect(Collectors.joining(Constants.AND_UPPER));
    }

-    private void updateFieldValueByTechName(SemanticParseInfo semanticParseInfo) {
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+    private void updateFieldValueByTechName(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
        Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();
        List<SchemaElement> dimensions = semanticSchema.getDimensions(modelIds);

--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DatabaseMapResult.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DatabaseMapResult.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import com.google.common.base.Objects;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
@@ -7,7 +7,7 @@ import lombok.ToString;

@Data
@ToString
-public class FuzzyResult extends MapResult {
+public class DatabaseMapResult extends MapResult {

    private SchemaElement schemaElement;

@@ -19,7 +19,7 @@ public class FuzzyResult extends MapResult {
        if (o == null || getClass() != o.getClass()) {
            return false;
        }
-        FuzzyResult that = (FuzzyResult) o;
+        DatabaseMapResult that = (DatabaseMapResult) o;
        return Objects.equal(name, that.name) && Objects.equal(schemaElement, that.schemaElement);
    }

--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DictConfig.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DictConfig.java
@@ -1,7 +1,6 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import java.util.List;
-
 import lombok.Data;


--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DictUpdateMode.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DictUpdateMode.java
@@ -1,4 +1,5 @@
-package com.tencent.supersonic.knowledge.dictionary;
+
+package com.tencent.supersonic.chat.core.knowledge;

 public enum DictUpdateMode {

--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DictWord.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DictWord.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import java.util.Objects;
 import lombok.Data;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DictionaryAttributeUtil.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DictionaryAttributeUtil.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge.dictionary;

 import com.hankcs.hanlp.corpus.tag.Nature;
 import com.hankcs.hanlp.dictionary.CoreDictionary;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DimValue2DictCommand.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DimValue2DictCommand.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;


 import java.util.HashMap;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DimValueDictInfo.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DimValueDictInfo.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;


 import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DimValueInfo.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/DimValueInfo.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;


 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/EmbeddingResult.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/EmbeddingResult.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import com.google.common.base.Objects;
 import java.util.Map;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/FileHandler.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/FileHandler.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import java.util.List;

@@ -19,7 +19,6 @@ public interface FileHandler {
     */
    void createDir(String path);

-
    Boolean existPath(String path);

    /**
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/HadoopFileIOAdapter.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/HadoopFileIOAdapter.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import com.hankcs.hanlp.corpus.io.IIOAdapter;
 import java.io.IOException;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/HanlpMapResult.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/HanlpMapResult.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import com.google.common.base.Objects;
 import java.util.List;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/LoadRemoveService.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/LoadRemoveService.java
@@ -1,6 +1,6 @@
-package com.tencent.supersonic.knowledge.service;
+package com.tencent.supersonic.chat.core.knowledge;

-import com.tencent.supersonic.knowledge.utils.NatureHelper;
+import com.tencent.supersonic.chat.core.utils.NatureHelper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -21,7 +21,6 @@ public class LoadRemoveService {
    @Value("${mapper.remove.nature.prefix:}")
    private String mapperRemoveNaturePrefix;

-
    public List removeNatures(List value, Integer agentId, Set<Long> detectModelIds) {
        if (CollectionUtils.isEmpty(value)) {
            return value;
@@ -52,4 +51,4 @@ public class LoadRemoveService {
        return resultList;
    }

-}
+}
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/LocalFileHandler.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/LocalFileHandler.java
@@ -1,6 +1,7 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;


+import com.tencent.supersonic.chat.core.config.LocalFileConfig;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -10,7 +11,6 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.util.List;
-
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -106,7 +106,6 @@ public class LocalFileHandler implements FileHandler {
        return Paths.get(path).toAbsolutePath().toString();
    }

-
    @Override
    public String getDictRootPath() {
        return Paths.get(localFileConfig.getDictDirectoryLatest()).toAbsolutePath().toString();
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/MapResult.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/MapResult.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import java.io.Serializable;
 import lombok.Data;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/ModelInfoStat.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/ModelInfoStat.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import java.io.Serializable;
 import lombok.Builder;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/MultiCustomDictionary.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/MultiCustomDictionary.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;

 import static com.hankcs.hanlp.utility.Predefine.logger;

@@ -15,8 +15,8 @@ import com.hankcs.hanlp.seg.common.Term;
 import com.hankcs.hanlp.utility.LexiconUtility;
 import com.hankcs.hanlp.utility.Predefine;
 import com.hankcs.hanlp.utility.TextUtility;
-import com.tencent.supersonic.knowledge.service.SearchService;
-import com.tencent.supersonic.knowledge.utils.HanlpHelper;
+import com.tencent.supersonic.chat.core.knowledge.dictionary.DictionaryAttributeUtil;
+import com.tencent.supersonic.chat.core.utils.HanlpHelper;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -222,7 +222,10 @@ public class MultiCustomDictionary extends DynamicCustomDictionary {
                            new BufferedOutputStream(IOUtil.newOutputStream(mainPath + ".bin")));
                    if (customNatureCollector.isEmpty()) {
                        for (int i = Nature.begin.ordinal() + 1; i < Nature.values().length; ++i) {
-                            customNatureCollector.add(Nature.values()[i]);
+                            Nature nature = Nature.values()[i];
+                            if (Objects.nonNull(nature)) {
+                                customNatureCollector.add(nature);
+                            }
                        }
                    }

@@ -350,7 +353,7 @@ public class MultiCustomDictionary extends DynamicCustomDictionary {

    }

-    public boolean insert(String word, String natureWithFrequency) {
+    public synchronized boolean insert(String word, String natureWithFrequency) {
        if (word == null) {
            return false;
        } else {
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/SearchService.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/SearchService.java
@@ -1,27 +1,27 @@
-package com.tencent.supersonic.knowledge.service;
+package com.tencent.supersonic.chat.core.knowledge;

 import com.hankcs.hanlp.collection.trie.bintrie.BaseNode;
 import com.hankcs.hanlp.collection.trie.bintrie.BinTrie;
 import com.hankcs.hanlp.corpus.tag.Nature;
 import com.hankcs.hanlp.dictionary.CoreDictionary;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
+import com.hankcs.hanlp.seg.common.Term;
+import com.tencent.supersonic.chat.api.pojo.request.DimensionValueReq;
+import com.tencent.supersonic.chat.core.knowledge.dictionary.DictionaryAttributeUtil;
 import com.tencent.supersonic.common.pojo.enums.DictWordType;
-import com.tencent.supersonic.knowledge.dictionary.DictionaryAttributeUtil;
-import com.tencent.supersonic.knowledge.dictionary.HanlpMapResult;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.PriorityQueue;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

-@Service
@Slf4j
 public class SearchService {

@@ -118,7 +118,6 @@ public class SearchService {
        trie.put(key, getValue(attribute.nature));
    }

-
    public static void loadSuffix(List<DictWord> suffixes) {
        if (CollectionUtils.isEmpty(suffixes)) {
            return;
@@ -157,5 +156,15 @@ public class SearchService {
            suffixTrie.remove(dictWord.getWord());
        }
    }
+
+    public static List<String> getDimensionValue(DimensionValueReq dimensionValueReq) {
+        String nature = DictWordType.NATURE_SPILT + dimensionValueReq.getModelId() + DictWordType.NATURE_SPILT
+                + dimensionValueReq.getElementID();
+        PriorityQueue<Term> terms = MultiCustomDictionary.NATURE_TO_VALUES.get(nature);
+        if (org.apache.commons.collections.CollectionUtils.isEmpty(terms)) {
+            return new ArrayList<>();
+        }
+        return terms.stream().map(term -> term.getWord()).collect(Collectors.toList());
+    }
 }

--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/BaseWordBuilder.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/BaseWordBuilder.java
@@ -1,7 +1,7 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;

 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
+import com.tencent.supersonic.chat.core.knowledge.DictWord;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/DimensionWordBuilder.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/DimensionWordBuilder.java
@@ -1,13 +1,11 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;

 import com.google.common.collect.Lists;
-
+import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.chat.core.knowledge.DictWord;
+import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import java.util.ArrayList;
 import java.util.List;
-
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
-import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -22,7 +20,6 @@ public class DimensionWordBuilder extends BaseWordBuilder {
    @Value("${nlp.dimension.use.suffix:true}")
    private boolean nlpDimensionUseSuffix = true;

-
    @Override
    public List<DictWord> doGet(String word, SchemaElement schemaElement) {
        List<DictWord> result = Lists.newArrayList();
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/EntityWordBuilder.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/EntityWordBuilder.java
@@ -1,13 +1,12 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;
+

 import com.google.common.collect.Lists;
-
+import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.chat.core.knowledge.DictWord;
+import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import java.util.List;
 import java.util.Objects;
-
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
-import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/MetricWordBuilder.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/MetricWordBuilder.java
@@ -1,13 +1,11 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;

 import com.google.common.collect.Lists;
-
+import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.chat.core.knowledge.DictWord;
+import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import java.util.ArrayList;
 import java.util.List;
-
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
-import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/ModelWordBuilder.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/ModelWordBuilder.java
@@ -1,9 +1,9 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;

 import com.google.common.collect.Lists;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.chat.core.knowledge.DictWord;
 import com.tencent.supersonic.common.pojo.enums.DictWordType;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/ValueWordBuilder.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/ValueWordBuilder.java
@@ -1,13 +1,12 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;
+

 import com.google.common.collect.Lists;
-
+import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.chat.core.knowledge.DictWord;
+import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import java.util.List;
 import java.util.Objects;
-
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
-import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
--- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/WordBuilderFactory.java
+++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/WordBuilderFactory.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;


 import com.tencent.supersonic.common.pojo.enums.DictWordType;
@@ -23,4 +23,4 @@ public class WordBuilderFactory {
    public static BaseWordBuilder get(DictWordType strategyType) {
        return wordNatures.get(strategyType);
    }
-}
+}
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/BaseSemanticInterpreter.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/BaseSemanticInterpreter.java
@@ -1,10 +1,9 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.knowledge.semantic;

 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.tencent.supersonic.chat.api.component.SemanticInterpreter;
 import com.tencent.supersonic.chat.api.pojo.ModelSchema;
-import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/LocalSemanticInterpreter.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/LocalSemanticInterpreter.java
@@ -1,36 +1,35 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.knowledge.semantic;

 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq;
-import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq;
-import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
-import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
-import com.tencent.supersonic.semantic.api.model.response.DomainResp;
-import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
-import com.tencent.supersonic.semantic.model.domain.DimensionService;
-import com.tencent.supersonic.semantic.model.domain.MetricService;
-import com.tencent.supersonic.semantic.query.service.QueryService;
-import com.tencent.supersonic.semantic.query.service.SchemaService;
+import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq;
+import com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.DomainResp;
+import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+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 java.util.ArrayList;
+import java.util.List;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

-import java.util.HashMap;
-import java.util.List;
-
@Slf4j
 public class LocalSemanticInterpreter extends BaseSemanticInterpreter {

@@ -41,20 +40,20 @@ public class LocalSemanticInterpreter extends BaseSemanticInterpreter {

    @SneakyThrows
    @Override
-    public QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user) {
+    public SemanticQueryResp queryByStruct(QueryStructReq queryStructReq, User user) {
        if (StringUtils.isNotBlank(queryStructReq.getCorrectS2SQL())) {
-            QueryS2SQLReq queryS2SQLReq = new QueryS2SQLReq();
-            queryS2SQLReq.setSql(queryStructReq.getCorrectS2SQL());
-            queryS2SQLReq.setModelIds(queryStructReq.getModelIdSet());
-            queryS2SQLReq.setVariables(new HashMap<>());
-            return queryByS2SQL(queryS2SQLReq, user);
+            QuerySqlReq querySQLReq = new QuerySqlReq();
+            querySQLReq.setSql(queryStructReq.getCorrectS2SQL());
+            querySQLReq.setModelIds(queryStructReq.getModelIdSet());
+            querySQLReq.setParams(new ArrayList<>());
+            return queryByS2SQL(querySQLReq, user);
        }
        queryService = ContextUtils.getBean(QueryService.class);
        return queryService.queryByStructWithAuth(queryStructReq, user);
    }

    @Override
-    public QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) {
+    public SemanticQueryResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) {
        try {
            queryService = ContextUtils.getBean(QueryService.class);
            return queryService.queryByMultiStruct(queryMultiStructReq, user);
@@ -66,15 +65,15 @@ public class LocalSemanticInterpreter extends BaseSemanticInterpreter {

    @Override
    @SneakyThrows
-    public QueryResultWithSchemaResp queryByS2SQL(QueryS2SQLReq queryS2SQLReq, User user) {
+    public SemanticQueryResp queryByS2SQL(QuerySqlReq querySQLReq, User user) {
        queryService = ContextUtils.getBean(QueryService.class);
-        Object object = queryService.queryBySql(queryS2SQLReq, user);
-        return JsonUtil.toObject(JsonUtil.toString(object), QueryResultWithSchemaResp.class);
+        SemanticQueryResp object = queryService.queryBySql(querySQLReq, user);
+        return JsonUtil.toObject(JsonUtil.toString(object), SemanticQueryResp.class);
    }

    @Override
    @SneakyThrows
-    public QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user) {
+    public SemanticQueryResp queryDimValue(QueryDimValueReq queryDimValueReq, User user) {
        queryService = ContextUtils.getBean(QueryService.class);
        return queryService.queryDimValue(queryDimValueReq, user);
    }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/ModelSchemaBuilder.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/ModelSchemaBuilder.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.knowledge.semantic;

 import com.google.common.collect.Lists;
 import com.tencent.supersonic.chat.api.pojo.ModelSchema;
@@ -6,12 +6,12 @@ import com.tencent.supersonic.chat.api.pojo.RelatedSchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SchemaValueMap;
-import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap;
-import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension;
-import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
-import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
+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.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
@@ -26,7 +26,7 @@ public class ModelSchemaBuilder {

    public static ModelSchema build(ModelSchemaResp resp) {
        ModelSchema modelSchema = new ModelSchema();
-        SchemaElement domain = SchemaElement.builder()
+        SchemaElement model = SchemaElement.builder()
                .model(resp.getId())
                .id(resp.getId())
                .name(resp.getName())
@@ -34,7 +34,7 @@ public class ModelSchemaBuilder {
                .type(SchemaElementType.MODEL)
                .alias(SchemaItem.getAliasList(resp.getAlias()))
                .build();
-        modelSchema.setModel(domain);
+        modelSchema.setModel(model);
        modelSchema.setModelRelas(resp.getModelRelas());

        Set<SchemaElement> metrics = new HashSet<>();
--- a/Show More
+++ b/Show More