Merge 'integration_2024-08-08_369430895874' into 'master'

merge branch integration_2024-08-08_369430895874 into master

See merge request: !238

Author: liuweiwei-xyz

README.md

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

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "0.1.122",
-	"meta_commit": "5e49170560779a53a25a7106c6372ecbda1c61ab"
+	"lasted": "0.1.123",
+	"meta_commit": "345612ce74b502317b8b4017986c4f1ebee71586"
 }

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.122</version>
+    <version>0.1.123</version>
     <name>volcengine-java-sdk</name>
     <url>https://open.volcengineapi.com</url>
     <description>The Java SDK For Volcengine</description>
@@ -246,5 +246,6 @@
         <module>volcengine-java-sdk-iam20210801</module>
         <module>volcengine-java-sdk-transitrouter</module>
         <module>volcengine-java-sdk-sts</module>
+        <module>volcengine-java-sdk-kms</module>
     </modules>
 </project>

volcengine-java-sdk-alb/pom.xml

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

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

@@ -28,7 +28,7 @@ public Response intercept(Chain chain) throws IOException {
         Response response = chain.proceed(request);
 
         int tryCount = 0;
-        while (response.code() >= 500 && tryCount < retryTimes) {
+        while ((response.code() >= 500 || response.code() == 429) && tryCount < retryTimes) {
             tryCount++;
 
             // retry the request

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

@@ -52,7 +52,6 @@ public String toString() {
                 ", frequencyPenalty=" + getFrequencyPenalty() +
                 ", logitBias=" + getLogitBias() +
                 ", user='" + getUser() + '\'' +
-                ", functions=" + getFunctions() +
                 ", tools=" + getTools() +
                 ", functionCall=" + getFunctionCall() +
                 ", logprobs=" + getLogprobs() +
@@ -208,7 +207,6 @@ public BotChatCompletionRequest build() {
             botChatCompletionRequest.setFrequencyPenalty(frequencyPenalty);
             botChatCompletionRequest.setLogitBias(logitBias);
             botChatCompletionRequest.setUser(user);
-            botChatCompletionRequest.setFunctions(functions);
             botChatCompletionRequest.setTools(tools);
             botChatCompletionRequest.setFunctionCall(functionCall);
             botChatCompletionRequest.setLogprobs(logprobs);

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

@@ -1,7 +1,9 @@
 package com.volcengine.ark.runtime.model.completion.chat;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.volcengine.ark.runtime.model.bot.completion.chat.BotChatCompletionRequest;
+import com.volcengine.ark.runtime.utils.JacksonUtil;
 
 import java.util.List;
 import java.util.Map;
@@ -86,11 +88,6 @@ public class ChatCompletionRequest {
      */
     String user;
 
-    /**
-     * A list of the available functions.
-     */
-    List<ChatFunction> functions;
-
     /**
      * A list of the available tools.
      */
@@ -115,6 +112,27 @@ public class ChatCompletionRequest {
     @JsonProperty("top_logprobs")
     Integer topLogprobs;
 
+    @JsonProperty("repetition_penalty")
+    Double repetitionPenalty;
+
+    /**
+     * How many chat completion chatCompletionChoices to generate for each input message.
+     */
+    Integer n;
+
+    @JsonProperty("tool_choice")
+    Object toolChoice;
+
+    /**
+     * `type` must be one of `text` or `json_object`.
+     * If the request only specifies type=`json_object` and no schema is specified, refer to the openai behavior,
+     * the model outputs an arbitrary json object (depending on the user's instruction in the user prompt/system prompt)
+     *
+     * Even if the schema is specified, still need to specify the expected json format in user prompt/system prompt
+     */
+    @JsonProperty("response_format")
+    ChatCompletionRequestResponseFormat responseFormat;
+
     public String getModel() {
         return model;
     }
@@ -211,14 +229,6 @@ public void setUser(String user) {
         this.user = user;
     }
 
-    public List<ChatFunction> getFunctions() {
-        return functions;
-    }
-
-    public void setFunctions(List<ChatFunction> functions) {
-        this.functions = functions;
-    }
-
     public List<ChatTool> getTools() {
         return tools;
     }
@@ -251,6 +261,38 @@ public void setTopLogprobs(Integer topLogprobs) {
         this.topLogprobs = topLogprobs;
     }
 
+    public Double getRepetitionPenalty() {
+        return repetitionPenalty;
+    }
+
+    public void setRepetitionPenalty(Double repetitionPenalty) {
+        this.repetitionPenalty = repetitionPenalty;
+    }
+
+    public Integer getN() {
+        return n;
+    }
+
+    public void setN(Integer n) {
+        this.n = n;
+    }
+
+    public Object getToolChoice() {
+        return toolChoice;
+    }
+
+    public void setToolChoice(Object toolChoice) {
+        this.toolChoice = toolChoice;
+    }
+
+    public ChatCompletionRequestResponseFormat getResponseFormat() {
+        return responseFormat;
+    }
+
+    public void setResponseFormat(ChatCompletionRequestResponseFormat responseFormat) {
+        this.responseFormat = responseFormat;
+    }
+
     @Override
     public String toString() {
         return "ChatCompletionRequest{" +
@@ -266,11 +308,14 @@ public String toString() {
                 ", frequencyPenalty=" + frequencyPenalty +
                 ", logitBias=" + logitBias +
                 ", user='" + user + '\'' +
-                ", functions=" + functions +
                 ", tools=" + tools +
                 ", functionCall=" + functionCall +
                 ", logprobs=" + logprobs +
                 ", topLogprobs=" + topLogprobs +
+                ", repetitionPenalty=" + repetitionPenalty +
+                ", n=" + n +
+                ", toolChoice=" + toolChoice +
+                ", responseFormat=" + responseFormat +
                 '}';
     }
 
@@ -315,6 +360,79 @@ public void setIncludeUsage(Boolean includeUsage) {
         }
     }
 
+    public static class ChatCompletionRequestResponseFormat {
+        String type;
+        JsonNode schema;
+
+        public ChatCompletionRequestResponseFormat(String type) {
+            this.type = type;
+        }
+
+        public ChatCompletionRequestResponseFormat(String type, Object schema) {
+            this.type = type;
+            this.schema = JacksonUtil.clsToJsonNode(schema);
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public JsonNode getSchema() {
+            return schema;
+        }
+
+        public void setSchema(JsonNode schema) {
+            this.schema = schema;
+        }
+    }
+
+    public static class ChatCompletionRequestToolChoice {
+        String type;
+        ChatCompletionRequestToolChoiceFunction function;
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public ChatCompletionRequestToolChoiceFunction getFunction() {
+            return function;
+        }
+
+        public void setFunction(ChatCompletionRequestToolChoiceFunction function) {
+            this.function = function;
+        }
+
+        public ChatCompletionRequestToolChoice(String type, ChatCompletionRequestToolChoiceFunction function) {
+            this.type = type;
+            this.function = function;
+        }
+
+    }
+
+    public static class ChatCompletionRequestToolChoiceFunction {
+        String name;
+
+        public ChatCompletionRequestToolChoiceFunction(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+
     public static ChatCompletionRequest.Builder builder() {
         return new ChatCompletionRequest.Builder();
     }
@@ -332,11 +450,14 @@ public static class Builder {
         private Double frequencyPenalty;
         private Map<String, Integer> logitBias;
         private String user;
-        private List<ChatFunction> functions;
         private List<ChatTool> tools;
         private ChatCompletionRequestFunctionCall functionCall;
         private Boolean logprobs;
         private Integer topLogprobs;
+        private Double repetitionPenalty;
+        private Integer n;
+        private Object toolChoice;
+        private ChatCompletionRequestResponseFormat responseFormat;
 
         public ChatCompletionRequest.Builder model(String model) {
             this.model = model;
@@ -398,11 +519,6 @@ public ChatCompletionRequest.Builder user(String user) {
             return this;
         }
 
-        public ChatCompletionRequest.Builder functions(List<ChatFunction> functions) {
-            this.functions = functions;
-            return this;
-        }
-
         public ChatCompletionRequest.Builder tools(List<ChatTool> tools) {
             this.tools = tools;
             return this;
@@ -423,6 +539,31 @@ public ChatCompletionRequest.Builder topLogprobs(Integer topLogprobs) {
             return this;
         }
 
+        public ChatCompletionRequest.Builder repetitionPenalty(Double repetitionPenalty) {
+            this.repetitionPenalty = repetitionPenalty;
+            return this;
+        }
+
+        public ChatCompletionRequest.Builder n(Integer n) {
+            this.n = n;
+            return this;
+        }
+
+        public ChatCompletionRequest.Builder toolChoice(String toolChoice) {
+            this.toolChoice = toolChoice;
+            return this;
+        }
+
+        public ChatCompletionRequest.Builder toolChoice(ChatCompletionRequestToolChoice toolChoice) {
+            this.toolChoice = toolChoice;
+            return this;
+        }
+
+        public ChatCompletionRequest.Builder responseFormat(ChatCompletionRequestResponseFormat responseFormat) {
+            this.responseFormat = responseFormat;
+            return this;
+        }
+
         public ChatCompletionRequest build() {
             ChatCompletionRequest chatCompletionRequest = new ChatCompletionRequest();
             chatCompletionRequest.setModel(model);
@@ -437,11 +578,14 @@ public ChatCompletionRequest build() {
             chatCompletionRequest.setFrequencyPenalty(frequencyPenalty);
             chatCompletionRequest.setLogitBias(logitBias);
             chatCompletionRequest.setUser(user);
-            chatCompletionRequest.setFunctions(functions);
             chatCompletionRequest.setTools(tools);
             chatCompletionRequest.setFunctionCall(functionCall);
             chatCompletionRequest.setLogprobs(logprobs);
             chatCompletionRequest.setTopLogprobs(topLogprobs);
+            chatCompletionRequest.setRepetitionPenalty(repetitionPenalty);
+            chatCompletionRequest.setN(n);
+            chatCompletionRequest.setToolChoice(toolChoice);
+            chatCompletionRequest.setResponseFormat(responseFormat);
             return chatCompletionRequest;
         }
     }