diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java index ed168661e..b0fe9faa3 100644 --- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java +++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/adaptor/UserAdaptor.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.auth.api.authentication.adaptor; import javax.servlet.http.HttpServletRequest; import com.tencent.supersonic.auth.api.authentication.pojo.Organization; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.request.UserReq; +import com.tencent.supersonic.common.pojo.User; import java.util.List; import java.util.Set; diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java index ec2b31664..fde397d3a 100644 --- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java +++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/service/UserService.java @@ -4,8 +4,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.tencent.supersonic.auth.api.authentication.pojo.Organization; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.request.UserReq; +import com.tencent.supersonic.common.pojo.User; import java.util.List; import java.util.Set; diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java index 7a1117b5e..9d34baa28 100644 --- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java +++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java @@ -3,9 +3,9 @@ package com.tencent.supersonic.auth.api.authentication.utils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserStrategy; import com.tencent.supersonic.common.config.SystemConfig; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.service.SystemConfigService; import com.tencent.supersonic.common.util.ContextUtils; import org.springframework.util.CollectionUtils; diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/service/AuthService.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/service/AuthService.java index 963428210..cf9bbc68a 100644 --- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/service/AuthService.java +++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authorization/service/AuthService.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.auth.api.authorization.service; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup; import com.tencent.supersonic.auth.api.authorization.request.QueryAuthResReq; import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResourceResp; +import com.tencent.supersonic.common.pojo.User; import java.util.List; diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java index 2283679f8..3e927a51f 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java @@ -6,12 +6,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor; import com.tencent.supersonic.auth.api.authentication.pojo.Organization; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword; import com.tencent.supersonic.auth.api.authentication.request.UserReq; import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO; import com.tencent.supersonic.auth.authentication.persistence.repository.UserRepository; import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.util.AESEncryptionUtil; import com.tencent.supersonic.common.util.ContextUtils; import lombok.extern.slf4j.Slf4j; diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java index 887c37858..97f094c6e 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java @@ -5,10 +5,10 @@ import javax.servlet.http.HttpServletResponse; import com.tencent.supersonic.auth.api.authentication.annotation.AuthenticationIgnore; import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword; import com.tencent.supersonic.auth.authentication.service.UserServiceImpl; import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.exception.AccessException; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.S2ThreadContext; diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java index 3896c85dc..327feaf42 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java @@ -4,9 +4,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.tencent.supersonic.auth.api.authentication.pojo.Organization; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.request.UserReq; import com.tencent.supersonic.auth.api.authentication.service.UserService; +import com.tencent.supersonic.common.pojo.User; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java index f3ea7f66c..d3c7bddc3 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java @@ -4,12 +4,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.tencent.supersonic.auth.api.authentication.pojo.Organization; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.request.UserReq; import com.tencent.supersonic.auth.api.authentication.service.UserService; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.auth.authentication.utils.ComponentFactory; import com.tencent.supersonic.common.config.SystemConfig; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.service.SystemConfigService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java index 82d0b0b8d..576f56d54 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.auth.authentication.strategy; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserStrategy; +import com.tencent.supersonic.common.pojo.User; import org.springframework.stereotype.Service; @Service diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java index 6712e9a8f..799245a91 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/HttpHeaderUserStrategy.java @@ -3,9 +3,9 @@ package com.tencent.supersonic.auth.authentication.strategy; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserStrategy; import com.tencent.supersonic.auth.authentication.utils.UserTokenUtils; +import com.tencent.supersonic.common.pojo.User; import org.springframework.stereotype.Service; @Service diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java index 6c9b06a56..20fba71f6 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java @@ -4,8 +4,8 @@ import javax.crypto.spec.SecretKeySpec; import javax.servlet.http.HttpServletRequest; import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.exception.AccessException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java index 56af4c1d1..f04a5a732 100644 --- a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java +++ b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/rest/AuthController.java @@ -3,12 +3,12 @@ package com.tencent.supersonic.auth.authorization.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup; import com.tencent.supersonic.auth.api.authorization.request.QueryAuthResReq; import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResourceResp; import com.tencent.supersonic.auth.api.authorization.service.AuthService; +import com.tencent.supersonic.common.pojo.User; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/service/AuthServiceImpl.java b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/service/AuthServiceImpl.java index 29472a1ae..ebad33fac 100644 --- a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/service/AuthServiceImpl.java +++ b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/service/AuthServiceImpl.java @@ -1,7 +1,6 @@ package com.tencent.supersonic.auth.authorization.service; import com.google.gson.Gson; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserService; import com.tencent.supersonic.auth.api.authorization.pojo.AuthGroup; import com.tencent.supersonic.auth.api.authorization.pojo.AuthRes; @@ -10,6 +9,7 @@ import com.tencent.supersonic.auth.api.authorization.pojo.DimensionFilter; import com.tencent.supersonic.auth.api.authorization.request.QueryAuthResReq; import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResourceResp; import com.tencent.supersonic.auth.api.authorization.service.AuthService; +import com.tencent.supersonic.common.pojo.User; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatQueryDataReq.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatQueryDataReq.java index 191b2cc6c..9bb6f32b9 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatQueryDataReq.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatQueryDataReq.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.chat.api.pojo.request; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.DateConf; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.request.QueryFilter; import lombok.Data; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java index 5f82bc9fc..21be35ba2 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java @@ -5,10 +5,10 @@ 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.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; +import com.tencent.supersonic.headless.server.utils.ModelConfigHelper; import dev.langchain4j.model.chat.ChatLanguageModel; import dev.langchain4j.model.input.Prompt; import dev.langchain4j.model.input.PromptTemplate; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java index a95689e1a..486bef058 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java @@ -6,7 +6,6 @@ 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.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; @@ -25,6 +24,7 @@ import com.tencent.supersonic.headless.api.pojo.response.MapResp; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.headless.api.pojo.response.QueryState; import com.tencent.supersonic.headless.server.facade.service.ChatLayerService; +import com.tencent.supersonic.headless.server.utils.ModelConfigHelper; import dev.langchain4j.data.message.AiMessage; import dev.langchain4j.model.chat.ChatLanguageModel; import dev.langchain4j.model.input.Prompt; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ExecuteContext.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ExecuteContext.java index c915ffaa6..258cc7ca6 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ExecuteContext.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ExecuteContext.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.chat.server.pojo; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.chat.server.agent.Agent; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import lombok.Data; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java index a7880e0b9..9b7188df8 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.chat.server.pojo; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.chat.server.agent.Agent; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.SchemaMapInfo; import com.tencent.supersonic.headless.api.pojo.request.QueryFilters; import lombok.Data; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java index 7260c5d4f..1d9544154 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java @@ -1,12 +1,12 @@ package com.tencent.supersonic.chat.server.processor.execute; -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; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.DateConf.DateMode; import com.tencent.supersonic.common.pojo.QueryColumn; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; import com.tencent.supersonic.common.pojo.enums.QueryType; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java index a0f7f8722..0cb4ddee0 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java @@ -3,11 +3,11 @@ package com.tencent.supersonic.chat.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -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.common.pojo.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java index ee0615aae..70db92e9e 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java @@ -3,7 +3,6 @@ package com.tencent.supersonic.chat.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -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; @@ -11,6 +10,7 @@ import com.tencent.supersonic.chat.api.pojo.request.ChatConfigFilter; import com.tencent.supersonic.chat.api.pojo.response.ChatConfigResp; import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp; import com.tencent.supersonic.chat.server.service.ConfigService; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; import com.tencent.supersonic.headless.api.pojo.response.ItemResp; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java index 94020fb56..61349a384 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java @@ -4,12 +4,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -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; import com.tencent.supersonic.chat.api.pojo.request.ChatQueryDataReq; import com.tencent.supersonic.chat.server.service.ChatQueryService; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.request.DimensionValueReq; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java index 5eaabf4bb..10d4bdea6 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/MemoryController.java @@ -4,7 +4,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; -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; @@ -12,6 +11,7 @@ import com.tencent.supersonic.chat.api.pojo.request.ChatMemoryUpdateReq; import com.tencent.supersonic.chat.api.pojo.request.PageMemoryReq; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatMemoryDO; import com.tencent.supersonic.chat.server.service.MemoryService; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java index 3796e51a3..552961602 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/PluginController.java @@ -4,11 +4,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.tencent.supersonic.auth.api.authentication.annotation.AuthenticationIgnore; -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; import com.tencent.supersonic.chat.server.service.PluginService; +import com.tencent.supersonic.common.pojo.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java index b16812863..147ff2615 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/AgentService.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.chat.server.service; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.chat.server.agent.Agent; +import com.tencent.supersonic.common.pojo.User; import java.util.List; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java index eb86bf6ea..98c89e115 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java @@ -1,7 +1,6 @@ package com.tencent.supersonic.chat.server.service; import com.github.pagehelper.PageInfo; -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; @@ -11,6 +10,7 @@ import com.tencent.supersonic.chat.api.pojo.response.ShowCaseResp; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatDO; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatParseDO; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatQueryService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatQueryService.java index 2d11a15a5..237086413 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatQueryService.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatQueryService.java @@ -1,10 +1,10 @@ package com.tencent.supersonic.chat.server.service; -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; import com.tencent.supersonic.chat.api.pojo.response.QueryResult; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.DimensionValueReq; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.headless.api.pojo.response.SearchResult; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ConfigService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ConfigService.java index 2b226080b..0d0a5f1cc 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ConfigService.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ConfigService.java @@ -1,6 +1,5 @@ package com.tencent.supersonic.chat.server.service; -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; @@ -8,6 +7,7 @@ import com.tencent.supersonic.chat.api.pojo.request.ItemNameVisibilityInfo; import com.tencent.supersonic.chat.api.pojo.response.ChatConfigResp; import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp; import com.tencent.supersonic.chat.server.config.ChatConfig; +import com.tencent.supersonic.common.pojo.User; import java.util.List; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/MemoryService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/MemoryService.java index bb326f154..6189ae386 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/MemoryService.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/MemoryService.java @@ -1,11 +1,11 @@ package com.tencent.supersonic.chat.server.service; import com.github.pagehelper.PageInfo; -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; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatMemoryDO; +import com.tencent.supersonic.common.pojo.User; import java.util.List; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/PluginService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/PluginService.java index ac24212ec..4ba0555a0 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/PluginService.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/PluginService.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.chat.server.service; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.chat.api.pojo.request.PluginQueryReq; import com.tencent.supersonic.chat.server.plugin.ChatPlugin; +import com.tencent.supersonic.common.pojo.User; import java.util.List; import java.util.Map; 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 2ace7ef8b..c048c59fc 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 @@ -1,7 +1,6 @@ package com.tencent.supersonic.chat.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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; @@ -12,10 +11,11 @@ import com.tencent.supersonic.chat.server.persistence.mapper.AgentDOMapper; import com.tencent.supersonic.chat.server.service.AgentService; 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.pojo.ChatApp; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.service.ChatModelService; +import com.tencent.supersonic.common.util.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java index 2a10f1e02..b649f9cfe 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java @@ -2,7 +2,6 @@ package com.tencent.supersonic.chat.server.service.impl; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; -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; @@ -16,6 +15,7 @@ import com.tencent.supersonic.chat.server.persistence.dataobject.QueryDO; import com.tencent.supersonic.chat.server.persistence.repository.ChatQueryRepository; import com.tencent.supersonic.chat.server.persistence.repository.ChatRepository; import com.tencent.supersonic.chat.server.service.ChatManageService; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java index 7aabc7fcf..56d251c5d 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java @@ -1,7 +1,6 @@ package com.tencent.supersonic.chat.server.service.impl; import com.google.common.collect.Lists; -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; @@ -23,7 +22,9 @@ import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper; import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; +import com.tencent.supersonic.common.service.ChatModelService; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateUtils; @@ -48,7 +49,6 @@ 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; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java index 5c5f821a1..87ca561ba 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java @@ -1,7 +1,6 @@ package com.tencent.supersonic.chat.server.service.impl; import com.google.common.collect.Lists; -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; @@ -23,6 +22,7 @@ import com.tencent.supersonic.chat.server.config.ChatConfig; import com.tencent.supersonic.chat.server.persistence.repository.ChatConfigRepository; import com.tencent.supersonic.chat.server.service.ConfigService; import com.tencent.supersonic.chat.server.util.ChatConfigHelper; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; import com.tencent.supersonic.headless.api.pojo.MetaFilter; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java index a1c98d7fe..2f1f89dd4 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java @@ -3,7 +3,6 @@ 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.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; @@ -13,6 +12,7 @@ import com.tencent.supersonic.chat.server.persistence.repository.ChatMemoryRepos import com.tencent.supersonic.chat.server.service.MemoryService; import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.pojo.Text2SQLExemplar; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.service.ExemplarService; import com.tencent.supersonic.common.util.BeanMapper; import org.apache.commons.lang3.StringUtils; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java index 8789fee94..1b5ea031d 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java @@ -2,7 +2,6 @@ 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.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; @@ -12,6 +11,7 @@ import com.tencent.supersonic.chat.server.plugin.event.PluginAddEvent; import com.tencent.supersonic.chat.server.plugin.event.PluginDelEvent; import com.tencent.supersonic.chat.server.plugin.event.PluginUpdateEvent; import com.tencent.supersonic.chat.server.service.PluginService; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.util.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/ChatConfigHelper.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/ChatConfigHelper.java index 27dbe3dbe..d8dffe592 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/ChatConfigHelper.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/ChatConfigHelper.java @@ -1,6 +1,5 @@ package com.tencent.supersonic.chat.server.util; -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; @@ -11,6 +10,7 @@ import com.tencent.supersonic.chat.api.pojo.response.ChatConfigResp; import com.tencent.supersonic.chat.server.config.ChatConfig; import com.tencent.supersonic.chat.server.persistence.dataobject.ChatConfigDO; import com.tencent.supersonic.common.pojo.RecordInfo; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; diff --git a/common/src/main/java/com/hankcs/hanlp/LoadRemoveService.java b/common/src/main/java/com/hankcs/hanlp/LoadRemoveService.java index f9887a2df..3472a6277 100644 --- a/common/src/main/java/com/hankcs/hanlp/LoadRemoveService.java +++ b/common/src/main/java/com/hankcs/hanlp/LoadRemoveService.java @@ -3,38 +3,38 @@ package com.hankcs.hanlp; import com.tencent.supersonic.common.pojo.enums.DictWordType; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Set; @Data @Slf4j public class LoadRemoveService { - @Value("${s2.mapper.remove.nature.prefix:}") - private String mapperRemoveNaturePrefix; - - public List removeNatures(List value) { + public List removeNatures(List value, Set modelIdOrDataSetIds) { if (CollectionUtils.isEmpty(value)) { return value; } List resultList = new ArrayList<>(value); - if (StringUtils.isNotBlank(mapperRemoveNaturePrefix)) { + if (!CollectionUtils.isEmpty(modelIdOrDataSetIds)) { resultList.removeIf(nature -> { if (Objects.isNull(nature)) { return false; } - return nature.startsWith(mapperRemoveNaturePrefix); + Long id = getId(nature); + if (Objects.nonNull(id)) { + return !modelIdOrDataSetIds.contains(id); + } + return false; }); } return resultList; } - public Long getDataSetId(String nature) { + public Long getId(String nature) { try { String[] split = nature.split(DictWordType.NATURE_SPILT); if (split.length <= 1) { diff --git a/common/src/main/java/com/hankcs/hanlp/collection/trie/bintrie/BaseNode.java b/common/src/main/java/com/hankcs/hanlp/collection/trie/bintrie/BaseNode.java index c8220e1b6..79525db19 100644 --- a/common/src/main/java/com/hankcs/hanlp/collection/trie/bintrie/BaseNode.java +++ b/common/src/main/java/com/hankcs/hanlp/collection/trie/bintrie/BaseNode.java @@ -20,16 +20,26 @@ import java.util.Set; @Slf4j public abstract class BaseNode implements Comparable { - /** 状态数组，方便读取的时候用 */ + /** + * 状态数组，方便读取的时候用 + */ static final Status[] ARRAY_STATUS = Status.values(); - /** 子节点 */ + /** + * 子节点 + */ protected BaseNode[] child; - /** 节点状态 */ + /** + * 节点状态 + */ protected Status status; - /** 节点代表的字符 */ + /** + * 节点代表的字符 + */ protected char c; - /** 节点代表的值 */ + /** + * 节点代表的值 + */ protected V value; protected String prefix = null; @@ -228,13 +238,21 @@ public abstract class BaseNode implements Comparable { } public enum Status { - /** 未指定，用于删除词条 */ + /** + * 未指定，用于删除词条 + */ UNDEFINED_0, - /** 不是词语的结尾 */ + /** + * 不是词语的结尾 + */ NOT_WORD_1, - /** 是个词语的结尾，并且还可以继续 */ + /** + * 是个词语的结尾，并且还可以继续 + */ WORD_MIDDLE_2, - /** 是个词语的结尾，并且没有继续 */ + /** + * 是个词语的结尾，并且没有继续 + */ WORD_END_3, } @@ -257,10 +275,10 @@ public abstract class BaseNode implements Comparable { + ", value=" + value + ", prefix='" + prefix + '\'' + '}'; } - public void walkNode(Set> entrySet) { + public void walkNode(Set> entrySet, Set modelIdOrDataSetIds) { if (status == Status.WORD_MIDDLE_2 || status == Status.WORD_END_3) { log.debug("walkNode before:{}", value.toString()); - List natures = new LoadRemoveService().removeNatures((List) value); + List natures = new LoadRemoveService().removeNatures((List) value, modelIdOrDataSetIds); String name = this.prefix != null ? this.prefix + c : "" + c; log.debug("walkNode name:{},after:{},natures:{}", name, (List) value, natures); entrySet.add(new TrieEntry(name, (V) natures)); @@ -273,7 +291,8 @@ public abstract class BaseNode implements Comparable { * @param sb * @param entrySet */ - public void walkLimit(StringBuilder sb, Set> entrySet) { + public void walkLimit(StringBuilder sb, Set> entrySet, + Set modelIdOrDataSetIds) { Queue queue = new ArrayDeque<>(); this.prefix = sb.toString(); queue.add(this); @@ -282,7 +301,7 @@ public abstract class BaseNode implements Comparable { if (root == null) { continue; } - root.walkNode(entrySet); + root.walkNode(entrySet, modelIdOrDataSetIds); if (root.child == null) { continue; } diff --git a/common/src/main/java/com/tencent/supersonic/common/config/ChatModel.java b/common/src/main/java/com/tencent/supersonic/common/config/ChatModel.java index e877b5967..edbcbde01 100644 --- a/common/src/main/java/com/tencent/supersonic/common/config/ChatModel.java +++ b/common/src/main/java/com/tencent/supersonic/common/config/ChatModel.java @@ -1,9 +1,10 @@ package com.tencent.supersonic.common.config; import com.tencent.supersonic.common.pojo.ChatModelConfig; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data public class ChatModel { private Integer id; diff --git a/common/src/main/java/com/tencent/supersonic/common/persistence/dataobject/ChatModelDO.java b/common/src/main/java/com/tencent/supersonic/common/persistence/dataobject/ChatModelDO.java index 54b4c3329..8c2d60abb 100644 --- a/common/src/main/java/com/tencent/supersonic/common/persistence/dataobject/ChatModelDO.java +++ b/common/src/main/java/com/tencent/supersonic/common/persistence/dataobject/ChatModelDO.java @@ -3,9 +3,10 @@ package com.tencent.supersonic.common.persistence.dataobject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName("s2_chat_model") public class ChatModelDO { diff --git a/common/src/main/java/com/tencent/supersonic/common/service/ChatModelService.java b/common/src/main/java/com/tencent/supersonic/common/service/ChatModelService.java index a657aab2f..90a778776 100644 --- a/common/src/main/java/com/tencent/supersonic/common/service/ChatModelService.java +++ b/common/src/main/java/com/tencent/supersonic/common/service/ChatModelService.java @@ -3,6 +3,7 @@ package com.tencent.supersonic.common.service; import com.tencent.supersonic.common.config.ChatModel; import com.tencent.supersonic.common.pojo.User; + import java.util.List; public interface ChatModelService { diff --git a/common/src/main/java/com/tencent/supersonic/common/service/impl/ChatModelServiceImpl.java b/common/src/main/java/com/tencent/supersonic/common/service/impl/ChatModelServiceImpl.java index a08adcc5d..a3e0131ad 100644 --- a/common/src/main/java/com/tencent/supersonic/common/service/impl/ChatModelServiceImpl.java +++ b/common/src/main/java/com/tencent/supersonic/common/service/impl/ChatModelServiceImpl.java @@ -9,14 +9,15 @@ import com.tencent.supersonic.common.pojo.ChatModelConfig; import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.service.ChatModelService; import com.tencent.supersonic.common.util.JsonUtil; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + @Slf4j @Service public class ChatModelServiceImpl extends ServiceImpl 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 8c202c18a..6e36566ff 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 @@ -22,7 +22,6 @@ public class ChatAppManager { public static Optional getApp(String appKey) { return chatApps.entrySet().stream().filter(e -> e.getKey().equals(appKey)) - .map(Map.Entry::getValue) - .findFirst(); + .map(Map.Entry::getValue).findFirst(); } } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelSchemaReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelSchemaReq.java index 87486f837..ab8547ace 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelSchemaReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelSchemaReq.java @@ -1,9 +1,10 @@ package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.ChatModelConfig; -import java.util.List; import lombok.Data; +import java.util.List; + @Data public class ModelSchemaReq { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryDataReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryDataReq.java index b4ee442d3..14c91042b 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryDataReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryDataReq.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.api.pojo.request; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.DateConf; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java index f98a6ce01..c94da6d0a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.api.pojo.request; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.ChatApp; import com.tencent.supersonic.common.pojo.Text2SQLExemplar; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.Text2SQLType; import com.tencent.supersonic.headless.api.pojo.QueryDataType; import com.tencent.supersonic.headless.api.pojo.SchemaMapInfo; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/ChatQueryContext.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/ChatQueryContext.java index 3147849d3..bc901a51e 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/ChatQueryContext.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/ChatQueryContext.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.chat; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.ChatApp; import com.tencent.supersonic.common.pojo.Text2SQLExemplar; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.Text2SQLType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java index abb61c923..40a9504b2 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java @@ -16,6 +16,7 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -51,7 +52,9 @@ public class SearchService { public static List prefixSearch(String key, int limit, BinTrie> binTrie, Map> modelIdToDataSetIds, Set detectDataSetIds) { - Set>> result = search(key, binTrie); + Set modelIdOrDataSetIds = + findModelIdOrDataSetIds(modelIdToDataSetIds, detectDataSetIds); + Set>> result = search(key, binTrie, modelIdOrDataSetIds); List hanlpMapResults = result.stream().map(entry -> { String name = entry.getKey().replace("#", " "); double similarity = EditDistanceUtils.getSimilarity(name, key); @@ -77,7 +80,11 @@ public class SearchService { BinTrie> binTrie, Map> modelIdToDataSetIds, Set detectDataSetIds) { String reverseDetectSegment = StringUtils.reverse(key); - Set>> result = search(reverseDetectSegment, binTrie); + Set modelIdOrDataSetIds = + findModelIdOrDataSetIds(modelIdToDataSetIds, detectDataSetIds); + + Set>> result = + search(reverseDetectSegment, binTrie, modelIdOrDataSetIds); List hanlpMapResults = result.stream().map(entry -> { String name = entry.getKey().replace("#", " "); List natures = entry.getValue().stream() @@ -115,7 +122,7 @@ public class SearchService { } private static Set>> search(String key, - BinTrie> binTrie) { + BinTrie> binTrie, Set modelIdOrDataSetIds) { key = key.toLowerCase(); Set>> entrySet = new TreeSet>>(); @@ -136,7 +143,7 @@ public class SearchService { if (branch == null) { return entrySet; } - branch.walkLimit(sb, entrySet); + branch.walkLimit(sb, entrySet, modelIdOrDataSetIds); return entrySet; } @@ -199,4 +206,23 @@ public class SearchService { } return terms.stream().map(term -> term.getWord()).collect(Collectors.toList()); } + + /** + * Find all modelIds and dataSetIds based on the dataSetId + */ + public static Set findModelIdOrDataSetIds(Map> modelIdToDataSetIds, + Set detectDataSetIds) { + if (CollectionUtils.isEmpty(detectDataSetIds)) { + return new HashSet<>(); + } + if (CollectionUtils.isEmpty(modelIdToDataSetIds)) { + return new HashSet<>(detectDataSetIds); + } + Set result = modelIdToDataSetIds.entrySet().stream() + .filter(entry -> entry.getValue().stream().anyMatch(detectDataSetIds::contains)) + .map(Map.Entry::getKey).collect(Collectors.toSet()); + + result.addAll(detectDataSetIds); + return result; + } } diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/NatureHelper.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/NatureHelper.java index 371651f03..46a91d5bf 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/NatureHelper.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/NatureHelper.java @@ -91,7 +91,7 @@ public class NatureHelper { public static List changeModel2DataSet(String nature, Map> modelIdToDataSetIds) { - if (SchemaElementType.TERM.equals(NatureHelper.convertToElementType(nature))) { + if (isTerm(nature)) { return Collections.singletonList(nature); } Long modelId = getModelId(nature); @@ -103,6 +103,10 @@ public class NatureHelper { .filter(Objects::nonNull).map(String::valueOf).collect(Collectors.toList()); } + public static boolean isTerm(String nature) { + return SchemaElementType.TERM.equals(NatureHelper.convertToElementType(nature)); + } + public static boolean isDimensionValueDataSetId(String nature) { return isNatureValid(nature) && !isNatureType(nature, DictWordType.METRIC, DictWordType.DIMENSION, diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java index c17cfffe5..5ff17608e 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.chat.parser; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper; import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java index 3f76a2028..fdd2750c0 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java @@ -1,7 +1,6 @@ package com.tencent.supersonic.headless.server.aspect; import com.google.common.collect.Sets; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authorization.pojo.AuthRes; import com.tencent.supersonic.auth.api.authorization.pojo.DimensionFilter; import com.tencent.supersonic.auth.api.authorization.request.QueryAuthResReq; @@ -10,6 +9,7 @@ import com.tencent.supersonic.auth.api.authorization.service.AuthService; import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.QueryAuthorization; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/builder/ModelIntelligentBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/builder/ModelIntelligentBuilder.java index 0c64ce468..9c6da8fcf 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/builder/ModelIntelligentBuilder.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/builder/ModelIntelligentBuilder.java @@ -11,10 +11,11 @@ import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaReq; import dev.langchain4j.model.input.Prompt; import dev.langchain4j.model.input.PromptTemplate; import dev.langchain4j.service.AiServices; +import org.springframework.stereotype.Component; + import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.springframework.stereotype.Component; @Component public class ModelIntelligentBuilder extends IntelligentBuilder { @@ -54,7 +55,8 @@ public class ModelIntelligentBuilder extends IntelligentBuilder { return null; } ChatModelConfig chatModelConfig = modelSchemaReq.getChatModelConfig(); - ModelSchemaExtractor extractor = AiServices.create(ModelSchemaExtractor.class, getChatModel(chatModelConfig)); + ModelSchemaExtractor extractor = + AiServices.create(ModelSchemaExtractor.class, getChatModel(chatModelConfig)); Prompt prompt = generatePrompt(dbSchema, chatApp.get()); return extractor.generateModelSchema(prompt.toUserMessage().singleText()); } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java index c05d1bd91..e45e46b85 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.facade.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; 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; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java index f5e700f34..e428dbf3d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.facade.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.QueryDataSetReq; import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java index 88e4a9d50..a32eba325 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.facade.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.QueryMapReq; import com.tencent.supersonic.headless.server.facade.service.ChatLayerService; import lombok.extern.slf4j.Slf4j; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java index a54d1c0b5..f37e12524 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.facade.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq; import com.tencent.supersonic.headless.api.pojo.request.DownloadMetricReq; import com.tencent.supersonic.headless.api.pojo.request.QueryMetricReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java index 19ae3deac..c82b540ad 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.facade.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.util.StringUtil; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlsReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java index 480df52f1..b44c1a0bd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.facade.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java index 10dcf33b8..335039b9d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.server.facade.service.impl; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.QueryColumn; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java index 1aa73190c..8a0774673 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java @@ -4,8 +4,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.AppQueryReq; import com.tencent.supersonic.headless.api.pojo.request.AppReq; import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java index 4fec286f9..71cff5a35 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.CanvasReq; import com.tencent.supersonic.headless.api.pojo.response.CanvasSchemaResp; import com.tencent.supersonic.headless.server.persistence.dataobject.CanvasDO; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java index b12fec3f0..bf33b3aa0 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java @@ -1,21 +1,27 @@ package com.tencent.supersonic.headless.server.rest; -import com.tencent.supersonic.common.config.ChatModel; -import com.tencent.supersonic.common.pojo.ChatModelParameters; -import com.tencent.supersonic.common.service.ChatModelService; -import com.tencent.supersonic.headless.server.utils.ModelConfigHelper; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.config.ChatModel; import com.tencent.supersonic.common.pojo.ChatApp; import com.tencent.supersonic.common.pojo.ChatModelConfig; +import com.tencent.supersonic.common.pojo.ChatModelParameters; import com.tencent.supersonic.common.pojo.Parameter; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AppModule; +import com.tencent.supersonic.common.service.ChatModelService; import com.tencent.supersonic.common.util.ChatAppManager; +import com.tencent.supersonic.headless.server.utils.ModelConfigHelper; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; @@ -28,7 +34,7 @@ public class ChatModelController { @PostMapping public ChatModel createModel(@RequestBody ChatModel model, - HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { + HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { User user = UserHolder.findUser(httpServletRequest, httpServletResponse); return chatModelService.createChatModel(model, user); } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java index 26677d552..4edb68e6b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java @@ -4,8 +4,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.ClassReq; import com.tencent.supersonic.headless.api.pojo.response.ClassResp; import com.tencent.supersonic.headless.server.pojo.ClassFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java index 12316eecf..b2c108744 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.server.persistence.dataobject.CollectDO; import com.tencent.supersonic.headless.server.service.CollectService; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java index d2b17ca9e..c445766dd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.api.pojo.request.DataSetReq; import com.tencent.supersonic.headless.api.pojo.response.DataSetResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java index 07b07c7f4..bd7e42f16 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.DBColumn; import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java index 1f00c86af..68961b8d8 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java @@ -5,8 +5,8 @@ import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.headless.api.pojo.DimValueMap; import com.tencent.supersonic.headless.api.pojo.MetaFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java index 4d277273d..a015e1947 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.DomainReq; import com.tencent.supersonic.headless.api.pojo.request.DomainUpdateReq; import com.tencent.supersonic.headless.api.pojo.response.DomainResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java index 0216b84a1..7ce9e6d4c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java @@ -5,8 +5,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import com.github.pagehelper.PageInfo; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.service.EmbeddingService; import com.tencent.supersonic.common.service.ExemplarService; import com.tencent.supersonic.headless.api.pojo.request.DictItemFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java index 18e323d58..bb7da86ce 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java @@ -5,8 +5,8 @@ import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.MetaFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java index 7162e6dba..fb2fd67b4 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java @@ -1,12 +1,11 @@ package com.tencent.supersonic.headless.server.rest; -import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.headless.api.pojo.ModelSchema; import com.tencent.supersonic.headless.api.pojo.request.FieldRemovedReq; @@ -30,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController; import java.sql.SQLException; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @RestController diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java index e868c7f0f..25dd7070f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.server.rest; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.ModelRela; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.server.service.ModelRelaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java index 721409c93..1c1f28df1 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.QueryRuleFilter; import com.tencent.supersonic.headless.api.pojo.request.QueryRuleReq; import com.tencent.supersonic.headless.api.pojo.response.QueryRuleResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java index 9879a2703..069afd995 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.headless.api.pojo.response.DomainResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java index fbd088ac2..d1aa10b52 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java @@ -5,8 +5,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import com.github.pagehelper.PageInfo; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.ItemValueReq; import com.tencent.supersonic.headless.api.pojo.request.TagDeleteReq; import com.tencent.supersonic.headless.api.pojo.request.TagFilterPageReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java index 1fa7f6a71..5ea5b8de6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.TagObjectReq; import com.tencent.supersonic.headless.api.pojo.response.TagObjectResp; import com.tencent.supersonic.headless.server.pojo.TagObjectFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java index f14645ede..1cd40043c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; import com.tencent.supersonic.headless.api.pojo.request.TermReq; import com.tencent.supersonic.headless.api.pojo.response.TermResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java index e173bb062..c5cf70ae7 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.service; import com.github.pagehelper.PageInfo; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.DataEvent; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.EventType; import com.tencent.supersonic.headless.api.pojo.DimValueMap; import com.tencent.supersonic.headless.api.pojo.MetaFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java index f18e0b302..49e254dd3 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.service; import com.github.pagehelper.PageInfo; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.DataEvent; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.EventType; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.MetaFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java index 350fb39b0..3ca442efc 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.server.service; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.ModelRela; +import com.tencent.supersonic.common.pojo.User; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java index de72e31c0..3b55aa6cf 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.server.service; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.ItemDateResp; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; import com.tencent.supersonic.headless.api.pojo.MetaFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java index 56e1d2406..f7d978bcc 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.server.service; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.ItemDateResp; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java index 372d77f16..8fe99042c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java index a8a0df228..a4cc51f56 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.QueryColumn; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.EngineType; import com.tencent.supersonic.headless.api.pojo.DBColumn; import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; @@ -28,7 +28,6 @@ import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.service.DatabaseService; import com.tencent.supersonic.headless.server.service.ModelService; import com.tencent.supersonic.headless.server.utils.DatabaseConverter; -import java.util.HashMap; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +36,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.sql.SQLException; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -208,14 +208,17 @@ public class DatabaseServiceImpl extends ServiceImpl> getDbColumns(ModelSchemaReq modelSchemaReq) throws SQLException { + public Map> getDbColumns(ModelSchemaReq modelSchemaReq) + throws SQLException { Map> dbColumnMap = new HashMap<>(); if (StringUtils.isNotBlank(modelSchemaReq.getSql())) { - List columns = getColumns(modelSchemaReq.getDatabaseId(), modelSchemaReq.getSql()); + List columns = + getColumns(modelSchemaReq.getDatabaseId(), modelSchemaReq.getSql()); dbColumnMap.put(modelSchemaReq.getSql(), columns); } else { for (String table : modelSchemaReq.getTables()) { - List columns = getColumns(modelSchemaReq.getDatabaseId(), modelSchemaReq.getDb(), table); + List columns = + getColumns(modelSchemaReq.getDatabaseId(), modelSchemaReq.getDb(), table); dbColumnMap.put(table, columns); } } 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 b4d840642..d83e8e2de 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 @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.service.impl; import com.github.pagehelper.PageInfo; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.Constants; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.util.BeanMapper; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java index 21e58c703..3905afaca 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.DataEvent; import com.tencent.supersonic.common.pojo.DataItem; import com.tencent.supersonic.common.pojo.ModelRela; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.EventType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java index 120c099c1..fd9f69d43 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.server.service.impl; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserService; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java index ddeb1d0c6..6570b83d6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java @@ -7,11 +7,11 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.util.FileUtils; import com.alibaba.excel.write.metadata.WriteSheet; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.QueryColumn; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.DateUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java index fd9c3da97..16ce35285 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java @@ -11,10 +11,10 @@ import com.google.common.cache.CacheBuilder; import com.google.protobuf.ByteString; import com.google.protobuf.Message; import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig; -import com.tencent.supersonic.common.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.common.pojo.User; import com.tencent.supersonic.headless.api.pojo.Param; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java index 9f9f0d1a6..3442c6b1f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java @@ -7,7 +7,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.Constants; @@ -15,6 +14,7 @@ import com.tencent.supersonic.common.pojo.DataEvent; import com.tencent.supersonic.common.pojo.DataItem; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.Filter; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.EventType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java index c9aae2651..474916c35 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java @@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.JoinCondition; import com.tencent.supersonic.common.pojo.ModelRela; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.headless.server.persistence.dataobject.ModelRelaDO; import com.tencent.supersonic.headless.server.persistence.mapper.ModelRelaDOMapper; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java index 02d549ae0..6fdca10d0 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java @@ -48,6 +48,14 @@ import com.tencent.supersonic.headless.server.service.MetricService; import com.tencent.supersonic.headless.server.service.ModelService; import com.tencent.supersonic.headless.server.utils.ModelConverter; import com.tencent.supersonic.headless.server.utils.NameCheckUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + import java.sql.SQLException; import java.util.ArrayList; import java.util.Comparator; @@ -58,13 +66,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; @Service @Slf4j @@ -93,8 +94,8 @@ public class ModelServiceImpl implements ModelService { public ModelServiceImpl(ModelRepository modelRepository, DatabaseService databaseService, @Lazy DimensionService dimensionService, @Lazy MetricService metricService, DomainService domainService, UserService userService, DataSetService dataSetService, - DateInfoRepository dateInfoRepository, - ModelIntelligentBuilder modelIntelligentBuilder, ChatModelService chatModelService) { + DateInfoRepository dateInfoRepository, ModelIntelligentBuilder modelIntelligentBuilder, + ChatModelService chatModelService) { this.modelRepository = modelRepository; this.databaseService = databaseService; this.dimensionService = dimensionService; @@ -200,7 +201,8 @@ public class ModelServiceImpl implements ModelService { } @Override - public Map buildModelSchema(ModelSchemaReq modelSchemaReq) throws SQLException { + public Map buildModelSchema(ModelSchemaReq modelSchemaReq) + throws SQLException { Map> dbColumnMap = databaseService.getDbColumns(modelSchemaReq); Map modelSchemaMap = new HashMap<>(); if (modelSchemaReq.isBuildByLLM()) { @@ -218,10 +220,10 @@ public class ModelServiceImpl implements ModelService { modelSchemaMap.put(entry.getKey(), build(entry.getValue())); } } - return modelSchemaMap; + return modelSchemaMap; } - private DbSchema convert(ModelSchemaReq modelSchemaReq, String key, List dbColumns) { + private DbSchema convert(ModelSchemaReq modelSchemaReq, String key, List dbColumns) { DbSchema dbSchema = new DbSchema(); dbSchema.setDb(modelSchemaReq.getDb()); dbSchema.setTable(key); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java index 1694f0060..2c4a62bd5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java @@ -4,9 +4,9 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.ModelRela; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java index 383b7e154..2f35bcb1a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.server.service.impl; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.DateConf; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.SchemaElementType; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java index 490a4ba72..aa3fb47bd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java @@ -1,11 +1,11 @@ package com.tencent.supersonic.headless.server.utils; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.Order; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConfigHelper.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConfigHelper.java index c0b8085e4..513134720 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConfigHelper.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConfigHelper.java @@ -1,11 +1,11 @@ package com.tencent.supersonic.headless.server.utils; +import com.tencent.supersonic.common.config.ChatModel; import com.tencent.supersonic.common.pojo.ChatApp; import com.tencent.supersonic.common.pojo.ChatModelConfig; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; -import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.config.ChatModel; import com.tencent.supersonic.common.service.ChatModelService; +import com.tencent.supersonic.common.util.ContextUtils; import dev.langchain4j.model.chat.ChatLanguageModel; import dev.langchain4j.provider.ModelProvider; import lombok.extern.slf4j.Slf4j; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java index d6eaac2a2..eee4263c9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.server.utils; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.DimensionConstants; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.JsonUtil; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java index b7666df8e..52e215616 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.utils; import com.alibaba.ttl.TransmittableThreadLocal; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.util.SqlFilterUtils; import com.tencent.supersonic.headless.api.pojo.QueryStat; diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java index 9ad95ba61..8fe98ec0d 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.service; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.DataFormat; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.DataFormatTypeEnum; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java index 40dc01ada..2258ba187 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.service; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserService; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.service.ChatModelService; diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java index 72ee6a779..1ab96415a 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java @@ -1,12 +1,14 @@ package com.tencent.supersonic.demo; import com.google.common.collect.Lists; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.auth.api.authorization.service.AuthService; import com.tencent.supersonic.chat.server.service.AgentService; import com.tencent.supersonic.chat.server.service.ChatManageService; import com.tencent.supersonic.chat.server.service.ChatQueryService; import com.tencent.supersonic.chat.server.service.PluginService; +import com.tencent.supersonic.common.config.ChatModel; +import com.tencent.supersonic.common.pojo.User; +import com.tencent.supersonic.common.service.ChatModelService; import com.tencent.supersonic.common.util.AESEncryptionUtil; import com.tencent.supersonic.headless.api.pojo.DataSetModelConfig; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; @@ -20,8 +22,6 @@ import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; -import com.tencent.supersonic.common.config.ChatModel; -import com.tencent.supersonic.common.service.ChatModelService; import com.tencent.supersonic.headless.server.service.DataSetService; import com.tencent.supersonic.headless.server.service.DatabaseService; import com.tencent.supersonic.headless.server.service.DimensionService; @@ -34,8 +34,6 @@ import com.tencent.supersonic.headless.server.service.TagObjectService; import com.tencent.supersonic.headless.server.service.TermService; import com.tencent.supersonic.headless.server.service.impl.DictWordService; import dev.langchain4j.provider.ModelProvider; -import java.util.List; -import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +43,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.core.env.Environment; import org.springframework.util.CollectionUtils; +import java.util.List; +import java.util.stream.Collectors; + @Slf4j public abstract class S2BaseDemo implements CommandLineRunner { diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java index 0b0f8ce13..686d9594b 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java @@ -8,11 +8,11 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.chat.server.service.AgentService; import com.tencent.supersonic.chat.server.service.ChatQueryService; import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; +import com.tencent.supersonic.common.service.ChatModelService; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.headless.api.pojo.response.QueryState; -import com.tencent.supersonic.common.service.ChatModelService; import com.tencent.supersonic.util.DataUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; 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 2973dd2cd..de395526c 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 @@ -3,15 +3,15 @@ package com.tencent.supersonic.evaluation; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.chat.BaseTest; import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.chat.server.agent.*; +import com.tencent.supersonic.common.config.ChatModel; import com.tencent.supersonic.common.pojo.ChatApp; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AppModule; import com.tencent.supersonic.common.util.ChatAppManager; import com.tencent.supersonic.headless.chat.corrector.LLMSqlCorrector; -import com.tencent.supersonic.common.config.ChatModel; import com.tencent.supersonic.util.DataUtils; import com.tencent.supersonic.util.LLMConfigUtils; import org.junit.jupiter.api.*; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java index c48ac3950..3955d841d 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java @@ -1,11 +1,11 @@ package com.tencent.supersonic.headless; import com.tencent.supersonic.BaseApplication; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.DateConf.DateMode; import com.tencent.supersonic.common.pojo.Order; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryBySqlTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryBySqlTest.java index fb2bfc1cb..f8c7a1f3a 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryBySqlTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryBySqlTest.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.QueryColumn; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.util.DataUtils; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java index 641e91e96..7e1b3a37d 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.QueryColumn; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.QueryType; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java b/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java index 51e3f1316..589265793 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.util; -import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq; import com.tencent.supersonic.common.pojo.DateConf; +import com.tencent.supersonic.common.pojo.User; import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.headless.api.pojo.SchemaElement;