Skip to content

Commit 62b5a18

Browse files
bytestarterbytestarter
committed
Merge 'integration_2025-05-08_883154236930' into 'master'
merge branch integration_2025-05-08_883154236930 into master See merge request: !474
2 parents 8364cca + f17547c commit 62b5a18

File tree

116 files changed

+5463
-143
lines changed

Some content is hidden

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

116 files changed

+5463
-143
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>com.volcengine</groupId>
6464
<artifactId>volcengine-java-sdk-bom</artifactId>
65-
<version>0.2.6</version>
65+
<version>0.2.7</version>
6666
<type>pom</type>
6767
<scope>import</scope>
6868
</dependency>
@@ -78,12 +78,12 @@
7878
<dependency>
7979
<groupId>com.volcengine</groupId>
8080
<artifactId>volcengine-java-sdk-vpc</artifactId>
81-
<version>0.2.6</version>
81+
<version>0.2.7</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>com.volcengine</groupId>
8585
<artifactId>volcengine-java-sdk-ecs</artifactId>
86-
<version>0.2.6</version>
86+
<version>0.2.7</version>
8787
</dependency>
8888
</dependencies>
8989
```

‎meta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.2.6",
3-
"meta_commit": "329851cfcec2044c71bfc167e9f7c3e11e29aa3a"
2+
"lasted": "0.2.7",
3+
"meta_commit": "750d261baa8789f1bfa9e7c852017e947b2def65"
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.2.6</version>
7+
<version>0.2.7</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -278,5 +278,6 @@
278278
<module>volcengine-java-sdk-volccontentplatform</module>
279279
<module>volcengine-java-sdk-mlplatform20240701</module>
280280
<module>volcengine-java-sdk-vod20250101</module>
281+
<module>volcengine-java-sdk-tag</module>
281282
</modules>
282283
</project>

‎volcengine-java-sdk-advdefence/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-advdefence20230308/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎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.2.6</version>
6+
<version>0.2.7</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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<build>

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/content/generation/CreateContentGenerationTaskRequest.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,17 @@ public static class Content {
8787
@JsonProperty("image_url")
8888
private ImageUrl imageUrl;
8989

90+
@JsonProperty("role")
91+
private String role;
92+
9093
public Content() {
9194
}
9295

93-
public Content(String type, String text, ImageUrl imageUrl) {
96+
public Content(String type, String text, ImageUrl imageUrl, String role) {
9497
this.type = type;
9598
this.text = text;
9699
this.imageUrl = imageUrl;
100+
this.role = role;
97101
}
98102

99103
public String getType() {
@@ -120,12 +124,21 @@ public void setImageUrl(ImageUrl imageUrl) {
120124
this.imageUrl = imageUrl;
121125
}
122126

127+
public String getRole() {
128+
return role;
129+
}
130+
131+
public void setRole(String role) {
132+
this.role = role;
133+
}
134+
123135
@Override
124136
public String toString() {
125137
return "Content{" +
126138
"type='" + type + '\'' +
127139
", text='" + text + '\'' +
128140
", imageUrl=" + imageUrl +
141+
", role=" + role +
129142
'}';
130143
}
131144

@@ -137,6 +150,7 @@ public static class Builder {
137150
private String type;
138151
private String text;
139152
private ImageUrl imageUrl;
153+
private String role;
140154

141155
private Builder() {
142156
}
@@ -156,11 +170,17 @@ public Builder imageUrl(ImageUrl imageUrl) {
156170
return this;
157171
}
158172

173+
public Builder role(String role) {
174+
this.role = role;
175+
return this;
176+
}
177+
159178
public Content build() {
160179
Content content = new Content();
161180
content.setType(type);
162181
content.setText(text);
163182
content.setImageUrl(imageUrl);
183+
content.setRole(role);
164184
return content;
165185
}
166186
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public static void main(String[] args) {
4444
.imageUrl(CreateContentGenerationTaskRequest.ImageUrl.builder()
4545
.url("${IMAGE URL HERE}")
4646
.build())
47+
// .role("first_frame")
4748
.build());
4849

4950
CreateContentGenerationTaskRequest createRequest = CreateContentGenerationTaskRequest.builder()

‎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.2.6</version>
6+
<version>0.2.7</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.2.6</version>
6+
<version>0.2.7</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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-bio/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.2.6</version>
6+
<version>0.2.7</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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
@@ -433,6 +433,12 @@
433433
<optional>false</optional>
434434
<version>${project.version}</version>
435435
</dependency>
436+
<dependency>
437+
<groupId>com.volcengine</groupId>
438+
<artifactId>volcengine-java-sdk-tag</artifactId>
439+
<optional>false</optional>
440+
<version>${project.version}</version>
441+
</dependency>
436442
</dependencies>
437443
</dependencyManagement>
438444
</project>

‎volcengine-java-sdk-cdn/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-cen/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-certificateservice/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-clb/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-clouddetect/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-cloudtrail/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-cloudtrail20180101/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

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

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

‎volcengine-java-sdk-core/src/main/java/com/volcengine/endpoint/DefaultEndpointProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class DefaultEndpointProvider implements EndpointResolver {
1111

1212
// 区域代码常量
1313
public static final String REGION_CODE_CN_BEIJING_AUTODRIVING = "cn-beijing-autodriving";
14+
public static final String REGION_CODE_CN_SHANGHAI_AUTODRIVING = "cn-shanghai-autodriving";
1415
public static final String REGION_CODE_AP_SOUTH_EAST_2 = "ap-southeast-2";
1516
public static final String REGION_CODE_AP_SOUTH_EAST_3 = "ap-southeast-3";
1617
public static final String REGION_CODE_CN_HONGKONG = "cn-hongkong";
@@ -27,6 +28,7 @@ public class DefaultEndpointProvider implements EndpointResolver {
2728
BOOTSTRAP_REGION.add(REGION_CODE_CN_BEIJING_AUTODRIVING);
2829
BOOTSTRAP_REGION.add(REGION_CODE_AP_SOUTH_EAST_2);
2930
BOOTSTRAP_REGION.add(REGION_CODE_AP_SOUTH_EAST_3);
31+
BOOTSTRAP_REGION.add(REGION_CODE_CN_SHANGHAI_AUTODRIVING);
3032
}
3133

3234
static {

‎volcengine-java-sdk-core/src/main/java/com/volcengine/version/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.volcengine.version;
22

33
public class Version {
4-
public final static String SDK_VERSION = "0.2.6";
4+
public final static String SDK_VERSION = "0.2.7";
55
public final static String SDK_NAME = "volcengine-java-sdk";
66
}

‎volcengine-java-sdk-cr/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-cv20240606/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-dataleap/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-dcdn/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-directconnect/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-dms/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-dns/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-ecs/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-edx/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.2.6</version>
6+
<version>0.2.7</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)