(improvement)(launcher)Move langchain4j related classes from launcher-common to common.

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/utils/UserHolder.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.auth.api.authentication.utils;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserStrategy;
-import com.tencent.supersonic.common.pojo.SystemConfig;
+import com.tencent.supersonic.common.config.SystemConfig;
 import com.tencent.supersonic.common.service.SystemConfigService;
 import com.tencent.supersonic.common.util.ContextUtils;
 import javax.servlet.http.HttpServletRequest;

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java

@@ -6,7 +6,7 @@ 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.pojo.SystemConfig;
+import com.tencent.supersonic.common.config.SystemConfig;
 import com.tencent.supersonic.common.service.SystemConfigService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java

@@ -4,7 +4,7 @@ package com.tencent.supersonic.chat.server.agent;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import com.tencent.supersonic.common.pojo.RecordInfo;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;

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

@@ -5,13 +5,13 @@ import com.tencent.supersonic.chat.server.persistence.repository.ChatQueryReposi
 import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
 import com.tencent.supersonic.chat.server.util.QueryReqConverter;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
 import com.tencent.supersonic.headless.api.pojo.request.QueryReq;
 import com.tencent.supersonic.headless.api.pojo.response.MapResp;
 import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
-import com.tencent.supersonic.headless.core.utils.S2ChatModelProvider;
+import com.tencent.supersonic.common.util.S2ChatModelProvider;
 import com.tencent.supersonic.headless.server.service.ChatQueryService;
 import dev.langchain4j.data.message.AiMessage;
 import dev.langchain4j.model.chat.ChatLanguageModel;

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

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.chat.server.parser;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.common.pojo.ParameterConfig;
+import com.tencent.supersonic.common.config.ParameterConfig;
 import com.tencent.supersonic.common.pojo.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -8,7 +8,7 @@ import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDO;
 import com.tencent.supersonic.chat.server.persistence.mapper.AgentDOMapper;
 import com.tencent.supersonic.chat.server.service.AgentService;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;

common/pom.xml

@@ -23,6 +23,7 @@
         </dependency>
 
 
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -154,6 +155,10 @@
         </dependency>
 
         <!--langchain4j-->
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-open-ai</artifactId>
@@ -174,6 +179,11 @@
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-azure-open-ai</artifactId>
         </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-embeddings-bge-small-zh</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>

common/src/main/java/com/tencent/supersonic/common/config/LLMConfig.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.pojo;
+package com.tencent.supersonic.common.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

common/src/main/java/com/tencent/supersonic/common/config/ParameterConfig.java

@@ -1,5 +1,6 @@
-package com.tencent.supersonic.common.pojo;
+package com.tencent.supersonic.common.config;
 
+import com.tencent.supersonic.common.pojo.Parameter;
 import com.tencent.supersonic.common.service.SystemConfigService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

common/src/main/java/com/tencent/supersonic/common/config/SystemConfig.java

@@ -1,6 +1,7 @@
-package com.tencent.supersonic.common.pojo;
+package com.tencent.supersonic.common.config;
 
 import com.google.common.collect.Lists;
+import com.tencent.supersonic.common.pojo.Parameter;
 import com.tencent.supersonic.common.util.ContextUtils;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;

common/src/main/java/com/tencent/supersonic/common/rest/SystemConfigController.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.common.rest;
 
-import com.tencent.supersonic.common.pojo.SystemConfig;
+import com.tencent.supersonic.common.config.SystemConfig;
 import com.tencent.supersonic.common.service.SystemConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

common/src/main/java/com/tencent/supersonic/common/service/SystemConfigService.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.tencent.supersonic.common.persistence.dataobject.SystemConfigDO;
-import com.tencent.supersonic.common.pojo.SystemConfig;
+import com.tencent.supersonic.common.config.SystemConfig;
 
 public interface SystemConfigService extends IService<SystemConfigDO> {
 

common/src/main/java/com/tencent/supersonic/common/service/impl/SystemConfigServiceImpl.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.tencent.supersonic.common.persistence.dataobject.SystemConfigDO;
 import com.tencent.supersonic.common.persistence.mapper.SystemConfigMapper;
 import com.tencent.supersonic.common.pojo.Parameter;
-import com.tencent.supersonic.common.pojo.SystemConfig;
+import com.tencent.supersonic.common.config.SystemConfig;
 import com.tencent.supersonic.common.service.SystemConfigService;
 import com.tencent.supersonic.common.util.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;

common/src/main/java/com/tencent/supersonic/common/util/S2ChatModelProvider.java

@@ -1,7 +1,6 @@
-package com.tencent.supersonic.headless.core.utils;
+package com.tencent.supersonic.common.util;
 
-import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import com.tencent.supersonic.common.pojo.enums.S2ModelProvider;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.localai.LocalAiChatModel;

common/src/main/java/dev/langchain4j/S2LangChain4jAutoConfiguration.java

@@ -1,6 +1,5 @@
 package dev.langchain4j;
 
-import static dev.langchain4j.ModelProvider.OPEN_AI;
 import static dev.langchain4j.exception.IllegalConfigurationException.illegalConfiguration;
 import static dev.langchain4j.internal.Utils.isNullOrBlank;
 
@@ -268,7 +267,7 @@ public class S2LangChain4jAutoConfiguration {
                     + "langchain4j.moderation-model.openai.api-key = sk-...\n");
         }
 
-        if (properties.getModerationModel().getProvider() != OPEN_AI) {
+        if (properties.getModerationModel().getProvider() != ModelProvider.OPEN_AI) {
             throw illegalConfiguration("Unsupported moderation model provider: %s",
                     properties.getModerationModel().getProvider());
         }

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryReq.java

@@ -3,7 +3,7 @@ package com.tencent.supersonic.headless.api.pojo.request;
 import com.google.common.collect.Sets;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.Text2SQLType;
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import com.tencent.supersonic.headless.api.pojo.QueryDataType;
 import com.tencent.supersonic.headless.api.pojo.SchemaMapInfo;
 import com.tencent.supersonic.headless.api.pojo.enums.MapModeEnum;

headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/llm/SqlGenStrategy.java

@@ -1,9 +1,9 @@
 package com.tencent.supersonic.headless.core.chat.parser.llm;
 
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import com.tencent.supersonic.headless.core.chat.query.llm.s2sql.LLMReq;
 import com.tencent.supersonic.headless.core.chat.query.llm.s2sql.LLMResp;
-import com.tencent.supersonic.headless.core.utils.S2ChatModelProvider;
+import com.tencent.supersonic.common.util.S2ChatModelProvider;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/query/llm/s2sql/LLMReq.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.chat.query.llm.s2sql;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import lombok.Data;
 

headless/core/src/main/java/com/tencent/supersonic/headless/core/config/MapperConfig.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.core.config;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.common.pojo.ParameterConfig;
+import com.tencent.supersonic.common.config.ParameterConfig;
 import com.tencent.supersonic.common.pojo.Parameter;
 import org.springframework.stereotype.Service;
 

headless/core/src/main/java/com/tencent/supersonic/headless/core/config/ParserConfig.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.core.config;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.common.pojo.ParameterConfig;
+import com.tencent.supersonic.common.config.ParameterConfig;
 import com.tencent.supersonic.common.pojo.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/QueryContext.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.Text2SQLType;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import com.tencent.supersonic.headless.api.pojo.QueryDataType;
 import com.tencent.supersonic.headless.api.pojo.SchemaMapInfo;
 import com.tencent.supersonic.headless.api.pojo.SemanticSchema;

launchers/common/pom.xml

@@ -43,16 +43,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <!--langchain4j-->
-        <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-spring-boot-starter</artifactId>
-        </dependency>
 
-        <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-embeddings-bge-small-zh</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

launchers/standalone/src/test/java/com/tencent/supersonic/evaluation/Text2SQLEval.java

@@ -8,7 +8,7 @@ import com.tencent.supersonic.chat.server.agent.AgentConfig;
 import com.tencent.supersonic.chat.server.agent.AgentToolType;
 import com.tencent.supersonic.chat.server.agent.MultiTurnConfig;
 import com.tencent.supersonic.chat.server.agent.RuleParserTool;
-import com.tencent.supersonic.headless.api.pojo.LLMConfig;
+import com.tencent.supersonic.common.config.LLMConfig;
 import com.tencent.supersonic.headless.api.pojo.response.QueryResult;
 import com.tencent.supersonic.util.DataUtils;
 import org.junit.jupiter.api.BeforeAll;