Merge 'integration_2025-01-09_670294536194' into 'master'

merge branch integration_2025-01-09_670294536194 into master

See merge request: !358

Author: sdk-liuzhaoliang

README.md

@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.volcengine</groupId>
 	  <artifactId>volcengine-java-sdk-bom</artifactId>
-       <version>0.1.146</version>
+       <version>0.1.147</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.146</version>
+   <version>0.1.147</version>
   </dependency>
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-ecs</artifactId>
-   <version>0.1.146</version>
+   <version>0.1.147</version>
   </dependency>
 </dependencies>
 ```

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "0.1.146",
-	"meta_commit": "6cae7cd48b5bccde8d819d8985fb93f11cf07614"
+	"lasted": "0.1.147",
+	"meta_commit": "45a564e0fbefdf857425029e6ba5c80a6d8112f4"
 }

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.146</version>
+    <version>0.1.147</version>
     <name>volcengine-java-sdk</name>
     <url>https://open.volcengineapi.com</url>
     <description>The Java SDK For Volcengine</description>
@@ -265,5 +265,6 @@
         <module>volcengine-java-sdk-cloudtrail</module>
         <module>volcengine-java-sdk-httpdns</module>
         <module>volcengine-java-sdk-cloudtrail20180101</module>
+        <module>volcengine-java-sdk-seccenter</module>
     </modules>
 </project>

volcengine-java-sdk-advdefence/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.146</version>
+        <version>0.1.147</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.146</version>
+        <version>0.1.147</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.146</version>
+        <version>0.1.147</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.146</version>
+        <version>0.1.147</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/completion/chat/ChatCompletionChoice.java

@@ -24,6 +24,12 @@ public class ChatCompletionChoice {
     @JsonProperty("finish_reason")
     String finishReason;
 
+    /**
+     * The type of content moderation service hit.
+     */
+    @JsonProperty("moderation_hit_type")
+    String moderationHitType;
+
     /**
      * Log probability information for the choice.
      */
@@ -54,6 +60,14 @@ public void setFinishReason(String finishReason) {
         this.finishReason = finishReason;
     }
 
+    public void setModerationHitType(String moderationHitType) {
+        this.moderationHitType = moderationHitType;
+    }
+
+    public String getModerationHitType() {
+        return moderationHitType;
+    }
+
     public ChatCompletionChoiceLogprob getLogprobs() {
         return logprobs;
     }
@@ -68,6 +82,7 @@ public String toString() {
                 "index=" + index +
                 ", message=" + message +
                 ", finishReason='" + finishReason + '\'' +
+                ", moderationHitType='" + moderationHitType + '\'' +
                 ", logprobs=" + logprobs +
                 '}';
     }

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

@@ -5,14 +5,11 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.volcengine.ark.runtime.*;
+import com.volcengine.ark.runtime.Const;
 import com.volcengine.ark.runtime.exception.ArkAPIError;
 import com.volcengine.ark.runtime.exception.ArkException;
 import com.volcengine.ark.runtime.exception.ArkHttpException;
-import com.volcengine.ark.runtime.interceptor.AuthenticationInterceptor;
-import com.volcengine.ark.runtime.interceptor.ArkResourceStsAuthenticationInterceptor;
-import com.volcengine.ark.runtime.interceptor.RequestIdInterceptor;
-import com.volcengine.ark.runtime.interceptor.RetryInterceptor;
+import com.volcengine.ark.runtime.interceptor.*;
 import com.volcengine.ark.runtime.model.content.generation.DeleteContentGenerationTaskResponse;
 import com.volcengine.ark.runtime.interceptor.*;
 import com.volcengine.ark.runtime.model.bot.completion.chat.BotChatCompletionChunk;
@@ -39,10 +36,12 @@
 import retrofit2.converter.jackson.JacksonConverterFactory;
 import retrofit2.Retrofit;
 
+
 import java.io.IOException;
 import java.net.Proxy;
 import java.time.Duration;
 import java.util.*;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -59,7 +58,7 @@ public ArkService(final String apiKey) {
     public ArkService(final String apiKey, final Duration timeout) {
         ObjectMapper mapper = defaultObjectMapper();
         OkHttpClient client = defaultApiKeyClient(apiKey, timeout);
-        Retrofit retrofit = defaultRetrofit(client, mapper, BASE_URL);
+        Retrofit retrofit = defaultRetrofit(client, mapper, BASE_URL, null);
 
         this.api = retrofit.create(ArkApi.class);
         this.executorService = client.dispatcher().executorService();
@@ -72,7 +71,7 @@ public ArkService(final String ak, final String sk) {
     public ArkService(final String ak, final String sk, final Duration timeout) {
         ObjectMapper mapper = defaultObjectMapper();
         OkHttpClient client = defaultResourceStsClient(ak, sk, timeout, BASE_REGION);
-        Retrofit retrofit = defaultRetrofit(client, mapper, BASE_URL);
+        Retrofit retrofit = defaultRetrofit(client, mapper, BASE_URL, null);
 
         this.api = retrofit.create(ArkApi.class);
         this.executorService = client.dispatcher().executorService();
@@ -116,13 +115,19 @@ public static OkHttpClient defaultResourceStsClient(String ak, String sk, Durati
                 .build();
     }
 
-    public static Retrofit defaultRetrofit(OkHttpClient client, ObjectMapper mapper, String baseUrl) {
-        return new Retrofit.Builder()
+    public static Retrofit defaultRetrofit(OkHttpClient client, ObjectMapper mapper, String baseUrl, Executor callbackExecutor) {
+        Retrofit.Builder builder = new Retrofit.Builder()
                 .baseUrl(baseUrl)
                 .client(client)
                 .addConverterFactory(JacksonConverterFactory.create(mapper))
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .build();
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create());
+
+        if (callbackExecutor != null) {
+            // to avoid NPE
+            builder.callbackExecutor(callbackExecutor);
+        }
+
+        return builder.build();
     }
 
     public static <T> T execute(Single<T> apiCall) {
@@ -329,6 +334,7 @@ public static class Builder {
         private Proxy proxy;
         private ConnectionPool connectionPool;
         private Dispatcher dispatcher;
+        private Executor callbackExecutor;
 
         public ArkService.Builder ak(String ak) {
             this.ak = ak;
@@ -388,6 +394,11 @@ public ArkService.Builder dispatcher(Dispatcher dispatcher) {
             return this;
         }
 
+        public ArkService.Builder callbackExecutor(Executor callbackExecutor) {
+            this.callbackExecutor = callbackExecutor;
+            return this;
+        }
+
         public ArkService build() {
             ObjectMapper mapper = defaultObjectMapper();
             OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
@@ -421,7 +432,7 @@ public ArkService build() {
                     .callTimeout(timeout.toMillis(), TimeUnit.MILLISECONDS)
                     .connectTimeout(connectTimeout)
                     .build();
-            Retrofit retrofit = defaultRetrofit(client, mapper, baseUrl);
+            Retrofit retrofit = defaultRetrofit(client, mapper, baseUrl, callbackExecutor);
 
             return new ArkService(
                     retrofit.create(ArkApi.class),

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/utils/ResponseBodyCallback.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.volcengine.ark.runtime.Const;
 import com.volcengine.ark.runtime.exception.ArkAPIError;
+import com.volcengine.ark.runtime.exception.ArkException;
 import com.volcengine.ark.runtime.exception.ArkHttpException;
 import com.volcengine.ark.runtime.SSEFormatException;
 import com.volcengine.ark.runtime.service.ArkService;
@@ -51,11 +52,15 @@ public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response)
                 if (errorBody == null) {
                     throw e;
                 } else {
-                    ArkAPIError error = mapper.readValue(
-                            errorBody.string(),
-                            ArkAPIError.class
-                    );
-                    throw new ArkHttpException(error, e, e.code(), requestId);
+                    try {
+                        ArkAPIError error = mapper.readValue(
+                                errorBody.string(),
+                                ArkAPIError.class
+                        );
+                        throw new ArkHttpException(error, e, e.code(), requestId);
+                    } catch (Exception ignore) {
+                        throw new ArkHttpException(new ArkAPIError(new ArkAPIError.ArkErrorDetails(e.getMessage(), "", "", "InternalServiceError")), e, e.code(), requestId);
+                    }
                 }
             }