(improvement)(headless&chat)Move ChatContext from Headless module to Chat module.

headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java

@@ -6,7 +6,7 @@ import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.request.QueryNLReq;
 import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
 import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
-import com.tencent.supersonic.headless.server.facade.service.ChatQueryService;
+import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
 import com.tencent.supersonic.headless.server.facade.service.RetrieveService;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 public class ChatQueryApiController {
 
     @Autowired
-    private ChatQueryService chatQueryService;
+    private ChatLayerService chatLayerService;
 
     @Autowired
     private RetrieveService retrieveService;
@@ -45,7 +45,7 @@ public class ChatQueryApiController {
                              HttpServletRequest request,
                              HttpServletResponse response) {
         queryNLReq.setUser(UserHolder.findUser(request, response));
-        return chatQueryService.performMapping(queryNLReq);
+        return chatLayerService.performMapping(queryNLReq);
     }
 
     @PostMapping("/chat/parse")
@@ -53,7 +53,7 @@ public class ChatQueryApiController {
             HttpServletRequest request,
             HttpServletResponse response) throws Exception {
         queryNLReq.setUser(UserHolder.findUser(request, response));
-        return chatQueryService.performParsing(queryNLReq);
+        return chatLayerService.performParsing(queryNLReq);
     }
 
     @PostMapping("/chat")
@@ -61,7 +61,7 @@ public class ChatQueryApiController {
                                  HttpServletRequest request,
                                  HttpServletResponse response) throws Exception {
         User user = UserHolder.findUser(request, response);
-        ParseResp parseResp = chatQueryService.performParsing(queryNLReq);
+        ParseResp parseResp = chatLayerService.performParsing(queryNLReq);
         if (parseResp.getState().equals(ParseResp.ParseState.COMPLETED)) {
             SemanticParseInfo parseInfo = parseResp.getSelectedParses().get(0);
             QuerySqlReq sqlReq = new QuerySqlReq();

headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java

@@ -3,7 +3,7 @@ package com.tencent.supersonic.headless.server.facade.rest;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.headless.api.pojo.request.QueryMapReq;
-import com.tencent.supersonic.headless.server.facade.service.ChatQueryService;
+import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,14 +20,14 @@ import javax.servlet.http.HttpServletResponse;
 public class MetaDiscoveryApiController {
 
     @Autowired
-    private ChatQueryService chatQueryService;
+    private ChatLayerService chatLayerService;
 
     @PostMapping("map")
     public Object map(@RequestBody QueryMapReq queryMapReq,
                       HttpServletRequest request, HttpServletResponse response) throws Exception {
         User user = UserHolder.findUser(request, response);
         queryMapReq.setUser(user);
-        return chatQueryService.map(queryMapReq);
+        return chatLayerService.map(queryMapReq);
     }
 
 }

headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java

@@ -7,7 +7,7 @@ import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
 import com.tencent.supersonic.headless.api.pojo.request.QuerySqlsReq;
 import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.server.facade.service.ChatQueryService;
+import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -33,7 +33,7 @@ public class SqlQueryApiController {
     private SemanticLayerService semanticLayerService;
 
     @Autowired
-    private ChatQueryService chatQueryService;
+    private ChatLayerService chatLayerService;
 
     @PostMapping("/sql")
     public Object queryBySql(@RequestBody QuerySqlReq querySqlReq,
@@ -42,7 +42,7 @@ public class SqlQueryApiController {
         User user = UserHolder.findUser(request, response);
         String sql = querySqlReq.getSql();
         querySqlReq.setSql(StringUtil.replaceBackticks(sql));
-        chatQueryService.correct(querySqlReq, user);
+        chatLayerService.correct(querySqlReq, user);
         return semanticLayerService.queryByReq(querySqlReq, user);
     }
 
@@ -56,7 +56,7 @@ public class SqlQueryApiController {
                     QuerySqlReq querySqlReq = new QuerySqlReq();
                     BeanUtils.copyProperties(querySqlsReq, querySqlReq);
                     querySqlReq.setSql(StringUtil.replaceBackticks(sql));
-                    chatQueryService.correct(querySqlReq, user);
+                    chatLayerService.correct(querySqlReq, user);
                     return querySqlReq;
                 }).collect(Collectors.toList());
 
@@ -82,7 +82,7 @@ public class SqlQueryApiController {
                     QuerySqlReq querySqlReq = new QuerySqlReq();
                     BeanUtils.copyProperties(querySqlsReq, querySqlReq);
                     querySqlReq.setSql(StringUtil.replaceBackticks(sql));
-                    chatQueryService.correct(querySqlReq, user);
+                    chatLayerService.correct(querySqlReq, user);
                     return querySqlReq;
                 }).collect(Collectors.toList());
         List<SemanticQueryResp> semanticQueryRespList = new ArrayList<>();
@@ -104,7 +104,7 @@ public class SqlQueryApiController {
         User user = UserHolder.findUser(request, response);
         String sql = querySqlReq.getSql();
         querySqlReq.setSql(StringUtil.replaceBackticks(sql));
-        return chatQueryService.validate(querySqlReq, user);
+        return chatLayerService.validate(querySqlReq, user);
     }
 
 }

headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/ChatLayerService.java

@@ -1,7 +1,6 @@
 package com.tencent.supersonic.headless.server.facade.service;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.SqlEvaluation;
 import com.tencent.supersonic.headless.api.pojo.request.DimensionValueReq;
 import com.tencent.supersonic.headless.api.pojo.request.QueryDataReq;
@@ -16,14 +15,12 @@ import com.tencent.supersonic.headless.api.pojo.response.QueryResult;
 /***dd
  * SemanticLayerService for query and search
  */
-public interface ChatQueryService {
+public interface ChatLayerService {
 
     MapResp performMapping(QueryNLReq queryNLReq);
 
     ParseResp performParsing(QueryNLReq queryNLReq);
 
-    SemanticParseInfo queryContext(Integer chatId);
-
     QueryResult executeDirectQuery(QueryDataReq queryData, User user) throws Exception;
 
     Object queryDimensionValue(DimensionValueReq dimensionValueReq, User user) throws Exception;

headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java

@@ -22,7 +22,6 @@ import com.tencent.supersonic.headless.chat.mapper.MatchText;
 import com.tencent.supersonic.headless.chat.mapper.ModelWithSemanticType;
 import com.tencent.supersonic.headless.chat.mapper.SearchMatchStrategy;
 import com.tencent.supersonic.headless.server.facade.service.RetrieveService;
-import com.tencent.supersonic.headless.server.web.service.ChatContextService;
 import com.tencent.supersonic.headless.server.web.service.DataSetService;
 import com.tencent.supersonic.headless.server.web.service.SchemaService;
 import lombok.extern.slf4j.Slf4j;
@@ -52,9 +51,6 @@ public class RetrieveServiceImpl implements RetrieveService {
     @Autowired
     private DataSetService dataSetService;
 
-    @Autowired
-    private ChatContextService chatContextService;
-
     @Autowired
     private SchemaService schemaService;
 
@@ -135,7 +131,7 @@ public class RetrieveServiceImpl implements RetrieveService {
 
         List<Long> possibleDataSets = NatureHelper.selectPossibleDataSets(originals);
 
-        Long contextDataset = chatContextService.getContextDataset(queryCtx.getChatId());
+        Long contextDataset = queryCtx.getContextParseInfo().getDataSetId();
 
         log.debug("possibleDataSets:{},dataSetInfoStat:{},contextDataset:{}",
                 possibleDataSets, dataSetInfoStat, contextDataset);

headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java

@@ -44,7 +44,6 @@ import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
 import com.tencent.supersonic.headless.api.pojo.response.QueryResult;
 import com.tencent.supersonic.headless.api.pojo.response.QueryState;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.chat.ChatContext;
 import com.tencent.supersonic.headless.chat.ChatQueryContext;
 import com.tencent.supersonic.headless.chat.corrector.GrammarCorrector;
 import com.tencent.supersonic.headless.chat.corrector.SchemaCorrector;
@@ -57,12 +56,11 @@ import com.tencent.supersonic.headless.chat.knowledge.helper.NatureHelper;
 import com.tencent.supersonic.headless.chat.query.QueryManager;
 import com.tencent.supersonic.headless.chat.query.SemanticQuery;
 import com.tencent.supersonic.headless.chat.query.llm.s2sql.LLMSqlQuery;
-import com.tencent.supersonic.headless.server.facade.service.ChatQueryService;
+import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import com.tencent.supersonic.headless.server.utils.ChatWorkflowEngine;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 import com.tencent.supersonic.headless.server.utils.ComponentFactory;
-import com.tencent.supersonic.headless.server.web.service.ChatContextService;
 import com.tencent.supersonic.headless.server.web.service.DataSetService;
 import com.tencent.supersonic.headless.server.web.service.SchemaService;
 import lombok.extern.slf4j.Slf4j;
@@ -98,14 +96,12 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-public class ChatQueryServiceImpl implements ChatQueryService {
+public class S2ChatLayerService implements ChatLayerService {
     @Autowired
     private SemanticLayerService semanticLayerService;
     @Autowired
     private SchemaService schemaService;
     @Autowired
-    private ChatContextService chatContextService;
-    @Autowired
     private KnowledgeBaseService knowledgeBaseService;
     @Autowired
     private DataSetService dataSetService;
@@ -141,14 +137,11 @@ public class ChatQueryServiceImpl implements ChatQueryService {
 
     @Override
     public ParseResp performParsing(QueryNLReq queryNLReq) {
-        ParseResp parseResult = new ParseResp(queryNLReq.getChatId(), queryNLReq.getQueryText());
-        // build queryContext and chatContext
+        ParseResp parseResult = new ParseResp(queryNLReq.getQueryText());
+        // build queryContext
         ChatQueryContext queryCtx = buildChatQueryContext(queryNLReq);
 
-        // in order to support multi-turn conversation, chat context is needed
-        ChatContext chatCtx = chatContextService.getOrCreateContext(queryNLReq.getChatId());
-
-        chatWorkflowEngine.execute(queryCtx, chatCtx, parseResult);
+        chatWorkflowEngine.execute(queryCtx, parseResult);
 
         List<SemanticParseInfo> parseInfos = queryCtx.getCandidateQueries().stream()
                 .map(SemanticQuery::getParseInfo).collect(Collectors.toList());
@@ -173,12 +166,6 @@ public class ChatQueryServiceImpl implements ChatQueryService {
         return queryCtx;
     }
 
-    @Override
-    public SemanticParseInfo queryContext(Integer chatId) {
-        ChatContext context = chatContextService.getOrCreateContext(chatId);
-        return context.getParseInfo();
-    }
-
     //mainly used for executing after revising filters,for example:"fans_cnt>=100000"->"fans_cnt>500000",
     //"style='流行'"->"style in ['流行','爱国']"
     @Override

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/ChatContextDO.java

@@ -1,16 +0,0 @@
-package com.tencent.supersonic.headless.server.persistence.dataobject;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.Instant;
-
-@Data
-public class ChatContextDO implements Serializable {
-
-    private Integer chatId;
-    private Instant modifiedAt;
-    private String user;
-    private String queryText;
-    private String semanticParse;
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/StatisticsDO.java

@@ -1,54 +0,0 @@
-package com.tencent.supersonic.headless.server.persistence.dataobject;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-
-import java.util.Date;
-
-@Data
-@Builder
-@NoArgsConstructor
-@Getter
-@AllArgsConstructor
-public class StatisticsDO {
-    /**
-     * questionId
-     */
-    private Long questionId;
-
-    /**
-     * chatId
-     */
-    private Long chatId;
-
-    /**
-     * createTime
-     */
-    private Date createTime;
-
-    /**
-     * queryText
-     */
-    private String queryText;
-
-    /**
-     * userName
-     */
-    private String userName;
-
-
-    /**
-     * interface
-     */
-    private String interfaceName;
-
-    /**
-     * cost
-     */
-    private Integer cost;
-
-    private Integer type;
-}

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

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

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/mapper/StatisticsMapper.java

@@ -1,12 +0,0 @@
-package com.tencent.supersonic.headless.server.persistence.mapper;
-
-import com.tencent.supersonic.headless.server.persistence.dataobject.StatisticsDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface StatisticsMapper {
-    boolean batchSaveStatistics(@Param("list") List<StatisticsDO> list);
-}

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

@@ -1,11 +0,0 @@
-package com.tencent.supersonic.headless.server.persistence.repository;
-
-import com.tencent.supersonic.headless.chat.ChatContext;
-
-public interface ChatContextRepository {
-
-    ChatContext getOrCreateContext(Integer chatId);
-
-    void updateContext(ChatContext chatCtx);
-
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/ChatContextRepositoryImpl.java

@@ -1,71 +0,0 @@
-package com.tencent.supersonic.headless.server.persistence.repository.impl;
-
-import com.google.gson.Gson;
-import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.headless.chat.ChatContext;
-import com.tencent.supersonic.headless.server.persistence.dataobject.ChatContextDO;
-import com.tencent.supersonic.headless.server.persistence.mapper.ChatContextMapper;
-import com.tencent.supersonic.headless.server.persistence.repository.ChatContextRepository;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Repository;
-
-@Repository
-@Primary
-@Slf4j
-public class ChatContextRepositoryImpl implements ChatContextRepository {
-
-
-    private final ChatContextMapper chatContextMapper;
-
-    public ChatContextRepositoryImpl(ChatContextMapper chatContextMapper) {
-        this.chatContextMapper = chatContextMapper;
-    }
-
-    @Override
-    public ChatContext getOrCreateContext(Integer chatId) {
-        ChatContextDO context = chatContextMapper.getContextByChatId(chatId);
-        if (context == null) {
-            ChatContext chatContext = new ChatContext();
-            chatContext.setChatId(chatId);
-            return chatContext;
-        }
-        return cast(context);
-    }
-
-    @Override
-    public void updateContext(ChatContext chatCtx) {
-        ChatContextDO context = cast(chatCtx);
-        if (chatContextMapper.getContextByChatId(chatCtx.getChatId()) == null) {
-            chatContextMapper.addContext(context);
-        } else {
-            chatContextMapper.updateContext(context);
-        }
-    }
-
-    private ChatContext cast(ChatContextDO contextDO) {
-        ChatContext chatContext = new ChatContext();
-        chatContext.setChatId(contextDO.getChatId());
-        chatContext.setUser(contextDO.getUser());
-        chatContext.setQueryText(contextDO.getQueryText());
-        if (contextDO.getSemanticParse() != null && !contextDO.getSemanticParse().isEmpty()) {
-            SemanticParseInfo semanticParseInfo = JsonUtil.toObject(contextDO.getSemanticParse(),
-                    SemanticParseInfo.class);
-            chatContext.setParseInfo(semanticParseInfo);
-        }
-        return chatContext;
-    }
-
-    private ChatContextDO cast(ChatContext chatContext) {
-        ChatContextDO chatContextDO = new ChatContextDO();
-        chatContextDO.setChatId(chatContext.getChatId());
-        chatContextDO.setQueryText(chatContext.getQueryText());
-        chatContextDO.setUser(chatContext.getUser());
-        if (chatContext.getParseInfo() != null) {
-            Gson g = new Gson();
-            chatContextDO.setSemanticParse(g.toJson(chatContext.getParseInfo()));
-        }
-        return chatContextDO;
-    }
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java

@@ -14,7 +14,6 @@ import com.tencent.supersonic.headless.api.pojo.SemanticSchema;
 import com.tencent.supersonic.headless.api.pojo.SqlInfo;
 import com.tencent.supersonic.headless.api.pojo.request.QueryFilter;
 import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
-import com.tencent.supersonic.headless.chat.ChatContext;
 import com.tencent.supersonic.headless.chat.ChatQueryContext;
 import com.tencent.supersonic.headless.chat.query.SemanticQuery;
 import com.tencent.supersonic.headless.server.web.service.SchemaService;
@@ -40,7 +39,7 @@ import java.util.stream.Collectors;
 public class ParseInfoProcessor implements ResultProcessor {
 
     @Override
-    public void process(ParseResp parseResp, ChatQueryContext chatQueryContext, ChatContext chatContext) {
+    public void process(ParseResp parseResp, ChatQueryContext chatQueryContext) {
         List<SemanticQuery> candidateQueries = chatQueryContext.getCandidateQueries();
         if (CollectionUtils.isEmpty(candidateQueries)) {
             return;

headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ResultProcessor.java

@@ -1,7 +1,6 @@
 package com.tencent.supersonic.headless.server.processor;
 
 import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
-import com.tencent.supersonic.headless.chat.ChatContext;
 import com.tencent.supersonic.headless.chat.ChatQueryContext;
 
 /**
@@ -9,6 +8,6 @@ import com.tencent.supersonic.headless.chat.ChatQueryContext;
  */
 public interface ResultProcessor {
 
-    void process(ParseResp parseResp, ChatQueryContext chatQueryContext, ChatContext chatContext);
+    void process(ParseResp parseResp, ChatQueryContext chatQueryContext);
 
 }

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ChatWorkflowEngine.java

@@ -7,7 +7,6 @@ import com.tencent.supersonic.headless.api.pojo.enums.ChatWorkflowState;
 import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq;
 import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticTranslateResp;
-import com.tencent.supersonic.headless.chat.ChatContext;
 import com.tencent.supersonic.headless.chat.ChatQueryContext;
 import com.tencent.supersonic.headless.chat.corrector.SemanticCorrector;
 import com.tencent.supersonic.headless.chat.mapper.SchemaMapper;
@@ -39,7 +38,7 @@ public class ChatWorkflowEngine {
     private List<SemanticCorrector> semanticCorrectors = ComponentFactory.getSemanticCorrectors();
     private List<ResultProcessor> resultProcessors = ComponentFactory.getResultProcessors();
 
-    public void execute(ChatQueryContext queryCtx, ChatContext chatCtx, ParseResp parseResult) {
+    public void execute(ChatQueryContext queryCtx, ParseResp parseResult) {
         queryCtx.setChatWorkflowState(ChatWorkflowState.MAPPING);
         while (queryCtx.getChatWorkflowState() != ChatWorkflowState.FINISHED) {
             switch (queryCtx.getChatWorkflowState()) {
@@ -54,7 +53,7 @@ public class ChatWorkflowEngine {
                     }
                     break;
                 case PARSING:
-                    performParsing(queryCtx, chatCtx);
+                    performParsing(queryCtx);
                     if (queryCtx.getCandidateQueries().size() == 0) {
                         parseResult.setState(ParseResp.ParseState.FAILED);
                         parseResult.setErrorMsg("No semantic queries can be parsed out.");
@@ -75,7 +74,7 @@ public class ChatWorkflowEngine {
                     break;
                 case PROCESSING:
                 default:
-                    performProcessing(queryCtx, chatCtx, parseResult);
+                    performProcessing(queryCtx, parseResult);
                     if (parseResult.getState().equals(ParseResp.ParseState.PENDING)) {
                         parseResult.setState(ParseResp.ParseState.COMPLETED);
                     }
@@ -92,9 +91,9 @@ public class ChatWorkflowEngine {
         }
     }
 
-    private void performParsing(ChatQueryContext queryCtx, ChatContext chatCtx) {
+    private void performParsing(ChatQueryContext queryCtx) {
         semanticParsers.forEach(parser -> {
-            parser.parse(queryCtx, chatCtx);
+            parser.parse(queryCtx);
             log.debug("{} result:{}", parser.getClass().getSimpleName(), JsonUtil.toString(queryCtx));
         });
     }
@@ -116,9 +115,9 @@ public class ChatWorkflowEngine {
         }
     }
 
-    private void performProcessing(ChatQueryContext queryCtx, ChatContext chatCtx, ParseResp parseResult) {
+    private void performProcessing(ChatQueryContext queryCtx, ParseResp parseResult) {
         resultProcessors.forEach(processor -> {
-            processor.process(parseResult, queryCtx, chatCtx);
+            processor.process(parseResult, queryCtx);
         });
     }
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java

@@ -1,18 +0,0 @@
-package com.tencent.supersonic.headless.server.web.service;
-
-import com.tencent.supersonic.headless.chat.ChatContext;
-
-public interface ChatContextService {
-
-    /***
-     * get the model from context
-     * @param chatId
-     * @return
-     */
-    Long getContextDataset(Integer chatId);
-
-    ChatContext getOrCreateContext(Integer chatId);
-
-    void updateContext(ChatContext chatCtx);
-
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java

@@ -1,50 +0,0 @@
-package com.tencent.supersonic.headless.server.web.service.impl;
-
-import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.headless.chat.ChatContext;
-import com.tencent.supersonic.headless.server.persistence.repository.ChatContextRepository;
-import com.tencent.supersonic.headless.server.web.service.ChatContextService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-
-@Slf4j
-@Service
-public class ChatContextServiceImpl implements ChatContextService {
-
-    private ChatContextRepository chatContextRepository;
-
-    public ChatContextServiceImpl(ChatContextRepository chatContextRepository) {
-        this.chatContextRepository = chatContextRepository;
-    }
-
-    @Override
-    public Long getContextDataset(Integer chatId) {
-        if (Objects.isNull(chatId)) {
-            return null;
-        }
-        ChatContext chatContext = getOrCreateContext(chatId);
-        if (Objects.isNull(chatContext)) {
-            return null;
-        }
-        SemanticParseInfo originalSemanticParse = chatContext.getParseInfo();
-        if (Objects.nonNull(originalSemanticParse) && Objects.nonNull(originalSemanticParse.getDataSetId())) {
-            return originalSemanticParse.getDataSetId();
-        }
-        return null;
-    }
-
-    @Override
-    public ChatContext getOrCreateContext(Integer chatId) {
-        return chatContextRepository.getOrCreateContext(chatId);
-    }
-
-    @Override
-    public void updateContext(ChatContext chatCtx) {
-        log.debug("save ChatContext {}", chatCtx);
-        chatContextRepository.updateContext(chatCtx);
-    }
-
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java

@@ -44,7 +44,7 @@ import com.tencent.supersonic.headless.api.pojo.response.MapInfoResp;
 import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
 import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import com.tencent.supersonic.headless.api.pojo.response.TagItem;
-import com.tencent.supersonic.headless.server.facade.service.ChatQueryService;
+import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
 import com.tencent.supersonic.headless.server.persistence.dataobject.CollectDO;
 import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO;
 import com.tencent.supersonic.headless.server.persistence.dataobject.MetricQueryDefaultConfigDO;
@@ -111,7 +111,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
 
     private TagMetaService tagMetaService;
 
-    private ChatQueryService chatQueryService;
+    private ChatLayerService chatLayerService;
 
     public MetricServiceImpl(MetricRepository metricRepository,
                              ModelService modelService,
@@ -121,7 +121,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
                              ApplicationEventPublisher eventPublisher,
                              DimensionService dimensionService,
                              TagMetaService tagMetaService,
-                             @Lazy ChatQueryService chatQueryService) {
+                             @Lazy ChatLayerService chatLayerService) {
         this.metricRepository = metricRepository;
         this.modelService = modelService;
         this.aliasGenerateHelper = aliasGenerateHelper;
@@ -130,7 +130,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         this.dataSetService = dataSetService;
         this.dimensionService = dimensionService;
         this.tagMetaService = tagMetaService;
-        this.chatQueryService = chatQueryService;
+        this.chatLayerService = chatLayerService;
     }
 
     @Override
@@ -299,7 +299,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         queryMapReq.setQueryText(pageMetricReq.getKey());
         queryMapReq.setUser(user);
         queryMapReq.setMapModeEnum(MapModeEnum.LOOSE);
-        MapInfoResp mapMeta = chatQueryService.map(queryMapReq);
+        MapInfoResp mapMeta = chatLayerService.map(queryMapReq);
         Map<String, DataSetMapInfo> dataSetMapInfoMap = mapMeta.getDataSetMapInfo();
         if (CollectionUtils.isEmpty(dataSetMapInfoMap)) {
             return metricRespPageInfo;

headless/server/src/main/resources/mapper/ChatContextMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
-<mapper namespace="com.tencent.supersonic.headless.server.persistence.mapper.ChatContextMapper">
-
-    <resultMap id="ChatContextDO"
-               type="com.tencent.supersonic.headless.server.persistence.dataobject.ChatContextDO">
-        <id column="chat_id" property="chatId"/>
-        <result column="modified_at" property="modifiedAt"/>
-        <result column="user" property="user"/>
-        <result column="query_text" property="queryText"/>
-        <result column="semantic_parse" property="semanticParse"/>
-        <!--<result column="ext_data" property="extData"/>-->
-    </resultMap>
-
-    <select id="getContextByChatId"  resultMap="ChatContextDO">
-        select *
-        from s2_chat_context where chat_id=#{chatId} limit 1
-    </select>
-
-    <insert id="addContext" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.ChatContextDO" >
-        insert into s2_chat_context  (chat_id,user,query_text,semantic_parse) values (#{chatId}, #{user},#{queryText}, #{semanticParse})
-    </insert>
-    <update id="updateContext">
-        update  s2_chat_context  set query_text=#{queryText},semantic_parse=#{semanticParse} where chat_id=#{chatId}
-    </update>
-
-</mapper>

headless/server/src/main/resources/mapper/StatisticsMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
-<mapper namespace="com.tencent.supersonic.headless.server.persistence.mapper.StatisticsMapper">
-
-    <resultMap id="Statistics" type="com.tencent.supersonic.headless.server.persistence.dataobject.StatisticsDO">
-        <id column="question_id" property="questionId"/>
-        <result column="chat_id" property="chatId"/>
-        <result column="user_name" property="userName"/>
-        <result column="query_text" property="queryText"/>
-        <result column="interface_name" property="interfaceName"/>
-        <result column="cost" property="cost"/>
-        <result column="type" property="type"/>
-        <result column="create_time" property="createTime"/>
-    </resultMap>
-
-    <insert id="batchSaveStatistics" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.StatisticsDO">
-        insert into s2_chat_statistics
-               (question_id,chat_id, user_name, query_text, interface_name,cost,type ,create_time)
-        values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.questionId}, #{item.chatId}, #{item.userName}, #{item.queryText}, #{item.interfaceName}, #{item.cost}, #{item.type},#{item.createTime})
-        </foreach>
-    </insert>
-
-</mapper>

headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java

@@ -16,7 +16,7 @@ import com.tencent.supersonic.headless.api.pojo.enums.MetricType;
 import com.tencent.supersonic.headless.api.pojo.request.MetricReq;
 import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
 import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
-import com.tencent.supersonic.headless.server.facade.service.ChatQueryService;
+import com.tencent.supersonic.headless.server.facade.service.ChatLayerService;
 import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO;
 import com.tencent.supersonic.headless.server.persistence.repository.MetricRepository;
 import com.tencent.supersonic.headless.server.utils.AliasGenerateHelper;
@@ -77,10 +77,10 @@ public class MetricServiceImplTest {
         DataSetService dataSetService = Mockito.mock(DataSetServiceImpl.class);
         DimensionService dimensionService = Mockito.mock(DimensionService.class);
         TagMetaService tagMetaService = Mockito.mock(TagMetaService.class);
-        ChatQueryService chatQueryService = Mockito.mock(ChatQueryService.class);
+        ChatLayerService chatLayerService = Mockito.mock(ChatLayerService.class);
         return new MetricServiceImpl(metricRepository, modelService, aliasGenerateHelper,
                 collectService, dataSetService, eventPublisher, dimensionService,
-                tagMetaService, chatQueryService);
+                tagMetaService, chatLayerService);
     }
 
     private MetricReq buildMetricReq() {