diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java index 942757c94..1998c17e4 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java @@ -5,7 +5,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.tencent.supersonic.common.pojo.ChatApp; import com.tencent.supersonic.common.pojo.RecordInfo; -import com.tencent.supersonic.common.pojo.enums.ChatModelType; import lombok.Data; import org.springframework.util.CollectionUtils; @@ -22,12 +21,8 @@ public class Agent extends RecordInfo { private Integer status; private List examples; private Integer enableSearch; - private Integer enableMemoryReview; private String toolConfig; - private Map chatModelConfig = Collections.EMPTY_MAP; private Map chatAppConfig = Collections.EMPTY_MAP; - private PromptConfig promptConfig; - private MultiTurnConfig multiTurnConfig; private VisualConfig visualConfig; public List getTools(AgentToolType type) { @@ -49,7 +44,7 @@ public class Agent extends RecordInfo { } public boolean enableMemoryReview() { - return enableMemoryReview != null && enableMemoryReview == 1; + return false; } public static boolean containsAllModel(Set detectViewIds) { diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatModelController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatModelController.java index cd0db1912..f670163b5 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatModelController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatModelController.java @@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.chat.api.pojo.response.ChatModelTypeResp; import com.tencent.supersonic.chat.server.config.ChatModelParameters; import com.tencent.supersonic.chat.server.pojo.ChatModel; import com.tencent.supersonic.chat.server.service.ChatModelService; @@ -13,15 +12,12 @@ import com.tencent.supersonic.chat.server.util.ModelConfigHelper; import com.tencent.supersonic.common.pojo.ChatApp; import com.tencent.supersonic.common.pojo.ChatModelConfig; import com.tencent.supersonic.common.pojo.Parameter; -import com.tencent.supersonic.common.pojo.enums.ChatModelType; import com.tencent.supersonic.common.util.ChatAppManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; @RestController @RequestMapping({"/api/chat/model", "/openapi/chat/model"}) diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java index 5b661ac9b..f75fdaa89 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java @@ -5,8 +5,6 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryFilter; import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq; import com.tencent.supersonic.chat.server.agent.Agent; -import com.tencent.supersonic.chat.server.agent.MultiTurnConfig; -import com.tencent.supersonic.chat.server.agent.PromptConfig; import com.tencent.supersonic.chat.server.agent.VisualConfig; import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDO; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatMemoryDO; @@ -24,8 +22,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; -import java.util.Map; -import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/ChatAppManager.java b/common/src/main/java/com/tencent/supersonic/common/util/ChatAppManager.java index ba2919925..9a7a992e4 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/ChatAppManager.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/ChatAppManager.java @@ -1,19 +1,14 @@ package com.tencent.supersonic.common.util; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.tencent.supersonic.common.pojo.ChatApp; -import java.util.List; import java.util.Map; public class ChatAppManager { private static final Map chatApps = Maps.newConcurrentMap(); public static void register(ChatApp chatApp) { - if (chatApps.containsKey(chatApp.getKey())) { - throw new RuntimeException("Duplicate chat app key is disallowed."); - } chatApps.put(chatApp.getKey(), chatApp); } diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/LLMSqlCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/LLMSqlCorrector.java index 448a3c75e..ff1296ace 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/LLMSqlCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/LLMSqlCorrector.java @@ -64,7 +64,8 @@ public class LLMSqlCorrector extends BaseSemanticCorrector { return; } - ChatLanguageModel chatLanguageModel = ModelProvider.getChatModel(chatApp.getChatModelConfig()); + ChatLanguageModel chatLanguageModel = + ModelProvider.getChatModel(chatApp.getChatModelConfig()); SemanticSqlExtractor extractor = AiServices.create(SemanticSqlExtractor.class, chatLanguageModel); Prompt prompt = generatePrompt(chatQueryContext.getQueryText(), semanticParseInfo, diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/file/FileHandlerImpl.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/file/FileHandlerImpl.java index 48c207da5..b2b2d82c1 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/file/FileHandlerImpl.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/file/FileHandlerImpl.java @@ -86,7 +86,7 @@ public class FileHandlerImpl implements FileHandler { } private PageInfo getDictValueRespPagWithKey(String fileName, - DictValueReq dictValueReq) { + DictValueReq dictValueReq) { PageInfo dictValueRespPageInfo = new PageInfo<>(); dictValueRespPageInfo.setPageSize(dictValueReq.getPageSize()); dictValueRespPageInfo.setPageNum(dictValueReq.getCurrent()); @@ -118,11 +118,12 @@ public class FileHandlerImpl implements FileHandler { } private PageInfo getDictValueRespPagWithoutKey(String fileName, - DictValueReq dictValueReq) { + DictValueReq dictValueReq) { PageInfo dictValueRespPageInfo = new PageInfo<>(); String filePath = localFileConfig.getDictDirectoryLatest() + FILE_SPILT + fileName; Long fileLineNum = getFileLineNum(filePath); - Integer startLine = Math.max(1, (dictValueReq.getCurrent() - 1) * dictValueReq.getPageSize() + 1); + Integer startLine = + Math.max(1, (dictValueReq.getCurrent() - 1) * dictValueReq.getPageSize() + 1); Integer endLine = Integer.valueOf( Math.min(dictValueReq.getCurrent() * dictValueReq.getPageSize(), fileLineNum) + ""); List dictValueRespList = getFileData(filePath, startLine, endLine); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java index 04ae85233..03169ab06 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java @@ -59,8 +59,8 @@ public class DictTaskServiceImpl implements DictTaskService { private final DimensionService dimensionService; public DictTaskServiceImpl(DictRepository dictRepository, DictUtils dictConverter, - DictUtils dictUtils, FileHandler fileHandler, DictWordService dictWordService, - DimensionService dimensionService) { + DictUtils dictUtils, FileHandler fileHandler, DictWordService dictWordService, + DimensionService dimensionService) { this.dictRepository = dictRepository; this.dictConverter = dictConverter; this.dictUtils = dictUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java index 4610db2c9..28809821c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java @@ -75,7 +75,7 @@ public class DimensionConverter { } public static DimensionResp convert2DimensionResp(DimensionDO dimensionDO, - Map modelRespMap) { + Map modelRespMap) { DimensionResp dimensionResp = new DimensionResp(); BeanUtils.copyProperties(dimensionDO, dimensionResp); dimensionResp.setModelName( @@ -123,11 +123,11 @@ public class DimensionConverter { } public static List filterByDataSet(List dimensionResps, - DataSetResp dataSetResp) { + DataSetResp dataSetResp) { return dimensionResps.stream() .filter(dimensionResp -> dataSetResp.dimensionIds().contains(dimensionResp.getId()) || dataSetResp.getAllIncludeAllModels() - .contains(dimensionResp.getModelId())) + .contains(dimensionResp.getModelId())) .collect(Collectors.toList()); } } diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java index dababd017..2b8affed7 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java @@ -9,7 +9,6 @@ import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq; import com.tencent.supersonic.chat.server.agent.Agent; import com.tencent.supersonic.chat.server.agent.AgentToolType; import com.tencent.supersonic.chat.server.agent.DatasetTool; -import com.tencent.supersonic.chat.server.agent.MultiTurnConfig; import com.tencent.supersonic.chat.server.agent.ToolConfig; import com.tencent.supersonic.chat.server.plugin.ChatPlugin; import com.tencent.supersonic.chat.server.plugin.PluginParseConfig; diff --git a/launchers/standalone/src/main/resources/META-INF/spring.factories b/launchers/standalone/src/main/resources/META-INF/spring.factories index ec6c3db30..cd16dcfc6 100644 --- a/launchers/standalone/src/main/resources/META-INF/spring.factories +++ b/launchers/standalone/src/main/resources/META-INF/spring.factories @@ -13,7 +13,8 @@ com.tencent.supersonic.headless.chat.parser.SemanticParser=\ com.tencent.supersonic.headless.chat.parser.QueryTypeParser com.tencent.supersonic.headless.chat.corrector.SemanticCorrector=\ - com.tencent.supersonic.headless.chat.corrector.RuleSqlCorrector + com.tencent.supersonic.headless.chat.corrector.RuleSqlCorrector,\ + com.tencent.supersonic.headless.chat.corrector.LLMSqlCorrector com.tencent.supersonic.headless.chat.knowledge.file.FileHandler=\ com.tencent.supersonic.headless.chat.knowledge.file.FileHandlerImpl diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java b/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java index fefb21314..d16b82685 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java @@ -29,7 +29,7 @@ public class Text2SQLEval extends BaseTest { @BeforeAll public void init() { - Agent agent = agentService.createAgent(getLLMAgent(false), DataUtils.getUser()); + Agent agent = agentService.createAgent(getLLMAgent(), DataUtils.getUser()); agentId = agent.getId(); } @@ -133,7 +133,7 @@ public class Text2SQLEval extends BaseTest { assert result.getTextResult().contains("3"); } - public Agent getLLMAgent(boolean enableMultiturn) { + public Agent getLLMAgent() { Agent agent = new Agent(); agent.setName("Agent for Test"); ToolConfig toolConfig = new ToolConfig();