Merge 'integration_2024-12-05_629870411266' into 'master'

merge branch integration_2024-12-05_629870411266 into master

See merge request: !313

Author: liuweiwei-xyz

README.md

@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.volcengine</groupId>
 	  <artifactId>volcengine-java-sdk-bom</artifactId>
-       <version>0.1.138</version>
+       <version>0.1.139</version>
 	  <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -70,12 +70,12 @@
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-vpc</artifactId>
-   <version>0.1.138</version>
+   <version>0.1.139</version>
   </dependency>
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-ecs</artifactId>
-   <version>0.1.138</version>
+   <version>0.1.139</version>
   </dependency>
 </dependencies>
 ```

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "0.1.138",
-	"meta_commit": "d6f154626edbc873356df218e33494c6fa5cbc32"
+	"lasted": "0.1.139",
+	"meta_commit": "9c1ca76c57d6b77bb842db8b1d54a35005b38060"
 }

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.138</version>
+    <version>0.1.139</version>
     <name>volcengine-java-sdk</name>
     <url>https://open.volcengineapi.com</url>
     <description>The Java SDK For Volcengine</description>

volcengine-java-sdk-advdefence/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.138</version>
+        <version>0.1.139</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-advdefence20230308/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.138</version>
+        <version>0.1.139</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-alb/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.138</version>
+        <version>0.1.139</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-ark-runtime/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.138</version>
+        <version>0.1.139</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/interceptor/RequestIdInterceptor.java

@@ -1,6 +1,7 @@
 package com.volcengine.ark.runtime.interceptor;
 
 import com.volcengine.ark.runtime.Const;
+import com.volcengine.version.Version;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -22,6 +23,7 @@ public Response intercept(Chain chain) throws IOException {
         if (chain.request().header(Const.CLIENT_REQUEST_HEADER) == null || chain.request().header(Const.CLIENT_REQUEST_HEADER).length() == 0) {
             requestBuilder = requestBuilder.header(Const.CLIENT_REQUEST_HEADER, genRequestId());
         }
+        requestBuilder.header("User-Agent", getUserAgent());
 
         Request request = requestBuilder.build();
         return chain.proceed(request);
@@ -32,4 +34,14 @@ private String genRequestId() {
         SimpleDateFormat dateFormat= new SimpleDateFormat("yyyyMMddhhmmss");
         return dateFormat.format(date) + RandomStringUtils.randomAlphanumeric(20);
     }
+
+    private static String getUserAgent() {
+        String format = "%s/%s/(%s;%s;%s)";
+
+        String osInfo = System.getProperty("os.name") + "-" + System.getProperty("os.version");
+        String jdkInfo = "java-" + System.getProperty("java.version");
+        String arch = System.getProperty("os.arch");
+
+        return String.format(format, Version.SDK_NAME, Version.SDK_VERSION, jdkInfo, osInfo, arch);
+    }
 }

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkBaseService.java

@@ -1,20 +1,20 @@
 package com.volcengine.ark.runtime.service;
 
 
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
+
 import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 
 
 /**
  * The interface ark service.
  */
 public abstract class ArkBaseService {
 
-    static final String BASE_URL = "https://ark.cn-beijing.volces.com";
-    static final String BASE_REGION = "cn-beijing";
-    static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(10);
-    static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofMinutes(1);
-    String apiKey = "";
-    String ak = "";
-    String sk = "";
-
+    public static final String BASE_URL = "https://ark.cn-beijing.volces.com";
+    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);
 }

volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/BotChatCompletionsExample.java

@@ -3,13 +3,15 @@
 
 import com.volcengine.ark.runtime.model.bot.completion.chat.BotChatCompletionRequest;
 import com.volcengine.ark.runtime.model.bot.completion.chat.BotChatCompletionResult;
-import com.volcengine.ark.runtime.model.completion.chat.ChatCompletionRequest;
 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 java.util.concurrent.TimeUnit;
 
 /*
 # pom.xml
@@ -37,11 +39,13 @@ public class BotChatCompletionsExample {
      * To get your ak&sk, please refer to this document(https://www.volcengine.com/docs/6291/65568)
      * For more information，please check this document（https://www.volcengine.com/docs/82379/1263279）
      */
-    public static void main(String[] args) {
 
-        String apiKey = System.getenv("ARK_API_KEY");
-        ArkService service = new ArkService(apiKey);
+    static String apiKey = System.getenv("ARK_API_KEY");
+    static ConnectionPool connectionPool = new ConnectionPool(5, 1, TimeUnit.SECONDS);
+    static Dispatcher dispatcher = new Dispatcher();
+    static ArkService service = ArkService.builder().dispatcher(dispatcher).connectionPool(connectionPool).apiKey(apiKey).build();
 
+    public static void main(String[] args) {
         System.out.println("\n----- standard request -----");
         final List<ChatMessage> messages = new ArrayList<>();
         final ChatMessage systemMessage = ChatMessage.builder().role(ChatMessageRole.SYSTEM).content("你是豆包，是由字节跳动开发的 AI 人工智能助手").build();
@@ -57,7 +61,9 @@ public static void main(String[] args) {
         BotChatCompletionResult chatCompletionResult =  service.createBotChatCompletion(chatCompletionRequest);
         chatCompletionResult.getChoices().forEach(choice -> System.out.println(choice.getMessage().getContent()));
         // the references example
-        chatCompletionResult.getReferences().forEach(ref -> System.out.println(ref.getUrl()));
+        if (chatCompletionResult.getReferences() != null) {
+            chatCompletionResult.getReferences().forEach(ref -> System.out.println(ref.getUrl()));
+        }
 
         System.out.println("\n----- streaming request -----");
         final List<ChatMessage> streamMessages = new ArrayList<>();
@@ -84,7 +90,7 @@ public static void main(String[] args) {
                         }
                 );
 
-        // shutdown service
+        // shutdown service after all requests is finished
         service.shutdownExecutor();
     }