Skip to content

Commit cefa3d0

Browse files
committed
Merge branch 'integration_2025-05-15_905315453698' into kafka-Java-2022-05-01-online-1146-2025_05_08_14_56_31
2 parents adef0cc + 23bf87d commit cefa3d0

File tree

54 files changed

+7237
-67
lines changed

Some content is hidden

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

54 files changed

+7237
-67
lines changed

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,12 @@
273273
<module>volcengine-java-sdk-rdspostgresql</module>
274274
<module>volcengine-java-sdk-clouddetect</module>
275275
<module>volcengine-java-sdk-translate20250301</module>
276+
<module>volcengine-java-sdk-volccontentplatform</module>
276277
<module>volcengine-java-sdk-edx</module>
277278
<module>volcengine-java-sdk-wafruntime</module>
278-
<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>
282+
<module>volcengine-java-sdk-bmq20240901</module>
281283
</modules>
282284
</project>

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()
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<parent>
4+
<artifactId>volcengine-java-sdk</artifactId>
5+
<groupId>com.volcengine</groupId>
6+
<version>0.2.8</version>
7+
<relativePath>../pom.xml</relativePath>
8+
</parent>
9+
<modelVersion>4.0.0</modelVersion>
10+
<artifactId>volcengine-java-sdk-bmq20240901</artifactId>
11+
<dependencies>
12+
<dependency>
13+
<groupId>com.volcengine</groupId>
14+
<artifactId>volcengine-java-sdk-core</artifactId>
15+
<version>${project.version}</version>
16+
</dependency>
17+
</dependencies>
18+
<build>
19+
<plugins>
20+
<plugin>
21+
<groupId>org.apache.maven.plugins</groupId>
22+
<artifactId>maven-source-plugin</artifactId>
23+
<configuration>
24+
<excludes>
25+
<exclude>com/volcengine/bmq20240901/examples/**</exclude>
26+
</excludes>
27+
</configuration>
28+
</plugin>
29+
<plugin>
30+
<groupId>org.apache.maven.plugins</groupId>
31+
<artifactId>maven-jar-plugin</artifactId>
32+
<configuration>
33+
<excludes>
34+
<exclude>com/volcengine/bmq20240901/examples/**</exclude>
35+
</excludes>
36+
</configuration>
37+
</plugin>
38+
</plugins>
39+
</build>
40+
</project>

0 commit comments

Comments
 (0)