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

* [improvement][semantic-fe] Add model alias setting & Add view permission restrictions to the model permission management tab.
[improvement][semantic-fe] Add permission control to the action buttons for the main domain; apply high sensitivity filtering to the authorization of metrics/dimensions.
[improvement][semantic-fe] Optimize the editing mode in the dimension/metric/datasource components to use the modelId stored in the database for data, instead of relying on the data from the state manager.

* [improvement][semantic-fe] Add time granularity setting in the data source configuration.

* [improvement][semantic-fe] Dictionary import for dimension values supported in Q&A visibility

* [improvement][semantic-fe] Modification of data source creation prompt wording"

* [improvement][semantic-fe] metric market experience optimization

* [improvement][semantic-fe] enhance the analysis of metric trends

* [improvement][semantic-fe] optimize the presentation of metric trend permissions

* [improvement][semantic-fe] add metric trend download functionality

* [improvement][semantic-fe] fix the dimension initialization issue in metric correlation

* [improvement][semantic-fe] Fix the issue of database changes not taking effect when creating based on an SQL data source.

* [improvement][semantic-fe] Optimizing pagination logic and some CSS styles

* [improvement][semantic-fe] Fixing the API for the indicator list by changing "current" to "pageNum"

* [improvement][semantic-fe] Fixing the default value setting for the indicator list

* [improvement][semantic-fe] Adding batch operations for indicators/dimensions/models

* [improvement][semantic-fe] Replacing the single status update API for indicators/dimensions with a batch update API

* [improvement][semantic-fe] Redesigning the indicator homepage to incorporate trend charts and table functionality for indicators

* [improvement][semantic-fe] Optimizing the logic for setting dimension values and editing data sources, and adding system settings functionality

* [improvement][semantic-fe] Upgrading antd version to 5.x, extracting the batch operation button component, optimizing the interaction for system settings, and expanding the configuration generation types for list-to-select component.

* [improvement][semantic-fe] Adding the ability to filter dimensions based on whether they are tags or not.

* [improvement][semantic-fe] Adding the ability to edit relationships between models in the canvas.

* [improvement][semantic-fe] Updating the datePicker component to use dayjs instead.

* [improvement][semantic-fe] Fixing the issue with passing the model ID for dimensions in the indicator market.

* [improvement][semantic-fe] Fixing the abnormal state of the popup when creating a model.

* [improvement][semantic-fe] Adding permission logic for bulk operations in the indicator market.

* [improvement][semantic-fe] Adding the ability to download and transpose data.

* [improvement][semantic-fe] Fixing the initialization issue with the date selection component in the indicator details page when switching time granularity.

* [improvement][semantic-fe] Fixing the logic error in the dimension value setting.

* [improvement][semantic-fe] Fixing the synchronization issue with the question and answer settings information.

* [improvement][semantic-fe] Optimizing the canvas functionality for better performance and user experience.

* [improvement][semantic-fe] Optimizing the update process for drawing model relationship edges in the canvas.

* [improvement][semantic-fe] Changing the line type for canvas connections.

* [improvement][semantic-fe] Replacing the initialization variable from "semantic" to "headless".

* [improvement][semantic-fe] Fixing the missing migration issue for default drill-down dimension configuration in model editing. Additionally, optimizing the data retrieval method for initializing fields in the model.

* [improvement][semantic-fe] Updating the logic for the fieldName.

* [improvement][semantic-fe] Adjusting the position of the metrics tab.

* [improvement][semantic-fe] Changing the 字段名称 to 英文名称.

* [improvement][semantic-fe] Fix metric measurement deletion.

* [improvement][semantic-fe] UI optimization for metric details page.

* [improvement][semantic-fe] UI optimization for metric details page.

* [improvement][semantic-fe] UI adjustment for metric details page.

* [improvement][semantic-fe] The granularity field in the time type of model editing now supports setting it as empty.

* [improvement][semantic-fe] Added field type and metric type to the metric creation options.

* [improvement][semantic-fe] The organization structure selection feature has been added to the permission management.

* [improvement][semantic-fe] Improved user experience for the metric list.

* [improvement][semantic-fe] fix update the metric list.

.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: supersonic CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+    - name: Cache Maven packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: Test with Maven
+      run: mvn test

CHANGELOG.md

@@ -4,6 +4,14 @@
 - "Breaking Changes" describes any changes that may break existing functionality or cause
   compatibility issues with previous versions.
 
+## SuperSonic [0.8.4] - 2024-01-19
+
+### Added
+- support creating derived metrics.
+  - Support creating metrics using three methods: by measure, metric, and field expressions.
+- added support for postgresql data source.
+- code adjustment and abstract optimization for chat and headless.
+
 ## SuperSonic [0.8.2] - 2023-12-18
 
 ### Added

README.md

@@ -1,5 +1,7 @@
 [中文介绍](README_CN.md) | [文档中心](https://github.com/tencentmusic/supersonic/wiki)
 
+![Java CI](https://github.com/tencentmusic/supersonic/workflows/supersonic%20CI/badge.svg)
+
 # SuperSonic (超音数)
 
 **SuperSonic is the next-generation LLM-powered data analytics platform that integrates ChatBI and HeadlessBI**. SuperSonic provides a chat interface that empowers users to query data using natural language and visualize the results with suitable charts. To enable such experience, the only thing necessary is to build logical semantic models (definition of entities/metrics/dimensions/tags, along with their meaning, context and relationships) on top of physical data models, and **no data modification or copying** is required. Meanwhile, SuperSonic is designed to be **highly extensible**, allowing custom functionalities to be added and configured with Java SPI.

assembly/bin/supersonic-build.sh

@@ -19,7 +19,7 @@ if [ $? -ne 0 ]; then
 fi
 
 #2. move package to build
-cp $baseDir/../launchers/semantic/target/*.tar.gz ${buildDir}/supersonic-semantic.tar.gz
+cp $baseDir/../launchers/headless/target/*.tar.gz ${buildDir}/supersonic-headless.tar.gz
 cp $baseDir/../launchers/chat/target/*.tar.gz ${buildDir}/supersonic-chat.tar.gz
 cp $baseDir/../launchers/standalone/target/*.tar.gz ${buildDir}/supersonic-standalone.tar.gz
 
@@ -38,7 +38,7 @@ fi
 cd $buildDir
 tar xvf supersonic-webapp.tar.gz
 mv supersonic-webapp webapp
-cp -fr webapp ../../launchers/semantic/target/classes
+cp -fr webapp ../../launchers/headless/target/classes
 cp -fr webapp ../../launchers/chat/target/classes
 cp -fr webapp ../../launchers/standalone/target/classes
 rm -fr  ${buildDir}/webapp
@@ -55,4 +55,4 @@ fi
 rm -fr $runtimeDir/supersonic*
 moveAllToRuntime
 setEnvToWeb chat
-setEnvToWeb semantic
+setEnvToWeb headless

assembly/bin/supersonic-common.sh

@@ -10,11 +10,11 @@ runtimeDir=$baseDir/../runtime
 buildDir=$baseDir/build
 
 readonly CHAT_APP_NAME="supersonic_chat"
-readonly SEMANTIC_APP_NAME="supersonic_semantic"
+readonly HEADLESS_APP_NAME="supersonic_headless"
 readonly PYLLM_APP_NAME="supersonic_pyllm"
 readonly STANDALONE_APP_NAME="supersonic_standalone"
 readonly CHAT_SERVICE="chat"
-readonly SEMANTIC_SERVICE="semantic"
+readonly HEADLESS_SERVICE="headless"
 readonly PYLLM_SERVICE="pyllm"
 readonly STANDALONE_SERVICE="standalone"
 readonly PYLLM_HOST="127.0.0.1"
@@ -46,7 +46,7 @@ function moveAllToRuntime {
   mv ${buildDir}/supersonic-webapp ${buildDir}/webapp
 
   moveToRuntime chat
-  moveToRuntime semantic
+  moveToRuntime headless
   moveToRuntime standalone
   rm -fr  ${buildDir}/webapp
 }

assembly/bin/supersonic-daemon.sh

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

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

@@ -24,4 +24,13 @@ public class AuthenticationConfig {
     @Value("${authentication.token.http.header.key:Authorization}")
     private String tokenHttpHeaderKey;
 
+    @Value("${authentication.app.appId:appId}")
+    private String appId;
+
+    @Value("${authentication.app.timestamp:timestamp}")
+    private String timestamp;
+
+    @Value("${authentication.app.signature:signature}")
+    private String signature;
+
 }

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

@@ -28,6 +28,11 @@ public class User {
         return new User(1L, "admin", "admin", "admin@email", 1);
     }
 
+    public static User getAppUser(int appId) {
+        String name = String.format("app_%s", appId);
+        return new User(1L, name, name, "", 1);
+    }
+
     public String getDisplayName() {
         return StringUtils.isBlank(displayName) ? name : displayName;
     }

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

@@ -4,11 +4,15 @@ import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Set;
 
 public interface UserService {
 
+    User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse);
+
     List<String> getUserNames();
 
     List<User> getUserList();

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

@@ -2,6 +2,11 @@ package com.tencent.supersonic.auth.api.authentication.utils;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
+import com.tencent.supersonic.common.pojo.SysParameter;
+import com.tencent.supersonic.common.service.SysParameterService;
+import com.tencent.supersonic.common.util.ContextUtils;
+import org.springframework.util.CollectionUtils;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -14,7 +19,14 @@ public final class UserHolder {
     }
 
     public static User findUser(HttpServletRequest request, HttpServletResponse response) {
-        return REPO.findUser(request, response);
+        User user = REPO.findUser(request, response);
+        SysParameterService sysParameterService = ContextUtils.getBean(SysParameterService.class);
+        SysParameter sysParameter = sysParameterService.getSysParameter();
+        if (!CollectionUtils.isEmpty(sysParameter.getAdmins())
+                && sysParameter.getAdmins().contains(user.getName())) {
+            user.setIsAdmin(1);
+        }
+        return user;
     }
 
 }

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

@@ -44,7 +44,17 @@ public class DefaultUserAdaptor implements UserAdaptor {
 
     @Override
     public List<Organization> getOrganizationTree() {
-        return Lists.newArrayList();
+        Organization superSonic = new Organization("1", "0",
+                "SuperSonic", "SuperSonic", Lists.newArrayList(), true);
+        Organization hr = new Organization("2", "1",
+                "Hr", "SuperSonic/Hr", Lists.newArrayList(), false);
+        Organization sales = new Organization("3", "1",
+                "Sales", "SuperSonic/Sales", Lists.newArrayList(), false);
+        Organization marketing = new Organization("4", "1",
+                "Marketing", "SuperSonic/Marketing", Lists.newArrayList(), false);
+        List<Organization> subOrganization = Lists.newArrayList(hr, sales, marketing);
+        superSonic.setSubOrganizations(subOrganization);
+        return Lists.newArrayList(superSonic);
     }
 
     private User convert(UserDO userDO) {

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

@@ -5,16 +5,17 @@ import com.tencent.supersonic.auth.api.authentication.constant.UserConstants;
 import com.tencent.supersonic.auth.authentication.service.UserServiceImpl;
 import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils;
 import com.tencent.supersonic.common.util.S2ThreadContext;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.catalina.connector.RequestFacade;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
 import org.springframework.web.servlet.HandlerInterceptor;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
 
 
 public abstract class AuthenticationInterceptor implements HandlerInterceptor {
@@ -58,6 +59,11 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor {
         return "true".equalsIgnoreCase(internal);
     }
 
+    protected boolean isAppRequest(HttpServletRequest request) {
+        String appId = request.getHeader(authenticationConfig.getAppId());
+        return StringUtils.isNotBlank(appId);
+    }
+
     protected void reflectSetparam(HttpServletRequest request, String key, String value) {
         try {
             if (request instanceof StandardMultipartHttpServletRequest) {

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

@@ -10,12 +10,12 @@ import com.tencent.supersonic.common.pojo.exception.AccessException;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.S2ThreadContext;
 import com.tencent.supersonic.common.util.ThreadContext;
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.method.HandlerMethod;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
 
 @Slf4j
 public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor {
@@ -35,7 +35,10 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor
             setFakerUser(request);
             return true;
         }
-
+        if (isAppRequest(request)) {
+            setFakerUser(request);
+            return true;
+        }
         if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();

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")
@@ -31,7 +31,7 @@ public class UserController {
 
     @GetMapping("/getCurrentUser")
     public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
-        return UserHolder.findUser(httpServletRequest, httpServletResponse);
+        return userService.getCurrentUser(httpServletRequest, httpServletResponse);
     }
 
     @GetMapping("/getUserNames")

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

@@ -4,15 +4,39 @@ import com.tencent.supersonic.auth.api.authentication.pojo.Organization;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.request.UserReq;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
+import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.auth.authentication.utils.ComponentFactory;
+import com.tencent.supersonic.common.pojo.SysParameter;
+import com.tencent.supersonic.common.service.SysParameterService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Set;
 
-import org.springframework.stereotype.Service;
-
 @Service
 public class UserServiceImpl implements UserService {
 
+    private SysParameterService sysParameterService;
+
+    public UserServiceImpl(SysParameterService sysParameterService) {
+        this.sysParameterService = sysParameterService;
+    }
+
+    @Override
+    public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
+        if (user != null) {
+            SysParameter sysParameter = sysParameterService.getSysParameter();
+            if (!CollectionUtils.isEmpty(sysParameter.getAdmins())
+                    && sysParameter.getAdmins().contains(user.getName())) {
+                user.setIsAdmin(1);
+            }
+        }
+        return user;
+    }
+
     @Override
     public List<String> getUserNames() {
         return ComponentFactory.getUserAdaptor().getUserNames();

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/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/SemanticParseInfo.java

@@ -1,9 +1,9 @@
 package com.tencent.supersonic.chat.api.pojo;
 
 
+import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
 import com.tencent.supersonic.chat.api.pojo.response.EntityInfo;
-import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.pojo.ModelCluster;
 import com.tencent.supersonic.common.pojo.Order;

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

@@ -1,15 +1,15 @@
 package com.tencent.supersonic.chat.api.pojo;
 
-import org.springframework.util.CollectionUtils;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.springframework.util.CollectionUtils;
 
 public class SemanticSchema implements Serializable {
 
@@ -117,7 +117,8 @@ public class SemanticSchema implements Serializable {
 
     public List<SchemaElement> getTags(Set<Long> modelIds) {
         List<SchemaElement> tags = new ArrayList<>();
-        modelSchemaList.stream().filter(schemaElement -> modelIds.contains(schemaElement.getModel()))
+        modelSchemaList.stream().filter(schemaElement ->
+                        modelIds.contains(schemaElement.getModel().getModel()))
                 .forEach(d -> tags.addAll(d.getTags()));
         return tags;
     }
@@ -139,6 +140,11 @@ public class SemanticSchema implements Serializable {
         return entities;
     }
 
+    public List<SchemaElement> getEntities(Set<Long> modelIds) {
+        List<SchemaElement> entities = getEntities();
+        return getElementsByModelId(modelIds, entities);
+    }
+
     private List<SchemaElement> getElementsByModelId(Set<Long> modelIds, List<SchemaElement> elements) {
         return elements.stream()
                 .filter(schemaElement -> modelIds.contains(schemaElement.getModel()))
@@ -154,7 +160,8 @@ public class SemanticSchema implements Serializable {
     private Optional<SchemaElement> getElementsByNameOrAlias(String name, List<SchemaElement> elements) {
         return elements.stream()
                 .filter(schemaElement ->
-                    name.equals(schemaElement.getName()) || schemaElement.getAlias().contains(name)
+                        name.equals(schemaElement.getName()) || (Objects.nonNull(schemaElement.getAlias())
+                                && schemaElement.getAlias().contains(name))
                 ).findFirst();
     }
 

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

@@ -2,7 +2,7 @@ package com.tencent.supersonic.chat.api.pojo.response;
 
 
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
-import com.tencent.supersonic.chat.api.pojo.request.ChatDefaultConfigReq;
+import com.tencent.supersonic.chat.api.pojo.request.ChatDefaultConfigReq.TimeMode;
 import com.tencent.supersonic.common.pojo.Constants;
 import lombok.Data;
 
@@ -26,6 +26,6 @@ public class ChatDefaultRichConfigResp {
      */
     private String period = Constants.DAY;
 
-    private ChatDefaultConfigReq.TimeMode timeMode;
+    private TimeMode timeMode;
 
 }

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

@@ -17,4 +17,6 @@ public class QueryResp {
     private QueryResult queryResult;
     private List<SemanticParseInfo> parseInfos;
     private List<SimilarQueryRecallResp> similarQueries;
+
+
 }

chat/core/pom.xml

@@ -22,6 +22,69 @@
             <artifactId>spring-context</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.hankcs</groupId>
+            <artifactId>hanlp</artifactId>
+            <version>${hanlp.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client</artifactId>
+            <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-hdfs</artifactId>
+            <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -72,17 +135,12 @@
         </dependency>
         <dependency>
             <groupId>com.tencent.supersonic</groupId>
-            <artifactId>chat-knowledge</artifactId>
+            <artifactId>headless-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.tencent.supersonic</groupId>
-            <artifactId>semantic-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.tencent.supersonic</groupId>
-            <artifactId>semantic-query</artifactId>
+            <artifactId>headless-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -104,6 +162,12 @@
             <version>${mockito-inline.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.tencent.supersonic</groupId>
+            <artifactId>headless-server</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

chat/core/src/main/java/com/hankcs/hanlp/collection/trie/bintrie/BaseNode.java

@@ -1,8 +1,8 @@
 package com.hankcs.hanlp.collection.trie.bintrie;
 
 import com.hankcs.hanlp.corpus.io.ByteArray;
+import com.tencent.supersonic.chat.core.knowledge.LoadRemoveService;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.knowledge.service.LoadRemoveService;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.ObjectInput;

chat/core/src/main/java/com/hankcs/hanlp/seg/common/Term.java

@@ -3,7 +3,7 @@ package com.hankcs.hanlp.seg.common;
 import com.hankcs.hanlp.corpus.tag.Nature;
 import com.hankcs.hanlp.dictionary.CoreDictionary;
 import com.hankcs.hanlp.dictionary.CustomDictionary;
-import com.tencent.supersonic.knowledge.utils.HanlpHelper;
+import com.tencent.supersonic.chat.core.utils.HanlpHelper;
 import lombok.Data;
 import lombok.ToString;
 

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/core/agent/Agent.java

@@ -1,15 +1,18 @@
-package com.tencent.supersonic.chat.agent;
+package com.tencent.supersonic.chat.core.agent;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;
-import java.util.Objects;
-import lombok.Data;
-import org.springframework.util.CollectionUtils;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.Data;
+import org.springframework.util.CollectionUtils;
 
 @Data
 public class Agent extends RecordInfo {
@@ -19,10 +22,13 @@ public class Agent extends RecordInfo {
     private String name;
     private String description;
 
-    //0 offline, 1 online
+    /**
+     * 0 offline, 1 online
+     */
     private Integer status;
     private List<String> examples;
     private String agentConfig;
+
     public List<String> getTools(AgentToolType type) {
         Map map = JSONObject.parseObject(agentConfig, Map.class);
         if (CollectionUtils.isEmpty(map) || map.get("tools") == null) {
@@ -45,4 +51,27 @@ public class Agent extends RecordInfo {
         return enableSearch != null && enableSearch == 1;
     }
 
+    public static boolean containsAllModel(Set<Long> detectModelIds) {
+        return !CollectionUtils.isEmpty(detectModelIds) && detectModelIds.contains(-1L);
+    }
+
+    public List<NL2SQLTool> getParserTools(AgentToolType agentToolType) {
+        List<String> tools = this.getTools(agentToolType);
+        if (CollectionUtils.isEmpty(tools)) {
+            return Lists.newArrayList();
+        }
+        return tools.stream().map(tool -> JSONObject.parseObject(tool, NL2SQLTool.class))
+                .collect(Collectors.toList());
+    }
+
+    public Set<Long> getModelIds(AgentToolType agentToolType) {
+        List<NL2SQLTool> commonAgentTools = getParserTools(agentToolType);
+        if (CollectionUtils.isEmpty(commonAgentTools)) {
+            return new HashSet<>();
+        }
+        return commonAgentTools.stream().map(NL2SQLTool::getModelIds)
+                .filter(modelIds -> !CollectionUtils.isEmpty(modelIds))
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+    }
 }

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.agent;
+package com.tencent.supersonic.chat.core.agent;
 
 public enum AgentToolType {
     NL2SQL_RULE,

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

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

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

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;
 
 import com.tencent.supersonic.common.pojo.Constants;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;
 
 import java.util.List;
 import lombok.AllArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;
 
 import java.util.List;
 import lombok.Data;

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

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

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;
 
 
 import lombok.Data;
@@ -16,10 +16,12 @@ public class LLMParserConfig {
     @Value("${query2sql.path:/query2sql}")
     private String queryToSqlPath;
 
-    @Value("${dimension.topn:5}")
+    @Value("${dimension.topn:10}")
     private Integer dimensionTopN;
 
-    @Value("${metric.topn:5}")
+    @Value("${metric.topn:10}")
     private Integer metricTopN;
 
+    @Value("${all.model:false}")
+    private Boolean allModel;
 }

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

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.config;
 
-import com.tencent.supersonic.knowledge.utils.HanlpHelper;
+import com.tencent.supersonic.chat.core.utils.HanlpHelper;
 import java.io.FileNotFoundException;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.chat.config;
+package com.tencent.supersonic.chat.core.config;
 
-import com.tencent.supersonic.chat.query.llm.s2sql.LLMReq.SqlGenerationMode;
+import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.SqlGenerationMode;
 import com.tencent.supersonic.common.service.SysParameterService;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -64,18 +64,21 @@ public class OptimizationConfig {
     @Value("${s2SQL.use.switch:true}")
     private boolean useS2SqlSwitch;
 
-    @Value("${text2sql.example.num:10}")
+    @Value("${text2sql.example.num:15}")
     private int text2sqlExampleNum;
 
-    @Value("${text2sql.fewShots.num:5}")
+    @Value("${text2sql.fewShots.num:10}")
     private int text2sqlFewShotsNum;
 
-    @Value("${text2sql.self.consistency.num:2}")
+    @Value("${text2sql.self.consistency.num:5}")
     private int text2sqlSelfConsistencyNum;
 
     @Value("${text2sql.collection.name:text2dsl_agent_collection}")
     private String text2sqlCollectionName;
 
+    @Value("${parse.show.count:3}")
+    private Integer parseShowCount;
+
     @Autowired
     private SysParameterService sysParameterService;
 
@@ -147,6 +150,10 @@ public class OptimizationConfig {
         return convertValue("s2SQL.generation", SqlGenerationMode.class, sqlGenerationMode);
     }
 
+    public Integer getParseShowCount() {
+        return convertValue("parse.show.count", Integer.class, parseShowCount);
+    }
+
     public <T> T convertValue(String paramName, Class<T> targetType, T defaultValue) {
         try {
             String value = sysParameterService.getSysParameter().getParameterByName(paramName);

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

@@ -1,22 +1,14 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;
 
-import com.tencent.supersonic.chat.api.component.SemanticCorrector;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.knowledge.service.SchemaService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.util.CollectionUtils;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -24,6 +16,10 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.springframework.util.CollectionUtils;
 
 /**
  * basic semantic correction functionality, offering common methods and an
@@ -32,23 +28,23 @@ import java.util.stream.Collectors;
 @Slf4j
 public abstract class BaseSemanticCorrector implements SemanticCorrector {
 
-    public void correct(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void correct(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
         try {
             if (StringUtils.isBlank(semanticParseInfo.getSqlInfo().getCorrectS2SQL())) {
                 return;
             }
-            doCorrect(queryReq, semanticParseInfo);
+            doCorrect(queryContext, semanticParseInfo);
             log.info("sqlCorrection:{} sql:{}", this.getClass().getSimpleName(), semanticParseInfo.getSqlInfo());
         } catch (Exception e) {
             log.error(String.format("correct error,sqlInfo:%s", semanticParseInfo.getSqlInfo()), e);
         }
     }
 
-    public abstract void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo);
+    public abstract void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo);
 
-    protected Map<String, String> getFieldNameMap(Set<Long> modelIds) {
+    protected Map<String, String> getFieldNameMap(QueryContext queryContext, Set<Long> modelIds) {
 
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
 
         List<SchemaElement> dbAllFields = new ArrayList<>();
         dbAllFields.addAll(semanticSchema.getMetrics());
@@ -101,12 +97,12 @@ public abstract class BaseSemanticCorrector implements SemanticCorrector {
         semanticParseInfo.getSqlInfo().setCorrectS2SQL(replaceFields);
     }
 
-    protected void addAggregateToMetric(SemanticParseInfo semanticParseInfo) {
+    protected void addAggregateToMetric(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
         //add aggregate to all metric
         String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
         Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();
 
-        List<SchemaElement> metrics = getMetricElements(modelIds);
+        List<SchemaElement> metrics = getMetricElements(queryContext, modelIds);
 
         Map<String, String> metricToAggregate = metrics.stream()
                 .map(schemaElement -> {
@@ -131,8 +127,8 @@ public abstract class BaseSemanticCorrector implements SemanticCorrector {
         semanticParseInfo.getSqlInfo().setCorrectS2SQL(aggregateSql);
     }
 
-    protected List<SchemaElement> getMetricElements(Set<Long> modelIds) {
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+    protected List<SchemaElement> getMetricElements(QueryContext queryContext, Set<Long> modelIds) {
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
         return semanticSchema.getMetrics(modelIds);
     }
 

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

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

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

@@ -1,21 +1,18 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;
 
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.knowledge.service.SchemaService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Perform SQL corrections on the "Group by" section in S2SQL.
@@ -24,19 +21,19 @@ import java.util.stream.Collectors;
 public class GroupByCorrector extends BaseSemanticCorrector {
 
     @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
 
-        addGroupByFields(semanticParseInfo);
+        addGroupByFields(queryContext, semanticParseInfo);
 
     }
 
-    private void addGroupByFields(SemanticParseInfo semanticParseInfo) {
+    private void addGroupByFields(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
         Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();
 
         //add dimension group by
         SqlInfo sqlInfo = semanticParseInfo.getSqlInfo();
         String correctS2SQL = sqlInfo.getCorrectS2SQL();
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
         //add alias field name
         Set<String> dimensions = semanticSchema.getDimensions(modelIds).stream()
                 .flatMap(
@@ -77,15 +74,15 @@ public class GroupByCorrector extends BaseSemanticCorrector {
                 .collect(Collectors.toSet());
         semanticParseInfo.getSqlInfo().setCorrectS2SQL(SqlParserAddHelper.addGroupBy(correctS2SQL, groupByFields));
 
-        addAggregate(semanticParseInfo);
+        addAggregate(queryContext, semanticParseInfo);
     }
 
-    private void addAggregate(SemanticParseInfo semanticParseInfo) {
+    private void addAggregate(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
         List<String> sqlGroupByFields = SqlParserSelectHelper.getGroupByFields(
                 semanticParseInfo.getSqlInfo().getCorrectS2SQL());
         if (CollectionUtils.isEmpty(sqlGroupByFields)) {
             return;
         }
-        addAggregateToMetric(semanticParseInfo);
+        addAggregateToMetric(queryContext, semanticParseInfo);
     }
 }

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

@@ -1,18 +1,14 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;
 
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.knowledge.service.SchemaService;
-
-import java.util.Set;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
-
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import org.springframework.util.CollectionUtils;
@@ -24,20 +20,20 @@ import org.springframework.util.CollectionUtils;
 public class HavingCorrector extends BaseSemanticCorrector {
 
     @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
 
         //add aggregate to all metric
-        addHaving(semanticParseInfo);
+        addHaving(queryContext, semanticParseInfo);
 
         //add having expression filed to select
         addHavingToSelect(semanticParseInfo);
 
     }
 
-    private void addHaving(SemanticParseInfo semanticParseInfo) {
+    private void addHaving(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
         Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();
 
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
 
         Set<String> metrics = semanticSchema.getMetrics(modelIds).stream()
                 .map(schemaElement -> schemaElement.getName()).collect(Collectors.toSet());

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

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;
 
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.SqlInfo;
-import com.tencent.supersonic.chat.parser.sql.llm.ParseResult;
-import com.tencent.supersonic.chat.query.llm.s2sql.LLMReq.ElementValue;
+import com.tencent.supersonic.chat.core.parser.sql.llm.ParseResult;
+import com.tencent.supersonic.chat.core.query.llm.s2sql.LLMReq.ElementValue;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.util.JsonUtil;
 import com.tencent.supersonic.common.util.jsqlparser.AggregateEnum;
@@ -24,7 +24,7 @@ import org.springframework.util.CollectionUtils;
 public class SchemaCorrector extends BaseSemanticCorrector {
 
     @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
 
         correctAggFunction(semanticParseInfo);
 
@@ -34,7 +34,7 @@ public class SchemaCorrector extends BaseSemanticCorrector {
 
         updateFieldValueByLinkingValue(semanticParseInfo);
 
-        correctFieldName(semanticParseInfo);
+        correctFieldName(queryContext, semanticParseInfo);
     }
 
     private void correctAggFunction(SemanticParseInfo semanticParseInfo) {
@@ -50,8 +50,8 @@ public class SchemaCorrector extends BaseSemanticCorrector {
         sqlInfo.setCorrectS2SQL(replaceAlias);
     }
 
-    private void correctFieldName(SemanticParseInfo semanticParseInfo) {
-        Map<String, String> fieldNameMap = getFieldNameMap(semanticParseInfo.getModel().getModelIds());
+    private void correctFieldName(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
+        Map<String, String> fieldNameMap = getFieldNameMap(queryContext, semanticParseInfo.getModel().getModelIds());
         SqlInfo sqlInfo = semanticParseInfo.getSqlInfo();
         String sql = SqlParserReplaceHelper.replaceFields(sqlInfo.getCorrectS2SQL(), fieldNameMap);
         sqlInfo.setCorrectS2SQL(sql);

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

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;
 
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +14,7 @@ import org.springframework.util.CollectionUtils;
 public class SelectCorrector extends BaseSemanticCorrector {
 
     @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
         String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
         List<String> aggregateFields = SqlParserSelectHelper.getAggregateFields(correctS2SQL);
         List<String> selectFields = SqlParserSelectHelper.getSelectFields(correctS2SQL);

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

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.chat.api.component;
+package com.tencent.supersonic.chat.core.corrector;
 
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 
 /**
  * A semantic corrector checks validity of extracted semantic information and
@@ -9,5 +9,5 @@ import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
  */
 public interface SemanticCorrector {
 
-    void correct(QueryReq queryReq, SemanticParseInfo semanticParseInfo);
+    void correct(QueryContext queryContext, SemanticParseInfo semanticParseInfo);
 }

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

@@ -1,20 +1,24 @@
-package com.tencent.supersonic.chat.corrector;
+package com.tencent.supersonic.chat.core.corrector;
 
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaValueMap;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.chat.parser.sql.llm.S2SqlDateHelper;
+import com.tencent.supersonic.chat.core.parser.sql.llm.S2SqlDateHelper;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.StringUtil;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.knowledge.service.SchemaService;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
@@ -23,13 +27,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 /**
  * Perform SQL corrections on the "Where" section in S2SQL.
  */
@@ -37,19 +34,19 @@ import java.util.stream.Collectors;
 public class WhereCorrector extends BaseSemanticCorrector {
 
     @Override
-    public void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
+    public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
 
-        addDateIfNotExist(semanticParseInfo);
+        addDateIfNotExist(queryContext, semanticParseInfo);
 
         parserDateDiffFunction(semanticParseInfo);
 
-        addQueryFilter(queryReq, semanticParseInfo);
+        addQueryFilter(queryContext, semanticParseInfo);
 
-        updateFieldValueByTechName(semanticParseInfo);
+        updateFieldValueByTechName(queryContext, semanticParseInfo);
     }
 
-    private void addQueryFilter(QueryReq queryReq, SemanticParseInfo semanticParseInfo) {
-        String queryFilter = getQueryFilter(queryReq.getQueryFilters());
+    private void addQueryFilter(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
+        String queryFilter = getQueryFilter(queryContext.getQueryFilters());
 
         String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
 
@@ -72,11 +69,11 @@ public class WhereCorrector extends BaseSemanticCorrector {
         semanticParseInfo.getSqlInfo().setCorrectS2SQL(correctS2SQL);
     }
 
-    private void addDateIfNotExist(SemanticParseInfo semanticParseInfo) {
+    private void addDateIfNotExist(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
         String correctS2SQL = semanticParseInfo.getSqlInfo().getCorrectS2SQL();
         List<String> whereFields = SqlParserSelectHelper.getWhereFields(correctS2SQL);
         if (CollectionUtils.isEmpty(whereFields) || !TimeDimensionEnum.containsZhTimeDimension(whereFields)) {
-            String currentDate = S2SqlDateHelper.getReferenceDate(semanticParseInfo.getModelId());
+            String currentDate = S2SqlDateHelper.getReferenceDate(queryContext, semanticParseInfo.getModelId());
             if (StringUtils.isNotBlank(currentDate)) {
                 correctS2SQL = SqlParserAddHelper.addParenthesisToWhere(correctS2SQL);
                 correctS2SQL = SqlParserAddHelper.addWhere(
@@ -100,8 +97,8 @@ public class WhereCorrector extends BaseSemanticCorrector {
                 .collect(Collectors.joining(Constants.AND_UPPER));
     }
 
-    private void updateFieldValueByTechName(SemanticParseInfo semanticParseInfo) {
-        SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
+    private void updateFieldValueByTechName(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
         Set<Long> modelIds = semanticParseInfo.getModel().getModelIds();
         List<SchemaElement> dimensions = semanticSchema.getDimensions(modelIds);
 

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DatabaseMapResult.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import com.google.common.base.Objects;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DictConfig.java

@@ -1,7 +1,6 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import java.util.List;
-
 import lombok.Data;
 
 

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DictUpdateMode.java

@@ -1,4 +1,5 @@
-package com.tencent.supersonic.knowledge.dictionary;
+
+package com.tencent.supersonic.chat.core.knowledge;
 
 public enum DictUpdateMode {
 

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DictWord.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import java.util.Objects;
 import lombok.Data;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DictionaryAttributeUtil.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge.dictionary;
 
 import com.hankcs.hanlp.corpus.tag.Nature;
 import com.hankcs.hanlp.dictionary.CoreDictionary;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DimValue2DictCommand.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 
 import java.util.HashMap;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DimValueDictInfo.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 
 import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/DimValueInfo.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/EmbeddingResult.java

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

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/FileHandler.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import java.util.List;
 

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/HadoopFileIOAdapter.java

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

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/HanlpMapResult.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import com.google.common.base.Objects;
 import java.util.List;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/LoadRemoveService.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.knowledge.service;
+package com.tencent.supersonic.chat.core.knowledge;
 
-import com.tencent.supersonic.knowledge.utils.NatureHelper;
+import com.tencent.supersonic.chat.core.utils.NatureHelper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/LocalFileHandler.java

@@ -1,6 +1,7 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 
+import com.tencent.supersonic.chat.core.config.LocalFileConfig;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -10,7 +11,6 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.util.List;
-
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/MapResult.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import java.io.Serializable;
 import lombok.Data;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/ModelInfoStat.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import java.io.Serializable;
 import lombok.Builder;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/MultiCustomDictionary.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import static com.hankcs.hanlp.utility.Predefine.logger;
 
@@ -15,8 +15,8 @@ import com.hankcs.hanlp.seg.common.Term;
 import com.hankcs.hanlp.utility.LexiconUtility;
 import com.hankcs.hanlp.utility.Predefine;
 import com.hankcs.hanlp.utility.TextUtility;
-import com.tencent.supersonic.knowledge.service.SearchService;
-import com.tencent.supersonic.knowledge.utils.HanlpHelper;
+import com.tencent.supersonic.chat.core.knowledge.dictionary.DictionaryAttributeUtil;
+import com.tencent.supersonic.chat.core.utils.HanlpHelper;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -353,7 +353,7 @@ public class MultiCustomDictionary extends DynamicCustomDictionary {
 
     }
 
-    public boolean insert(String word, String natureWithFrequency) {
+    public synchronized boolean insert(String word, String natureWithFrequency) {
         if (word == null) {
             return false;
         } else {

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/SearchService.java

@@ -1,27 +1,27 @@
-package com.tencent.supersonic.knowledge.service;
+package com.tencent.supersonic.chat.core.knowledge;
 
 import com.hankcs.hanlp.collection.trie.bintrie.BaseNode;
 import com.hankcs.hanlp.collection.trie.bintrie.BinTrie;
 import com.hankcs.hanlp.corpus.tag.Nature;
 import com.hankcs.hanlp.dictionary.CoreDictionary;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
+import com.hankcs.hanlp.seg.common.Term;
+import com.tencent.supersonic.chat.api.pojo.request.DimensionValueReq;
+import com.tencent.supersonic.chat.core.knowledge.dictionary.DictionaryAttributeUtil;
 import com.tencent.supersonic.common.pojo.enums.DictWordType;
-import com.tencent.supersonic.knowledge.dictionary.DictionaryAttributeUtil;
-import com.tencent.supersonic.knowledge.dictionary.HanlpMapResult;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.PriorityQueue;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-@Service
 @Slf4j
 public class SearchService {
 
@@ -156,5 +156,15 @@ public class SearchService {
             suffixTrie.remove(dictWord.getWord());
         }
     }
+
+    public static List<String> getDimensionValue(DimensionValueReq dimensionValueReq) {
+        String nature = DictWordType.NATURE_SPILT + dimensionValueReq.getModelId() + DictWordType.NATURE_SPILT
+                + dimensionValueReq.getElementID();
+        PriorityQueue<Term> terms = MultiCustomDictionary.NATURE_TO_VALUES.get(nature);
+        if (org.apache.commons.collections.CollectionUtils.isEmpty(terms)) {
+            return new ArrayList<>();
+        }
+        return terms.stream().map(term -> term.getWord()).collect(Collectors.toList());
+    }
 }
 

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/builder/BaseWordBuilder.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;
 
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
-import com.tencent.supersonic.knowledge.dictionary.DictWord;
+import com.tencent.supersonic.chat.core.knowledge.DictWord;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/builder/DimensionWordBuilder.java

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

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/builder/EntityWordBuilder.java

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

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/builder/MetricWordBuilder.java

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

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/builder/ModelWordBuilder.java

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

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/builder/ValueWordBuilder.java

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

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/builder/WordBuilderFactory.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.dictionary.builder;
+package com.tencent.supersonic.chat.core.knowledge.builder;
 
 
 import com.tencent.supersonic.common.pojo.enums.DictWordType;

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

@@ -1,10 +1,9 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.knowledge.semantic;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.tencent.supersonic.chat.api.component.SemanticInterpreter;
 import com.tencent.supersonic.chat.api.pojo.ModelSchema;
-import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

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

@@ -1,36 +1,35 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.knowledge.semantic;
 
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq;
-import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq;
-import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
-import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
-import com.tencent.supersonic.semantic.api.model.response.DomainResp;
-import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
-import com.tencent.supersonic.semantic.model.domain.DimensionService;
-import com.tencent.supersonic.semantic.model.domain.MetricService;
-import com.tencent.supersonic.semantic.query.service.QueryService;
-import com.tencent.supersonic.semantic.query.service.SchemaService;
+import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq;
+import com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.DomainResp;
+import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.server.service.DimensionService;
+import com.tencent.supersonic.headless.server.service.MetricService;
+import com.tencent.supersonic.headless.server.service.QueryService;
+import com.tencent.supersonic.headless.server.service.SchemaService;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.HashMap;
-import java.util.List;
-
 @Slf4j
 public class LocalSemanticInterpreter extends BaseSemanticInterpreter {
 
@@ -41,20 +40,20 @@ public class LocalSemanticInterpreter extends BaseSemanticInterpreter {
 
     @SneakyThrows
     @Override
-    public QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user) {
+    public SemanticQueryResp queryByStruct(QueryStructReq queryStructReq, User user) {
         if (StringUtils.isNotBlank(queryStructReq.getCorrectS2SQL())) {
-            QueryS2SQLReq queryS2SQLReq = new QueryS2SQLReq();
-            queryS2SQLReq.setSql(queryStructReq.getCorrectS2SQL());
-            queryS2SQLReq.setModelIds(queryStructReq.getModelIdSet());
-            queryS2SQLReq.setVariables(new HashMap<>());
-            return queryByS2SQL(queryS2SQLReq, user);
+            QuerySqlReq querySQLReq = new QuerySqlReq();
+            querySQLReq.setSql(queryStructReq.getCorrectS2SQL());
+            querySQLReq.setModelIds(queryStructReq.getModelIdSet());
+            querySQLReq.setParams(new ArrayList<>());
+            return queryByS2SQL(querySQLReq, user);
         }
         queryService = ContextUtils.getBean(QueryService.class);
         return queryService.queryByStructWithAuth(queryStructReq, user);
     }
 
     @Override
-    public QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) {
+    public SemanticQueryResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) {
         try {
             queryService = ContextUtils.getBean(QueryService.class);
             return queryService.queryByMultiStruct(queryMultiStructReq, user);
@@ -66,15 +65,15 @@ public class LocalSemanticInterpreter extends BaseSemanticInterpreter {
 
     @Override
     @SneakyThrows
-    public QueryResultWithSchemaResp queryByS2SQL(QueryS2SQLReq queryS2SQLReq, User user) {
+    public SemanticQueryResp queryByS2SQL(QuerySqlReq querySQLReq, User user) {
         queryService = ContextUtils.getBean(QueryService.class);
-        Object object = queryService.queryBySql(queryS2SQLReq, user);
-        return JsonUtil.toObject(JsonUtil.toString(object), QueryResultWithSchemaResp.class);
+        SemanticQueryResp object = queryService.queryBySql(querySQLReq, user);
+        return JsonUtil.toObject(JsonUtil.toString(object), SemanticQueryResp.class);
     }
 
     @Override
     @SneakyThrows
-    public QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user) {
+    public SemanticQueryResp queryDimValue(QueryDimValueReq queryDimValueReq, User user) {
         queryService = ContextUtils.getBean(QueryService.class);
         return queryService.queryDimValue(queryDimValueReq, user);
     }

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/ModelSchemaBuilder.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.knowledge.semantic;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.chat.api.pojo.ModelSchema;
@@ -6,12 +6,12 @@ import com.tencent.supersonic.chat.api.pojo.RelatedSchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SchemaValueMap;
-import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap;
-import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension;
-import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
-import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.DimValueMap;
+import com.tencent.supersonic.headless.api.pojo.RelateDimension;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;

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

@@ -1,4 +1,9 @@
-package com.tencent.supersonic.knowledge.semantic;
+package com.tencent.supersonic.chat.core.knowledge.semantic;
+
+import static com.tencent.supersonic.common.pojo.Constants.LIST_LOWER;
+import static com.tencent.supersonic.common.pojo.Constants.PAGESIZE_LOWER;
+import static com.tencent.supersonic.common.pojo.Constants.TOTAL_LOWER;
+import static com.tencent.supersonic.common.pojo.Constants.TRUE_LOWER;
 
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
@@ -6,29 +11,36 @@ import com.google.gson.Gson;
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.constant.UserConstants;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.chat.core.config.DefaultSemanticConfig;
 import com.tencent.supersonic.common.pojo.ResultData;
-import com.tencent.supersonic.common.pojo.enums.ReturnCode;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
+import com.tencent.supersonic.common.pojo.enums.ReturnCode;
 import com.tencent.supersonic.common.pojo.exception.CommonException;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
 import com.tencent.supersonic.common.util.S2ThreadContext;
 import com.tencent.supersonic.common.util.ThreadContext;
-import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq;
-import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq;
-import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
-import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
-import com.tencent.supersonic.semantic.api.model.response.DomainResp;
-import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq;
+import com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.DomainResp;
+import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
@@ -42,18 +54,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import java.net.URI;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
-
-import static com.tencent.supersonic.common.pojo.Constants.LIST_LOWER;
-import static com.tencent.supersonic.common.pojo.Constants.PAGESIZE_LOWER;
-import static com.tencent.supersonic.common.pojo.Constants.TOTAL_LOWER;
-import static com.tencent.supersonic.common.pojo.Constants.TRUE_LOWER;
-
 @Slf4j
 public class RemoteSemanticInterpreter extends BaseSemanticInterpreter {
 
@@ -61,8 +61,8 @@ public class RemoteSemanticInterpreter extends BaseSemanticInterpreter {
 
     private AuthenticationConfig authenticationConfig;
 
-    private ParameterizedTypeReference<ResultData<QueryResultWithSchemaResp>> structTypeRef =
-            new ParameterizedTypeReference<ResultData<QueryResultWithSchemaResp>>() {
+    private ParameterizedTypeReference<ResultData<SemanticQueryResp>> structTypeRef =
+            new ParameterizedTypeReference<ResultData<SemanticQueryResp>>() {
             };
 
     private ParameterizedTypeReference<ResultData<ExplainResp>> explainTypeRef =
@@ -70,13 +70,13 @@ public class RemoteSemanticInterpreter extends BaseSemanticInterpreter {
             };
 
     @Override
-    public QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user) {
+    public SemanticQueryResp queryByStruct(QueryStructReq queryStructReq, User user) {
         if (StringUtils.isNotBlank(queryStructReq.getCorrectS2SQL())) {
-            QueryS2SQLReq queryS2SQLReq = new QueryS2SQLReq();
-            queryS2SQLReq.setSql(queryStructReq.getCorrectS2SQL());
-            queryS2SQLReq.setModelIds(queryStructReq.getModelIdSet());
-            queryS2SQLReq.setVariables(new HashMap<>());
-            return queryByS2SQL(queryS2SQLReq, user);
+            QuerySqlReq querySQLReq = new QuerySqlReq();
+            querySQLReq.setSql(queryStructReq.getCorrectS2SQL());
+            querySQLReq.setModelIds(queryStructReq.getModelIdSet());
+            querySQLReq.setParams(new ArrayList<>());
+            return queryByS2SQL(querySQLReq, user);
         }
 
         DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
@@ -86,7 +86,7 @@ public class RemoteSemanticInterpreter extends BaseSemanticInterpreter {
     }
 
     @Override
-    public QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) {
+    public SemanticQueryResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) {
         DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
         return searchByRestTemplate(
                 defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getSearchByMultiStructPath(),
@@ -94,44 +94,44 @@ public class RemoteSemanticInterpreter extends BaseSemanticInterpreter {
     }
 
     @Override
-    public QueryResultWithSchemaResp queryByS2SQL(QueryS2SQLReq queryS2SQLReq, User user) {
+    public SemanticQueryResp queryByS2SQL(QuerySqlReq querySQLReq, User user) {
         DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
         return searchByRestTemplate(defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getSearchBySqlPath(),
-                new Gson().toJson(queryS2SQLReq));
+                new Gson().toJson(querySQLReq));
     }
 
-    public QueryResultWithSchemaResp searchByRestTemplate(String url, String jsonReq) {
+    public SemanticQueryResp searchByRestTemplate(String url, String jsonReq) {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         fillToken(headers);
         URI requestUrl = UriComponentsBuilder.fromHttpUrl(url).build().encode().toUri();
         HttpEntity<String> entity = new HttpEntity<>(jsonReq, headers);
         log.info("url:{},searchByRestTemplate:{}", url, entity.getBody());
-        ResultData<QueryResultWithSchemaResp> responseBody;
+        ResultData<SemanticQueryResp> responseBody;
         try {
             RestTemplate restTemplate = ContextUtils.getBean(RestTemplate.class);
 
-            ResponseEntity<ResultData<QueryResultWithSchemaResp>> responseEntity = restTemplate.exchange(
+            ResponseEntity<ResultData<SemanticQueryResp>> responseEntity = restTemplate.exchange(
                     requestUrl, HttpMethod.POST, entity, structTypeRef);
             responseBody = responseEntity.getBody();
             log.info("ApiResponse<QueryResultWithColumns> responseBody:{}", responseBody);
-            QueryResultWithSchemaResp semanticQuery = new QueryResultWithSchemaResp();
+            SemanticQueryResp schemaResp = new SemanticQueryResp();
             if (ReturnCode.SUCCESS.getCode() == responseBody.getCode()) {
-                QueryResultWithSchemaResp data = responseBody.getData();
-                semanticQuery.setColumns(data.getColumns());
-                semanticQuery.setResultList(data.getResultList());
-                semanticQuery.setSql(data.getSql());
-                semanticQuery.setQueryAuthorization(data.getQueryAuthorization());
-                return semanticQuery;
+                SemanticQueryResp data = responseBody.getData();
+                schemaResp.setColumns(data.getColumns());
+                schemaResp.setResultList(data.getResultList());
+                schemaResp.setSql(data.getSql());
+                schemaResp.setQueryAuthorization(data.getQueryAuthorization());
+                return schemaResp;
             }
         } catch (Exception e) {
-            throw new RuntimeException("search semantic interface error,url:" + url, e);
+            throw new RuntimeException("search headless interface error,url:" + url, e);
         }
         throw new CommonException(responseBody.getCode(), responseBody.getMsg());
     }
 
     @Override
-    public QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user) {
+    public SemanticQueryResp queryDimValue(QueryDimValueReq queryDimValueReq, User user) {
         DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
         return searchByRestTemplate(defaultSemanticConfig.getSemanticUrl()
                         + defaultSemanticConfig.getQueryDimValuePath(),

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

@@ -1,23 +1,23 @@
-package com.tencent.supersonic.chat.api.component;
+package com.tencent.supersonic.chat.core.knowledge.semantic;
 
 import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.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 com.tencent.supersonic.headless.api.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.response.DomainResp;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.request.QueryStructReq;
 
 import java.util.List;
 
@@ -34,13 +34,13 @@ import java.util.List;
  */
 public interface SemanticInterpreter {
 
-    QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user);
+    SemanticQueryResp queryByStruct(QueryStructReq queryStructReq, User user);
 
-    QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user);
+    SemanticQueryResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user);
 
-    QueryResultWithSchemaResp queryByS2SQL(QueryS2SQLReq queryS2SQLReq, User user);
+    SemanticQueryResp queryByS2SQL(QuerySqlReq querySQLReq, User user);
 
-    QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user);
+    SemanticQueryResp queryDimValue(QueryDimValueReq queryDimValueReq, User user);
 
     List<ModelSchema> getModelSchema();
 

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

@@ -1,14 +1,12 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
-import com.tencent.supersonic.chat.api.component.SchemaMapper;
 import com.tencent.supersonic.chat.api.pojo.ModelSchema;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
-import com.tencent.supersonic.chat.service.SemanticService;
-import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -68,10 +66,10 @@ public abstract class BaseMapper implements SchemaMapper {
         }
     }
 
-    public SchemaElement getSchemaElement(Long modelId, SchemaElementType elementType, Long elementID) {
+    public SchemaElement getSchemaElement(Long modelId, SchemaElementType elementType, Long elementID,
+            SemanticSchema semanticSchema) {
         SchemaElement element = new SchemaElement();
-        SemanticService schemaService = ContextUtils.getBean(SemanticService.class);
-        ModelSchema modelSchema = schemaService.getModelSchema(modelId);
+        ModelSchema modelSchema = semanticSchema.getModelSchemaMap().get(modelId);
         if (Objects.isNull(modelSchema)) {
             return null;
         }

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

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
-import com.tencent.supersonic.knowledge.utils.NatureHelper;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.utils.NatureHelper;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -28,7 +28,7 @@ public abstract class BaseMatchStrategy<T> implements MatchStrategy<T> {
 
     @Override
     public Map<MatchText, List<T>> match(QueryContext queryContext, List<Term> terms, Set<Long> detectModelIds) {
-        String text = queryContext.getRequest().getQueryText();
+        String text = queryContext.getQueryText();
         if (Objects.isNull(terms) || StringUtils.isEmpty(text)) {
             return null;
         }
@@ -44,7 +44,7 @@ public abstract class BaseMatchStrategy<T> implements MatchStrategy<T> {
 
     public List<T> detect(QueryContext queryContext, List<Term> terms, Set<Long> detectModelIds) {
         Map<Integer, Integer> regOffsetToLength = getRegOffsetToLength(terms);
-        String text = queryContext.getRequest().getQueryText();
+        String text = queryContext.getQueryText();
         Set<T> results = new HashSet<>();
 
         Set<String> detectSegments = new HashSet<>();
@@ -102,7 +102,7 @@ public abstract class BaseMatchStrategy<T> implements MatchStrategy<T> {
     }
 
     public List<T> getMatches(QueryContext queryContext, List<Term> terms) {
-        Set<Long> detectModelIds = mapperHelper.getModelIds(queryContext.getRequest());
+        Set<Long> detectModelIds = mapperHelper.getModelIds(queryContext.getModelId(), queryContext.getAgent());
         terms = filterByModelIds(terms, detectModelIds);
         Map<MatchText, List<T>> matchResult = match(queryContext, terms, detectModelIds);
         List<T> matches = new ArrayList<>();

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

@@ -1,13 +1,12 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
-import com.tencent.supersonic.chat.config.OptimizationConfig;
+import com.tencent.supersonic.chat.core.config.OptimizationConfig;
+import com.tencent.supersonic.chat.core.knowledge.DatabaseMapResult;
 import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.knowledge.dictionary.DatabaseMapResult;
-import com.tencent.supersonic.knowledge.service.SchemaService;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -33,14 +32,12 @@ public class DatabaseMatchStrategy extends BaseMatchStrategy<DatabaseMapResult>
     private OptimizationConfig optimizationConfig;
     @Autowired
     private MapperHelper mapperHelper;
-    @Autowired
-    private SchemaService schemaService;
     private List<SchemaElement> allElements;
 
     @Override
     public Map<MatchText, List<DatabaseMapResult>> match(QueryContext queryContext, List<Term> terms,
             Set<Long> detectModelIds) {
-        this.allElements = getSchemaElements();
+        this.allElements = getSchemaElements(queryContext);
         return super.match(queryContext, terms, detectModelIds);
     }
 
@@ -58,11 +55,11 @@ public class DatabaseMatchStrategy extends BaseMatchStrategy<DatabaseMapResult>
 
     public void detectByStep(QueryContext queryContext, Set<DatabaseMapResult> existResults, Set<Long> detectModelIds,
             Integer startIndex, Integer index, int offset) {
-        String detectSegment = queryContext.getRequest().getQueryText().substring(startIndex, index);
+        String detectSegment = queryContext.getQueryText().substring(startIndex, index);
         if (StringUtils.isBlank(detectSegment)) {
             return;
         }
-        Set<Long> modelIds = mapperHelper.getModelIds(queryContext.getRequest());
+        Set<Long> modelIds = mapperHelper.getModelIds(queryContext.getModelId(), queryContext.getAgent());
 
         Double metricDimensionThresholdConfig = getThreshold(queryContext);
 
@@ -90,10 +87,10 @@ public class DatabaseMatchStrategy extends BaseMatchStrategy<DatabaseMapResult>
         }
     }
 
-    private List<SchemaElement> getSchemaElements() {
+    private List<SchemaElement> getSchemaElements(QueryContext queryContext) {
         List<SchemaElement> allElements = new ArrayList<>();
-        allElements.addAll(schemaService.getSemanticSchema().getDimensions());
-        allElements.addAll(schemaService.getSemanticSchema().getMetrics());
+        allElements.addAll(queryContext.getSemanticSchema().getDimensions());
+        allElements.addAll(queryContext.getSemanticSchema().getMetrics());
         return allElements;
     }
 

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

@@ -1,15 +1,15 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
+import com.tencent.supersonic.chat.core.knowledge.EmbeddingResult;
+import com.tencent.supersonic.chat.core.knowledge.builder.BaseWordBuilder;
+import com.tencent.supersonic.chat.core.utils.HanlpHelper;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.embedding.Retrieval;
-import com.tencent.supersonic.knowledge.dictionary.EmbeddingResult;
-import com.tencent.supersonic.knowledge.dictionary.builder.BaseWordBuilder;
-import com.tencent.supersonic.knowledge.utils.HanlpHelper;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -23,7 +23,7 @@ public class EmbeddingMapper extends BaseMapper {
     @Override
     public void doMap(QueryContext queryContext) {
         //1. query from embedding by queryText
-        String queryText = queryContext.getRequest().getQueryText();
+        String queryText = queryContext.getQueryText();
         List<Term> terms = HanlpHelper.getTerms(queryText);
 
         EmbeddingMatchStrategy matchStrategy = ContextUtils.getBean(EmbeddingMatchStrategy.class);
@@ -43,7 +43,8 @@ public class EmbeddingMapper extends BaseMapper {
                 continue;
             }
             long modelId = Long.parseLong(modelIdStr);
-            schemaElement = getSchemaElement(modelId, schemaElement.getType(), elementId);
+            schemaElement = getSchemaElement(modelId, schemaElement.getType(), elementId,
+                    queryContext.getSemanticSchema());
             if (schemaElement == null) {
                 continue;
             }

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

@@ -1,16 +1,16 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
-import com.tencent.supersonic.chat.config.OptimizationConfig;
+import com.tencent.supersonic.chat.core.config.OptimizationConfig;
+import com.tencent.supersonic.chat.core.knowledge.EmbeddingResult;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
+import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.util.ComponentFactory;
 import com.tencent.supersonic.common.util.embedding.Retrieval;
 import com.tencent.supersonic.common.util.embedding.RetrieveQuery;
 import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
 import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
-import com.tencent.supersonic.knowledge.dictionary.EmbeddingResult;
-import com.tencent.supersonic.semantic.model.domain.listener.MetaEmbeddingListener;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -35,6 +35,9 @@ public class EmbeddingMatchStrategy extends BaseMatchStrategy<EmbeddingResult> {
     @Autowired
     private OptimizationConfig optimizationConfig;
 
+    @Autowired
+    private EmbeddingConfig embeddingConfig;
+
     private S2EmbeddingStore s2EmbeddingStore = ComponentFactory.getS2EmbeddingStore();
 
     @Override
@@ -86,7 +89,7 @@ public class EmbeddingMatchStrategy extends BaseMatchStrategy<EmbeddingResult> {
                 .build();
         // step2. retrieveQuery by detectSegment
         List<RetrieveQueryResult> retrieveQueryResults = s2EmbeddingStore.retrieveQuery(
-                MetaEmbeddingListener.COLLECTION_NAME, retrieveQuery, embeddingNumber);
+                embeddingConfig.getMetaCollectionName(), retrieveQuery, embeddingNumber);
 
         if (CollectionUtils.isEmpty(retrieveQueryResults)) {
             return;

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

@@ -1,21 +1,19 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 
 import com.tencent.supersonic.chat.api.pojo.ModelSchema;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
-import com.tencent.supersonic.chat.service.SemanticService;
-import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * A mapper capable of converting the VALUE of entity dimension values into ID types.
  */
@@ -30,7 +28,7 @@ public class EntityMapper extends BaseMapper {
             if (CollectionUtils.isEmpty(schemaElementMatchList)) {
                 continue;
             }
-            SchemaElement entity = getEntity(modelId);
+            SchemaElement entity = getEntity(modelId, queryContext);
             if (entity == null || entity.getId() == null) {
                 continue;
             }
@@ -66,9 +64,9 @@ public class EntityMapper extends BaseMapper {
         return false;
     }
 
-    private SchemaElement getEntity(Long modelId) {
-        SemanticService semanticService = ContextUtils.getBean(SemanticService.class);
-        ModelSchema modelSchema = semanticService.getModelSchema(modelId);
+    private SchemaElement getEntity(Long modelId, QueryContext queryContext) {
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
+        ModelSchema modelSchema = semanticSchema.getModelSchemaMap().get(modelId);
         if (modelSchema != null && modelSchema.getEntity() != null) {
             return modelSchema.getEntity();
         }

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

@@ -1,12 +1,11 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.chat.config.OptimizationConfig;
+import com.tencent.supersonic.chat.core.config.OptimizationConfig;
+import com.tencent.supersonic.chat.core.knowledge.HanlpMapResult;
+import com.tencent.supersonic.chat.core.knowledge.SearchService;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.knowledge.dictionary.HanlpMapResult;
-import com.tencent.supersonic.knowledge.service.SearchService;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -38,8 +37,7 @@ public class HanlpDictMatchStrategy extends BaseMatchStrategy<HanlpMapResult> {
     @Override
     public Map<MatchText, List<HanlpMapResult>> match(QueryContext queryContext, List<Term> terms,
             Set<Long> detectModelIds) {
-        QueryReq queryReq = queryContext.getRequest();
-        String text = queryReq.getQueryText();
+        String text = queryContext.getQueryText();
         if (Objects.isNull(terms) || StringUtils.isEmpty(text)) {
             return null;
         }
@@ -61,16 +59,14 @@ public class HanlpDictMatchStrategy extends BaseMatchStrategy<HanlpMapResult> {
 
     public void detectByStep(QueryContext queryContext, Set<HanlpMapResult> existResults, Set<Long> detectModelIds,
             Integer startIndex, Integer index, int offset) {
-        QueryReq queryReq = queryContext.getRequest();
-        String text = queryReq.getQueryText();
-        Integer agentId = queryReq.getAgentId();
+        String text = queryContext.getQueryText();
+        Integer agentId = queryContext.getAgentId();
         String detectSegment = text.substring(startIndex, index);
 
         // step1. pre search
         Integer oneDetectionMaxSize = optimizationConfig.getOneDetectionMaxSize();
         LinkedHashSet<HanlpMapResult> hanlpMapResults = SearchService.prefixSearch(detectSegment, oneDetectionMaxSize,
-                agentId,
-                detectModelIds).stream().collect(Collectors.toCollection(LinkedHashSet::new));
+                agentId, detectModelIds).stream().collect(Collectors.toCollection(LinkedHashSet::new));
         // step2. suffix search
         LinkedHashSet<HanlpMapResult> suffixHanlpMapResults = SearchService.suffixSearch(detectSegment,
                         oneDetectionMaxSize, agentId, detectModelIds).stream()

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

@@ -1,16 +1,16 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
+import com.tencent.supersonic.chat.core.knowledge.DatabaseMapResult;
+import com.tencent.supersonic.chat.core.knowledge.HanlpMapResult;
+import com.tencent.supersonic.chat.core.utils.HanlpHelper;
+import com.tencent.supersonic.chat.core.utils.NatureHelper;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.knowledge.dictionary.DatabaseMapResult;
-import com.tencent.supersonic.knowledge.dictionary.HanlpMapResult;
-import com.tencent.supersonic.knowledge.utils.HanlpHelper;
-import com.tencent.supersonic.knowledge.utils.NatureHelper;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -29,13 +29,13 @@ public class KeywordMapper extends BaseMapper {
 
     @Override
     public void doMap(QueryContext queryContext) {
-        String queryText = queryContext.getRequest().getQueryText();
+        String queryText = queryContext.getQueryText();
         //1.hanlpDict Match
         List<Term> terms = HanlpHelper.getTerms(queryText);
         HanlpDictMatchStrategy hanlpMatchStrategy = ContextUtils.getBean(HanlpDictMatchStrategy.class);
 
         List<HanlpMapResult> hanlpMapResults = hanlpMatchStrategy.getMatches(queryContext, terms);
-        convertHanlpMapResultToMapInfo(hanlpMapResults, queryContext.getMapInfo(), terms);
+        convertHanlpMapResultToMapInfo(hanlpMapResults, queryContext, terms);
 
         //2.database Match
         DatabaseMatchStrategy databaseMatchStrategy = ContextUtils.getBean(DatabaseMatchStrategy.class);
@@ -44,7 +44,7 @@ public class KeywordMapper extends BaseMapper {
         convertDatabaseMapResultToMapInfo(queryContext, databaseResults);
     }
 
-    private void convertHanlpMapResultToMapInfo(List<HanlpMapResult> mapResults, SchemaMapInfo schemaMap,
+    private void convertHanlpMapResultToMapInfo(List<HanlpMapResult> mapResults, QueryContext queryContext,
             List<Term> terms) {
         if (CollectionUtils.isEmpty(mapResults)) {
             return;
@@ -65,7 +65,8 @@ public class KeywordMapper extends BaseMapper {
                     continue;
                 }
                 Long elementID = NatureHelper.getElementID(nature);
-                SchemaElement element = getSchemaElement(modelId, elementType, elementID);
+                SchemaElement element = getSchemaElement(modelId, elementType, elementID,
+                        queryContext.getSemanticSchema());
                 if (element == null) {
                     continue;
                 }
@@ -81,7 +82,7 @@ public class KeywordMapper extends BaseMapper {
                         .detectWord(hanlpMapResult.getDetectWord())
                         .build();
 
-                addToSchemaMap(schemaMap, modelId, schemaElementMatch);
+                addToSchemaMap(queryContext.getMapInfo(), modelId, schemaElementMatch);
             }
         }
     }

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

@@ -1,12 +1,10 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.hankcs.hanlp.algorithm.EditDistance;
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
-import com.tencent.supersonic.chat.config.OptimizationConfig;
-import com.tencent.supersonic.chat.service.AgentService;
-import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.knowledge.utils.NatureHelper;
+import com.tencent.supersonic.chat.core.agent.Agent;
+import com.tencent.supersonic.chat.core.config.OptimizationConfig;
+import com.tencent.supersonic.chat.core.utils.NatureHelper;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -83,15 +81,14 @@ public class MapperHelper {
                 detectSegment.length());
     }
 
-    public Set<Long> getModelIds(QueryReq request) {
+    public Set<Long> getModelIds(Long modelId, Agent agent) {
 
-        Long modelId = request.getModelId();
-
-        AgentService agentService = ContextUtils.getBean(AgentService.class);
-
-        Set<Long> detectModelIds = agentService.getModelIds(request.getAgentId(), null);
+        Set<Long> detectModelIds = new HashSet<>();
+        if (Objects.nonNull(agent)) {
+            detectModelIds = agent.getModelIds(null);
+        }
         //contains all
-        if (agentService.containsAllModel(detectModelIds)) {
+        if (Agent.containsAllModel(detectModelIds)) {
             if (Objects.nonNull(modelId) && modelId > 0) {
                 Set<Long> result = new HashSet<>();
                 result.add(modelId);

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

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import java.util.Objects;
 import lombok.Builder;

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

@@ -1,16 +1,12 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
-import com.tencent.supersonic.chat.api.component.SchemaMapper;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
 import com.tencent.supersonic.chat.api.pojo.SchemaModelClusterMapInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.utils.ModelClusterBuilder;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.utils.ModelClusterBuilder;
 import com.tencent.supersonic.common.pojo.ModelCluster;
-import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.knowledge.service.SchemaService;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -27,8 +23,7 @@ public class ModelClusterMapper implements SchemaMapper {
 
     @Override
     public void map(QueryContext queryContext) {
-        SchemaService schemaService = ContextUtils.getBean(SchemaService.class);
-        SemanticSchema semanticSchema = schemaService.getSemanticSchema();
+        SemanticSchema semanticSchema = queryContext.getSemanticSchema();
         SchemaMapInfo schemaMapInfo = queryContext.getMapInfo();
         List<ModelCluster> modelClusters = buildModelClusterMatched(schemaMapInfo, semanticSchema);
         Map<String, List<SchemaElementMatch>> modelClusterElementMatches = new HashMap<>();
@@ -46,7 +41,7 @@ public class ModelClusterMapper implements SchemaMapper {
     }
 
     private List<ModelCluster> buildModelClusterMatched(SchemaMapInfo schemaMapInfo,
-                                                        SemanticSchema semanticSchema) {
+            SemanticSchema semanticSchema) {
         Set<Long> matchedModels = schemaMapInfo.getMatchedModels();
         List<ModelCluster> modelClusters = ModelClusterBuilder.buildModelClusters(semanticSchema);
         return modelClusters.stream().map(ModelCluster::getModelIds).peek(modelCluster -> {

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import java.io.Serializable;
@@ -10,10 +10,10 @@ import lombok.ToString;
 public class ModelWithSemanticType implements Serializable {
 
     private Long model;
-    private SchemaElementType semanticType;
+    private SchemaElementType schemaElementType;
 
-    public ModelWithSemanticType(Long model, SchemaElementType semanticType) {
+    public ModelWithSemanticType(Long model, SchemaElementType schemaElementType) {
         this.model = model;
-        this.semanticType = semanticType;
+        this.schemaElementType = schemaElementType;
     }
 }

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

@@ -1,31 +1,29 @@
-package com.tencent.supersonic.chat.mapper;
+package com.tencent.supersonic.chat.core.mapper;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.chat.api.component.SchemaMapper;
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
-import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
-import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
+import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
+import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
+import com.tencent.supersonic.chat.core.knowledge.builder.BaseWordBuilder;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.knowledge.dictionary.builder.BaseWordBuilder;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
 
 @Slf4j
 public class QueryFilterMapper implements SchemaMapper {
+
     private double similarity = 1.0;
 
     @Override
     public void map(QueryContext queryContext) {
-        QueryReq queryReq = queryContext.getRequest();
-        Long modelId = queryReq.getModelId();
+        Long modelId = queryContext.getModelId();
         if (modelId == null || modelId <= 0) {
             return;
         }
@@ -36,7 +34,7 @@ public class QueryFilterMapper implements SchemaMapper {
             schemaElementMatches = Lists.newArrayList();
             schemaMapInfo.setMatchedElements(modelId, schemaElementMatches);
         }
-        addValueSchemaElementMatch(queryContext, schemaElementMatches, queryReq.getQueryFilters());
+        addValueSchemaElementMatch(queryContext, schemaElementMatches);
     }
 
     private void clearOtherSchemaElementMatch(Long modelId, SchemaMapInfo schemaMapInfo) {
@@ -48,12 +46,12 @@ public class QueryFilterMapper implements SchemaMapper {
     }
 
     private List<SchemaElementMatch> addValueSchemaElementMatch(QueryContext queryContext,
-                                                                List<SchemaElementMatch> candidateElementMatches,
-                                                           QueryFilters queryFilter) {
-        if (queryFilter == null || CollectionUtils.isEmpty(queryFilter.getFilters())) {
+            List<SchemaElementMatch> candidateElementMatches) {
+        QueryFilters queryFilters = queryContext.getQueryFilters();
+        if (queryFilters == null || CollectionUtils.isEmpty(queryFilters.getFilters())) {
             return candidateElementMatches;
         }
-        for (QueryFilter filter : queryFilter.getFilters()) {
+        for (QueryFilter filter : queryFilters.getFilters()) {
             if (checkExistSameValueSchemaElementMatch(filter, candidateElementMatches)) {
                 continue;
             }
@@ -62,7 +60,7 @@ public class QueryFilterMapper implements SchemaMapper {
                     .name(String.valueOf(filter.getValue()))
                     .type(SchemaElementType.VALUE)
                     .bizName(filter.getBizName())
-                    .model(queryContext.getRequest().getModelId())
+                    .model(queryContext.getModelId())
                     .build();
             SchemaElementMatch schemaElementMatch = SchemaElementMatch.builder()
                     .element(element)
@@ -77,7 +75,7 @@ public class QueryFilterMapper implements SchemaMapper {
     }
 
     private boolean checkExistSameValueSchemaElementMatch(QueryFilter queryFilter,
-                                                          List<SchemaElementMatch> schemaElementMatches) {
+            List<SchemaElementMatch> schemaElementMatches) {
         List<SchemaElementMatch> valueSchemaElements = schemaElementMatches.stream().filter(schemaElementMatch ->
                         SchemaElementType.VALUE.equals(schemaElementMatch.getElement().getType()))
                 .collect(Collectors.toList());

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

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.chat.api.component;
+package com.tencent.supersonic.chat.core.mapper;
 
-import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 
 /**
  * A schema mapper identifies references to schema elements(metrics/dimensions/entities/values)