(improvement)(common) Optimized the structure of the common package. (#1164)

chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/PluginManager.java

@@ -14,13 +14,13 @@ import com.tencent.supersonic.chat.server.plugin.event.PluginUpdateEvent;
 import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
 import com.tencent.supersonic.chat.server.service.PluginService;
 import com.tencent.supersonic.common.config.EmbeddingConfig;
-import com.tencent.supersonic.common.util.ComponentFactory;
+import dev.langchain4j.store.embedding.ComponentFactory;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.embedding.EmbeddingQuery;
-import com.tencent.supersonic.common.util.embedding.Retrieval;
-import com.tencent.supersonic.common.util.embedding.RetrieveQuery;
-import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
-import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
+import dev.langchain4j.store.embedding.EmbeddingQuery;
+import dev.langchain4j.store.embedding.Retrieval;
+import dev.langchain4j.store.embedding.RetrieveQuery;
+import dev.langchain4j.store.embedding.RetrieveQueryResult;
+import dev.langchain4j.store.embedding.S2EmbeddingStore;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementType;

chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/recognize/embedding/EmbeddingRecallRecognizer.java

@@ -9,8 +9,8 @@ import com.tencent.supersonic.chat.server.plugin.recognize.PluginRecognizer;
 import com.tencent.supersonic.chat.server.pojo.ChatParseContext;
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.embedding.Retrieval;
-import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
+import dev.langchain4j.store.embedding.Retrieval;
+import dev.langchain4j.store.embedding.RetrieveQueryResult;
 import com.tencent.supersonic.headless.chat.utils.ComponentFactory;
 import com.tencent.supersonic.headless.chat.parser.llm.PythonLLMProxy;
 import lombok.extern.slf4j.Slf4j;

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

@@ -20,7 +20,7 @@ import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.RatioOverType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateUtils;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.AggregateInfo;
 import com.tencent.supersonic.headless.api.pojo.MetricInfo;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;

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

@@ -5,9 +5,9 @@ import com.tencent.supersonic.chat.server.pojo.ChatExecuteContext;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.embedding.Retrieval;
-import com.tencent.supersonic.common.util.embedding.RetrieveQuery;
-import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
+import dev.langchain4j.store.embedding.Retrieval;
+import dev.langchain4j.store.embedding.RetrieveQuery;
+import dev.langchain4j.store.embedding.RetrieveQueryResult;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;

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

@@ -4,12 +4,12 @@ import com.google.common.collect.Lists;
 import com.tencent.supersonic.chat.api.pojo.request.SimilarQueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp;
 import com.tencent.supersonic.common.config.EmbeddingConfig;
-import com.tencent.supersonic.common.util.ComponentFactory;
-import com.tencent.supersonic.common.util.embedding.EmbeddingQuery;
-import com.tencent.supersonic.common.util.embedding.Retrieval;
-import com.tencent.supersonic.common.util.embedding.RetrieveQuery;
-import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
-import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
+import dev.langchain4j.store.embedding.ComponentFactory;
+import dev.langchain4j.store.embedding.EmbeddingQuery;
+import dev.langchain4j.store.embedding.Retrieval;
+import dev.langchain4j.store.embedding.RetrieveQuery;
+import dev.langchain4j.store.embedding.RetrieveQueryResult;
+import dev.langchain4j.store.embedding.S2EmbeddingStore;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

common/src/main/java/com/tencent/supersonic/common/calcite/S2MysqlSqlDialect.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.calcite;
+package com.tencent.supersonic.common.calcite;
 
 import org.apache.calcite.sql.dialect.MysqlSqlDialect;
 

common/src/main/java/com/tencent/supersonic/common/calcite/SqlParseUtils.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.calcite;
+package com.tencent.supersonic.common.calcite;
 
 
 import java.util.HashMap;

common/src/main/java/com/tencent/supersonic/common/calcite/SqlParserInfo.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.calcite;
+package com.tencent.supersonic.common.calcite;
 
 import java.io.Serializable;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Arrays;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.DatePeriodEnum;
 import com.tencent.supersonic.common.util.DateUtils;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import lombok.Data;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/ExpressionReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Objects;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAcquireVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Set;
 import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.DatePeriodEnum;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldExpression.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.Data;
 

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldlValueReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.JsonUtil;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledExpression.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.Data;
 

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledFilterReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.ArrayList;
 import java.util.List;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledNameReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Objects;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FilterRemoveVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import net.sf.jsqlparser.expression.Expression;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionAliasReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.HashMap;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionNameReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Objects;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.StringUtil;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.HashSet;
 import java.util.Set;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByFunctionReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.statement.select.GroupByElement;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/JsqlConstants.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByAcquireVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.Constants;
 import java.util.Set;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByExpression.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.Data;
 

common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import net.sf.jsqlparser.expression.Expression;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Map.Entry;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Objects;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelper.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.jsqlparser.DateVisitor.DateBoundInfo;
+
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +14,7 @@ import net.sf.jsqlparser.statement.select.PlainSelect;
 @Slf4j
 public class SqlDateSelectHelper {
 
-    public static DateBoundInfo getDateBoundInfo(String sql) {
+    public static DateVisitor.DateBoundInfo getDateBoundInfo(String sql) {
         List<PlainSelect> plainSelectList = SqlSelectHelper.getPlainSelect(sql);
         if (plainSelectList.size() != 1) {
             return null;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEditEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 public enum SqlEditEnum {
     NUMBER_FILTER,

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.HashSet;
 import java.util.List;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.util.StringUtil;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.StringUtil;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/TableNameReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.select.FromItemVisitorAdapter;

common/src/main/java/com/tencent/supersonic/common/util/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java

@@ -1,21 +0,0 @@
-package com.tencent.supersonic.common.util.embedding;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore;
-import java.lang.reflect.Type;
-
-public class GsonInMemoryEmbeddingStoreJsonCodec implements InMemoryEmbeddingStoreJsonCodec {
-
-    @Override
-    public InMemoryEmbeddingStore<EmbeddingQuery> fromJson(String json) {
-        Type type = new TypeToken<InMemoryEmbeddingStore<EmbeddingQuery>>() {
-        }.getType();
-        return new Gson().fromJson(json, type);
-    }
-
-    @Override
-    public String toJson(InMemoryEmbeddingStore<?> store) {
-        return new Gson().toJson(store);
-    }
-}

common/src/main/java/dev/langchain4j/store/embedding/ComponentFactory.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.common.util;
+package dev.langchain4j.store.embedding;
 
-import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
-import java.util.Objects;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 
+import java.util.Objects;
+
 public class ComponentFactory {
 
     private static S2EmbeddingStore s2EmbeddingStore;

common/src/main/java/dev/langchain4j/store/embedding/EmbeddingCollection.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 
 import lombok.Data;

common/src/main/java/dev/langchain4j/store/embedding/EmbeddingQuery.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 
 import com.alibaba.fastjson.JSONObject;

common/src/main/java/dev/langchain4j/store/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java

@@ -0,0 +1,21 @@
+package dev.langchain4j.store.embedding;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+
+public class GsonInMemoryEmbeddingStoreJsonCodec implements InMemoryEmbeddingStoreJsonCodec {
+
+    @Override
+    public InMemoryS2EmbeddingStore.InMemoryEmbeddingStore<EmbeddingQuery> fromJson(String json) {
+        Type type = new TypeToken<InMemoryS2EmbeddingStore.InMemoryEmbeddingStore<EmbeddingQuery>>() {
+        }.getType();
+        return new Gson().fromJson(json, type);
+    }
+
+    @Override
+    public String toJson(InMemoryS2EmbeddingStore.InMemoryEmbeddingStore<?> store) {
+        return new Gson().toJson(store);
+    }
+}

common/src/main/java/dev/langchain4j/store/embedding/InMemoryEmbeddingStoreJsonCodec.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
-import com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore;
+import dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore;
 
 public interface InMemoryEmbeddingStoreJsonCodec {
 

common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java

@@ -1,15 +1,11 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.util.ContextUtils;
 import dev.langchain4j.data.embedding.Embedding;
 import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.store.embedding.CosineSimilarity;
-import dev.langchain4j.store.embedding.EmbeddingMatch;
-import dev.langchain4j.store.embedding.EmbeddingStore;
-import dev.langchain4j.store.embedding.RelevanceScore;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;

common/src/main/java/dev/langchain4j/store/embedding/PythonServiceS2EmbeddingStore.java

@@ -1,14 +1,10 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.util.ContextUtils;
-import java.net.URI;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -20,6 +16,11 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /***
  * Implementation of calling the Python service S2EmbeddingStore.
  */

common/src/main/java/dev/langchain4j/store/embedding/Retrieval.java

@@ -1,11 +1,12 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import com.google.common.base.Objects;
 import com.tencent.supersonic.common.pojo.Constants;
-import java.util.Map;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Map;
+
 @Data
 public class Retrieval {
 

common/src/main/java/dev/langchain4j/store/embedding/RetrieveQuery.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import lombok.Builder;
 import lombok.Data;

common/src/main/java/dev/langchain4j/store/embedding/RetrieveQueryResult.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 
 import lombok.Data;

common/src/main/java/dev/langchain4j/store/embedding/S2EmbeddingStore.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import java.util.List;
 

common/src/test/java/com/tencent/supersonic/common/DateUtilsTest.java

@@ -1,6 +1,8 @@
-package com.tencent.supersonic.common.util;
+package com.tencent.supersonic.common;
 
 import com.tencent.supersonic.common.pojo.Constants;
+import com.tencent.supersonic.common.util.DatePeriodEnum;
+import com.tencent.supersonic.common.util.DateUtils;
 import org.assertj.core.util.Lists;
 import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;

common/src/test/java/com/tencent/supersonic/common/calcite/SqlParseUtilsTest.java

@@ -1,8 +1,9 @@
-package com.tencent.supersonic.common.util.calcite;
+package com.tencent.supersonic.common.calcite;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.junit.Assert;

common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelperTest.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -6,6 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;

common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelperTest.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 
-import com.tencent.supersonic.common.util.jsqlparser.DateVisitor.DateBoundInfo;
+import com.tencent.supersonic.common.jsqlparser.DateVisitor.DateBoundInfo;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 

common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelperTest.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 
 import org.junit.Assert;

common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelperTest.java

@@ -1,8 +1,9 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 

common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelperTest.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import java.util.Collections;

common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelperTest.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import net.sf.jsqlparser.JSQLParserException;
 import org.junit.Assert;

common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelperTest.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.statement.select.Select;

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

@@ -12,7 +12,7 @@ import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/AggCorrector.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.chat.corrector;
 
 
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.chat.QueryContext;
 import lombok.extern.slf4j.Slf4j;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/BaseSemanticCorrector.java

@@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.chat.corrector;
 import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.SemanticSchema;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GrammarCorrector.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.chat.corrector;
 
-import com.tencent.supersonic.common.util.jsqlparser.SqlRemoveHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.chat.QueryContext;
 import lombok.extern.slf4j.Slf4j;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GroupByCorrector.java

@@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.chat.corrector;
 
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.SemanticSchema;
 import com.tencent.supersonic.headless.api.pojo.SqlInfo;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java

@@ -1,9 +1,9 @@
 package com.tencent.supersonic.headless.chat.corrector;
 
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectFunctionHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.SemanticSchema;
 import com.tencent.supersonic.headless.chat.QueryContext;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SchemaCorrector.java

@@ -5,11 +5,11 @@ import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.DateUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.util.jsqlparser.AggregateEnum;
-import com.tencent.supersonic.common.util.jsqlparser.FieldExpression;
-import com.tencent.supersonic.common.util.jsqlparser.SqlRemoveHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.AggregateEnum;
+import com.tencent.supersonic.common.jsqlparser.FieldExpression;
+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.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.SemanticSchema;
 import com.tencent.supersonic.headless.api.pojo.SqlInfo;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java

@@ -1,8 +1,8 @@
 package com.tencent.supersonic.headless.chat.corrector;
 
 
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.chat.QueryContext;
 import lombok.extern.slf4j.Slf4j;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/TimeCorrector.java

@@ -3,12 +3,12 @@ package com.tencent.supersonic.headless.chat.corrector;
 
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlDateSelectHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlRemoveHelper;
-import com.tencent.supersonic.common.util.jsqlparser.DateVisitor.DateBoundInfo;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlDateSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper;
+import com.tencent.supersonic.common.jsqlparser.DateVisitor.DateBoundInfo;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.chat.QueryContext;
 import com.tencent.supersonic.headless.chat.utils.S2SqlDateHelper;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/WhereCorrector.java

@@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.chat.corrector;
 
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.util.StringUtil;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SchemaValueMap;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/MetaEmbeddingService.java

@@ -2,11 +2,11 @@ package com.tencent.supersonic.headless.chat.knowledge;
 
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.common.util.ComponentFactory;
-import com.tencent.supersonic.common.util.embedding.Retrieval;
-import com.tencent.supersonic.common.util.embedding.RetrieveQuery;
-import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
-import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
+import dev.langchain4j.store.embedding.ComponentFactory;
+import dev.langchain4j.store.embedding.Retrieval;
+import dev.langchain4j.store.embedding.RetrieveQuery;
+import dev.langchain4j.store.embedding.RetrieveQueryResult;
+import dev.langchain4j.store.embedding.S2EmbeddingStore;
 import com.tencent.supersonic.headless.chat.knowledge.helper.NatureHelper;
 import java.util.ArrayList;
 import java.util.HashMap;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMapper.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.chat.mapper;
 
 
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.embedding.Retrieval;
+import dev.langchain4j.store.embedding.Retrieval;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.headless.api.pojo.SchemaElementType;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMatchStrategy.java

@@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.chat.mapper;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.common.util.embedding.Retrieval;
-import com.tencent.supersonic.common.util.embedding.RetrieveQuery;
-import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
+import dev.langchain4j.store.embedding.Retrieval;
+import dev.langchain4j.store.embedding.RetrieveQuery;
+import dev.langchain4j.store.embedding.RetrieveQueryResult;
 import com.tencent.supersonic.headless.chat.QueryContext;
 import com.tencent.supersonic.headless.chat.knowledge.EmbeddingResult;
 import com.tencent.supersonic.headless.chat.knowledge.MetaEmbeddingService;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java

@@ -3,7 +3,7 @@ package com.tencent.supersonic.headless.chat.parser;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.SemanticSchema;

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

@@ -3,13 +3,13 @@ package com.tencent.supersonic.headless.chat.parser.llm;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.tencent.supersonic.common.config.EmbeddingConfig;
-import com.tencent.supersonic.common.util.ComponentFactory;
+import dev.langchain4j.store.embedding.ComponentFactory;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.util.embedding.EmbeddingQuery;
-import com.tencent.supersonic.common.util.embedding.Retrieval;
-import com.tencent.supersonic.common.util.embedding.RetrieveQuery;
-import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult;
-import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
+import dev.langchain4j.store.embedding.EmbeddingQuery;
+import dev.langchain4j.store.embedding.Retrieval;
+import dev.langchain4j.store.embedding.RetrieveQuery;
+import dev.langchain4j.store.embedding.RetrieveQueryResult;
+import dev.langchain4j.store.embedding.S2EmbeddingStore;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.chat.parser.llm;
 
 import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.common.util.jsqlparser.SqlEqualHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlEqualHelper;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.chat.query.QueryManager;
 import com.tencent.supersonic.headless.chat.query.llm.LLMSemanticQuery;

headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/ClickHouseAdaptor.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.adaptor.db;
 
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.pojo.Constants;
 import java.util.HashMap;

headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.adaptor.db;
 
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;

headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/accelerator/AbstractAccelerator.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.executor.accelerator;
 
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.core.parser.calcite.Configuration;
 import com.tencent.supersonic.headless.core.parser.calcite.s2sql.TimeRange;
 import com.tencent.supersonic.headless.core.parser.calcite.schema.DataSourceTable;

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.parser;
 
 import com.google.common.base.Strings;
 import com.tencent.supersonic.common.util.StringUtil;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java

@@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.core.parser.converter;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;

headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java

@@ -15,8 +15,8 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
 import com.tencent.supersonic.common.util.StringUtil;
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.Measure;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;

headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java

@@ -6,9 +6,9 @@ import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.util.jsqlparser.FieldExpression;
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.FieldExpression;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.DimValueMap;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;

headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java

@@ -3,7 +3,7 @@ package com.tencent.supersonic.headless.server.aspect;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
 import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;

headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java

@@ -21,7 +21,7 @@ import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
 import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
 import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
 import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import com.tencent.supersonic.headless.api.pojo.request.SchemaFilterReq;

headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/MetaEmbeddingListener.java

@@ -4,9 +4,9 @@ import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.pojo.DataEvent;
 import com.tencent.supersonic.common.pojo.DataItem;
 import com.tencent.supersonic.common.pojo.enums.EventType;
-import com.tencent.supersonic.common.util.ComponentFactory;
-import com.tencent.supersonic.common.util.embedding.EmbeddingQuery;
-import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
+import dev.langchain4j.store.embedding.ComponentFactory;
+import dev.langchain4j.store.embedding.EmbeddingQuery;
+import dev.langchain4j.store.embedding.S2EmbeddingStore;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java

@@ -6,8 +6,8 @@ import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.common.util.jsqlparser.FieldExpression;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.FieldExpression;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;
 import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.headless.api.pojo.SemanticSchema;

headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java

@@ -2,10 +2,10 @@ package com.tencent.supersonic.headless.server.schedule;
 
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.pojo.DataItem;
-import com.tencent.supersonic.common.util.ComponentFactory;
-import com.tencent.supersonic.common.util.embedding.EmbeddingQuery;
-import com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore;
-import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
+import dev.langchain4j.store.embedding.ComponentFactory;
+import dev.langchain4j.store.embedding.EmbeddingQuery;
+import dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore;
+import dev.langchain4j.store.embedding.S2EmbeddingStore;
 import com.tencent.supersonic.headless.server.service.DimensionService;
 import com.tencent.supersonic.headless.server.service.MetricService;
 import lombok.extern.slf4j.Slf4j;

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

@@ -9,11 +9,11 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.util.jsqlparser.FieldExpression;
-import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlRemoveHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.FieldExpression;
+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.headless.api.pojo.DataSetSchema;
 import com.tencent.supersonic.headless.api.pojo.EntityInfo;
 import com.tencent.supersonic.headless.api.pojo.SchemaElement;

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java

@@ -11,7 +11,7 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
 import com.tencent.supersonic.common.util.BeanMapper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.DataSetDetail;
 import com.tencent.supersonic.headless.api.pojo.QueryConfig;
 import com.tencent.supersonic.headless.api.pojo.enums.TagDefineType;

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java

@@ -6,7 +6,7 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.Pair;
 import com.tencent.supersonic.common.pojo.QueryColumn;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq;
 import com.tencent.supersonic.headless.api.pojo.request.SqlExecuteReq;
 import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp;

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java

@@ -18,7 +18,7 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.common.util.BeanMapper;
 import com.tencent.supersonic.headless.server.utils.AliasGenerateHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectFunctionHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper;
 import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
 import com.tencent.supersonic.headless.api.pojo.Measure;
 import com.tencent.supersonic.headless.api.pojo.MeasureParam;

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.server.utils;
 
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectFunctionHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper;
 import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType;
 import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams;
 import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams;

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java

@@ -6,9 +6,9 @@ import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectFunctionHelper;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.Measure;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java

@@ -7,8 +7,8 @@ import com.tencent.supersonic.common.pojo.ItemDateResp;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
-import com.tencent.supersonic.common.util.jsqlparser.FieldExpression;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.FieldExpression;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.ItemDateFilter;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
-import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.QueryStat;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.enums.QueryOptMode;