remove es

CodePhiliaX · Oct 28, 2023 · 3f357b9 · 3f357b9
1 parent 6bd0977
commit 3f357b9
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 396,390 deletions.
diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml b/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml
@@ -84,11 +84,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>org.ansj</groupId>
-            <artifactId>ansj_seg</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/...-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/ChatController.java b/...-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/ChatController.java
@@ -45,7 +45,6 @@
 import ai.chat2db.server.web.api.http.response.EsTableSchemaResponse;
 import ai.chat2db.server.web.api.http.response.TableSchemaResponse;
 import ai.chat2db.server.web.api.util.ApplicationContextUtil;
-import ai.chat2db.server.web.api.util.SegmentUtils;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
@@ -556,10 +555,9 @@ public String mappingDatabaseSchema(ChatQueryRequest queryRequest) {
         if (StringUtils.isNotBlank(apiKey)) {
             boolean res = gatewayClientService.checkInWhite(new WhiteListRequest(apiKey, WhiteListTypeEnum.VECTOR.getCode())).getData();
             if (res) {
-                properties = queryDatabaseSchema(queryRequest) + querySchemaByEs(queryRequest);
+//                properties = queryDatabaseSchema(queryRequest) + querySchemaByEs(queryRequest);
+                properties = queryDatabaseSchema(queryRequest);
             }
-        } else {
-            properties = querySchemaByEs(queryRequest);
         }
         return properties;
     }
@@ -573,10 +571,11 @@ public String mappingDatabaseSchema(ChatQueryRequest queryRequest) {
      */
     public String queryDatabaseSchema(ChatQueryRequest queryRequest) {
         // request embedding
-        String input = SegmentUtils.baseAnalysis(queryRequest.getMessage());
-        log.info("search message:{}", input);
-        FastChatEmbeddingResponse response = distributeAIEmbedding(input);
+        FastChatEmbeddingResponse response = distributeAIEmbedding(queryRequest.getMessage());
         List<List<BigDecimal>> contentVector = new ArrayList<>();
+        if (Objects.isNull(response) || CollectionUtils.isEmpty(response.getData())) {
+            return "";
+        }
         contentVector.add(response.getData().get(0).getEmbedding());
 
         // search embedding

diff --git a/...rver-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDdlController.java b/...rver-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDdlController.java
@@ -78,7 +78,7 @@ public WebPageResult<TableVO> list(@Valid TableBriefQueryRequest request) {
             try {
                 Chat2DBContext.putContext(connectInfo);
                 syncTableVector(request);
-                syncTableEs(request);
+//                syncTableEs(request);
             } catch (Exception e) {
                 log.error("sync table vector error", e);
             } finally {

diff --git a/...erver-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/TableController.java b/...erver-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/TableController.java
@@ -69,7 +69,7 @@ public WebPageResult<TableVO> list(@Valid TableBriefQueryRequest request) {
             try {
                 Chat2DBContext.putContext(connectInfo);
                 syncTableVector(request);
-                syncTableEs(request);
+//                syncTableEs(request);
             } catch (Exception e) {
                 log.error("sync table vector error", e);
             } finally {

diff --git a/...web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/util/SegmentUtils.java b/...web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/util/SegmentUtils.java
diff --git a/chat2db-server/pom.xml b/chat2db-server/pom.xml
@@ -290,12 +290,6 @@
                 <version>2.0.24</version>
             </dependency>
 
-
-            <dependency>
-                <groupId>org.ansj</groupId>
-                <artifactId>ansj_seg</artifactId>
-                <version>5.1.1</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/library/ambiguity.dic b/library/ambiguity.dic