feat(model/audio): upgrade audio models use dedicated thread pool

Author: songguocola

src/main/java/com/alibaba/dashscope/audio/asr/recognition/Recognition.java

@@ -104,7 +104,9 @@ public Recognition() {
             .task(Task.ASR.getValue())
             .function(Function.RECOGNITION.getValue())
             .build();
-    duplexApi = new SynchronizeFullDuplexApi<>(serviceOption);
+    ConnectionOptions connectionOptions = ConnectionOptions.builder().build();
+    connectionOptions.setUseDefaultClient(false);
+    duplexApi = new SynchronizeFullDuplexApi<>(connectionOptions, serviceOption);
   }
 
   public Recognition(ConnectionOptions connectionOptions) {
@@ -117,7 +119,12 @@ public Recognition(ConnectionOptions connectionOptions) {
             .task(Task.ASR.getValue())
             .function(Function.RECOGNITION.getValue())
             .build();
-    duplexApi = new SynchronizeFullDuplexApi<>(connectionOptions, serviceOption);
+    ConnectionOptions thisOptions = connectionOptions;
+    if (connectionOptions == null) {
+      thisOptions = ConnectionOptions.builder().build();
+      thisOptions.setUseDefaultClient(false);
+    }
+    duplexApi = new SynchronizeFullDuplexApi<>(thisOptions, serviceOption);
   }
 
   public Recognition(ConnectionOptions connectionOptions, String baseUrl) {
@@ -131,7 +138,12 @@ public Recognition(ConnectionOptions connectionOptions, String baseUrl) {
             .baseWebSocketUrl(baseUrl)
             .function(Function.RECOGNITION.getValue())
             .build();
-    duplexApi = new SynchronizeFullDuplexApi<>(connectionOptions, serviceOption);
+    ConnectionOptions thisOptions = connectionOptions;
+    if (connectionOptions == null) {
+      thisOptions = ConnectionOptions.builder().build();
+      thisOptions.setUseDefaultClient(false);
+    }
+    duplexApi = new SynchronizeFullDuplexApi<>(thisOptions, serviceOption);
   }
 
   public Flowable<RecognitionResult> streamCall(

src/main/java/com/alibaba/dashscope/audio/ttsv2/SpeechSynthesizer.java

@@ -96,7 +96,12 @@ public SpeechSynthesizer(
             .baseWebSocketUrl(baseUrl)
             .passTaskStarted(true)
             .build();
-    duplexApi = new SynchronizeFullDuplexApi<>(connectionOptions, serviceOption);
+    ConnectionOptions thisOptions = connectionOptions;
+    if (connectionOptions == null) {
+      thisOptions = ConnectionOptions.builder().build();
+      thisOptions.setUseDefaultClient(false);
+    }
+    duplexApi = new SynchronizeFullDuplexApi<>(thisOptions, serviceOption);
     this.callback = callback;
     this.asyncCall = this.callback != null;
   }
@@ -120,7 +125,12 @@ public SpeechSynthesizer(String baseUrl, ConnectionOptions connectionOptions) {
             .baseWebSocketUrl(baseUrl)
             .passTaskStarted(true)
             .build();
-    duplexApi = new SynchronizeFullDuplexApi<>(connectionOptions, serviceOption);
+    ConnectionOptions thisOptions = connectionOptions;
+    if (connectionOptions == null) {
+      thisOptions = ConnectionOptions.builder().build();
+      thisOptions.setUseDefaultClient(false);
+    }
+    duplexApi = new SynchronizeFullDuplexApi<>(thisOptions, serviceOption);
     this.callback = null;
   }
 
@@ -137,7 +147,9 @@ public SpeechSynthesizer() {
             .function(Function.SPEECH_SYNTHESIZER.getValue())
             .passTaskStarted(true)
             .build();
-    duplexApi = new SynchronizeFullDuplexApi<>(serviceOption);
+    ConnectionOptions connectionOptions = ConnectionOptions.builder().build();
+    connectionOptions.setUseDefaultClient(false);
+    duplexApi = new SynchronizeFullDuplexApi<>(connectionOptions, serviceOption);
     this.callback = null;
   }
 
@@ -186,7 +198,9 @@ public SpeechSynthesizer(
             .baseWebSocketUrl(baseUrl)
             .passTaskStarted(true)
             .build();
-    duplexApi = new SynchronizeFullDuplexApi<>(serviceOption);
+    ConnectionOptions connectionOptions = ConnectionOptions.builder().build();
+    connectionOptions.setUseDefaultClient(false);
+    duplexApi = new SynchronizeFullDuplexApi<>(connectionOptions, serviceOption);
     this.callback = callback;
     this.asyncCall = this.callback != null;
   }
@@ -215,7 +229,9 @@ public SpeechSynthesizer(
             .function(Function.SPEECH_SYNTHESIZER.getValue())
             .passTaskStarted(true)
             .build();
-    duplexApi = new SynchronizeFullDuplexApi<>(serviceOption);
+    ConnectionOptions connectionOptions = ConnectionOptions.builder().build();
+    connectionOptions.setUseDefaultClient(false);
+    duplexApi = new SynchronizeFullDuplexApi<>(connectionOptions, serviceOption);
     this.callback = callback;
     this.asyncCall = this.callback != null;
   }

src/main/java/com/alibaba/dashscope/protocol/ConnectionOptions.java

@@ -93,4 +93,16 @@ public boolean isUseDefaultClient() {
   public void setUseDefaultClient(boolean useDefaultClient) {
     this.useDefaultClient = useDefaultClient;
   }
+
+  public boolean hasCustomConnectTimeout() {
+    return connectTimeout != null;
+  }
+
+  public boolean hasCustomWriteTimeout() {
+    return writeTimeout != null;
+  }
+
+  public boolean hasCustomReadTimeout() {
+    return readTimeout != null;
+  }
 }

src/main/java/com/alibaba/dashscope/protocol/okhttp/OkHttpClientFactory.java

@@ -75,12 +75,17 @@ public static OkHttpClient getOkHttpClient() {
   }
 
   public static OkHttpClient getNewOkHttpClient(ConnectionOptions connectionOptions) {
-    Builder builder =
-        Holder.INSTANCE
-            .newBuilder()
-            .connectTimeout(connectionOptions.getConnectTimeout())
-            .readTimeout(connectionOptions.getReadTimeout())
-            .writeTimeout(connectionOptions.getWriteTimeout());
+    Builder builder = Holder.INSTANCE.newBuilder();
+
+    if (connectionOptions.hasCustomConnectTimeout()) {
+      builder.connectTimeout(connectionOptions.getConnectTimeout());
+    }
+    if (connectionOptions.hasCustomReadTimeout()) {
+      builder.readTimeout(connectionOptions.getReadTimeout());
+    }
+    if (connectionOptions.hasCustomWriteTimeout()) {
+      builder.writeTimeout(connectionOptions.getWriteTimeout());
+    }
 
     // Configure proxy if available
     if (connectionOptions.getProxy() != null) {