Skip to content

Commit 585dbed

Browse files
liuweiwei-xyzliuweiwei-xyz
committed
Merge 'integration_2024-10-17_473379051010' into 'master'
merge branch integration_2024-10-17_473379051010 into master See merge request: !270
2 parents 350822e + e6e7ce2 commit 585dbed

File tree

56 files changed

+1069
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1069
-52
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.volcengine</groupId>
5656
<artifactId>volcengine-java-sdk-bom</artifactId>
57-
<version>0.1.131</version>
57+
<version>0.1.132</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -70,12 +70,12 @@
7070
<dependency>
7171
<groupId>com.volcengine</groupId>
7272
<artifactId>volcengine-java-sdk-vpc</artifactId>
73-
<version>0.1.131</version>
73+
<version>0.1.132</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.1.131</version>
78+
<version>0.1.132</version>
7979
</dependency>
8080
</dependencies>
8181
```

‎meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.1.131",
3-
"meta_commit": "8e383da903aa834899be30050aa80a0ebf59b38d"
2+
"lasted": "0.1.132",
3+
"meta_commit": "0d7342816830162316e4acd0b0b0ec660e66ca97"
44
}

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.volcengine</groupId>
55
<artifactId>volcengine-java-sdk</artifactId>
66
<packaging>pom</packaging>
7-
<version>0.1.131</version>
7+
<version>0.1.132</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -247,5 +247,6 @@
247247
<module>volcengine-java-sdk-transitrouter</module>
248248
<module>volcengine-java-sdk-sts</module>
249249
<module>volcengine-java-sdk-kms</module>
250+
<module>volcengine-java-sdk-nta</module>
250251
</modules>
251252
</project>

‎volcengine-java-sdk-alb/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.131</version>
6+
<version>0.1.132</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.131</version>
6+
<version>0.1.132</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<build>

‎volcengine-java-sdk-ark-runtime/test/java/com/volcengine/ark/runtime/ChatCompletionsVisionExample.java‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
package com.volcengine.ark.runtime;
2+
3+
import com.volcengine.ark.runtime.model.completion.chat.ChatCompletionContentPart;
4+
import com.volcengine.ark.runtime.model.completion.chat.ChatCompletionRequest;
5+
import com.volcengine.ark.runtime.model.completion.chat.ChatMessage;
6+
import com.volcengine.ark.runtime.model.completion.chat.ChatMessageRole;
7+
import com.volcengine.ark.runtime.service.ArkService;
8+
9+
import java.util.ArrayList;
10+
import java.util.List;
11+
12+
/*
13+
# pom.xml
14+
<dependency>
15+
<groupId>com.volcengine</groupId>
16+
<artifactId>volcengine-java-sdk-ark-runtime</artifactId>
17+
<version>LATEST</version>
18+
</dependency>
19+
*/
20+
21+
public class ChatCompletionsVisionExample {
22+
23+
/**
24+
* Authentication
25+
* 1.If you authorize your endpoint using an API key, you can set your api key to environment variable "ARK_API_KEY"
26+
* String apiKey = System.getenv("ARK_API_KEY");
27+
* ArkService service = new ArkService(apiKey);
28+
* Note: If you use an API key, this API key will not be refreshed.
29+
* To prevent the API from expiring and failing after some time, choose an API key with no expiration date.
30+
* <p>
31+
* 2.If you authorize your endpoint with Volcengine Identity and Access Management（IAM), set your api key to environment variable "VOLC_ACCESSKEY", "VOLC_SECRETKEY"
32+
* String ak = System.getenv("VOLC_ACCESSKEY");
33+
* String sk = System.getenv("VOLC_SECRETKEY");
34+
* ArkService service = new ArkService(ak, sk);
35+
* To get your ak&sk, please refer to this document(https://www.volcengine.com/docs/6291/65568)
36+
* For more information，please check this document（https://www.volcengine.com/docs/82379/1263279）
37+
*/
38+
public static void main(String[] args) {
39+
40+
String apiKey = System.getenv("ARK_API_KEY");
41+
ArkService service = new ArkService(apiKey);
42+
43+
System.out.println("----- image input -----");
44+
final List<ChatMessage> messages = new ArrayList<>();
45+
final List<ChatCompletionContentPart> multiParts = new ArrayList<>();
46+
multiParts.add(ChatCompletionContentPart.builder().type("text").text(
47+
"这是哪里？"
48+
).build());
49+
multiParts.add(ChatCompletionContentPart.builder().type("image_url").imageUrl(
50+
new ChatCompletionContentPart.ChatCompletionContentPartImageURL(
51+
"https://ark-project.tos-cn-beijing.ivolces.com/images/view.jpeg"
52+
)
53+
).build());
54+
final ChatMessage userMessage = ChatMessage.builder().role(ChatMessageRole.USER)
55+
.multiContent(multiParts).build();
56+
messages.add(userMessage);
57+
58+
ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest.builder()
59+
.model("${YOUR_ENDPOINT_ID}")
60+
.messages(messages)
61+
.build();
62+
63+
service.createChatCompletion(chatCompletionRequest).getChoices().forEach(choice -> System.out.println(choice.getMessage().getContent()));
64+
65+
// shutdown service
66+
service.shutdownExecutor();
67+
}
68+
69+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.131</version>
6+
<version>0.1.132</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-autoscaling/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.131</version>
6+
<version>0.1.132</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-billing/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.131</version>
6+
<version>0.1.132</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-bom/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.131</version>
6+
<version>0.1.132</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
@@ -247,6 +247,12 @@
247247
<optional>false</optional>
248248
<version>${project.version}</version>
249249
</dependency>
250+
<dependency>
251+
<groupId>com.volcengine</groupId>
252+
<artifactId>volcengine-java-sdk-nta</artifactId>
253+
<optional>false</optional>
254+
<version>${project.version}</version>
255+
</dependency>
250256
</dependencies>
251257
</dependencyManagement>
252258
</project>

0 commit comments

Comments
 (0)