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

Co-authored-by: lxwcodemonkey
2026-04-20 21:54:19 +08:00 · 2024-10-20 18:42:08 +08:00
parent 2b70140619
commit 1f208ffcb7
156 changed files with 13172 additions and 16317 deletions
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/chat/BaseTest.java
@@ -6,13 +6,13 @@ 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.response.QueryResult;
 import com.tencent.supersonic.chat.server.service.AgentService;
-import com.tencent.supersonic.chat.server.service.ChatModelService;
 import com.tencent.supersonic.chat.server.service.ChatQueryService;
 import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum;
 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;
--- 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.auth.api.authentication.pojo.User;
+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.chat.server.pojo.ChatModel;
 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.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.*;
--- 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,7 +1,7 @@
 package com.tencent.supersonic.headless;

 import com.tencent.supersonic.BaseApplication;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+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;
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/MetaDiscoveryTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/MetaDiscoveryTest.java
@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.QueryDataType;
 import com.tencent.supersonic.headless.api.pojo.request.QueryMapReq;
 import com.tencent.supersonic.headless.api.pojo.response.MapInfoResp;
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java
@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.QueryMetricReq;
 import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
--- 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,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
--- 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,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+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;
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryDimensionTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryDimensionTest.java
@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.DimensionValueReq;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import org.junit.Assert;
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryRuleTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryRuleTest.java
@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.ActionInfo;
 import com.tencent.supersonic.headless.api.pojo.RuleInfo;
 import com.tencent.supersonic.headless.api.pojo.enums.QueryRuleType;
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java
@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless;

 import com.google.common.collect.Lists;
-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.headless.api.pojo.response.DataSetResp;
 import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagObjectTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagObjectTest.java
@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+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;
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagTest.java
@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.ItemValueReq;
 import com.tencent.supersonic.headless.api.pojo.response.ItemValueResp;
 import com.tencent.supersonic.headless.server.service.TagQueryService;
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TranslateTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TranslateTest.java
@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticTranslateResp;
 import com.tencent.supersonic.headless.chat.utils.QueryReqBuilder;
--- 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,6 +1,6 @@
 package com.tencent.supersonic.util;

-import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum;