(improvement)(Common) Move ChatModel management to common modules and add chatApp for data-model builder (#1831)

Co-authored-by: lxwcodemonkey

chat/server/src/main/java/com/tencent/supersonic/chat/server/config/ChatModelParameters.java

@@ -1,126 +0,0 @@
-package com.tencent.supersonic.chat.server.config;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.tencent.supersonic.common.pojo.Parameter;
-import dev.langchain4j.provider.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class ChatModelParameters {
-    private static final String MODULE_NAME = "对话模型配置";
-
-    public static final Parameter CHAT_MODEL_PROVIDER =
-            new Parameter("provider", ModelProvider.DEMO_CHAT_MODEL.getProvider(), "接口协议", "",
-                    "list", MODULE_NAME, getCandidateValues());
-
-    public static final Parameter CHAT_MODEL_BASE_URL =
-            new Parameter("baseUrl", ModelProvider.DEMO_CHAT_MODEL.getBaseUrl(), "BaseUrl", "",
-                    "string", MODULE_NAME, null, getBaseUrlDependency());
-
-    public static final Parameter CHAT_MODEL_NAME =
-            new Parameter("modelName", ModelProvider.DEMO_CHAT_MODEL.getModelName(), "ModelName",
-                    "", "string", MODULE_NAME, null, getModelNameDependency());
-
-    public static final Parameter CHAT_MODEL_API_KEY = new Parameter("apiKey", "", "ApiKey", "",
-            "password", MODULE_NAME, null, getApiKeyDependency());
-
-    public static final Parameter CHAT_MODEL_ENDPOINT = new Parameter("endpoint", "llama_2_70b",
-            "Endpoint", "", "string", MODULE_NAME, null, getEndpointDependency());
-
-    public static final Parameter CHAT_MODEL_SECRET_KEY = new Parameter("secretKey", "demo",
-            "SecretKey", "", "password", MODULE_NAME, null, getSecretKeyDependency());
-
-    public static final Parameter CHAT_MODEL_ENABLE_SEARCH = new Parameter("enableSearch", "false",
-            "是否启用搜索增强功能，设为false表示不启用", "", "bool", MODULE_NAME, null, getEnableSearchDependency());
-
-    public static final Parameter CHAT_MODEL_TEMPERATURE =
-            new Parameter("temperature", "0.0", "Temperature", "", "slider", MODULE_NAME);
-
-    public static final Parameter CHAT_MODEL_TIMEOUT =
-            new Parameter("timeOut", "60", "超时时间(秒)", "", "number", MODULE_NAME);
-
-    public static List<Parameter> getParameters() {
-        return Lists.newArrayList(CHAT_MODEL_PROVIDER, CHAT_MODEL_BASE_URL, CHAT_MODEL_ENDPOINT,
-                CHAT_MODEL_API_KEY, CHAT_MODEL_SECRET_KEY, CHAT_MODEL_NAME,
-                CHAT_MODEL_ENABLE_SEARCH, CHAT_MODEL_TEMPERATURE, CHAT_MODEL_TIMEOUT);
-    }
-
-    private static List<String> getCandidateValues() {
-        return Lists.newArrayList(OpenAiModelFactory.PROVIDER, OllamaModelFactory.PROVIDER,
-                QianfanModelFactory.PROVIDER, ZhipuModelFactory.PROVIDER,
-                LocalAiModelFactory.PROVIDER, DashscopeModelFactory.PROVIDER,
-                AzureModelFactory.PROVIDER);
-    }
-
-    private static List<Parameter.Dependency> getBaseUrlDependency() {
-        return getDependency(CHAT_MODEL_PROVIDER.getName(), getCandidateValues(),
-                ImmutableMap.of(OpenAiModelFactory.PROVIDER, OpenAiModelFactory.DEFAULT_BASE_URL,
-                        AzureModelFactory.PROVIDER, AzureModelFactory.DEFAULT_BASE_URL,
-                        OllamaModelFactory.PROVIDER, OllamaModelFactory.DEFAULT_BASE_URL,
-                        QianfanModelFactory.PROVIDER, QianfanModelFactory.DEFAULT_BASE_URL,
-                        ZhipuModelFactory.PROVIDER, ZhipuModelFactory.DEFAULT_BASE_URL,
-                        LocalAiModelFactory.PROVIDER, LocalAiModelFactory.DEFAULT_BASE_URL,
-                        DashscopeModelFactory.PROVIDER, DashscopeModelFactory.DEFAULT_BASE_URL));
-    }
-
-    private static List<Parameter.Dependency> getApiKeyDependency() {
-        return getDependency(CHAT_MODEL_PROVIDER.getName(),
-                Lists.newArrayList(OpenAiModelFactory.PROVIDER, QianfanModelFactory.PROVIDER,
-                        ZhipuModelFactory.PROVIDER, LocalAiModelFactory.PROVIDER,
-                        AzureModelFactory.PROVIDER, DashscopeModelFactory.PROVIDER),
-                ImmutableMap.of(OpenAiModelFactory.PROVIDER,
-                        ModelProvider.DEMO_CHAT_MODEL.getApiKey(), QianfanModelFactory.PROVIDER,
-                        ModelProvider.DEMO_CHAT_MODEL.getApiKey(), ZhipuModelFactory.PROVIDER,
-                        ModelProvider.DEMO_CHAT_MODEL.getApiKey(), LocalAiModelFactory.PROVIDER,
-                        ModelProvider.DEMO_CHAT_MODEL.getApiKey(), AzureModelFactory.PROVIDER,
-                        ModelProvider.DEMO_CHAT_MODEL.getApiKey(), DashscopeModelFactory.PROVIDER,
-                        ModelProvider.DEMO_CHAT_MODEL.getApiKey()));
-    }
-
-    private static List<Parameter.Dependency> getModelNameDependency() {
-        return getDependency(CHAT_MODEL_PROVIDER.getName(), getCandidateValues(),
-                ImmutableMap.of(OpenAiModelFactory.PROVIDER, OpenAiModelFactory.DEFAULT_MODEL_NAME,
-                        OllamaModelFactory.PROVIDER, OllamaModelFactory.DEFAULT_MODEL_NAME,
-                        QianfanModelFactory.PROVIDER, QianfanModelFactory.DEFAULT_MODEL_NAME,
-                        ZhipuModelFactory.PROVIDER, ZhipuModelFactory.DEFAULT_MODEL_NAME,
-                        LocalAiModelFactory.PROVIDER, LocalAiModelFactory.DEFAULT_MODEL_NAME,
-                        AzureModelFactory.PROVIDER, AzureModelFactory.DEFAULT_MODEL_NAME,
-                        DashscopeModelFactory.PROVIDER, DashscopeModelFactory.DEFAULT_MODEL_NAME));
-    }
-
-    private static List<Parameter.Dependency> getEndpointDependency() {
-        return getDependency(CHAT_MODEL_PROVIDER.getName(),
-                Lists.newArrayList(QianfanModelFactory.PROVIDER), ImmutableMap
-                        .of(QianfanModelFactory.PROVIDER, QianfanModelFactory.DEFAULT_ENDPOINT));
-    }
-
-    private static List<Parameter.Dependency> getEnableSearchDependency() {
-        return getDependency(CHAT_MODEL_PROVIDER.getName(),
-                Lists.newArrayList(DashscopeModelFactory.PROVIDER),
-                ImmutableMap.of(DashscopeModelFactory.PROVIDER, "false"));
-    }
-
-    private static List<Parameter.Dependency> getSecretKeyDependency() {
-        return getDependency(CHAT_MODEL_PROVIDER.getName(),
-                Lists.newArrayList(QianfanModelFactory.PROVIDER), ImmutableMap.of(
-                        QianfanModelFactory.PROVIDER, ModelProvider.DEMO_CHAT_MODEL.getApiKey()));
-    }
-
-    private static List<Parameter.Dependency> getDependency(String dependencyParameterName,
-            List<String> includesValue, Map<String, String> setDefaultValue) {
-
-        Parameter.Dependency.Show show = new Parameter.Dependency.Show();
-        show.setIncludesValue(includesValue);
-
-        Parameter.Dependency dependency = new Parameter.Dependency();
-        dependency.setName(dependencyParameterName);
-        dependency.setShow(show);
-        dependency.setSetDefaultValue(setDefaultValue);
-        List<Parameter.Dependency> dependencies = new ArrayList<>();
-        dependencies.add(dependency);
-        return dependencies;
-    }
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java

@@ -5,7 +5,7 @@ import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.chat.server.persistence.dataobject.ChatMemoryDO;
 import com.tencent.supersonic.chat.server.service.AgentService;
 import com.tencent.supersonic.chat.server.service.MemoryService;
-import com.tencent.supersonic.chat.server.util.ModelConfigHelper;
+import com.tencent.supersonic.headless.server.utils.ModelConfigHelper;
 import com.tencent.supersonic.common.pojo.ChatApp;
 import com.tencent.supersonic.common.pojo.enums.AppModule;
 import com.tencent.supersonic.common.util.ChatAppManager;

chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java

@@ -6,7 +6,7 @@ import com.tencent.supersonic.chat.server.pojo.ChatContext;
 import com.tencent.supersonic.chat.server.pojo.ParseContext;
 import com.tencent.supersonic.chat.server.service.ChatContextService;
 import com.tencent.supersonic.chat.server.service.ChatManageService;
-import com.tencent.supersonic.chat.server.util.ModelConfigHelper;
+import com.tencent.supersonic.headless.server.utils.ModelConfigHelper;
 import com.tencent.supersonic.chat.server.util.QueryReqConverter;
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.pojo.ChatApp;

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/ChatModelDO.java

@@ -1,33 +0,0 @@
-package com.tencent.supersonic.chat.server.persistence.dataobject;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@TableName("s2_chat_model")
-public class ChatModelDO {
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    private String name;
-
-    private String description;
-
-    private String config;
-
-    private Date createdAt;
-
-    private String createdBy;
-
-    private Date updatedAt;
-
-    private String updatedBy;
-
-    private String admin;
-
-    private String viewer;
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/mapper/ChatModelMapper.java

@@ -1,9 +0,0 @@
-package com.tencent.supersonic.chat.server.persistence.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tencent.supersonic.chat.server.persistence.dataobject.ChatModelDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ChatModelMapper extends BaseMapper<ChatModelDO> {
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ChatModel.java

@@ -1,29 +0,0 @@
-package com.tencent.supersonic.chat.server.pojo;
-
-import com.tencent.supersonic.common.pojo.ChatModelConfig;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ChatModel {
-    private Integer id;
-
-    private String name;
-
-    private String description;
-
-    private ChatModelConfig Config;
-
-    private Date createdAt;
-
-    private String createdBy;
-
-    private Date updatedAt;
-
-    private String updatedBy;
-
-    private String admin;
-
-    private String viewer;
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ExecuteContext.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.server.pojo;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import lombok.Data;

chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.server.pojo;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.headless.api.pojo.SchemaMapInfo;
 import com.tencent.supersonic.headless.api.pojo.request.QueryFilters;

chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.server.processor.execute;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.server.pojo.ExecuteContext;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;

chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java

@@ -3,13 +3,11 @@ package com.tencent.supersonic.chat.server.rest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.chat.server.agent.AgentToolType;
 import com.tencent.supersonic.chat.server.service.AgentService;
-import com.tencent.supersonic.chat.server.util.ModelConfigHelper;
-import com.tencent.supersonic.common.pojo.ChatModelConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;

chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java

@@ -3,7 +3,7 @@ package com.tencent.supersonic.chat.server.rest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigBaseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigEditReqReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatModelController.java

@@ -1,68 +0,0 @@
-package com.tencent.supersonic.chat.server.rest;
-
-import javax.servlet.http.HttpServletRequest;
-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.server.config.ChatModelParameters;
-import com.tencent.supersonic.chat.server.pojo.ChatModel;
-import com.tencent.supersonic.chat.server.service.ChatModelService;
-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.AppModule;
-import com.tencent.supersonic.common.util.ChatAppManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping({"/api/chat/model", "/openapi/chat/model"})
-public class ChatModelController {
-    @Autowired
-    private ChatModelService chatModelService;
-
-    @PostMapping
-    public ChatModel createModel(@RequestBody ChatModel model,
-            HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
-        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
-        return chatModelService.createChatModel(model, user);
-    }
-
-    @PutMapping
-    public ChatModel updateModel(@RequestBody ChatModel model,
-            HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
-        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
-        return chatModelService.updateChatModel(model, user);
-    }
-
-    @DeleteMapping("/{id}")
-    public boolean deleteModel(@PathVariable("id") Integer id) {
-        chatModelService.deleteChatModel(id);
-        return true;
-    }
-
-    @RequestMapping("/getModelList")
-    public List<ChatModel> getModelList() {
-        return chatModelService.getChatModels();
-    }
-
-    @RequestMapping("/getModelAppList")
-    public Map<String, ChatApp> getChatAppList() {
-        return ChatAppManager.getAllApps(AppModule.CHAT);
-    }
-
-    @RequestMapping("/getModelParameters")
-    public List<Parameter> getModelParameters() {
-        return ChatModelParameters.getParameters();
-    }
-
-    @PostMapping("/testConnection")
-    public boolean testConnection(@RequestBody ChatModelConfig modelConfig) {
-        return ModelConfigHelper.testConnection(modelConfig);
-    }
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java

@@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java

@@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.enums.MemoryReviewResult;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryCreateReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java

@@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.tencent.supersonic.auth.api.authentication.annotation.AuthenticationIgnore;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
 import com.tencent.supersonic.chat.api.pojo.request.PluginQueryReq;
 import com.tencent.supersonic.chat.server.plugin.ChatPlugin;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.server.service;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.server.agent.Agent;
 
 import java.util.List;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.chat.server.service;
 
 import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
 import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatModelService.java

@@ -1,18 +0,0 @@
-package com.tencent.supersonic.chat.server.service;
-
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.server.pojo.ChatModel;
-
-import java.util.List;
-
-public interface ChatModelService {
-    List<ChatModel> getChatModels();
-
-    ChatModel getChatModel(Integer id);
-
-    ChatModel createChatModel(ChatModel chatModel, User user);
-
-    ChatModel updateChatModel(ChatModel chatModel, User user);
-
-    void deleteChatModel(Integer id);
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatQueryService.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.server.service;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatQueryDataReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ConfigService.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.server.service;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigBaseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigEditReqReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigFilter;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/MemoryService.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.chat.server.service;
 
 import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryFilter;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryUpdateReq;
 import com.tencent.supersonic.chat.api.pojo.request.PageMemoryReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/PluginService.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.server.service;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.PluginQueryReq;
 import com.tencent.supersonic.chat.server.plugin.ChatPlugin;
 

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.chat.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.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;
@@ -9,13 +9,13 @@ 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;
 import com.tencent.supersonic.chat.server.persistence.mapper.AgentDOMapper;
-import com.tencent.supersonic.chat.server.pojo.ChatModel;
 import com.tencent.supersonic.chat.server.service.AgentService;
-import com.tencent.supersonic.chat.server.service.ChatModelService;
 import com.tencent.supersonic.chat.server.service.ChatQueryService;
 import com.tencent.supersonic.chat.server.service.MemoryService;
 import com.tencent.supersonic.common.pojo.ChatApp;
 import com.tencent.supersonic.common.util.JsonUtil;
+import com.tencent.supersonic.common.config.ChatModel;
+import com.tencent.supersonic.common.service.ChatModelService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.chat.server.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
 import com.tencent.supersonic.chat.api.pojo.request.PageQueryInfoReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatModelServiceImpl.java

@@ -1,90 +0,0 @@
-package com.tencent.supersonic.chat.server.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
-import com.tencent.supersonic.chat.server.persistence.dataobject.ChatModelDO;
-import com.tencent.supersonic.chat.server.persistence.mapper.ChatModelMapper;
-import com.tencent.supersonic.chat.server.pojo.ChatModel;
-import com.tencent.supersonic.chat.server.service.ChatModelService;
-import com.tencent.supersonic.common.pojo.ChatModelConfig;
-import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.util.StringUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModelDO>
-        implements ChatModelService {
-    @Override
-    public List<ChatModel> getChatModels() {
-        return list().stream().map(this::convert).collect(Collectors.toList());
-    }
-
-    @Override
-    public ChatModel getChatModel(Integer id) {
-        if (id == null) {
-            return null;
-        }
-        return convert(getById(id));
-    }
-
-    @Override
-    public ChatModel createChatModel(ChatModel chatModel, User user) {
-        ChatModelDO chatModelDO = convert(chatModel);
-        chatModelDO.setCreatedBy(user.getName());
-        chatModelDO.setCreatedAt(new Date());
-        chatModelDO.setUpdatedBy(user.getName());
-        chatModelDO.setUpdatedAt(new Date());
-        if (StringUtils.isBlank(chatModel.getAdmin())) {
-            chatModelDO.setAdmin(user.getName());
-        }
-        save(chatModelDO);
-        chatModel.setId(chatModelDO.getId());
-        return chatModel;
-    }
-
-    @Override
-    public ChatModel updateChatModel(ChatModel chatModel, User user) {
-        ChatModelDO chatModelDO = convert(chatModel);
-        chatModelDO.setUpdatedBy(user.getName());
-        chatModelDO.setUpdatedAt(new Date());
-        if (StringUtils.isBlank(chatModel.getAdmin())) {
-            chatModel.setAdmin(user.getName());
-        }
-        updateById(chatModelDO);
-        return chatModel;
-    }
-
-    @Override
-    public void deleteChatModel(Integer id) {
-        removeById(id);
-    }
-
-    private ChatModel convert(ChatModelDO chatModelDO) {
-        if (chatModelDO == null) {
-            return null;
-        }
-        ChatModel chatModel = new ChatModel();
-        BeanUtils.copyProperties(chatModelDO, chatModel);
-        chatModel.setConfig(JsonUtil.toObject(chatModelDO.getConfig(), ChatModelConfig.class));
-        return chatModel;
-    }
-
-    private ChatModelDO convert(ChatModel chatModel) {
-        if (chatModel == null) {
-            return null;
-        }
-        ChatModelDO chatModelDO = new ChatModelDO();
-        BeanUtils.copyProperties(chatModel, chatModelDO);
-        chatModelDO.setConfig(JsonUtil.toString(chatModel.getConfig()));
-        return chatModelDO;
-    }
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.chat.server.service.impl;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatQueryDataReq;
@@ -9,14 +9,12 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.chat.server.executor.ChatQueryExecutor;
 import com.tencent.supersonic.chat.server.parser.ChatQueryParser;
-import com.tencent.supersonic.chat.server.pojo.ChatModel;
 import com.tencent.supersonic.chat.server.pojo.ExecuteContext;
 import com.tencent.supersonic.chat.server.pojo.ParseContext;
 import com.tencent.supersonic.chat.server.processor.execute.ExecuteResultProcessor;
 import com.tencent.supersonic.chat.server.processor.parse.ParseResultProcessor;
 import com.tencent.supersonic.chat.server.service.AgentService;
 import com.tencent.supersonic.chat.server.service.ChatManageService;
-import com.tencent.supersonic.chat.server.service.ChatModelService;
 import com.tencent.supersonic.chat.server.service.ChatQueryService;
 import com.tencent.supersonic.chat.server.util.ComponentFactory;
 import com.tencent.supersonic.chat.server.util.QueryReqConverter;
@@ -50,6 +48,7 @@ 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.ChatLayerService;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
+import com.tencent.supersonic.common.service.ChatModelService;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.chat.server.service.impl;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatAggConfigReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigBaseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigEditReqReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java

@@ -3,7 +3,7 @@ package com.tencent.supersonic.chat.server.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.enums.MemoryStatus;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryFilter;
 import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryUpdateReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.chat.server.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.PluginQueryReq;
 import com.tencent.supersonic.chat.server.persistence.dataobject.PluginDO;
 import com.tencent.supersonic.chat.server.persistence.repository.PluginRepository;

chat/server/src/main/java/com/tencent/supersonic/chat/server/util/ChatConfigHelper.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.chat.server.util;
 
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatAggConfigReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigBaseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigEditReqReq;

chat/server/src/main/java/com/tencent/supersonic/chat/server/util/ModelConfigHelper.java

@@ -1,43 +0,0 @@
-package com.tencent.supersonic.chat.server.util;
-
-import com.tencent.supersonic.chat.server.agent.Agent;
-import com.tencent.supersonic.chat.server.pojo.ChatModel;
-import com.tencent.supersonic.chat.server.service.ChatModelService;
-import com.tencent.supersonic.common.pojo.ChatApp;
-import com.tencent.supersonic.common.pojo.ChatModelConfig;
-import com.tencent.supersonic.common.pojo.enums.ChatModelType;
-import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
-import com.tencent.supersonic.common.util.ContextUtils;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.provider.ModelProvider;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Objects;
-
-@Slf4j
-public class ModelConfigHelper {
-    public static boolean testConnection(ChatModelConfig modelConfig) {
-        try {
-            if (modelConfig == null || StringUtils.isBlank(modelConfig.getBaseUrl())) {
-                return false;
-            }
-            ChatLanguageModel chatLanguageModel = ModelProvider.getChatModel(modelConfig);
-            String response = chatLanguageModel.generate("Hi there");
-            return StringUtils.isNotEmpty(response) ? true : false;
-        } catch (Exception e) {
-            log.warn("connect to llm failed:", e);
-            throw new InvalidArgumentException(e.getMessage());
-        }
-    }
-
-    public static ChatModelConfig getChatModelConfig(ChatApp chatApp) {
-        ChatModelService chatModelService = ContextUtils.getBean(ChatModelService.class);
-        ChatModel chatModel = chatModelService.getChatModel(chatApp.getChatModelId());
-        if (Objects.isNull(chatModel)) {
-            return null;
-        }
-
-        return chatModel.getConfig();
-    }
-}

chat/server/src/main/java/com/tencent/supersonic/chat/server/util/QueryReqConverter.java

@@ -3,12 +3,8 @@ package com.tencent.supersonic.chat.server.util;
 import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.chat.server.pojo.ChatContext;
 import com.tencent.supersonic.chat.server.pojo.ParseContext;
-import com.tencent.supersonic.chat.server.service.ChatModelService;
-import com.tencent.supersonic.common.pojo.ChatModelConfig;
-import com.tencent.supersonic.common.pojo.enums.ChatModelType;
 import com.tencent.supersonic.common.pojo.enums.Text2SQLType;
 import com.tencent.supersonic.common.util.BeanMapper;
-import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.headless.api.pojo.request.QueryNLReq;
 import org.apache.commons.collections.MapUtils;