Fix:1555修复通义千问返回结果不能解析问题

.github/workflows/release.yml

@@ -62,6 +62,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
           java-package: "jre"
+          architecture: "x64"
 
       # Install jre MacOS arm64
       - name: Install Jre MacOS arm64
@@ -86,7 +87,7 @@ jobs:
       - name: Enable tls1
         if: ${{ runner.os == 'Windows' }}
         run: |
-          # sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" "${{ env.JAVA_HOME }}/conf/security/java.security"
+          # sed -i '' "s/\(^jdk.tls.disabledAlgorithms=\)\(.*\)\( TLSv1, TLSv1.1,\)\(.*\)/\1\2\4/" "${{ env.JAVA_HOME }}\conf\security\java.security"
           $filePath = "${{ env.JAVA_HOME }}\conf\security\java.security"
           $content = Get-Content $filePath -Raw
           $updatedContent = $content -replace '^(jdk.tls.disabledAlgorithms=)(.*)( TLSv1, TLSv1.1,)(.*)', '$1$2$4'
@@ -210,7 +211,7 @@ jobs:
         run: |
           xcrun notarytool store-credentials "Chat2DB" --apple-id "${{secrets.MAC_APPLE_ID}}" --password "${{secrets.MAC_APPLE_PASSWORD}}" --team-id "${{secrets.MAC_TEAM_ID}}"
           xcrun notarytool submit chat2db-client/release/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.dmg --keychain-profile "Chat2DB"
-      
+
       # macos arm64
       - name: Build/release Electron app for MacOS arm64
         if: ${{ runner.os == 'macOS' && matrix.arch == 'arm64' }}
@@ -346,4 +347,4 @@ jobs:
             {
               "title": "Linux-test-打包完成通知",
               "text": "# Linux-test-打包完成通知   \n ![bang](https://oss.sqlgpt.cn/static/happy100.jpg)   \n ###  任务id：[${{ github.run_id }}](https://github.com/chat2db/Chat2DB/actions/runs/${{ github.run_id }})   \n ### Linux下载地址：[https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage](https://oss.sqlgpt.cn/release/${{ steps.chat2db_version.outputs.substring }}/Chat2DB-${{ steps.chat2db_version.outputs.substring }}.AppImage)"
-            }
+            }

chat2db-client/src/blocks/Setting/UpdateDetection/index.tsx

@@ -41,9 +41,9 @@ const UpdateDetection = memo(
     const [notificationApi, notificationDom] = notification.useNotification();
     const timesRef = React.useRef(0);
 
-    useEffect(() => {
-      checkUpdate();
-    }, []);
+    // useEffect(() => {
+    //   checkUpdate();
+    // }, []);
 
     const close = () => {};
 

chat2db-client/src/typings/ai.ts

@@ -1,5 +1,5 @@
 export enum AIType {
-  // CHAT2DBAI = 'CHAT2DBAI',
+  CHAT2DBAI = 'CHAT2DBAI',
   ZHIPUAI = 'ZHIPUAI',
   BAICHUANAI='BAICHUANAI',
   WENXINAI='WENXINAI',

chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/builder/ClickHouseSqlBuilder.java

@@ -10,6 +10,8 @@
 import ai.chat2db.spi.model.TableIndex;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
+
 
 public class ClickHouseSqlBuilder extends DefaultSqlBuilder {
     @Override

chat2db-server/chat2db-plugins/chat2db-h2/src/main/java/ai/chat2db/plugin/h2/H2Meta.java

@@ -3,6 +3,7 @@
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
 

chat2db-server/chat2db-plugins/chat2db-hive/src/main/java/ai/chat2db/plugin/hive/builder/HiveSqlBuilder.java

@@ -2,13 +2,15 @@
 
 import ai.chat2db.plugin.hive.type.HiveColumnTypeEnum;
 import ai.chat2db.plugin.hive.type.HiveIndexTypeEnum;
+import ai.chat2db.spi.SqlBuilder;
 import ai.chat2db.spi.jdbc.DefaultSqlBuilder;
 import ai.chat2db.spi.model.Database;
 import ai.chat2db.spi.model.Table;
 import ai.chat2db.spi.model.TableColumn;
 import ai.chat2db.spi.model.TableIndex;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
 
 
 public class HiveSqlBuilder extends DefaultSqlBuilder implements SqlBuilder<Table> {

chat2db-server/chat2db-server-domain/chat2db-server-domain-repository/src/main/resources/db/migration/V2_1_10__REMOVEdEMO.sql

@@ -0,0 +1,7 @@
+delete from DATA_SOURCE where ALIAS ='DEMO@db.sqlgpt.cn';
+
+delete from DASHBOARD where id =ID;
+
+delete from CHART where id<=3;
+
+delete  from DASHBOARD_CHART_RELATION where CHART_ID<=3;

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/tongyi/listener/TongyiChatAIEventSourceListener.java

@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * description：OpenAIEventSourceListener
@@ -52,26 +54,27 @@ public void onOpen(EventSource eventSource, Response response) {
     @Override
     public void onEvent(EventSource eventSource, String id, String type, String data) {
         log.info("Tongyi Chat AI response data：{}", data);
-        if (data.equals("[DONE]")) {
-            log.info("Tongyi Chat AI closed");
+        if (data.contains("\"finish_reason\":\"stop\"")) {
+            TongyiChatCompletions chatCompletions = mapper.readValue(data, TongyiChatCompletions.class);
+            String text = chatCompletions.getOutput().getText();
+            log.info("id: {}, text: {}", chatCompletions.getId(), text);
+            String sqlContent = "";
+            if (text.indexOf("```sql") == -1) {
+                sqlContent = text;
+            } else {
+                Pattern pattern = Pattern.compile("```sql(.*?)```", Pattern.DOTALL);
+                Matcher matcher = pattern.matcher(text);
+                if (matcher.find()) {
+                    sqlContent = matcher.group(1).trim();
+                }
+            }
+            Message message = new Message();
+            message.setContent(sqlContent);
             sseEmitter.send(SseEmitter.event()
-                .id("[DONE]")
-                .data("[DONE]")
-                .reconnectTime(3000));
-            sseEmitter.complete();
-            return;
+                    .id(null)
+                    .data(message)
+                    .reconnectTime(3000));
         }
-
-        TongyiChatCompletions chatCompletions = mapper.readValue(data, TongyiChatCompletions.class);
-        String text = chatCompletions.getOutput().getText();
-        log.info("id: {}, text: {}", chatCompletions.getId(), text);
-
-        Message message = new Message();
-        message.setContent(text);
-        sseEmitter.send(SseEmitter.event()
-            .id(null)
-            .data(message)
-            .reconnectTime(3000));
     }
 
     @Override

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/converter/RdbWebConverter.java

@@ -42,6 +42,8 @@ public abstract class RdbWebConverter {
     public abstract DlExecuteParam request2param(DmlRequest request);
 
 
+
+    public abstract GroupByParam request2param(GroupByRequest request);
     /**
      * Parameter conversion
      *