Merge branch 'integration_2024-06-06_285058385410' into 'master'

merge branch integration_2024-06-06_285058385410 into master

See merge request iaasng/volcengine-java-sdk!190

Author: liuweiwei-xyz

README.md

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

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "0.1.113",
-	"meta_commit": "0804d09ee7273611691f35de519fde15cbeeb5fd"
+	"lasted": "0.1.114",
+	"meta_commit": "a6ec2b06777897f8d3af4d52398034611e2bdf77"
 }

pom.xml

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

volcengine-java-sdk-alb/pom.xml

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

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

@@ -31,7 +31,7 @@ public class EndpointStsAuthenticationInterceptor implements Interceptor {
     private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
     private final ArkApi volcClient;
 
-    public EndpointStsAuthenticationInterceptor(String ak, String sk) {
+    public EndpointStsAuthenticationInterceptor(String ak, String sk, String region) {
         Objects.requireNonNull(ak, "Ak token required");
         Objects.requireNonNull(sk, "Sk token required");
         this.ak = ak;
@@ -40,9 +40,8 @@ public EndpointStsAuthenticationInterceptor(String ak, String sk) {
 
         ApiClient apiClient = new ApiClient()
                 .setCredentials(Credentials.getCredentials(ak,sk))
-                .setRegion("cn-beijing");
-        ArkApi arkApi = new ArkApi(apiClient);
-        this.volcClient = arkApi;
+                .setRegion(region);
+        this.volcClient = new ArkApi(apiClient);
     }
 
     @Override

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

@@ -0,0 +1,57 @@
+package com.volcengine.ark.runtime.interceptor;
+
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+
+import static java.lang.Math.random;
+
+public class RetryInterceptor implements Interceptor {
+
+    private final int retryTimes;
+    private final double INITIAL_RETRY_DELAY = 0.5;
+    private final double MAX_RETRY_DELAY = 8.0;
+
+    public RetryInterceptor(int retryTimes) {
+        this.retryTimes = retryTimes;
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+
+        // try the request
+        Response response = chain.proceed(request);
+
+        int tryCount = 0;
+        while (response.code() >= 500 && tryCount < retryTimes) {
+            tryCount++;
+
+            // retry the request
+            response.close();
+
+            try {
+                double interval = retryInterval(retryTimes, retryTimes - tryCount) * 1000;
+                Thread.sleep(Math.round(interval));
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new InterruptedIOException();
+            }
+            response = chain.proceed(request);
+        }
+
+        return response;
+    }
+
+    public double retryInterval(int max, int remain) {
+        int nbRetries = max - remain;
+        double sleepSeconds = Math.min(INITIAL_RETRY_DELAY * Math.pow(2.0, nbRetries), MAX_RETRY_DELAY);
+        double jitter = 1 - 0.25 * random();
+        return sleepSeconds * jitter;
+    }
+}
+

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

@@ -12,9 +12,9 @@ public class ChatFunctionCall {
     /**
      * The arguments of the call produced by the model, represented as a JsonNode for easy manipulation.
      */
-    JsonNode arguments;
+    String arguments;
 
-    public ChatFunctionCall(String name, JsonNode arguments) {
+    public ChatFunctionCall(String name, String arguments) {
         this.name = name;
         this.arguments = arguments;
     }
@@ -29,11 +29,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public JsonNode getArguments() {
+    public String getArguments() {
         return arguments;
     }
 
-    public void setArguments(JsonNode arguments) {
+    public void setArguments(String arguments) {
         this.arguments = arguments;
     }
 

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

@@ -16,9 +16,9 @@ public class ChatToolCall {
     /**
      * The function that the model called
      */
-    ChatFunction function;
+    ChatFunctionCall function;
 
-    public ChatToolCall(String id, String type, ChatFunction function) {
+    public ChatToolCall(String id, String type, ChatFunctionCall function) {
         this.id = id;
         this.type = type;
         this.function = function;
@@ -42,11 +42,11 @@ public void setType(String type) {
         this.type = type;
     }
 
-    public ChatFunction getFunction() {
+    public ChatFunctionCall getFunction() {
         return function;
     }
 
-    public void setFunction(ChatFunction function) {
+    public void setFunction(ChatFunctionCall function) {
         this.function = function;
     }
 

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/embeddings/Embedding.java

@@ -0,0 +1,54 @@
+package com.volcengine.ark.runtime.model.embeddings;
+
+import java.util.List;
+
+public class Embedding {
+
+    /**
+     * The type of object returned, should be "embedding"
+     */
+    String object;
+
+    /**
+     * The embedding vector
+     */
+    List<Double> embedding;
+
+    /**
+     * The position of this embedding in the list
+     */
+    Integer index;
+
+    public String getObject() {
+        return object;
+    }
+
+    public void setObject(String object) {
+        this.object = object;
+    }
+
+    public List<Double> getEmbedding() {
+        return embedding;
+    }
+
+    public void setEmbedding(List<Double> embedding) {
+        this.embedding = embedding;
+    }
+
+    public Integer getIndex() {
+        return index;
+    }
+
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+
+    @Override
+    public String toString() {
+        return "Embedding{" +
+                "object='" + object + '\'' +
+                ", embedding=" + embedding +
+                ", index=" + index +
+                '}';
+    }
+}