feat: optimize bot example

hexiaochun · hexiaochun · commit aaab65885670 · 2024-12-03T16:21:37.000+08:00
diff --git a/volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkBaseService.java b/volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkBaseService.java
@@ -17,6 +17,4 @@ public abstract class ArkBaseService {
     public static final String BASE_REGION = "cn-beijing";
     public static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(10);
     public static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofMinutes(1);
-    public static final ConnectionPool DEFAULT_CONNECTION_POOL = new ConnectionPool(5, 1, TimeUnit.SECONDS);
-    public static final Dispatcher DEFAULT_DISPATCHER = new Dispatcher();
 }
diff --git a/volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkService.java b/volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkService.java
@@ -314,13 +314,11 @@ public ArkService build() {
             if (connectionPool != null) {
                 clientBuilder.connectionPool(connectionPool);
             } else {
-                clientBuilder.connectionPool(DEFAULT_CONNECTION_POOL);
+                clientBuilder.connectionPool(new ConnectionPool(5, 1, TimeUnit.SECONDS));
             }
 
             if (dispatcher != null) {
                 clientBuilder.dispatcher(dispatcher);
-            } else {
-                clientBuilder.dispatcher(DEFAULT_DISPATCHER);
             }
 
             OkHttpClient client = clientBuilder
diff --git a/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/BotChatCompletionsExample.java b/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/BotChatCompletionsExample.java
@@ -6,12 +6,12 @@
 import com.volcengine.ark.runtime.model.completion.chat.ChatMessage;
 import com.volcengine.ark.runtime.model.completion.chat.ChatMessageRole;
 import com.volcengine.ark.runtime.service.ArkService;
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_CONNECTION_POOL;
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_DISPATCHER;
+import java.util.concurrent.TimeUnit;
 
 /*
 # pom.xml
@@ -41,6 +41,8 @@ public class BotChatCompletionsExample {
      */
 
     static String apiKey = System.getenv("ARK_API_KEY");
+    static ConnectionPool DEFAULT_CONNECTION_POOL = new ConnectionPool(5, 1, TimeUnit.SECONDS);
+    static Dispatcher DEFAULT_DISPATCHER = new Dispatcher();
     static ArkService service = ArkService.builder().dispatcher(DEFAULT_DISPATCHER).connectionPool(DEFAULT_CONNECTION_POOL).apiKey(apiKey).build();
 
     public static void main(String[] args) {
diff --git a/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/ChatCompletionsExample.java b/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/ChatCompletionsExample.java
@@ -5,12 +5,12 @@
 import com.volcengine.ark.runtime.model.completion.chat.ChatMessage;
 import com.volcengine.ark.runtime.model.completion.chat.ChatMessageRole;
 import com.volcengine.ark.runtime.service.ArkService;
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_CONNECTION_POOL;
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_DISPATCHER;
+import java.util.concurrent.TimeUnit;
 
 /*
 # pom.xml
@@ -40,6 +40,8 @@ public class ChatCompletionsExample {
      */
 
     static String apiKey = System.getenv("ARK_API_KEY");
+    static ConnectionPool DEFAULT_CONNECTION_POOL = new ConnectionPool(5, 1, TimeUnit.SECONDS);
+    static Dispatcher DEFAULT_DISPATCHER = new Dispatcher();
     static ArkService service = ArkService.builder().dispatcher(DEFAULT_DISPATCHER).connectionPool(DEFAULT_CONNECTION_POOL).apiKey(apiKey).build();
 
     public static void main(String[] args) {
diff --git a/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/ChatCompletionsFunctionCallExample.java b/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/ChatCompletionsFunctionCallExample.java
@@ -3,11 +3,11 @@
 
 import com.volcengine.ark.runtime.model.completion.chat.*;
 import com.volcengine.ark.runtime.service.ArkService;
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
 
 import java.util.*;
-
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_CONNECTION_POOL;
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_DISPATCHER;
+import java.util.concurrent.TimeUnit;
 
 public class ChatCompletionsFunctionCallExample {
 
@@ -28,6 +28,8 @@ public class ChatCompletionsFunctionCallExample {
      */
 
     static String apiKey = System.getenv("ARK_API_KEY");
+    static ConnectionPool DEFAULT_CONNECTION_POOL = new ConnectionPool(5, 1, TimeUnit.SECONDS);
+    static Dispatcher DEFAULT_DISPATCHER = new Dispatcher();
     static ArkService service = ArkService.builder().dispatcher(DEFAULT_DISPATCHER).connectionPool(DEFAULT_CONNECTION_POOL).apiKey(apiKey).build();
 
     public static void main(String[] args) {
diff --git a/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/ChatCompletionsVisionExample.java b/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/ChatCompletionsVisionExample.java
@@ -5,12 +5,12 @@
 import com.volcengine.ark.runtime.model.completion.chat.ChatMessage;
 import com.volcengine.ark.runtime.model.completion.chat.ChatMessageRole;
 import com.volcengine.ark.runtime.service.ArkService;
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_CONNECTION_POOL;
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_DISPATCHER;
+import java.util.concurrent.TimeUnit;
 
 /*
 # pom.xml
@@ -40,6 +40,8 @@ public class ChatCompletionsVisionExample {
      */
 
     static String apiKey = System.getenv("ARK_API_KEY");
+    static ConnectionPool DEFAULT_CONNECTION_POOL = new ConnectionPool(5, 1, TimeUnit.SECONDS);
+    static Dispatcher DEFAULT_DISPATCHER = new Dispatcher();
     static ArkService service = ArkService.builder().dispatcher(DEFAULT_DISPATCHER).connectionPool(DEFAULT_CONNECTION_POOL).apiKey(apiKey).build();
 
     public static void main(String[] args) {
diff --git a/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/EmbeddingsExample.java b/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/EmbeddingsExample.java
@@ -4,12 +4,12 @@
 import com.volcengine.ark.runtime.model.embeddings.EmbeddingRequest;
 import com.volcengine.ark.runtime.model.embeddings.EmbeddingResult;
 import com.volcengine.ark.runtime.service.ArkService;
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_CONNECTION_POOL;
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_DISPATCHER;
+import java.util.concurrent.TimeUnit;
 
 public class EmbeddingsExample {
 
@@ -30,6 +30,8 @@ public class EmbeddingsExample {
      */
 
     static String apiKey = System.getenv("ARK_API_KEY");
+    static ConnectionPool DEFAULT_CONNECTION_POOL = new ConnectionPool(5, 1, TimeUnit.SECONDS);
+    static Dispatcher DEFAULT_DISPATCHER = new Dispatcher();
     static ArkService service = ArkService.builder().dispatcher(DEFAULT_DISPATCHER).connectionPool(DEFAULT_CONNECTION_POOL).apiKey(apiKey).build();
 
     public static void main(String[] args) {
diff --git a/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/TokenizationExample.java b/volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/TokenizationExample.java
@@ -4,12 +4,12 @@
 import com.volcengine.ark.runtime.model.tokenization.TokenizationRequest;
 import com.volcengine.ark.runtime.model.tokenization.TokenizationResult;
 import com.volcengine.ark.runtime.service.ArkService;
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_CONNECTION_POOL;
-import static com.volcengine.ark.runtime.service.ArkBaseService.DEFAULT_DISPATCHER;
+import java.util.concurrent.TimeUnit;
 
 public class TokenizationExample {
 
@@ -30,6 +30,8 @@ public class TokenizationExample {
      */
 
     static String apiKey = System.getenv("ARK_API_KEY");
+    static ConnectionPool DEFAULT_CONNECTION_POOL = new ConnectionPool(5, 1, TimeUnit.SECONDS);
+    static Dispatcher DEFAULT_DISPATCHER = new Dispatcher();
     static ArkService service = ArkService.builder().dispatcher(DEFAULT_DISPATCHER).connectionPool(DEFAULT_CONNECTION_POOL).apiKey(apiKey).build();
 
     public static void main(String[] args) {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,4 @@ public abstract class ArkBaseService {`
`17`	`17`	`public static final String BASE_REGION = "cn-beijing";`
`18`	`18`	`public static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(10);`
`19`	`19`	`public static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofMinutes(1);`
`20`		`- public static final ConnectionPool DEFAULT_CONNECTION_POOL = new ConnectionPool(5, 1, TimeUnit.SECONDS);`
`21`		`- public static final Dispatcher DEFAULT_DISPATCHER = new Dispatcher();`
`22`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -314,13 +314,11 @@ public ArkService build() {`
`314`	`314`	`if (connectionPool != null) {`
`315`	`315`	`clientBuilder.connectionPool(connectionPool);`
`316`	`316`	`} else {`
`317`		`- clientBuilder.connectionPool(DEFAULT_CONNECTION_POOL);`
	`317`	`+ clientBuilder.connectionPool(new ConnectionPool(5, 1, TimeUnit.SECONDS));`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`if (dispatcher != null) {`
`321`	`321`	`clientBuilder.dispatcher(dispatcher);`
`322`		`- } else {`
`323`		`- clientBuilder.dispatcher(DEFAULT_DISPATCHER);`
`324`	`322`	`}`
`325`	`323`
`326`	`324`	`OkHttpClient client = clientBuilder`