(project)Change version to 0.9.6.

Co-authored-by: lxwcodemonkey

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,89 @@
+name: SuperSonic Bug report
+title: "[Bug] "
+description: Problems and issues with code of SuperSonic
+labels: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you very much for submitting feedback to SuperSonic to help SuperSonic develop better.
+
+        If it is an idea or help wanted, please go to:
+        [Github Discussion](https://github.com/tencentmusic/supersonic/discussions)
+
+  - type: checkboxes
+    attributes:
+      label: Search before asking
+      description: >
+        Please make sure to search in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) first to see
+        whether the same issue was reported already.
+      options:
+        - label: >
+            I had searched in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) and found no similar
+            issues.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Version
+      description: What is the current version
+      placeholder: >
+        Please provide the version you are using.
+        If it is the trunk version, please input commit id.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What's Wrong?
+      description: Describe the bug.
+      placeholder: >
+        Describe the specific problem, the more detailed the better.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What You Expected?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: How to Reproduce?
+      placeholder: >
+        Please try to give reproducing steps to facilitate quick location of the problem.
+
+        - What actions were performed
+        - Table building statement
+        - Import statement
+        - Cluster information: number of nodes, configuration, etc.
+
+        If it is hard to reproduce, please also explain the general scene.
+
+  - type: textarea
+    attributes:
+      label: Anything Else?
+
+  - type: checkboxes
+    attributes:
+      label: Are you willing to submit PR?
+      description: >
+        We very much look forward to developers or users to help solve the SuperSonic problem together.
+        If you are willing to submit a PR to fix this problem, please tick it.
+      options:
+        - label: Yes I am willing to submit a PR!
+
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it.
+      options:
+        - label: >
+            I agree to follow this project's
+            [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
+          required: true
+
+  - type: markdown
+    attributes:
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/enhancement_request.yml

@@ -0,0 +1,57 @@
+name: SuperSonic enhancement request
+description: Add an enhancement for SuperSonic
+title: "[Enhancement] "
+labels: enhancement
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you very much for your good enhancement for SuperSonic.
+  - type: checkboxes
+    attributes:
+      label: Search before asking
+      description: >
+        Please make sure to search in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) first to see
+        whether the same issue was reported already.
+      options:
+        - label: >
+            I had searched in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) and found no similar
+            issues.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Description
+      description: Describe the enhancement what you want, including motivation if it exists.
+
+  - type: textarea
+    attributes:
+      label: Solution
+      placeholder: >
+        Add overview of proposed solution. 
+
+        Add related materials like links if they exist.
+
+  - type: checkboxes
+    attributes:
+      label: Are you willing to submit PR?
+      description: >
+        We very much look forward to developers or users to help develop the SuperSonic together.
+        If you are willing to submit a PR to implement this feature, please tick it.
+      options:
+        - label: Yes I am willing to submit a PR!
+
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it.
+      options:
+        - label: >
+            I agree to follow this project's
+            [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
+          required: true
+
+  - type: markdown
+    attributes:
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,60 @@
+name: SuperSonic feature request
+description: Suggest an idea for SuperSonic
+title: "[Feature] "
+labels: feature
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you very much for your good ideas and suggestions for SuperSonic
+
+  - type: checkboxes
+    attributes:
+      label: Search before asking
+      description: >
+        Please make sure to search in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) first to see
+        whether the same issue was reported already.
+      options:
+        - label: >
+            I had searched in the [issues](https://github.com/tencentmusic/supersonic/issues?q=is%3Aissue) and found no similar
+            issues.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Description
+      description: Describe your ideas and needs.
+
+  - type: textarea
+    attributes:
+      label: Use case
+      placeholder: >
+        What problem does this feature mainly solve, or what scenarios it is suitable for.
+
+  - type: textarea
+    attributes:
+      label: Related issues
+      description: Is there currently another issue associated with this?
+
+  - type: checkboxes
+    attributes:
+      label: Are you willing to submit PR?
+      description: >
+        We very much look forward to developers or users to help develop the SuperSonic together.
+        If you are willing to submit a PR to implement this feature, please tick it.
+      options:
+        - label: Yes I am willing to submit a PR!
+
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it.
+      options:
+        - label: >
+            I agree to follow this project's
+            [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
+          required: true
+
+  - type: markdown
+    attributes:
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/question_request.yml

@@ -0,0 +1,58 @@
+name: SuperSonic question request
+description: Ask a question about SuperSonic
+title: "[question] "
+labels: question
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Ask a Question about SuperSonic
+        Please provide a detailed description of your question or the clarification you seek regarding the SuperSonic project.
+  - type: textarea
+    id: describe-question
+    attributes:
+      label: Describe your question
+      description: Please provide a clear and concise description of your question.
+      placeholder: "Type your question here..."
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Provide any additional context or information
+      description: If your question is related to a specific part of the SuperSonic project or if you have already looked through certain documentation, please provide that information here.
+      placeholder: "Add context here..."
+    validations:
+      required: false
+  - type: textarea
+    id: tried-to-resolve
+    attributes:
+      label: What have you tried to resolve your question
+      description: Let us know what you have done to try and understand or resolve your question. This can help us provide you with the most useful guidance.
+      placeholder: "I've already tried..."
+    validations:
+      required: false
+  - type: textarea
+    id: environment
+    attributes:
+      label: Your environment
+      description: Share details about your environment to help us reproduce the issue. Include your operating system, version of SuperSonic, and any other relevant details.
+      placeholder: "OS, SuperSonic version, etc..."
+    validations:
+      required: false
+  - type: textarea
+    id: screenshots-logs
+    attributes:
+      label: Screenshots or Logs
+      description: If applicable, add screenshots or logs to help explain your problem.
+      placeholder: "Paste your logs or attach screenshots here..."
+    validations:
+      required: false
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: Add any other context or details you think might be helpful for understanding your question.
+      placeholder: "Any other information..."
+    validations:
+      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,36 @@
+# Pull Request Template
+
+## Description
+
+Please include a summary of the change and which issue is fixed. Also include relevant motivation and context. List any dependencies that are required for this change.
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+## How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration.
+
+- [ ] Test A
+- [ ] Test B
+
+## Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] Any dependent changes have been merged and published in downstream modules
+
+## Additional information
+
+Any additional information, configuration or data that might be necessary to reproduce the issue.

.github/workflows/centos-ci.yml

@@ -0,0 +1,64 @@
+name: supersonic CentOS CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: quay.io/centos/centos:stream8  # 使用 CentOS Stream 8 容器
+
+    strategy:
+      matrix:
+        java-version: [8, 11, 21]  # 定义要测试的JDK版本
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Reset DNF repositories
+        run: |
+          cd /etc/yum.repos.d/
+          sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+          sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+
+      - name: Update DNF package index
+        run: dnf makecache
+
+      - name: Install Java and Maven with retry
+        run: |
+          if [ ${{ matrix.java-version }} -eq 8 ]; then
+            for i in {1..5}; do
+              dnf install -y java-1.8.0-openjdk-devel maven && break || sleep 15
+            done
+          elif [ ${{ matrix.java-version }} -eq 11 ]; then
+            for i in {1..5}; do
+              dnf install -y java-11-openjdk-devel maven && break || sleep 15
+            done
+          elif [ ${{ matrix.java-version }} -eq 21 ]; then
+            for i in {1..5}; do
+              dnf install -y java-21-openjdk-devel maven && break || sleep 15
+            done
+          fi
+
+      - name: Verify Java and Maven installation
+        run: |
+          java -version
+          mvn -version
+
+      - 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

.github/workflows/mac-ci.yml

@@ -0,0 +1,39 @@
+name: supersonic mac CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: macos-latest  # Specify a macOS runner
+
+    strategy:
+      matrix:
+        java-version: [8, 11, 21]  # Define the JDK versions to test
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'adopt'
+
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/Library/Caches/Maven  # macOS Maven cache path
+          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

.github/workflows/ubuntu-ci.yml

@@ -0,0 +1,39 @@
+name: supersonic ubuntu CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java-version: [8, 11, 21]  # 定义要测试的JDK版本
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java-version }}
+          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

.github/workflows/windows-ci.yml

@@ -0,0 +1,39 @@
+name: supersonic windows CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: windows-latest  # Specify a Windows runner
+
+    strategy:
+      matrix:
+        java-version: [8, 11, 21]  # Add JDK 21 to the matrix
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'adopt'  # You might need to change this if 'adopt' doesn't support JDK 21
+
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~\.m2  # Windows uses a backslash for paths
+          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

.gitignore

@@ -8,6 +8,7 @@ log/
 *.bin
 *.log
 *.tar.gz
+*.zip
 *.lib
 assembly/runtime/*
 **/dist/
@@ -17,4 +18,5 @@ assembly/runtime/*
 **/.flattened-pom.xml
 chm_db/
 __pycache__/
-/dict
+/dict
+assembly/build/*-SNAPSHOT

CHANGELOG.md

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

README.md

@@ -1,63 +1,84 @@
-[中文介绍](README_CN.md) | [文档中心](https://github.com/tencentmusic/supersonic/wiki)
+[中文版](README_CN.md) | [日本語版](README_JP.md) | [Docs](https://supersonicbi.github.io/)
 
-# SuperSonic (超音数)
+![Java CI](https://github.com/tencentmusic/supersonic/workflows/supersonic%20CI/badge.svg)
 
-**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
 
-<img src="./docs/images/supersonic_demo.gif" height="100%" width="100%" align="center"/>
+SuperSonic is the next-generation BI platform that integrates **Chat BI** (powered by LLM) and **Headless BI** (powered by semantic layer) paradigms. This integration ensures that Chat BI has access to the same curated and governed semantic data models as traditional BI. Furthermore, the implementation of both paradigms benefits from the integration: 
+
+- Chat BI's Text2SQL gets augmented with context-retrieval from semantic models.
+- Headless BI's query interface gets extended with natural language API.
+
+<img src="https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_ideas.png" height="75%" width="75%" />
+
+SuperSonic provides a **Chat BI interface** that empowers users to query data using natural language and visualize the results with suitable charts. To enable such experience, the only thing necessary is to build logical semantic models (definition of metric/dimension/tag, along with their meaning and relationships) through a **Headless BI interface**. Meanwhile, SuperSonic is designed to be extensible and composable, allowing custom implementations to be added and configured with Java SPI.
+
+<img src="https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_demo.gif" height="100%" width="100%" />
 
 ## 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, leading to a new paradigm in the field of data analytics known as Chat BI. To implement Chat BI, both academia and industry are primarily focused on harnessing the power of LLMs to convert natural language into SQL, commonly referred to as Text2SQL or NL2SQL. While some approaches show promising results, their **reliability** falls short for large-scale real-world applications.
 
-From our perspective, the key to filling the real-world gap lies in three aspects: 
-1. 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).
+Meanwhile, another emerging paradigm called Headless BI, which focuses on constructing unified semantic data models, has garnered significant attention. Headless BI is implemented through a universal semantic layer that exposes consistent data semantics via an open API.
 
-With these ideas in mind, we develop SuperSonic as a practical reference implementation and use it to power our real-world products. Additionally, to facilitate further development of ChatBI, we decide to open source SuperSonic as an extensible framework.
+From our perspective, the integration of Chat BI and Headless BI has the potential to enhance the Text2SQL generation in two dimensions:
+
+1. Incorporate data semantics (such as business terms, column values, etc.) into the prompt, enabling LLM to better understand the semantics and **reduce hallucination**.
+2. Offload the generation of advanced SQL syntax (such as join, formula, etc.) from LLM to the semantic layer to **reduce complexity**. 
+
+With these ideas in mind, we develop SuperSonic as a practical reference implementation and use it to power our real-world products. Additionally, to facilitate further development we decide to open source SuperSonic as an extensible framework.
 
 ## Out-of-the-box Features
 
-- Built-in 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 GUI for *system administrators* to manage chat agents and third-party plugins
-- Support input auto-completion as well as query recommendation
-- Support multi-turn conversation and history context management 
-- Support four-level permission control: domain-level, model-level, column-level and row-level
+- Built-in Chat BI interface for *business users* to enter natural language queries
+- Built-in Headless BI interface for *analytics engineers* to build semantic data models
+- Built-in rule-based semantic parser to improve efficiency in certain scenarios (e.g. demonstration, integration testing)
+- Built-in support for input auto-completion, multi-turn conversation as well as post-query recommendation
+- Built-in support for three-level data access control: dataset-level, column-level and row-level
 
 ## Extensible Components
 
 The high-level architecture and main process flow is as follows:
 
-<img src="./docs/images/supersonic_components.png" height="65%" width="65%" align="center"/> 
+<img src="https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_components.png" height="65%" width="65%" /> 
 
 - **Knowledge Base:** extracts schema information periodically from the semantic models and build dictionary and index to facilitate schema mapping.
 
 - **Schema Mapper:** identifies references to schema elements(metrics/dimensions/entities/values) in user queries. It matches the query text against the knowledge base.
 
-- **Semantic Parser:** understands user queries and extracts semantic information. It consists of a combination of rule-based and model-based parsers, each of which deals with specific scenarios.
+- **Semantic Parser:** understands user queries and generates semantic query statement. It consists of a combination of rule-based and model-based parsers, each of which deals with specific scenarios.
 
-- **Semantic Corrector:** checks validity of extracted semantic information and performs correction and optimization if needed.
+- **Semantic Corrector:** checks validity of semantic query statement and performs correction and optimization if needed.
 
-- **Semantic Interpreter:** performs execution according to extracted semantic information. It generates SQL statements and executes them against physical data models.
+- **Semantic Translator:** converts semantic query statement into SQL statement that can be executed against physical data models.
 
-- **Chat Plugin:** extends functionality with third-party tools. The LLM is going to select the most suitable one, given all configured plugins with function description and sample questions.
+- **Chat Plugin:** extends functionality with third-party tools. Given a list of configured plugins with descriptions and sample questions, an LLM will be leveraged to select the most suitable one.
+
+- **Chat Memory:** encapsulates a collection of historical query trajectories that can be recalled to facilitate few-shot prompting.
 
 ## Quick Demo
+### Online playground
+Visit http://117.72.46.148:9080 to register and experience as a new user. Please do not modify system configurations. We will restart to reset configurations regularly every weekend.
 
+### Docker Deployment
+- Install Docker and docker-compose.
+- Download the docker-compose.yml file; Execute: wget https://raw.githubusercontent.com/tencentmusic/supersonic/master/docker/docker-compose.yml.
+- Execute "docker-compose up -d".
+- Open a browser and visit http://localhost:9080 to start exploring.
+
+### Local build
 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
 
-Please refer to project [wiki](https://github.com/tencentmusic/supersonic/wiki). 
+Please refer to project [Docs](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E7%BC%96%E8%AF%91%E6%9E%84%E5%BB%BA/). 
 
 ## WeChat Contact
 
 Please follow SuperSonic wechat official account:
 
-<img src="./docs/images/supersonic_wechat_oa.png" height="50%" width="50%" align="center"/> 
+<img src="https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_wechat_oa.png" height="50%" width="50%" />

README_CN.md

@@ -1,61 +1,84 @@
-# 超音数（SuperSonic）
+[English](README.md) | [日本語版](README_JP.md) | [文档中心](https://supersonicbi.github.io/)
 
-**超音数是一个开箱即用且易于扩展的数据问答对话框架**。通过超音数的问答对话界面，用户能够使用自然语言查询数据，系统会选择合适的可视化图表呈现结果。超音数不需要修改或复制数据，只需要在物理数据模型之上构建逻辑语义模型（指标/维度/实体的定义，以及他们的业务含义、相互间关系等），即可开启数据问答体验。与此同时，超音数被设计为可插拔式的框架，允许以插件形式来扩展新功能，或者将核心组件与其他系统集成。
+# SuperSonic
 
-<img src="./docs/images/supersonic_demo.gif" height="100%" width="100%" align="center"/>
+**SuperSonic融合Chat BI（powered by LLM）和Headless BI（powered by 语义层）打造新一代的BI平台**。这种融合确保了Chat BI能够与传统BI一样访问统一化治理的语义数据模型。此外，两种BI新范式都从中获得收益：
+
+- Chat BI的Text2SQL生成通过检索语义数据模型得到增强。
+- Headless BI的查询接口通过支持自然语言API得到拓展。
+
+<img src="https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_ideas.png" height="75%" width="75%" />
+
+通过SuperSonic的问答对话界面，用户能够使用自然语言查询数据，系统会选择合适的可视化图表呈现结果。SuperSonic不需要修改或复制数据，只需要在物理数据模型之上构建逻辑语义模型（定义指标/维度/实体/标签，以及它们的业务含义、相互关系等），即可开启数据问答体验。与此同时，SuperSonic被设计为可插拔的框架，采用Java SPI机制来扩展定制功能。
+
+<img src="https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_demo.gif" height="100%" width="100%" />
 
 ## 项目动机
 
-大型语言模型（LLMs）如ChatGPT的出现正在重塑信息检索的方式。在数据分析领域，学术界和工业界主要关注利用深度学习模型将自然语言查询转换为SQL查询。虽然一些工作显示出有前景的结果，但它们的可靠性还达不到生产可用的要求。
+大型语言模型（LLM）如ChatGPT的出现正在重塑信息检索的方式，引领数据分析领域的一种新范式，被称为Chat BI。为了实现Chat BI，学术界和工业界主要关注利用LLM的能力将自然语言转换为SQL，通常称为Text2SQL或NL2SQL。尽管一些方法显示出有希望的结果，但它们在大规模实际应用中的可靠性还不足。
 
-在我们看来，为了在实际场景发挥价值，有三个关键点：
-1. 引入语义模型层，封装底层数据的上下文（关联、公式等），降低SQL生成的**复杂度**。
-2. 通过一前一后的模式映射器和语义修正器，来缓解LLM常见的**幻觉**现象。
-3. 设计启发式的规则，在一些特定场景提升语义解析的**效率**。
+与此同时，另一种新兴范式被称为Headless BI，它专注于构建统一的语义数据模型，并引起了广泛的关注。Headless BI通过一个通用的语义层来实现，通过开放的API公开一致的数据语义。
 
-为了验证上述想法，我们开发了超音数项目，并将其应用在实际的内部产品中。与此同时，我们将超音数作为一个可扩展的框架开源，希望能够促进数据问答对话领域的进一步发展。
+从我们的角度来看，Chat BI和Headless BI的融合有潜力在两个方面增强Text2SQL的能力：
+
+1. 将数据语义（如业务术语、列值等）纳入提示词中，使LLM能够更好地理解语义，以**减少幻觉**。
+2. 将高级SQL语法（如连接、公式等）的生成从LLM卸载到语义层，以**减少复杂度**。
+
+为了验证上述想法，我们开发了SuperSonic项目，并将其应用在实际的内部产品中。与此同时，我们将SuperSonic作为一个可扩展的框架开源，希望能够促进数据问答对话领域的进一步发展。
 
 ## 开箱即用的特性
 
-- 内置对话界面以便*业务用户*输入数据查询。
-- 内置图形界面以便*分析工程师*构建语义模型。
-- 内置图形界面以便*系统管理员*管理第三方插件和对话助理。
-- 支持文本输入的联想和查询问题的推荐。
-- 支持多轮对话，根据语境自动切换上下文。
-- 支持四级权限控制：主题域级、模型级、列级、行级。
+- 内置Chat BI界面以便*业务用户*输入数据查询。
+- 内置Headless BI界面以便*分析工程师*构建语义模型。
+- 内置基于规则的语义解析器，在特定场景（比如DEMO演示、集成测试）可以提升推理效率。
+- 支持文本输入联想、多轮对话、查询后问题推荐等高级特征。
+- 支持三级权限控制：数据集级、列级、行级。
 
 ## 易于扩展的组件
 
-超音数的整体架构和主流程如下图所示：
+SuperSonic的整体架构和主流程如下图所示：
 
-<img src="./docs/images/supersonic_components.png" height="65%" width="65%" align="center"/> 
+<img src="https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_components.png" height="65%" width="65%" /> 
 
 - **模型知识库(Knowledge Base)：** 定期从语义模型中提取相关的模式信息，构建词典和索引，以便后续的模式映射。
 
 - **模式映射器(Schema Mapper)：** 将自然语言文本在知识库中进行匹配，为后续的语义解析提供相关信息。
 
-- **语义解析器(Semantic Parser)：** 理解用户查询并抽取语义信息，其由一组基于规则和基于模型的解析器组成，每个解析器可应对不同的特定场景。
+- **语义解析器(Semantic Parser)：** 理解用户查询并抽取语义信息，生成语义查询语句S2SQL。
 
-- **语义修正器(Semantic Corrector)：** 检查语义信息的合法性，对不合法的信息做修正和优化处理。
+- **语义修正器(Semantic Corrector)：** 检查语义查询语句的合法性，对不合法的信息做修正和优化处理。
 
-- **语义解释器(Semantic Interpreter)：** 根据语义信息生成物理SQL执行查询。
+- **语义翻译器(Semantic Translator)：** 将语义查询语句翻译成可在物理数据模型上执行的SQL语句。
 
 - **问答插件(Chat Plugin)：** 通过第三方工具扩展功能。给定所有配置的插件及其功能描述和示例问题，大语言模型将选择最合适的插件。
 
+- **问答记忆(Chat Memory)：** 将历史的查询轨迹进行封装，可被召回作为few-shot样例嵌入提示词。
+
 ## 快速体验
 
-超音数自带样例的语义模型和问答对话，只需以下三步即可快速体验：
+### 线上环境体验
+访问http://117.72.46.148:9080 注册新用户体验. 请勿修改系统配置。我们每周末定期重启重置配置。
+
+### Docker部署
+- 安装好Docker以及docker-compose
+- 下载docker-compose.yml；执行命令：wget https://raw.githubusercontent.com/tencentmusic/supersonic/master/docker/docker-compose.yml
+- 执行："docker-compose up -d"
+- 在浏览器访问http://localhost:9080 开启探索
+
+### 本地构建
+
+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 开启探索
 
 ## 如何构建和部署
 
-请参考项目[wiki](https://github.com/tencentmusic/supersonic/wiki)。
+请参考项目[文档](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E7%BC%96%E8%AF%91%E6%9E%84%E5%BB%BA/)。
 
 ## 微信联系方式
 
 欢迎关注微信公众号：
 
-<img src="./docs/images/supersonic_wechat_oa.png" height="50%" width="50%" align="center"/> 
+<img src="https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_wechat_oa.png" height="50%" width="50%" />

README_JP.md

@@ -0,0 +1,80 @@
+[英文版](README.md) | [中国語版](README_CN.md)
+
+# SuperSonic
+
+**SuperSonicは、LLM（大規模言語モデル）によるChat BIと、セマンティックレイヤーによるHeadless BIを統合した次世代のBIプラットフォームです。** この統合により、Chat BIは従来のBIと同様に、統一されたガバナンスされたセマンティックデータモデルにアクセスできます。さらに、両方のBIパラダイムは統合から恩恵を受けます：
+
+- Chat BIのText2SQLは、セマンティックモデルからのコンテキスト検索によって強化されます。
+- Headless BIのクエリインターフェースは、自然言語APIによって拡張されます。
+
+![SuperSonicのアイデア](https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_ideas.png)
+
+SuperSonicは、ユーザーが自然言語でデータをクエリし、適切なチャートで結果を視覚化できる**Chat BIインターフェース**を提供します。このような体験を実現するために必要なのは、**Headless BIインターフェース**を通じて論理的なセマンティックモデル（メトリック/ディメンション/タグの定義、それらの意味と関係など）を構築することだけです。同時に、SuperSonicは拡張可能で構成可能な設計を採用しており、Java SPIを使用してカスタム実装を追加および設定できます。
+
+![SuperSonicのデモ](https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_demo.gif)
+
+## プロジェクトの動機
+
+ChatGPTのような大規模言語モデル（LLM）の出現は、情報検索の方法を再定義し、データ分析分野における新しいパラダイムであるChat BIをリードしています。Chat BIを実装するために、学術界と産業界は主に、自然言語をSQLに変換するLLMの能力を活用することに焦点を当てています。これは一般にText2SQLまたはNL2SQLと呼ばれます。一部のアプローチは有望な結果を示していますが、大規模な実世界のアプリケーションでの**信頼性**はまだ不十分です。
+
+一方で、統一されたセマンティックデータモデルを構築することに焦点を当てた別の新興パラダイムであるHeadless BIも、大きな注目を集めています。Headless BIは、オープンAPIを介して一貫したデータセマンティクスを公開するユニバーサルセマンティックレイヤーを通じて実装されます。
+
+私たちの観点から見ると、Chat BIとHeadless BIの統合は、Text2SQL生成を2つの側面で強化する可能性があります：
+
+1. データセマンティクス（ビジネス用語、列の値など）をプロンプトに組み込むことで、LLMがセマンティクスをよりよく理解し、**幻覚を減らす**ことができます。
+2. 高度なSQL構文（結合、式など）の生成をLLMからセマンティックレイヤーにオフロードすることで、**複雑さを減らす**ことができます。
+
+これらのアイデアを念頭に置いて、私たちはSuperSonicプロジェクトを開発し、実際の製品でそれを使用しています。同時に、SuperSonicを拡張可能なフレームワークとしてオープンソース化し、データクエリ対話分野のさらなる発展を促進したいと考えています。
+
+## 初期設定で利用可能な機能
+
+- *ビジネスユーザー*が自然言語クエリを入力できる組み込みのChat BIインターフェース。
+- *分析エンジニア*がセマンティックモデルを構築できる組み込みのHeadless BIインターフェース。
+- 特定のシナリオ（例：デモンストレーション、統合テスト）で推論効率を向上させるための組み込みのルールベースのセマンティックパーサー。
+- 入力自動補完、マルチターン会話、クエリ後の質問推奨などの高度な機能をサポート。
+- データセットレベル、列レベル、行レベルの3レベルのデータアクセス制御をサポート。
+
+## 拡張可能なコンポーネント
+
+高レベルのアーキテクチャとメインのプロセスフローは以下の通りです：
+
+![SuperSonicのコンポーネント](https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_components.png)
+
+- **モデル知識ベース(Knowledge Base)：** セマンティックモデルから定期的にスキーマ情報を抽出し、辞書とインデックスを構築して、スキーママッピングを容易にします。
+
+- **スキーママッパー(Schema Mapper)：** ユーザークエリ内のスキーマ要素（メトリック/ディメンション/エンティティ/値）を識別します。クエリテキストを知識ベースと照合します。
+
+- **セマンティックパーサー(Semantic Parser)：** ユーザークエリを理解し、セマンティッククエリステートメントS2SQLを生成します。
+
+- **セマンティック修正器(Semantic Corrector)：** セマンティッククエリステートメントの妥当性をチェックし、必要に応じて修正と最適化を行います。
+
+- **セマンティックトランスレーター(Semantic Translator)：** セマンティッククエリステートメントを、物理データモデル上で実行可能なSQLステートメントに変換します。
+
+- **チャットプラグイン(Chat Plugin)：** サードパーティツールで機能を拡張します。すべての設定されたプラグインとその機能説明、サンプル質問が与えられた場合、LLMは最も適切なプラグインを選択します。
+
+## クイックデモ
+### オンラインプレイグラウンド
+http://117.72.46.148:9080 にアクセスして、新規ユーザーとして登録して体験してください。システム設定を変更しないでください。毎週末に定期的に再起動して設定をリセットします。
+
+### Dockerのデプロイメント
+- Dockerおよびdocker-composeをインストールします。
+- docker-compose.ymlファイルをダウンロードします。コマンドを実行します：wget https://raw.githubusercontent.com/tencentmusic/supersonic/master/docker/docker-compose.yml。
+- docker-compose up -dを実行します。
+- ブラウザを開いてhttp://localhost:9080にアクセスし、探索を開始します。
+
+### ローカルビルド
+SuperSonicには、サンプルのセマンティックモデルとチャット会話が付属しており、以下の手順で簡単に体験できます：
+
+- [リリースページ](https://github.com/tencentmusic/supersonic/releases)から最新のプリビルドバイナリをダウンロード
+- スクリプト "assembly/bin/supersonic-daemon.sh start" を実行して、スタンドアロンJavaサービスを起動
+- ブラウザで http://localhost:9080 にアクセスして探索を開始
+
+## ビルドと開発
+
+プロジェクト[ドキュメント](https://supersonicbi.github.io/docs/%E7%B3%BB%E7%BB%9F%E9%83%A8%E7%BD%B2/%E7%BC%96%E8%AF%91%E6%9E%84%E5%BB%BA/)を参照してください。
+
+## WeChat連絡先
+
+SuperSonicの公式WeChatアカウントをフォローしてください：
+
+![SuperSonicのWeChat公式アカウント](https://github.com/supersonicbi/supersonic-website/blob/main/static/img/supersonic_wechat_oa.png)

assembly/bin/supersonic-build.bat

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

assembly/bin/supersonic-build.sh

@@ -1,48 +1,78 @@
 #!/usr/bin/env bash
 
-set -x
 sbinDir=$(cd "$(dirname "$0")"; pwd)
 chmod +x $sbinDir/supersonic-common.sh
 source $sbinDir/supersonic-common.sh
+cd $projectDir
+MVN_VERSION=$(mvn help:evaluate -Dexpression=project.version | grep -e '^[^\[]')
 
 cd $baseDir
+service=$1
+if [ -z "$service"  ]; then
+  service=${STANDALONE_SERVICE}
+fi
 
-#1. build backend java modules
-rm -fr ${buildDir}/*.tar.gz
-rm -fr dist
+function buildJavaService {
+  model_name=$1
+  echo "starting building supersonic-${model_name} service"
+  mvn -f $projectDir clean package -DskipTests
+  if [ $? -ne 0 ]; then
+      echo "Failed to build backend Java modules."
+      exit 1
+  fi
+  cp $projectDir/launchers/${model_name}/target/*.tar.gz ${buildDir}/
+  echo "finished building supersonic-${model_name} service"
+}
 
-set +x
+function buildWebapp {
+  echo "starting building supersonic webapp"
+  chmod +x $projectDir/webapp/start-fe-prod.sh
+  cd $projectDir/webapp
+  sh ./start-fe-prod.sh
+  cp -fr  ./supersonic-webapp.tar.gz ${buildDir}/
+  # check build result
+  if [ $? -ne 0 ]; then
+      echo "Failed to build frontend webapp."
+      exit 1
+  fi
+  echo "finished building supersonic webapp"
+}
 
-mvn -f $baseDir/../ clean package -DskipTests
+function packageRelease {
+  model_name=$1
+  release_dir=supersonic-${model_name}-${MVN_VERSION}
+  service_name=launchers-${model_name}-${MVN_VERSION}
+  echo "starting packaging supersonic release"
+  cd $buildDir
+  [ -d "$release_dir" ] && rm -rf "$release_dir"
+  [ -f "$release_dir.zip" ] && rm -f "$release_dir.zip"
+  mkdir $release_dir
+  # package webapp
+  tar xvf supersonic-webapp.tar.gz
+  mv supersonic-webapp webapp
+  json='{"env": "''"}'
+  echo $json > webapp/supersonic.config.json
+  mv webapp $release_dir/
+  # package java service
+  tar xvf $service_name-bin.tar.gz
+  mv $service_name/* $release_dir/
+  # generate zip file
+  zip -r $release_dir.zip $release_dir
+  # delete intermediate files
+  rm supersonic-webapp.tar.gz $service_name-bin.tar.gz
+  rm -rf webapp $service_name $release_dir
+  echo "finished packaging supersonic release"
+}
 
-#2. move package to build
-cp $baseDir/../launchers/semantic/target/*.tar.gz ${buildDir}/supersonic-semantic.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
-
-#3. build frontend webapp
-chmod +x $baseDir/../webapp/start-fe-prod.sh
-cd ../webapp
-sh ./start-fe-prod.sh
-cp -fr  ./supersonic-webapp.tar.gz ${buildDir}/
-
-#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/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"
-
-#6. reset runtime
-rm -fr $runtimeDir/*
-moveAllToRuntime
-setEnvToWeb chat
-setEnvToWeb semantic
+#1. build backend services
+if [ "$service" == "webapp" ]; then
+  buildWebapp
+  target_path=$projectDir/launchers/$STANDALONE_SERVICE/target/classes
+  tar xvf $projectDir/webapp/supersonic-webapp.tar.gz -C $target_path
+  rm -rf $target_path/webapp
+  mv $target_path/supersonic-webapp $target_path/webapp
+else
+  buildJavaService $service
+  buildWebapp
+  packageRelease $service
+fi

assembly/bin/supersonic-common.bat

@@ -0,0 +1,6 @@
+set "sbinDir=%~dp0"
+set "baseDir=%~dp0.."
+set "buildDir=%baseDir%\build"
+set "main_class=com.tencent.supersonic.StandaloneLauncher"
+set "standalone_service=standalone"
+set "projectDir=%baseDir%\.."

assembly/bin/supersonic-common.sh

@@ -1,106 +1,16 @@
 #!/usr/bin/env bash
 
 # environment parameters
-python_path=${PYTHON_PATH:-"python3"}
-pip_path=${PIP_PATH:-"pip3"}
-
 sbinDir=$(cd "$(dirname "$0")"; pwd)
 baseDir=$(cd "$sbinDir/.." && pwd -P)
-runtimeDir=$baseDir/../runtime
+runtimeDir=$baseDir/runtime
 buildDir=$baseDir/build
+projectDir=$baseDir/..
 
 readonly CHAT_APP_NAME="supersonic_chat"
-readonly SEMANTIC_APP_NAME="supersonic_semantic"
-readonly LLMPARSER_APP_NAME="supersonic_llmparser"
+readonly HEADLESS_APP_NAME="supersonic_headless"
 readonly STANDALONE_APP_NAME="supersonic_standalone"
+
 readonly CHAT_SERVICE="chat"
-readonly SEMANTIC_SERVICE="semantic"
-readonly LLMPARSER_SERVICE="llmparser"
-readonly STANDALONE_SERVICE="standalone"
-readonly LLMPARSER_HOST="127.0.0.1"
-readonly LLMPARSER_PORT="9092"
-
-function setEnvToWeb {
-   model_name=$1
-   json='{"env": "'$model_name'"}'
-   echo $json > ${runtimeDir}/supersonic-${model_name}/webapp/supersonic.config.json
-   echo $json > $baseDir/../launchers/${model_name}/target/classes/webapp/supersonic.config.json
-}
-
-function moveToRuntime {
-  model_name=$1
-  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
-}
-
-function moveAllToRuntime {
-  mkdir -p ${runtimeDir}
-  tar xvf  ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
-  mv ${buildDir}/supersonic-webapp ${buildDir}/webapp
-
-  moveToRuntime chat
-  moveToRuntime semantic
-  moveToRuntime standalone
-  rm -fr  ${buildDir}/webapp
-}
-
-# run java service
-function runJavaService {
-  javaRunDir=${runtimeDir}/supersonic-${model_name}
-  local_app_name=$1
-  libDir=$javaRunDir/lib
-  confDir=$javaRunDir/conf
-
-  CLASSPATH=""
-  CLASSPATH=$CLASSPATH:$confDir
-
-  for jarPath in $libDir/*.jar; do
-   CLASSPATH=$CLASSPATH:$jarPath
-  done
-
-  export CLASSPATH
-  export LANG="zh_CN.UTF-8"
-
-  cd $javaRunDir
-  if [[ "$JAVA_HOME" == "" ]]; then
-    JAVA_HOME=$(ls /usr/jdk64/jdk* -d 2>/dev/null | xargs | awk '{print "'$local_app_name'"}')
-  fi
-  export PATH=$JAVA_HOME/bin:$PATH
-  command="-Dfile.encoding="UTF-8"  -Duser.language="Zh" -Duser.region="CN" -Duser.timezone="GMT+08" -Dapp_name=${local_app_name} -Xms1024m -Xmx2048m "$main_class
-
-  mkdir -p $javaRunDir/logs
-  if [[ "$is_test" == "true" ]]; then
-    java -Dspring.profiles.active="dev" $command >/dev/null 2>$javaRunDir/logs/error.log &
-  else
-    java  $command $javaRunDir >/dev/null 2>$javaRunDir/logs/error.log &
-  fi
-}
-
-# run python service
-function runPythonService {
-  pythonRunDir=${runtimeDir}/supersonic-${model_name}/llmparser
-  cd $pythonRunDir
-  nohup ${python_path} supersonic_llmparser.py  > $pythonRunDir/llmparser.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"
-    status_ok="Healthy"
-    if [[ $response == *$status_ok* ]] ; then
-      echo "llmparser 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."
-      fi
-      echo "Retrying after 5 seconds..."
-      sleep 5
-    fi
-  done
-}
+readonly HEADLESS_SERVICE="headless"
+readonly STANDALONE_SERVICE="standalone"

assembly/bin/supersonic-daemon.bat

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

assembly/bin/supersonic-daemon.sh

@@ -1,147 +1,111 @@
 #!/usr/bin/env bash
 
-set -x
 sbinDir=$(cd "$(dirname "$0")"; pwd)
-chmod +x $sbinDir/supersonic-common.sh
 source $sbinDir/supersonic-common.sh
 
-# 1.init environment parameters
-if [ ! -d "$runtimeDir" ]; then
-    echo "the runtime dir does not exist move all to runtime"
-    moveAllToRuntime
-fi
-set +x
-
 command=$1
 service=$2
+profile=$3
+
 if [ -z "$service"  ]; then
   service=${STANDALONE_SERVICE}
 fi
 
-app_name=$STANDALONE_APP_NAME
-main_class="com.tencent.supersonic.StandaloneLauncher"
-model_name=$service
-
-if [ "$service" == "llmparser" ]; then
-  model_name=${STANDALONE_SERVICE}
+if [ -z "$profile" ]; then
+  profile="local"
 fi
 
+model_name=$service
 cd $baseDir
 
-# 2.set main class
 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"
+  else
+    main_class="com.tencent.supersonic.StandaloneLauncher"
   fi
 }
-setMainClass
-# 3.set app name
+
 function setAppName {
   if [ "$service" == $CHAT_SERVICE ]; then
     app_name=$CHAT_APP_NAME
-  elif [ "$service" == $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
+  else
+    app_name=$STANDALONE_APP_NAME
   fi
 }
-setAppName
 
-function reloadExamples {
-  pythonRunDir=${runtimeDir}/supersonic-${model_name}/llmparser
-  cd $pythonRunDir/sql
-  ${python_path} examples_reload_run.py
+function runJavaService {
+  javaRunDir=$baseDir
+  local_app_name=$1
+  libDir=$baseDir/lib
+  confDir=$baseDir/conf
+
+  CLASSPATH=""
+  CLASSPATH=$CLASSPATH:$confDir
+
+  for jarPath in $libDir/*.jar; do
+   CLASSPATH=$CLASSPATH:$jarPath
+  done
+
+  export CLASSPATH
+  export LANG="zh_CN.UTF-8"
+
+  cd $javaRunDir
+  if [[ "$JAVA_HOME" == "" ]]; then
+    JAVA_HOME=$(ls /usr/jdk64/jdk* -d 2>/dev/null | xargs | awk '{print "'$local_app_name'"}')
+  fi
+  export PATH=$JAVA_HOME/bin:$PATH
+  command="-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dapp_name=${local_app_name} -Xms1024m -Xmx1024m $main_class"
+
+  mkdir -p $javaRunDir/logs
+  java -Dspring.profiles.active="$profile" $command >/dev/null 2>$javaRunDir/logs/error.log &
 }
 
-
-function start()
-{
+function start() {
   local_app_name=$1
-  pid=$(ps aux |grep ${local_app_name} | grep -v grep | awk '{print $2}')
+  echo "Starting ${local_app_name}"
+  pid=$(ps aux | grep ${local_app_name} | grep -v grep | awk '{print $2}')
   if [[ "$pid" == "" ]]; then
-    if [[ ${local_app_name} == $LLMPARSER_APP_NAME ]]; then
-      runPythonService ${local_app_name}
-    else
-      runJavaService ${local_app_name}
-    fi
+    runJavaService ${local_app_name}
   else
     echo "Process (PID = $pid) is running."
     return 1
   fi
+  echo "Start success"
 }
 
-function stop()
-{
+function stop() {
+  echo "Stopping $1"
   pid=$(ps aux | grep $1 | grep -v grep | awk '{print $2}')
   if [[ "$pid" == "" ]]; then
-    echo "Process $1 is not running !"
+    echo "Process $1 is not running!"
     return 1
   else
     kill -9 $pid
-    echo "Process (PID = $pid) is killed !"
+    echo "Process (PID = $pid) is killed!"
     return 0
   fi
+  echo "Stop success"
 }
 
-function reload()
-{
-  if [[ $1 == $LLMPARSER_APP_NAME ]]; then
-    reloadExamples
-  fi
-}
-
-# 4. execute command operation
+setMainClass
+setAppName
 case "$command" in
   start)
-        if [ "$service" == $STANDALONE_SERVICE ]; then
-          echo  "Starting $LLMPARSER_APP_NAME"
-          start $LLMPARSER_APP_NAME
-          echo  "Starting $app_name"
-          start $app_name
-        else
-          echo  "Starting $app_name"
-          start $app_name
-        fi
-        echo  "Start success"
-        ;;
+    start ${app_name}
+    ;;
   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  "Stop success"
-        ;;
-  reload)
-        echo  "Reloading ${app_name}"
-        reload ${app_name}
-        echo  "Reload success"
-        ;;
+    stop $app_name
+    ;;
   restart)
-        if [ "$service" == $STANDALONE_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  "Starting ${app_name}"
-          start ${app_name}
-        else
-          echo  "Stopping ${app_name}"
-          stop ${app_name}
-          echo  "Starting ${app_name}"
-          start ${app_name}
-        fi
-        echo  "Restart success"
-        ;;
+    stop ${app_name}
+    start ${app_name}
+    ;;
   *)
-        echo "Use command {start|stop|restart} to run."
-        exit 1
-esac
+    echo "Use command {start|stop|restart} to run."
+    exit 1
+esac

assembly/build/build.xml

@@ -21,8 +21,12 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/../../chat/python</directory>
-            <outputDirectory>llmparser</outputDirectory>
+            <directory>${project.basedir}/../../assembly/bin</directory>
+            <excludes>
+                <exclude>supersonic-build.sh</exclude>
+                <exclude>supersonic-build.bat</exclude>
+            </excludes>
+            <outputDirectory>bin</outputDirectory>
             <fileMode>0777</fileMode>
             <directoryMode>0755</directoryMode>
         </fileSet>

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java

@@ -6,7 +6,11 @@ import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 
 import java.util.List;
 import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
 
+/**
+ * UserAdaptor defines some interfaces for obtaining user and organization information
+ */
 public interface UserAdaptor {
 
     List<String> getUserNames();
@@ -17,7 +21,9 @@ public interface UserAdaptor {
 
     void register(UserReq userReq);
 
-    String login(UserReq userReq);
+    String login(UserReq userReq, HttpServletRequest request);
+
+    String login(UserReq userReq, String appKey);
 
     List<User> getUserByOrg(String key);
 

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/annotation/AuthenticationIgnore.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.auth.authentication.interceptor;
+package com.tencent.supersonic.auth.api.authentication.annotation;
 
 
 import java.lang.annotation.ElementType;

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/config/AuthenticationConfig.java

@@ -5,23 +5,51 @@ import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @Data
 @Configuration
 public class AuthenticationConfig {
 
-    @Value("${authentication.exclude.path:XXX}")
+    @Value("${s2.authentication.exclude.path:XXX}")
     private String excludePath;
 
-    @Value("${authentication.include.path:/api}")
+    @Value("${s2.authentication.include.path:/api}")
     private String includePath;
 
-    @Value("${authentication.enable:false}")
+    @Value("${s2.authentication.enable:false}")
     private boolean enabled;
 
-    @Value("${authentication.token.secret:secret}")
-    private String tokenSecret;
+    @Value("${s2.authentication.token.default.appKey:supersonic}")
+    private String tokenDefaultAppKey;
 
-    @Value("${authentication.token.http.header.key:Authorization}")
+    @Value("${s2.authentication.token.appSecret:supersonic:WIaO9YRRVt+7QtpPvyWsARFngnEcbaKBk"
+            + "783uGFwMrbJBaochsqCH62L4Kijcb0sZCYoSsiKGV/zPml5MnZ3uQ==}")
+    private String tokenAppSecret;
+
+    @Value("${s2.authentication.token.http.header.key:Authorization}")
     private String tokenHttpHeaderKey;
 
+    @Value("${s2.authentication.token.http.app.key:App-Key}")
+    private String tokenHttpHeaderAppKey;
+
+    @Value("${s2.authentication.app.appId:appId}")
+    private String appId;
+
+    @Value("${s2.authentication.app.timestamp:timestamp}")
+    private String timestamp;
+
+    @Value("${s2.authentication.app.signature:signature}")
+    private String signature;
+
+    @Value("${s2.authentication.token.timeout:72000000}")
+    private Long tokenTimeout;
+
+    public Map<String, String> getAppKeyToSecretMap() {
+        return Arrays.stream(this.tokenAppSecret.split(","))
+                .map(s -> s.split(":"))
+                .collect(Collectors.toMap(e -> e[0].trim(), e -> e[1].trim()));
+    }
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/constant/UserConstants.java

@@ -13,16 +13,9 @@ public class UserConstants {
     public static final String TOKEN_USER_EMAIL = "token_user_email";
 
     public static final String TOKEN_IS_ADMIN = "token_is_admin";
-
-    public static final String TOKEN_ALGORITHM = "HS512";
-
     public static final String TOKEN_CREATE_TIME = "token_create_time";
 
     public static final String TOKEN_PREFIX = "Bearer";
-
-    public static final Long TOKEN_TIME_OUT = 25920000000L;
-
     public static final String INTERNAL = "internal";
 
-
 }

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;

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/User.java

@@ -24,10 +24,19 @@ public class User {
         return new User(id, name, displayName, email, isAdmin);
     }
 
+    public static User get(Long id, String name) {
+        return new User(id, name, name, name, 0);
+    }
+
     public static User getFakeUser() {
         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;
     }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java

@@ -4,18 +4,24 @@ 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();
 
     void register(UserReq userCmd);
 
-    String login(UserReq userCmd);
+    String login(UserReq userCmd, HttpServletRequest request);
+
+    String login(UserReq userCmd, String appKey);
 
     Set<String> getUserAllOrgId(String userName);
 

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserStrategy.java

@@ -11,4 +11,6 @@ public interface UserStrategy {
 
     User findUser(HttpServletRequest request, HttpServletResponse response);
 
+    User findUser(String token, String appKey);
+
 }

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

@@ -2,8 +2,12 @@ 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.config.SystemConfig;
+import com.tencent.supersonic.common.service.SystemConfigService;
+import com.tencent.supersonic.common.util.ContextUtils;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.springframework.util.CollectionUtils;
 
 public final class UserHolder {
 
@@ -14,7 +18,23 @@ public final class UserHolder {
     }
 
     public static User findUser(HttpServletRequest request, HttpServletResponse response) {
-        return REPO.findUser(request, response);
+        User user = REPO.findUser(request, response);
+        return getUser(user);
+    }
+
+    public static User findUser(String token, String appKey) {
+        User user = REPO.findUser(token, appKey);
+        return getUser(user);
+    }
+
+    private static User getUser(User user) {
+        SystemConfigService sysParameterService = ContextUtils.getBean(SystemConfigService.class);
+        SystemConfig systemConfig = sysParameterService.getSystemConfig();
+        if (!CollectionUtils.isEmpty(systemConfig.getAdmins())
+                && systemConfig.getAdmins().contains(user.getName())) {
+            user.setIsAdmin(1);
+        }
+        return user;
     }
 
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/pojo/AuthResGrp.java

@@ -1,11 +0,0 @@
-package com.tencent.supersonic.auth.api.authorization.pojo;
-
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class AuthResGrp {
-
-    private List<AuthRes> group = new ArrayList<>();
-}

auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/request/QueryAuthResReq.java

@@ -1,7 +1,6 @@
 package com.tencent.supersonic.auth.api.authorization.request;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.auth.api.authorization.pojo.AuthRes;
 import lombok.Data;
 import lombok.ToString;
 import org.springframework.util.CollectionUtils;
@@ -15,8 +14,6 @@ public class QueryAuthResReq {
 
     private List<String> departmentIds = new ArrayList<>();
 
-    private List<AuthRes> resources;
-
     private Long modelId;
 
     private List<Long> modelIds;

auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/response/AuthorizedResourceResp.java

@@ -1,16 +1,16 @@
 package com.tencent.supersonic.auth.api.authorization.response;
 
-import com.tencent.supersonic.auth.api.authorization.pojo.AuthResGrp;
+import com.tencent.supersonic.auth.api.authorization.pojo.AuthRes;
 import com.tencent.supersonic.auth.api.authorization.pojo.DimensionFilter;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Data;
-
 @Data
 public class AuthorizedResourceResp {
 
-    private List<AuthResGrp> resources = new ArrayList<>();
+    private List<AuthRes> authResList = new ArrayList<>();
 
     private List<DimensionFilter> filters = new ArrayList<>();
 }

auth/authentication/pom.xml

@@ -38,10 +38,6 @@
             <artifactId>druid</artifactId>
             <version>${alibaba.druid.version}</version>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -50,7 +46,6 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
-            <version>${pagehelper.version}</version>
             <scope>compile</scope>
         </dependency>
 

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java

@@ -9,13 +9,21 @@ import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
 import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository;
+import com.tencent.supersonic.common.util.AESEncryptionUtil;
 import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 import com.tencent.supersonic.common.util.ContextUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+/**
+ * DefaultUserAdaptor provides a default method to obtain user and organization information
+ */
+@Slf4j
 public class DefaultUserAdaptor implements UserAdaptor {
 
     private List<UserDO> getUserDOList() {
@@ -41,7 +49,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) {
@@ -59,22 +77,53 @@ public class DefaultUserAdaptor implements UserAdaptor {
         }
         UserDO userDO = new UserDO();
         BeanUtils.copyProperties(userReq, userDO);
+        try {
+            byte[] salt = AESEncryptionUtil.generateSalt(userDO.getName());
+            userDO.setSalt(AESEncryptionUtil.getStringFromBytes(salt));
+            userDO.setPassword(AESEncryptionUtil.encrypt(userReq.getPassword(), salt));
+        } catch (Exception e) {
+            throw new RuntimeException("password encrypt error, please try again");
+        }
         userRepository.addUser(userDO);
     }
 
     @Override
-    public String login(UserReq userReq) {
+    public String login(UserReq userReq, HttpServletRequest request) {
         UserTokenUtils userTokenUtils = ContextUtils.getBean(UserTokenUtils.class);
+        String appKey = userTokenUtils.getAppKey(request);
+        return login(userReq, appKey);
+    }
+
+    @Override
+    public String login(UserReq userReq, String appKey) {
+        UserTokenUtils userTokenUtils = ContextUtils.getBean(UserTokenUtils.class);
+        try {
+            UserWithPassword user = getUserWithPassword(userReq);
+            return userTokenUtils.generateToken(user, appKey);
+        } catch (Exception e) {
+            log.error("", e);
+            throw new RuntimeException("password encrypt error, please try again");
+        }
+    }
+
+    private UserWithPassword getUserWithPassword(UserReq userReq) {
         UserDO userDO = getUser(userReq.getName());
         if (userDO == null) {
             throw new RuntimeException("user not exist,please register");
         }
-        if (userDO.getPassword().equals(userReq.getPassword())) {
-            UserWithPassword user = UserWithPassword.get(userDO.getId(), userDO.getName(), userDO.getDisplayName(),
-                    userDO.getEmail(), userDO.getPassword(), userDO.getIsAdmin());
-            return userTokenUtils.generateToken(user);
+        try {
+            String password = AESEncryptionUtil.encrypt(userReq.getPassword(),
+                    AESEncryptionUtil.getBytesFromString(userDO.getSalt()));
+            if (userDO.getPassword().equals(password)) {
+                UserWithPassword user = UserWithPassword.get(userDO.getId(), userDO.getName(), userDO.getDisplayName(),
+                        userDO.getEmail(), userDO.getPassword(), userDO.getIsAdmin());
+                return user;
+            } else {
+                throw new RuntimeException("password not correct, please try again");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("password encrypt error, please try again");
         }
-        throw new RuntimeException("password not correct, please try again");
     }
 
     @Override

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java

@@ -5,18 +5,20 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.apache.catalina.connector.RequestFacade;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 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;
 
+@Slf4j
 public abstract class AuthenticationInterceptor implements HandlerInterceptor {
 
 
@@ -29,10 +31,9 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
 
     protected S2ThreadContext s2ThreadContext;
 
-
     protected boolean isExcludedUri(String uri) {
         String excludePathStr = authenticationConfig.getExcludePath();
-        if (Strings.isEmpty(excludePathStr)) {
+        if (StringUtils.isEmpty(excludePathStr)) {
             return false;
         }
         List<String> excludePaths = Arrays.asList(excludePathStr.split(","));
@@ -44,7 +45,7 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
 
     protected boolean isIncludedUri(String uri) {
         String includePathStr = authenticationConfig.getIncludePath();
-        if (Strings.isEmpty(includePathStr)) {
+        if (StringUtils.isEmpty(includePathStr)) {
             return false;
         }
         List<String> includePaths = Arrays.asList(includePathStr.split(","));
@@ -59,8 +60,12 @@ 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) {
+    protected void reflectSetParam(HttpServletRequest request, String key, String value) {
         try {
             if (request instanceof StandardMultipartHttpServletRequest) {
                 RequestFacade servletRequest =
@@ -94,7 +99,7 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
                 o2.addValue(key).setString(value);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("reflectSetParam error:", e);
         }
     }
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java

@@ -1,6 +1,7 @@
 package com.tencent.supersonic.auth.authentication.interceptor;
 
 
+import com.tencent.supersonic.auth.api.authentication.annotation.AuthenticationIgnore;
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
@@ -10,12 +11,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 +36,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();
@@ -63,8 +67,8 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
     }
 
     private void setFakerUser(HttpServletRequest request) {
-        String token = userTokenUtils.generateAdminToken();
-        reflectSetparam(request, authenticationConfig.getTokenHttpHeaderKey(), token);
+        String token = userTokenUtils.generateAdminToken(request);
+        reflectSetParam(request, authenticationConfig.getTokenHttpHeaderKey(), token);
         setContext(User.getFakeUser().getName(), request);
     }
 
@@ -76,5 +80,4 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
         s2ThreadContext.set(threadContext);
     }
 
-
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDO.java

@@ -16,6 +16,8 @@ public class UserDO {
      */
     private String password;
 
+    private String salt;
+
     /**
      * 
      */
@@ -79,6 +81,14 @@ public class UserDO {
         this.password = password == null ? null : password.trim();
     }
 
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt == null ? null : salt.trim();
+    }
+
     /**
      * 
      * @return display_name 

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);
     }
 
-
 }

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")
@@ -66,9 +65,8 @@ public class UserController {
     }
 
     @PostMapping("/login")
-    public String login(@RequestBody UserReq userCmd) {
-        return userService.login(userCmd);
+    public String login(@RequestBody UserReq userCmd, HttpServletRequest request) {
+        return userService.login(userCmd, request);
     }
 
-
 }

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.config.SystemConfig;
+import com.tencent.supersonic.common.service.SystemConfigService;
+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 SystemConfigService sysParameterService;
+
+    public UserServiceImpl(SystemConfigService sysParameterService) {
+        this.sysParameterService = sysParameterService;
+    }
+
+    @Override
+    public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
+        if (user != null) {
+            SystemConfig systemConfig = sysParameterService.getSystemConfig();
+            if (!CollectionUtils.isEmpty(systemConfig.getAdmins())
+                    && systemConfig.getAdmins().contains(user.getName())) {
+                user.setIsAdmin(1);
+            }
+        }
+        return user;
+    }
 
     @Override
     public List<String> getUserNames() {
@@ -45,8 +68,13 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String login(UserReq userReq) {
-        return ComponentFactory.getUserAdaptor().login(userReq);
+    public String login(UserReq userReq, HttpServletRequest request) {
+        return ComponentFactory.getUserAdaptor().login(userReq, request);
+    }
+
+    @Override
+    public String login(UserReq userReq, String appKey) {
+        return ComponentFactory.getUserAdaptor().login(userReq, appKey);
     }
 
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java

@@ -20,5 +20,9 @@ public class FakeUserStrategy implements UserStrategy {
         return User.getFakeUser();
     }
 
+    @Override
+    public User findUser(String token, String appKey) {
+        return User.getFakeUser();
+    }
 
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java

@@ -28,4 +28,9 @@ public class HttpHeaderUserStrategy implements UserStrategy {
     public User findUser(HttpServletRequest request, HttpServletResponse response) {
         return userTokenUtils.getUser(request);
     }
+
+    @Override
+    public User findUser(String token, String appKey) {
+        return userTokenUtils.getUser(token, appKey);
+    }
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java

@@ -1,15 +1,5 @@
 package com.tencent.supersonic.auth.authentication.utils;
 
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_ALGORITHM;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_CREATE_TIME;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_IS_ADMIN;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_PREFIX;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_TIME_OUT;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_DISPLAY_NAME;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_EMAIL;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_ID;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_NAME;
-import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_PASSWORD;
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword;
@@ -17,14 +7,25 @@ import com.tencent.supersonic.common.pojo.exception.AccessException;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
+
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_CREATE_TIME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_IS_ADMIN;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_PREFIX;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_DISPLAY_NAME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_EMAIL;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_ID;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_NAME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_PASSWORD;
 
 @Slf4j
 @Component
@@ -36,7 +37,12 @@ public class UserTokenUtils {
         this.authenticationConfig = authenticationConfig;
     }
 
-    public String generateToken(UserWithPassword user) {
+    public String generateToken(UserWithPassword user, HttpServletRequest request) {
+        String appKey = getAppKey(request);
+        return generateToken(user, appKey);
+    }
+
+    public String generateToken(UserWithPassword user, String appKey) {
         Map<String, Object> claims = new HashMap<>(5);
         claims.put(TOKEN_USER_ID, user.getId());
         claims.put(TOKEN_USER_NAME, StringUtils.isEmpty(user.getName()) ? "" : user.getName());
@@ -44,24 +50,31 @@ public class UserTokenUtils {
         claims.put(TOKEN_USER_DISPLAY_NAME, user.getDisplayName());
         claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis());
         claims.put(TOKEN_IS_ADMIN, user.getIsAdmin());
-        return generate(claims);
+        return generate(claims, appKey);
     }
 
-    public String generateAdminToken() {
-        Map<String, Object> claims = new HashMap<>(5);
-        claims.put(TOKEN_USER_ID, "1");
-        claims.put(TOKEN_USER_NAME, "admin");
-        claims.put(TOKEN_USER_PASSWORD, "admin");
-        claims.put(TOKEN_USER_DISPLAY_NAME, "admin");
-        claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis());
-        claims.put(TOKEN_IS_ADMIN, 1);
-        return generate(claims);
+    public String generateAdminToken(HttpServletRequest request) {
+        UserWithPassword admin = new UserWithPassword("admin");
+        admin.setId(1L);
+        admin.setName("admin");
+        admin.setPassword("c3VwZXJzb25pY0BiaWNvbdktJJYWw6A3rEmBUPzbn/6DNeYnD+y3mAwDKEMS3KVT");
+        admin.setDisplayName("admin");
+        admin.setIsAdmin(1);
+        return generateToken(admin, request);
     }
 
-
     public User getUser(HttpServletRequest request) {
         String token = request.getHeader(authenticationConfig.getTokenHttpHeaderKey());
-        final Claims claims = getClaims(token);
+        final Claims claims = getClaims(token, request);
+        return getUser(claims);
+    }
+
+    public User getUser(String token, String appKey) {
+        final Claims claims = getClaims(token, appKey);
+        return getUser(claims);
+    }
+
+    private User getUser(Claims claims) {
         Long userId = Long.parseLong(claims.getOrDefault(TOKEN_USER_ID, 0).toString());
         String userName = String.valueOf(claims.get(TOKEN_USER_NAME));
         String email = String.valueOf(claims.get(TOKEN_USER_EMAIL));
@@ -78,7 +91,7 @@ public class UserTokenUtils {
             log.warn("{}, uri: {}", message, request.getServletPath());
             throw new AccessException(message);
         }
-        final Claims claims = getClaims(token);
+        final Claims claims = getClaims(token, request);
         Long userId = Long.parseLong(claims.getOrDefault(TOKEN_USER_ID, 0).toString());
         String userName = String.valueOf(claims.get(TOKEN_USER_NAME));
         String email = String.valueOf(claims.get(TOKEN_USER_EMAIL));
@@ -89,36 +102,69 @@ public class UserTokenUtils {
         return UserWithPassword.get(userId, userName, displayName, email, password, isAdmin);
     }
 
-    private Claims getClaims(String token) {
+    private Claims getClaims(String token, HttpServletRequest request) {
         Claims claims;
         try {
-            claims = Jwts.parser()
-                    .setSigningKey(authenticationConfig.getTokenSecret().getBytes(StandardCharsets.UTF_8))
-                    .parseClaimsJws(token.startsWith(TOKEN_PREFIX)
-                            ? token.substring(token.indexOf(TOKEN_PREFIX) + TOKEN_PREFIX.length()).trim() :
-                            token.trim()).getBody();
+            String appKey = getAppKey(request);
+            claims = getClaims(token, appKey);
         } catch (Exception e) {
             throw new AccessException("parse user info from token failed :" + token);
         }
         return claims;
     }
 
-    private String generate(Map<String, Object> claims) {
-        return toTokenString(claims);
+    private Claims getClaims(String token, String appKey) {
+        Claims claims;
+        try {
+            String tokenSecret = getTokenSecret(appKey);
+            claims = Jwts.parser()
+                    .setSigningKey(tokenSecret.getBytes(StandardCharsets.UTF_8))
+                    .build().parseClaimsJws(getTokenString(token)).getBody();
+        } catch (Exception e) {
+            log.error("getClaims", e);
+            throw new AccessException("parse user info from token failed :" + token);
+        }
+        return claims;
     }
 
-    private String toTokenString(Map<String, Object> claims) {
-        long expiration = Long.parseLong(claims.get(TOKEN_CREATE_TIME) + "") + TOKEN_TIME_OUT;
+    private static String getTokenString(String token) {
+        return token.startsWith(TOKEN_PREFIX) ? token.substring(token.indexOf(TOKEN_PREFIX)
+                + TOKEN_PREFIX.length()).trim() : token.trim();
+    }
+
+    private String generate(Map<String, Object> claims, String appKey) {
+        return toTokenString(claims, appKey);
+    }
+
+    private String toTokenString(Map<String, Object> claims, String appKey) {
+        Long tokenTimeout = authenticationConfig.getTokenTimeout();
+        long expiration = Long.parseLong(claims.get(TOKEN_CREATE_TIME) + "") + tokenTimeout;
+        Date expirationDate = new Date(expiration);
+        String tokenSecret = getTokenSecret(appKey);
 
-        SignatureAlgorithm.valueOf(TOKEN_ALGORITHM);
         return Jwts.builder()
                 .setClaims(claims)
                 .setSubject(claims.get(TOKEN_USER_NAME).toString())
-                .setExpiration(new Date(expiration))
-                .signWith(SignatureAlgorithm.valueOf(TOKEN_ALGORITHM),
-                        authenticationConfig.getTokenSecret().getBytes(StandardCharsets.UTF_8))
+                .setExpiration(expirationDate)
+                .signWith(new SecretKeySpec(tokenSecret.getBytes(StandardCharsets.UTF_8),
+                        SignatureAlgorithm.HS512.getJcaName()), SignatureAlgorithm.HS512)
                 .compact();
     }
 
+    private String getTokenSecret(String appKey) {
+        Map<String, String> appKeyToSecretMap = authenticationConfig.getAppKeyToSecretMap();
+        String secret = appKeyToSecretMap.get(appKey);
+        if (StringUtils.isBlank(secret)) {
+            throw new AccessException("get secret from appKey failed :" + appKey);
+        }
+        return secret;
+    }
 
+    public String getAppKey(HttpServletRequest request) {
+        String appKey = request.getHeader(authenticationConfig.getTokenHttpHeaderAppKey());
+        if (StringUtils.isBlank(appKey)) {
+            appKey = authenticationConfig.getTokenDefaultAppKey();
+        }
+        return appKey;
+    }
 }

auth/authentication/src/main/resources/mapper/UserDOMapper.xml

@@ -5,6 +5,7 @@
     <result column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="salt" jdbcType="VARCHAR" property="salt" />
     <result column="display_name" jdbcType="VARCHAR" property="displayName" />
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="is_admin" jdbcType="INTEGER" property="isAdmin" />
@@ -39,7 +40,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, password, display_name, email, is_admin
+    id, name, password, salt, display_name, email, is_admin
   </sql>
   <select id="selectByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultMap="BaseResultMap">
     select
@@ -59,10 +60,10 @@
     </if>
   </select>
   <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-    insert into s2_user (id, name, password, 
+    insert into s2_user (id, name, password, salt,
       display_name, email, is_admin
       )
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR},
       #{displayName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{isAdmin,jdbcType=INTEGER}
       )
   </insert>
@@ -78,6 +79,9 @@
       <if test="password != null">
         password,
       </if>
+      <if test="password != null">
+        salt,
+      </if>
       <if test="displayName != null">
         display_name,
       </if>
@@ -98,6 +102,9 @@
       <if test="password != null">
         #{password,jdbcType=VARCHAR},
       </if>
+      <if test="salt != null">
+        #{salt,jdbcType=VARCHAR},
+      </if>
       <if test="displayName != null">
         #{displayName,jdbcType=VARCHAR},
       </if>

auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/service/AuthServiceImpl.java

@@ -1,26 +1,25 @@
-package com.tencent.supersonic.auth.authorization.application;
+package com.tencent.supersonic.auth.authorization.service;
 
-import com.google.common.base.Strings;
 import com.google.gson.Gson;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
+import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup;
 import com.tencent.supersonic.auth.api.authorization.pojo.AuthRes;
-import com.tencent.supersonic.auth.api.authorization.pojo.AuthResGrp;
+import com.tencent.supersonic.auth.api.authorization.pojo.AuthRule;
 import com.tencent.supersonic.auth.api.authorization.pojo.DimensionFilter;
 import com.tencent.supersonic.auth.api.authorization.request.QueryAuthResReq;
 import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResourceResp;
 import com.tencent.supersonic.auth.api.authorization.service.AuthService;
-import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup;
-import com.tencent.supersonic.auth.api.authorization.pojo.AuthRule;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.Map;
-import java.util.ArrayList;
 import java.util.stream.Collectors;
 
 @Service
@@ -75,52 +74,37 @@ 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) {
+        if (CollectionUtils.isEmpty(req.getModelIds())) {
+            return new AuthorizedResourceResp();
+        }
         Set<String> userOrgIds = userService.getUserAllOrgId(user.getName());
         List<AuthGroup> groups = getAuthGroups(req.getModelIds(), user.getName(), new ArrayList<>(userOrgIds));
         AuthorizedResourceResp resource = new AuthorizedResourceResp();
         Map<Long, List<AuthGroup>> authGroupsByModelId = groups.stream()
                 .collect(Collectors.groupingBy(AuthGroup::getModelId));
-        Map<Long, List<AuthRes>> reqAuthRes = req.getResources().stream()
-                .collect(Collectors.groupingBy(AuthRes::getModelId));
-
-        for (Long modelId : reqAuthRes.keySet()) {
-            List<AuthRes> reqResourcesList = reqAuthRes.get(modelId);
-            AuthResGrp rg = new AuthResGrp();
+        for (Long modelId : req.getModelIds()) {
             if (authGroupsByModelId.containsKey(modelId)) {
                 List<AuthGroup> authGroups = authGroupsByModelId.get(modelId);
-                for (AuthRes reqRes : reqResourcesList) {
-                    for (AuthGroup authRuleGroup : authGroups) {
-                        List<AuthRule> authRules = authRuleGroup.getAuthRules();
-                        List<String> allAuthItems = new ArrayList<>();
-                        authRules.forEach(authRule -> allAuthItems.addAll(authRule.resourceNames()));
-
-                        if (allAuthItems.contains(reqRes.getName())) {
-                            rg.getGroup().add(reqRes);
+                for (AuthGroup authRuleGroup : authGroups) {
+                    List<AuthRule> authRules = authRuleGroup.getAuthRules();
+                    for (AuthRule authRule : authRules) {
+                        for (String resBizName : authRule.resourceNames()) {
+                            resource.getAuthResList().add(new AuthRes(modelId, resBizName));
                         }
-
                     }
                 }
             }
-            if (!CollectionUtils.isEmpty(rg.getGroup())) {
-                resource.getResources().add(rg);
-            }
         }
-
-        if (req.getModelId() != null) {
-            List<AuthGroup> authGroups = authGroupsByModelId.get(req.getModelId());
-            if (!CollectionUtils.isEmpty(authGroups)) {
-                for (AuthGroup group : authGroups) {
-                    if (group.getDimensionFilters() != null
-                            && group.getDimensionFilters().stream().anyMatch(expr -> !Strings.isNullOrEmpty(expr))) {
-                        DimensionFilter df = new DimensionFilter();
-                        df.setDescription(group.getDimensionFilterDescription());
-                        df.setExpressions(group.getDimensionFilters());
-                        resource.getFilters().add(df);
-                    }
-                }
+        Set<Map.Entry<Long, List<AuthGroup>>> entries = authGroupsByModelId.entrySet();
+        for (Map.Entry<Long, List<AuthGroup>> entry : entries) {
+            List<AuthGroup> authGroups = entry.getValue();
+            for (AuthGroup authGroup : authGroups) {
+                DimensionFilter df = new DimensionFilter();
+                df.setDescription(authGroup.getDimensionFilterDescription());
+                df.setExpressions(authGroup.getDimensionFilters());
+                resource.getFilters().add(df);
             }
         }
         return resource;
@@ -129,11 +113,11 @@ public class AuthServiceImpl implements AuthService {
     private List<AuthGroup> getAuthGroups(List<Long> modelIds, String userName, List<String> departmentIds) {
         List<AuthGroup> groups = load().stream()
                 .filter(group -> {
-                    if (CollectionUtils.isEmpty(modelIds) || !modelIds.contains(group.getModelId())) {
+                    if (!modelIds.contains(group.getModelId())) {
                         return false;
                     }
-                    if (!CollectionUtils.isEmpty(group.getAuthorizedUsers()) && group.getAuthorizedUsers()
-                            .contains(userName)) {
+                    if (!CollectionUtils.isEmpty(group.getAuthorizedUsers())
+                            && group.getAuthorizedUsers().contains(userName)) {
                         return true;
                     }
                     for (String departmentId : departmentIds) {

benchmark/benchmark.md

@@ -0,0 +1,84 @@
+## 使用场景
+产品上线阶段批量测试问答对话的问题，统计测试结果。
+注意：与evaluation模块的区别，evaluation是构建数据集多个模型的横向评估，benchmark是选定模型下，批量自动化业务问题的测试。
+## 功能说明
+批量自动化测试问答对话测试，支持单轮问答测试。
+
+## 使用说明
+- 注意1：建议在开发测试环境的执行，如果需要在生产环境的测试，请避开用户使用高峰期。
+- 注意2: python版本要求3.8可以运行。3.8.5版本测试通过。以上python版本未测试。
+1. 准备测试问题
+
+将问题写入`test_data.csv`文件，格式如下：
+```csv
+question
+各BG期间在职、入职、离职人员的平均薪资是多少？（注意：薪资不包括香港视源、广视以及并购控股子公司青松、仙视的数据。）
+各BG期间入职且仍在职的人数有多少？
+各BG当月的净增长人数及其增长率是多少？
+```
+将文件放入`benchmark/data`目录下。
+
+2. 执行测试
+```bash
+python benchmark -u http://localhost:3100 -a 6 -c 141 -f data/renli.csv -p zds
+```
+参数说明：
+- -a: 问答对话的id
+- -c: chat_id
+- -f: 测试问题文件
+- -u: 用户id
+如果执行报错，没有安装相关python包，可以执行`pip install -r requirements.txt`安装相关包。
+
+3. 查看测试结果
+当前，只能在数据库中查看测试结果。
+```sql
+select question_id,chat_id,create_time,query_text,
+       JSON_EXTRACT(parse_info,'$.sqlInfo.s2SQL') as s2sql,
+       JSON_EXTRACT(parse_info,'$.sqlInfo.correctS2SQL') as correctS2SQL,
+       JSON_EXTRACT(parse_info,'$.sqlInfo.querySQL') as querySQL,
+       '请标记正确的SQL' as correctSQL,
+       '请标记生成SQL是否正确' as isOk,
+       '请分类不正确的原因' as reason
+from s2_chat_parse scp where user_name = 'zhaodongsheng' and chat_id = '141';
+
+select question_id,chat_id,create_time,query_text,
+       JSON_EXTRACT(query_result,'$.querySql') as querySql,
+       JSON_EXTRACT(query_result,'$.queryResults') as queryResults
+from s2_chat_query where user_name = 'zhaodongsheng' and chat_id = '141' and query_state = 1;
+
+```
+4. 查看帮助
+```bash
+python benchmark.py --help
+usage: benchmark.py [-h] -u URL -a AGENTID -c CHATID -f FILEPATH -p USERNAME
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -u URL, --url URL     url:问答系统url,例如：https://chatdata-dev.test.com
+  -a AGENTID, --agentId AGENTID
+                        agentId：助手ID
+  -c CHATID, --chatId CHATID
+                        chatId:会话ID,需要通过浏览器开发者模式获取
+  -f FILEPATH, --filePath FILEPATH
+                        filePath：问题文件路径, csv格式. 请提前上传到benchmark/data目录下
+  -p USERNAME, --userName USERNAME
+                        userName：用户名，用户获取登录token
+```
+
+## 演示效果
+```bash
+python benchmark.py -u https://chatdata-dev.test.com -a 3 -c 35 -f data/shuce.csv -p zds
+批量测试配置信息[url: https://chatdata-dev.test.com agentId: 3 chatId: 35 filePath: data/shuce.csv userName: zds ]
+请确认输入的压力测试信息是否正确:
+1. Yes
+2. No
+1
+start to ask question: 各BG期间在职、入职、离职人员的平均薪资是多少？（注意：薪资不包括香港视源、广视以及并购控股子公司青松、仙视的数据。）
+start to ask question: 各BG期间入职且仍在职的人数有多少？
+start to ask question: 各BG当月的净增长人数及其增长率是多少？
+```
+
+## TODO
+- [x] 问答对话测试
+- [ ] 多轮对话测试
+- [ ] 问答对话测试结果展示

benchmark/benchmark.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+# -----------------------------------------------------------------------------------
+'''
+@filename     : batchmark.py
+@time         : 2024/06/20
+@author       : zhaodongsheng
+@Version      : 1.0
+@description  : 批量问答测试
+'''
+# -----------------------------------------------------------------------------------
+import pandas as pd
+import json
+import requests
+import time
+import jwt
+import traceback
+
+class BatchTest:
+    def __init__(self, url, agentId, chatId, userName):
+        self.base_url = url + '/api/chat/query/'
+        self.agentId = agentId
+        self.auth_token = self.__get_authorization(userName)
+        self.chatId = chatId
+
+    def parse(self, query_text):
+        url = self.base_url + 'parse'
+        data = {
+            'queryText': query_text,
+            'agentId': self.agentId,
+            'chatId': self.chatId,
+        }
+        headers = {
+            'Authorization': 'Bearer ' + self.auth_token,
+            'Content-Type': 'application/json',
+        }
+
+        response = requests.post(url, headers=headers, data=json.dumps(data))
+        return response.json()
+
+    def execute(self, query_text, queryId):
+        url = self.base_url + 'execute'
+        data = {
+            'queryText': query_text,
+            'parseId': 1,
+            'chatId': self.chatId,
+            'queryId': queryId,
+        }
+        headers = {
+            'Authorization': 'Bearer ' + self.auth_token,
+            'Content-Type': 'application/json',
+        }
+
+        response = requests.post(url, headers=headers, data=json.dumps(data))
+        return response.json()
+
+    def read_question_from_csv(self, filePath):
+        df = pd.read_csv(filePath)
+        return df
+
+    def __get_authorization(self, userName):
+        # secret 请和 com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig.tokenAppSecret 保持一致
+        secret = "WIaO9YRRVt+7QtpPvyWsARFngnEcbaKBk783uGFwMrbJBaochsqCH62L4Kijcb0sZCYoSsiKGV/zPml5MnZ3uQ=="
+        exp = time.time() + 100000000
+        token= jwt.encode({"token_user_name": userName,"exp": exp}, secret, algorithm="HS512")
+        return token
+
+
+def benchmark(url:str, agentId:str, chatId:str, filePath:str, userName:str):
+    batch_test = BatchTest(url, agentId, chatId, userName)
+    df = batch_test.read_question_from_csv(filePath)
+    for index, row in df.iterrows():
+        question = row['question']
+        print('start to ask question:', question)
+        # 捕获异常，防止程序中断
+        try:
+            parse_resp = batch_test.parse(question)
+            batch_test.execute(question, parse_resp['data']['queryId'])
+        except Exception as e:
+            print('error:', e)
+            traceback.print_exc()
+            continue
+        time.sleep(1)
+
+if __name__ == '__main__':
+
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-u', '--url', type=str, required=True, help='url:问答系统url,例如：https://chatdata-dev.test.com')
+    parser.add_argument('-a', '--agentId', type=str, required=True, help='agentId：助手ID')
+    parser.add_argument('-c', '--chatId', type=str, required=True, help='chatId:会话ID,需要通过浏览器开发者模式获取')
+    parser.add_argument('-f', '--filePath', type=str, required=True, help='filePath：问题文件路径, csv格式. 请提前上传到benchmark/data目录下')
+    parser.add_argument('-p', '--userName', type=str, required=True, help='userName：用户名，用户获取登录token')
+    args = parser.parse_args()
+
+    print('批量测试配置信息[url:', args.url,'agentId:', args.agentId, 'chatId:', args.chatId, 'filePath:', args.filePath, 'userName:', args.userName, ']')
+    print('请确认输入的压力测试信息是否正确:')
+    print('1. Yes')
+    print('2. No')
+    confirm = input()
+    if confirm == '1' or confirm == 'Yes' or confirm == 'yes' or confirm == 'YES':
+        benchmark(args.url, args.agentId, args.chatId, args.filePath, args.userName)
+    else:
+        print('请重新输入压力测试配置信息: url, agentId, chatId, filePath, userName')

benchmark/data/caiwu.csv

@@ -0,0 +1,3 @@
+question
+每个业务组（BG）的员工人数是多少？
+每个业务组的损益情况如何？

benchmark/data/renli.csv

@@ -0,0 +1,8 @@
+question
+在职人员的男女比例是多少？
+期间入职且离职的人数及其占比如何？
+期间新入职社招人员的平均年龄是多少？
+期间入职且在职的人数有多少？
+期间在职人员的平均年龄是多少？
+当月的净增长人数及其增长率是多少？
+期间新入职社招人员的年龄分布情况如何？

benchmark/data/shuce.csv

@@ -0,0 +1,4 @@
+question
+在广东省内，哪一个学校的累计集备数最多，请返回该学校的学校名称
+在广东省内，哪一个学校的累计集体备课数最多，请返回该学校的学校名称
+

benchmark/requirements.txt

@@ -0,0 +1,5 @@
+pandas==2.0.3
+PyJWT==2.8.0
+requests==2.28.2
+
+

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>

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticCorrector.java

@@ -1,13 +0,0 @@
-package com.tencent.supersonic.chat.api.component;
-
-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
- * performs correction and optimization if needed.
- */
-public interface SemanticCorrector {
-
-    void correct(QueryReq queryReq, SemanticParseInfo semanticParseInfo);
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticInterpreter.java

@@ -1,63 +0,0 @@
-package com.tencent.supersonic.chat.api.component;
-
-import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.api.pojo.ModelSchema;
-import com.tencent.supersonic.common.pojo.enums.AuthType;
-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.DomainResp;
-import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
-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.QueryS2SQLReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
-
-import java.util.List;
-
-/**
- * A semantic layer provides a simplified and consistent view of data from multiple sources.
- * It abstracts away the complexity of the underlying data sources and provides a unified view
- * of the data that is easier to understand and use.
- * <p>
- * The interface defines methods for getting metadata as well as querying data in the semantic layer.
- * Implementations of this interface should provide concrete implementations that interact with the
- * underlying data sources and return results in a consistent format. Or it can be implemented
- * as proxy to a remote semantic service.
- * </p>
- */
-public interface SemanticInterpreter {
-
-    QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user);
-
-    QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user);
-
-    QueryResultWithSchemaResp queryByS2SQL(QueryS2SQLReq queryS2SQLReq, User user);
-
-    QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user);
-
-    List<ModelSchema> getModelSchema();
-
-    List<ModelSchema> getModelSchema(List<Long> ids);
-
-    ModelSchema getModelSchema(Long model, Boolean cacheEnable);
-
-    PageInfo<DimensionResp> getDimensionPage(PageDimensionReq pageDimensionReq);
-
-    PageInfo<MetricResp> getMetricPage(PageMetricReq pageDimensionReq, User user);
-
-    List<DomainResp> getDomainList(User user);
-
-    List<ModelResp> getModelList(AuthType authType, Long domainId, User user);
-
-    <T> ExplainResp explain(ExplainSqlReq<T> explainSqlReq, User user) throws Exception;
-
-    List<ModelSchemaResp> fetchModelSchema(List<Long> ids, Boolean cacheEnable);
-
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticParser.java

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

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticQuery.java

@@ -1,24 +0,0 @@
-package com.tencent.supersonic.chat.api.component;
-
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
-import org.apache.calcite.sql.parser.SqlParseException;
-
-/**
- * A semantic query executes specific type of query based on the results of semantic parsing.
- */
-public interface SemanticQuery {
-
-    String getQueryMode();
-
-    QueryResult execute(User user) throws SqlParseException;
-
-    void initS2Sql(User user);
-
-    String explain(User user);
-
-    SemanticParseInfo getParseInfo();
-
-    void setParseInfo(SemanticParseInfo parseInfo);
-}

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

@@ -1,98 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import com.google.common.collect.Sets;
-import com.tencent.supersonic.common.pojo.ModelRela;
-import lombok.Data;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-@Data
-public class ModelSchema {
-
-    private SchemaElement model;
-    private Set<SchemaElement> metrics = new HashSet<>();
-    private Set<SchemaElement> dimensions = new HashSet<>();
-    private Set<SchemaElement> dimensionValues = new HashSet<>();
-    private Set<SchemaElement> tags = new HashSet<>();
-    private SchemaElement entity = new SchemaElement();
-    private List<ModelRela> modelRelas = new ArrayList<>();
-
-    public SchemaElement getElement(SchemaElementType elementType, long elementID) {
-        Optional<SchemaElement> element = Optional.empty();
-
-        switch (elementType) {
-            case ENTITY:
-                element = Optional.ofNullable(entity);
-                break;
-            case MODEL:
-                element = Optional.of(model);
-                break;
-            case METRIC:
-                element = metrics.stream().filter(e -> e.getId() == elementID).findFirst();
-                break;
-            case DIMENSION:
-                element = dimensions.stream().filter(e -> e.getId() == elementID).findFirst();
-                break;
-            case VALUE:
-                element = dimensionValues.stream().filter(e -> e.getId() == elementID).findFirst();
-                break;
-            case TAG:
-                element = tags.stream().filter(e -> e.getId() == elementID).findFirst();
-                break;
-            default:
-        }
-
-        if (element.isPresent()) {
-            return element.get();
-        } else {
-            return null;
-        }
-    }
-
-    public SchemaElement getElement(SchemaElementType elementType, String name) {
-        Optional<SchemaElement> element = Optional.empty();
-
-        switch (elementType) {
-            case ENTITY:
-                element = Optional.ofNullable(entity);
-                break;
-            case MODEL:
-                element = Optional.of(model);
-                break;
-            case METRIC:
-                element = metrics.stream().filter(e -> name.equals(e.getName())).findFirst();
-                break;
-            case DIMENSION:
-                element = dimensions.stream().filter(e -> name.equals(e.getName())).findFirst();
-                break;
-            case VALUE:
-                element = dimensionValues.stream().filter(e -> name.equals(e.getName())).findFirst();
-                break;
-            default:
-        }
-
-        if (element.isPresent()) {
-            return element.get();
-        } else {
-            return null;
-        }
-    }
-
-    public Set<Long> getModelClusterSet() {
-        if (CollectionUtils.isEmpty(modelRelas)) {
-            return Sets.newHashSet();
-        }
-        Set<Long> modelClusterSet = new HashSet<>();
-        modelRelas.forEach(modelRela -> {
-            modelClusterSet.add(modelRela.getToModelId());
-            modelClusterSet.add(modelRela.getFromModelId());
-        });
-        return modelClusterSet;
-    }
-
-}

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;
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import com.google.common.base.Objects;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@Getter
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class SchemaElement implements Serializable {
-
-    private Long model;
-    private Long id;
-    private String name;
-    private String bizName;
-    private Long useCnt;
-    private SchemaElementType type;
-    private List<String> alias;
-    private List<SchemaValueMap> schemaValueMaps;
-    private List<RelatedSchemaElement> relatedSchemaElements;
-
-    private String defaultAgg;
-
-    private double order;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SchemaElement schemaElement = (SchemaElement) o;
-        return Objects.equal(model, schemaElement.model) && Objects.equal(id,
-                schemaElement.id) && Objects.equal(name, schemaElement.name)
-                && Objects.equal(bizName, schemaElement.bizName)
-                && Objects.equal(type, schemaElement.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(model, id, name, bizName, type);
-    }
-
-}

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

@@ -1,31 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class SchemaMapInfo {
-
-    private Map<Long, List<SchemaElementMatch>> modelElementMatches = new HashMap<>();
-
-    public Set<Long> getMatchedModels() {
-        return modelElementMatches.keySet();
-    }
-
-    public List<SchemaElementMatch> getMatchedElements(Long model) {
-        return modelElementMatches.get(model);
-    }
-
-    public Map<Long, List<SchemaElementMatch>> getModelElementMatches() {
-        return modelElementMatches;
-    }
-
-    public void setModelElementMatches(Map<Long, List<SchemaElementMatch>> modelElementMatches) {
-        this.modelElementMatches = modelElementMatches;
-    }
-
-    public void setMatchedElements(Long model, List<SchemaElementMatch> elementMatches) {
-        modelElementMatches.put(model, elementMatches);
-    }
-}

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

@@ -1,61 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-import com.clickhouse.client.internal.apache.commons.compress.utils.Lists;
-import com.tencent.supersonic.common.pojo.ModelCluster;
-import lombok.Data;
-import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Data
-public class SchemaModelClusterMapInfo {
-
-    private Map<String, List<SchemaElementMatch>> modelElementMatches = new HashMap<>();
-
-    public Set<String> getMatchedModelClusters() {
-        return modelElementMatches.keySet();
-    }
-
-    public List<SchemaElementMatch> getMatchedElements(Long modelId) {
-        for (String key : modelElementMatches.keySet()) {
-            if (ModelCluster.getModelIdFromKey(key).contains(modelId)) {
-                return modelElementMatches.get(key);
-            }
-        }
-        return Lists.newArrayList();
-    }
-
-    public List<SchemaElementMatch> getMatchedElements(String modelCluster) {
-        return modelElementMatches.get(modelCluster);
-    }
-
-    public Map<String, List<SchemaElementMatch>> getModelElementMatches() {
-        return modelElementMatches;
-    }
-
-    public Map<String, List<SchemaElementMatch>> getElementMatchesByModelIds(Set<Long> modelIds) {
-        if (CollectionUtils.isEmpty(modelIds)) {
-            return modelElementMatches;
-        }
-        Map<String, List<SchemaElementMatch>> modelElementMatchesFiltered = new HashMap<>();
-        for (String key : modelElementMatches.keySet()) {
-            for (Long modelId : modelIds) {
-                if (ModelCluster.getModelIdFromKey(key).contains(modelId)) {
-                    modelElementMatchesFiltered.put(key, modelElementMatches.get(key));
-                }
-            }
-        }
-        return modelElementMatchesFiltered;
-    }
-
-    public void setModelElementMatches(Map<String, List<SchemaElementMatch>> modelElementMatches) {
-        this.modelElementMatches = modelElementMatches;
-    }
-
-    public void setMatchedElements(String modelCluster, List<SchemaElementMatch> elementMatches) {
-        modelElementMatches.put(modelCluster, elementMatches);
-    }
-}

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

@@ -1,111 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo;
-
-
-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.AggregateTypeEnum;
-import com.tencent.supersonic.common.pojo.enums.FilterType;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-@Data
-public class SemanticParseInfo {
-
-    private Integer id;
-    private String queryMode;
-    private ModelCluster model = new ModelCluster();
-    private Set<SchemaElement> metrics = new TreeSet<>(new SchemaNameLengthComparator());
-    private Set<SchemaElement> dimensions = new LinkedHashSet();
-    private SchemaElement entity;
-    private AggregateTypeEnum aggType = AggregateTypeEnum.NONE;
-    private FilterType filterType = FilterType.UNION;
-    private Set<QueryFilter> dimensionFilters = new LinkedHashSet();
-    private Set<QueryFilter> metricFilters = new LinkedHashSet();
-    private Set<Order> orders = new LinkedHashSet();
-    private DateConf dateInfo;
-    private Long limit;
-    private double score;
-    private List<SchemaElementMatch> elementMatches = new ArrayList<>();
-    private Map<String, Object> properties = new HashMap<>();
-    private EntityInfo entityInfo;
-    private SqlInfo sqlInfo = new SqlInfo();
-    private QueryType queryType = QueryType.OTHER;
-
-    public String getModelClusterKey() {
-        if (model == null) {
-            return "";
-        }
-        return model.getKey();
-    }
-
-    public String getModelName() {
-        if (model == null) {
-            return "";
-        }
-        return model.getName();
-    }
-
-    private static class SchemaNameLengthComparator implements Comparator<SchemaElement> {
-
-        @Override
-        public int compare(SchemaElement o1, SchemaElement o2) {
-            if (o1.getOrder() != o2.getOrder()) {
-                if (o1.getOrder() < o2.getOrder()) {
-                    return -1;
-                } else {
-                    return 1;
-                }
-            }
-            int len1 = o1.getName().length();
-            int len2 = o2.getName().length();
-            if (len1 != len2) {
-                return len1 - len2;
-            } else {
-                return o1.getName().compareTo(o2.getName());
-            }
-        }
-    }
-
-    public Set<SchemaElement> getMetrics() {
-        Set<SchemaElement> metricSet = new TreeSet<>(new SchemaNameLengthComparator());
-        metricSet.addAll(metrics);
-        metrics = metricSet;
-        return metrics;
-    }
-
-    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);
-        });
-        return elementCountMap;
-    }
-
-    public Long getModelId() {
-        Map<Long, Integer> elementCountMap = getModelElementCountMap();
-        Long modelId = -1L;
-        int maxCnt = 0;
-        for (Long model : elementCountMap.keySet()) {
-            if (elementCountMap.get(model) > maxCnt) {
-                maxCnt = elementCountMap.get(model);
-                modelId = model;
-            }
-        }
-        return modelId;
-    }
-
-}

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

@@ -1,181 +0,0 @@
-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.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class SemanticSchema implements Serializable {
-
-    private List<ModelSchema> modelSchemaList;
-
-    public SemanticSchema(List<ModelSchema> modelSchemaList) {
-        this.modelSchemaList = modelSchemaList;
-    }
-
-    public void add(ModelSchema schema) {
-        modelSchemaList.add(schema);
-    }
-
-    public SchemaElement getElement(SchemaElementType elementType, long elementID) {
-        Optional<SchemaElement> element = Optional.empty();
-
-        switch (elementType) {
-            case ENTITY:
-                element = getElementsById(elementID, getEntities());
-                break;
-            case MODEL:
-                element = getElementsById(elementID, getModels());
-                break;
-            case METRIC:
-                element = getElementsById(elementID, getMetrics());
-                break;
-            case DIMENSION:
-                element = getElementsById(elementID, getDimensions());
-                break;
-            case VALUE:
-                element = getElementsById(elementID, getDimensionValues());
-                break;
-            default:
-        }
-
-        if (element.isPresent()) {
-            return element.get();
-        } else {
-            return null;
-        }
-    }
-
-    public SchemaElement getElementByName(SchemaElementType elementType, String name) {
-        Optional<SchemaElement> element = Optional.empty();
-
-        switch (elementType) {
-            case ENTITY:
-                element = getElementsByName(name, getEntities());
-                break;
-            case MODEL:
-                element = getElementsByName(name, getModels());
-                break;
-            case METRIC:
-                element = getElementsByName(name, getMetrics());
-                break;
-            case DIMENSION:
-                element = getElementsByName(name, getDimensions());
-                break;
-            case VALUE:
-                element = getElementsByName(name, getDimensionValues());
-                break;
-            default:
-        }
-
-        if (element.isPresent()) {
-            return element.get();
-        } else {
-            return null;
-        }
-    }
-
-    public Map<Long, String> getModelIdToName() {
-        return modelSchemaList.stream()
-                .collect(Collectors.toMap(a -> a.getModel().getId(), a -> a.getModel().getName(), (k1, k2) -> k1));
-    }
-
-    public List<SchemaElement> getDimensionValues() {
-        List<SchemaElement> dimensionValues = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> dimensionValues.addAll(d.getDimensionValues()));
-        return dimensionValues;
-    }
-
-    public List<SchemaElement> getDimensions() {
-        List<SchemaElement> dimensions = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> dimensions.addAll(d.getDimensions()));
-        return dimensions;
-    }
-
-    public List<SchemaElement> getDimensions(Set<Long> modelIds) {
-        List<SchemaElement> dimensions = getDimensions();
-        return getElementsByModelId(modelIds, dimensions);
-    }
-
-    public SchemaElement getDimensions(Long id) {
-        List<SchemaElement> dimensions = getDimensions();
-        Optional<SchemaElement> dimension = getElementsById(id, dimensions);
-        return dimension.orElse(null);
-    }
-
-    public List<SchemaElement> getTags() {
-        List<SchemaElement> tags = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> tags.addAll(d.getTags()));
-        return tags;
-    }
-
-    public List<SchemaElement> getTags(Set<Long> modelIds) {
-        List<SchemaElement> tags = new ArrayList<>();
-        modelSchemaList.stream().filter(schemaElement -> modelIds.contains(schemaElement.getModel()))
-                .forEach(d -> tags.addAll(d.getTags()));
-        return tags;
-    }
-
-    public List<SchemaElement> getMetrics() {
-        List<SchemaElement> metrics = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> metrics.addAll(d.getMetrics()));
-        return metrics;
-    }
-
-    public List<SchemaElement> getMetrics(Set<Long> modelIds) {
-        List<SchemaElement> metrics = getMetrics();
-        return getElementsByModelId(modelIds, metrics);
-    }
-
-    public List<SchemaElement> getEntities() {
-        List<SchemaElement> entities = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> entities.add(d.getEntity()));
-        return entities;
-    }
-
-    private List<SchemaElement> getElementsByModelId(Set<Long> modelIds, List<SchemaElement> elements) {
-        return elements.stream()
-                .filter(schemaElement -> modelIds.contains(schemaElement.getModel()))
-                .collect(Collectors.toList());
-    }
-
-    private Optional<SchemaElement> getElementsById(Long id, List<SchemaElement> elements) {
-        return elements.stream()
-                .filter(schemaElement -> id.equals(schemaElement.getId()))
-                .findFirst();
-    }
-
-    private Optional<SchemaElement> getElementsByName(String name, List<SchemaElement> elements) {
-        return elements.stream()
-                .filter(schemaElement -> name.equals(schemaElement.getName()))
-                .findFirst();
-    }
-
-    public List<SchemaElement> getModels() {
-        List<SchemaElement> models = new ArrayList<>();
-        modelSchemaList.stream().forEach(d -> models.add(d.getModel()));
-        return models;
-    }
-
-    public Map<String, String> getBizNameToName(Set<Long> modelIds) {
-        List<SchemaElement> allElements = new ArrayList<>();
-        allElements.addAll(getDimensions(modelIds));
-        allElements.addAll(getMetrics(modelIds));
-        return allElements.stream()
-                .collect(Collectors.toMap(SchemaElement::getBizName, SchemaElement::getName, (k1, k2) -> k1));
-    }
-
-    public Map<Long, ModelSchema> getModelSchemaMap() {
-        if (CollectionUtils.isEmpty(modelSchemaList)) {
-            return new HashMap<>();
-        }
-        return modelSchemaList.stream().collect(Collectors.toMap(modelSchema
-                -> modelSchema.getModel().getModel(), modelSchema -> modelSchema));
-    }
-}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/enums/MemoryReviewResult.java

@@ -0,0 +1,9 @@
+package com.tencent.supersonic.chat.api.pojo.enums;
+
+
+public enum MemoryReviewResult {
+
+    POSITIVE,
+    NEGATIVE
+
+}

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/enums/MemoryStatus.java

@@ -0,0 +1,10 @@
+package com.tencent.supersonic.chat.api.pojo.enums;
+
+
+public enum MemoryStatus {
+
+    PENDING,
+    ENABLED,
+    DISABLED;
+
+}

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

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

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

@@ -1,7 +1,6 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
 
-import com.tencent.supersonic.common.pojo.Constants;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -13,26 +12,5 @@ public class ChatDefaultConfigReq {
     private List<Long> dimensionIds = new ArrayList<>();
     private List<Long> metricIds = new ArrayList<>();
 
-    /**
-     * default time span unit
-     */
-    private Integer unit = 1;
-
-    /**
-     * default time type: day
-     * DAY, WEEK, MONTH, YEAR
-     */
-    private String period = Constants.DAY;
-
-    private TimeMode timeMode = TimeMode.LAST;
-
-    public enum TimeMode {
-        /**
-         * date mode
-         * LAST   - a certain time
-         * RECENT - a period time
-         */
-        LAST, RECENT
-    }
 
 }

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

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

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

@@ -0,0 +1,30 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
+import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChatMemoryFilter {
+
+    private Integer agentId;
+
+    private String question;
+
+    private List<String> questions;
+
+    private MemoryStatus status;
+
+    private MemoryReviewResult llmReviewRet;
+
+    private MemoryReviewResult humanReviewRet;
+
+}

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

@@ -0,0 +1,27 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+
+import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
+import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus;
+import com.tencent.supersonic.common.pojo.RecordInfo;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ChatMemoryUpdateReq extends RecordInfo {
+
+    @NotNull(message = "id不可为空")
+    private Long id;
+
+    private String dbSchema;
+
+    private String s2sql;
+
+    private MemoryStatus status;
+
+    private MemoryReviewResult humanReviewRet;
+
+    private String humanReviewCmt;
+
+}

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

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

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

@@ -1,15 +1,16 @@
 package com.tencent.supersonic.chat.api.pojo.request;
 
-
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.common.pojo.DateConf;
-import java.util.HashSet;
-import java.util.Set;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.request.QueryFilter;
 import lombok.Data;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @Data
-public class QueryDataReq {
+public class ChatQueryDataReq {
     private User user;
     private Set<SchemaElement> metrics = new HashSet<>();
     private Set<SchemaElement> dimensions = new HashSet<>();

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

@@ -1,23 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo.request;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-import static java.time.LocalDate.now;
-
-@ToString
-@Data
-@NoArgsConstructor
-public class DictLatestTaskReq {
-
-    @NotNull
-    private Long modelId;
-
-    private List<Long> dimIds;
-
-    private String createdAt = now().plusDays(-4).toString();
-}

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

@@ -1,20 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo.request;
-
-import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
-import lombok.Data;
-import lombok.ToString;
-
-@ToString
-@Data
-public class DictTaskFilterReq {
-
-    private Long id;
-
-    private String name;
-
-    private String createdBy;
-
-    private String createdAt;
-
-    private TaskStatusEnum status;
-}

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

@@ -1,21 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo.request;
-
-import javax.validation.constraints.NotNull;
-import lombok.Data;
-
-@Data
-public class DimensionValueReq {
-
-    private Integer agentId;
-
-    @NotNull
-    private Long elementID;
-
-    @NotNull
-    private Long modelId;
-
-    private String bizName;
-
-    @NotNull
-    private String value;
-}

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

@@ -0,0 +1,12 @@
+package com.tencent.supersonic.chat.api.pojo.request;
+
+import com.tencent.supersonic.common.pojo.PageBaseReq;
+import lombok.Data;
+
+
+@Data
+public class PageMemoryReq extends PageBaseReq {
+
+    private ChatMemoryFilter chatMemoryFilter = new ChatMemoryFilter();
+
+}

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

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

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;
 
@@ -18,7 +18,7 @@ public class SolvedQueryReq {
 
     private String queryText;
 
-    private String modelId;
+    private Long dataSetId;
 
     private Integer agentId;
 

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

@@ -1,9 +1,9 @@
 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.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.common.pojo.Constants;
+import com.tencent.supersonic.common.pojo.enums.TimeMode;
 import lombok.Data;
 
 import java.util.List;
@@ -21,11 +21,11 @@ public class ChatDefaultRichConfigResp {
     private Integer unit = 1;
 
     /**
-     * default time type: day
+     * default time type:
      * DAY, WEEK, MONTH, YEAR
      */
     private String period = Constants.DAY;
 
-    private ChatDefaultConfigReq.TimeMode timeMode;
+    private TimeMode timeMode;
 
 }

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

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 
 import java.util.List;
 import lombok.Data;

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

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

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/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;
 }

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

@@ -1,9 +1,11 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
+import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.response.ParseTimeCostResp;
+import lombok.Data;
 import java.util.Date;
 import java.util.List;
-import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import lombok.Data;
+
 
 @Data
 public class QueryResp {
@@ -16,4 +18,7 @@ public class QueryResp {
     private String queryText;
     private QueryResult queryResult;
     private List<SemanticParseInfo> parseInfos;
+    private List<SimilarQueryRecallResp> similarQueries;
+    private ParseTimeCostResp parseTimeCost = new ParseTimeCostResp();
+
 }

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

@@ -1,17 +1,19 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.common.pojo.QueryAuthorization;
 import com.tencent.supersonic.common.pojo.QueryColumn;
+import com.tencent.supersonic.headless.api.pojo.AggregateInfo;
+import com.tencent.supersonic.headless.api.pojo.EntityInfo;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.headless.api.pojo.response.QueryState;
+import lombok.Data;
+
 import java.util.List;
 import java.util.Map;
-import lombok.Data;
 
 @Data
 public class QueryResult {
-
-    public EntityInfo entityInfo;
-    public AggregateInfo aggregateInfo;
     private Long queryId;
     private String queryMode;
     private String querySql;
@@ -21,5 +23,9 @@ public class QueryResult {
     private SemanticParseInfo chatContext;
     private Object response;
     private List<Map<String, Object>> queryResults;
+    private String textResult;
     private Long queryTimeCost;
+    private EntityInfo entityInfo;
+    private List<SchemaElement> recommendedDimensions;
+    private AggregateInfo aggregateInfo;
 }

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

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.api.pojo.response;
 
-import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import lombok.Data;
 
 import java.util.List;

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

@@ -6,12 +6,10 @@ import lombok.Data;
 
 @Data
 @Builder
-public class SolvedQueryRecallResp {
+public class SimilarQueryRecallResp {
 
     private Long queryId;
 
-    private Integer parseId;
-
     private String queryText;
 
 }

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

@@ -1,11 +0,0 @@
-package com.tencent.supersonic.chat.api.pojo.response;
-
-import lombok.Data;
-
-@Data
-public class SqlInfo {
-
-    private String s2SQL;
-    private String correctS2SQL;
-    private String querySQL;
-}

chat/core/pom.xml

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

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

@@ -1,49 +0,0 @@
-package com.tencent.supersonic.chat.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.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Data
-public class Agent extends RecordInfo {
-
-    private Integer id;
-    private Integer enableSearch;
-    private String name;
-    private String description;
-
-    //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) {
-            return Lists.newArrayList();
-        }
-        List<Map> toolList = (List) map.get("tools");
-        return toolList.stream()
-                .filter(tool -> {
-                            if (Objects.isNull(type)) {
-                                return true;
-                            }
-                            return type.name().equals(tool.get("type"));
-                        }
-                )
-                .map(JSONObject::toJSONString)
-                .collect(Collectors.toList());
-    }
-
-    public boolean enableSearch() {
-        return enableSearch != null && enableSearch == 1;
-    }
-
-}

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
-}

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;
-
-}

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;
-
-}

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;
-}

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

@@ -1,25 +0,0 @@
-package com.tencent.supersonic.chat.config;
-
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Data
-public class LLMParserConfig {
-
-
-    @Value("${llm.parser.url:}")
-    private String url;
-
-    @Value("${query2sql.path:/query2sql}")
-    private String queryToSqlPath;
-
-    @Value("${dimension.topn:5}")
-    private Integer dimensionTopN;
-
-    @Value("${metric.topn:5}")
-    private Integer metricTopN;
-
-}

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

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

chat/core/src/main/java/com/tencent/supersonic/chat/corrector/BaseSemanticCorrector.java

@@ -1,131 +0,0 @@
-package com.tencent.supersonic.chat.corrector;
-
-import com.tencent.supersonic.chat.api.component.SemanticCorrector;
-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;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * basic semantic correction functionality, offering common methods and an
- * abstract method called doCorrect
- */
-@Slf4j
-public abstract class BaseSemanticCorrector implements SemanticCorrector {
-
-    public void correct(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
-        try {
-            if (StringUtils.isBlank(semanticParseInfo.getSqlInfo().getCorrectS2SQL())) {
-                return;
-            }
-            doCorrect(queryReq, 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(QueryReq queryReq, SemanticParseInfo semanticParseInfo);
-
-    protected Map<String, String> getFieldNameMap(Set<Long> modelIds) {
-
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
-
-        List<SchemaElement> dbAllFields = new ArrayList<>();
-        dbAllFields.addAll(semanticSchema.getMetrics());
-        dbAllFields.addAll(semanticSchema.getDimensions());
-
-        // support fieldName and field alias
-        Map<String, String> result = dbAllFields.stream()
-                .filter(entry -> modelIds.contains(entry.getModel()))
-                .flatMap(schemaElement -> {
-                    Set<String> elements = new HashSet<>();
-                    elements.add(schemaElement.getName());
-                    if (!CollectionUtils.isEmpty(schemaElement.getAlias())) {
-                        elements.addAll(schemaElement.getAlias());
-                    }
-                    return elements.stream();
-                })
-                .collect(Collectors.toMap(a -> a, a -> a, (k1, k2) -> k1));
-        result.put(TimeDimensionEnum.DAY.getChName(), TimeDimensionEnum.DAY.getChName());
-        result.put(TimeDimensionEnum.MONTH.getChName(), TimeDimensionEnum.MONTH.getChName());
-        result.put(TimeDimensionEnum.WEEK.getChName(), TimeDimensionEnum.WEEK.getChName());
-
-        result.put(TimeDimensionEnum.DAY.getName(), TimeDimensionEnum.DAY.getChName());
-        result.put(TimeDimensionEnum.MONTH.getName(), TimeDimensionEnum.MONTH.getChName());
-        result.put(TimeDimensionEnum.WEEK.getName(), TimeDimensionEnum.WEEK.getChName());
-
-        return result;
-    }
-
-    protected void addFieldsToSelect(SemanticParseInfo semanticParseInfo, String correctS2SQL) {
-        Set<String> selectFields = new HashSet<>(SqlParserSelectHelper.getSelectFields(correctS2SQL));
-        Set<String> needAddFields = new HashSet<>(SqlParserSelectHelper.getGroupByFields(correctS2SQL));
-        needAddFields.addAll(SqlParserSelectHelper.getOrderByFields(correctS2SQL));
-
-        // If there is no aggregate function in the S2SQL statement and
-        // there is a data field in 'WHERE' statement, add the field to the 'SELECT' statement.
-        if (!SqlParserSelectFunctionHelper.hasAggregateFunction(correctS2SQL)) {
-            List<String> whereFields = SqlParserSelectHelper.getWhereFields(correctS2SQL);
-            List<String> timeChNameList = TimeDimensionEnum.getChNameList();
-            Set<String> timeFields = whereFields.stream().filter(field -> timeChNameList.contains(field))
-                    .collect(Collectors.toSet());
-            needAddFields.addAll(timeFields);
-        }
-
-        if (CollectionUtils.isEmpty(selectFields) || CollectionUtils.isEmpty(needAddFields)) {
-            return;
-        }
-
-        needAddFields.removeAll(selectFields);
-        String replaceFields = SqlParserAddHelper.addFieldsToSelect(correctS2SQL, new ArrayList<>(needAddFields));
-        semanticParseInfo.getSqlInfo().setCorrectS2SQL(replaceFields);
-    }
-
-    protected void addAggregateToMetric(SemanticParseInfo semanticParseInfo) {
-        //add aggregate to all metric
-        String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
-        Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();
-
-        List<SchemaElement> metrics = getMetricElements(modelIds);
-
-        Map<String, String> metricToAggregate = metrics.stream()
-                .map(schemaElement -> {
-                    if (Objects.isNull(schemaElement.getDefaultAgg())) {
-                        schemaElement.setDefaultAgg(AggregateTypeEnum.SUM.name());
-                    }
-                    return schemaElement;
-                }).collect(Collectors.toMap(a -> a.getName(), a -> a.getDefaultAgg(), (k1, k2) -> k1));
-
-        if (CollectionUtils.isEmpty(metricToAggregate)) {
-            return;
-        }
-        String aggregateSql = SqlParserAddHelper.addAggregateToField(correctS2SQL, metricToAggregate);
-        semanticParseInfo.getSqlInfo().setCorrectS2SQL(aggregateSql);
-    }
-
-    protected List<SchemaElement> getMetricElements(Set<Long> modelIds) {
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
-        return semanticSchema.getMetrics(modelIds);
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/corrector/FromCorrector.java

@@ -1,17 +0,0 @@
-package com.tencent.supersonic.chat.corrector;
-
-import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class FromCorrector extends BaseSemanticCorrector {
-
-    @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
-        String modelName = semanticParseInfo.getModel().getName();
-        SqlParserReplaceHelper.replaceTable(semanticParseInfo.getSqlInfo().getCorrectS2SQL(), modelName);
-    }
-
-}

chat/core/src/main/java/com/tencent/supersonic/chat/corrector/GroupByCorrector.java

@@ -1,91 +0,0 @@
-package com.tencent.supersonic.chat.corrector;
-
-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;
-
-/**
- * Perform SQL corrections on the "group by" section in S2SQL.
- */
-@Slf4j
-public class GroupByCorrector extends BaseSemanticCorrector {
-
-    @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
-
-        addGroupByFields(semanticParseInfo);
-
-    }
-
-    private void addGroupByFields(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();
-        //add alias field name
-        Set<String> dimensions = semanticSchema.getDimensions(modelIds).stream()
-                .flatMap(
-                        schemaElement -> {
-                            Set<String> elements = new HashSet<>();
-                            elements.add(schemaElement.getName());
-                            if (!CollectionUtils.isEmpty(schemaElement.getAlias())) {
-                                elements.addAll(schemaElement.getAlias());
-                            }
-                            return elements.stream();
-                        }
-                ).collect(Collectors.toSet());
-        dimensions.add(TimeDimensionEnum.DAY.getChName());
-
-        List<String> selectFields = SqlParserSelectHelper.getSelectFields(correctS2SQL);
-
-        if (CollectionUtils.isEmpty(selectFields) || CollectionUtils.isEmpty(dimensions)) {
-            return;
-        }
-        // if only date in select not add group by.
-        if (selectFields.size() == 1 && selectFields.contains(TimeDimensionEnum.DAY.getChName())) {
-            return;
-        }
-        if (SqlParserSelectHelper.hasGroupBy(correctS2SQL)) {
-            log.info("not add group by ,exist group by in correctS2SQL:{}", correctS2SQL);
-            return;
-        }
-
-        List<String> aggregateFields = SqlParserSelectHelper.getAggregateFields(correctS2SQL);
-        Set<String> groupByFields = selectFields.stream()
-                .filter(field -> dimensions.contains(field))
-                .filter(field -> {
-                    if (!CollectionUtils.isEmpty(aggregateFields) && aggregateFields.contains(field)) {
-                        return false;
-                    }
-                    return true;
-                })
-                .collect(Collectors.toSet());
-        semanticParseInfo.getSqlInfo().setCorrectS2SQL(SqlParserAddHelper.addGroupBy(correctS2SQL, groupByFields));
-
-        addAggregate(semanticParseInfo);
-    }
-
-    private void addAggregate(SemanticParseInfo semanticParseInfo) {
-        List<String> sqlGroupByFields = SqlParserSelectHelper.getGroupByFields(
-                semanticParseInfo.getSqlInfo().getCorrectS2SQL());
-        if (CollectionUtils.isEmpty(sqlGroupByFields)) {
-            return;
-        }
-        addAggregateToMetric(semanticParseInfo);
-    }
-}

chat/core/src/main/java/com/tencent/supersonic/chat/corrector/HavingCorrector.java

@@ -1,66 +0,0 @@
-package com.tencent.supersonic.chat.corrector;
-
-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.stream.Collectors;
-
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.expression.Expression;
-import org.springframework.util.CollectionUtils;
-
-/**
- * Perform SQL corrections on the "Having" section in S2SQL.
- */
-@Slf4j
-public class HavingCorrector extends BaseSemanticCorrector {
-
-    @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
-
-        //add aggregate to all metric
-        addHaving(semanticParseInfo);
-
-        //add having expression filed to select
-        addHavingToSelect(semanticParseInfo);
-
-    }
-
-    private void addHaving(SemanticParseInfo semanticParseInfo) {
-        Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();
-
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
-
-        Set<String> metrics = semanticSchema.getMetrics(modelIds).stream()
-                .map(schemaElement -> schemaElement.getName()).collect(Collectors.toSet());
-
-        if (CollectionUtils.isEmpty(metrics)) {
-            return;
-        }
-        String havingSql = SqlParserAddHelper.addHaving(semanticParseInfo.getSqlInfo().getCorrectS2SQL(), metrics);
-        semanticParseInfo.getSqlInfo().setCorrectS2SQL(havingSql);
-    }
-
-    private void addHavingToSelect(SemanticParseInfo semanticParseInfo) {
-        String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
-        if (!SqlParserSelectFunctionHelper.hasAggregateFunction(correctS2SQL)) {
-            return;
-        }
-        List<Expression> havingExpressionList = SqlParserSelectHelper.getHavingExpression(correctS2SQL);
-        if (!CollectionUtils.isEmpty(havingExpressionList)) {
-            String replaceSql = SqlParserAddHelper.addFunctionToSelect(correctS2SQL, havingExpressionList);
-            semanticParseInfo.getSqlInfo().setCorrectS2SQL(replaceSql);
-        }
-        return;
-    }
-
-
-}