Skip to content

Commit 7a742c6

Browse files
volc-sdk-teamvolc-sdk-team
committed
Merge 'feat/seedance-seedream-0224-del' into 'master'
feat: support seedance and seedream param See merge request: !885
2 parents 13806ae + c630a07 commit 7a742c6

File tree

3 files changed

+179
-2
lines changed

3 files changed

+179
-2
lines changed

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/images/generation/GenerateImagesRequest.java‎

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,47 @@ public class GenerateImagesRequest {
5757
@JsonProperty("stream")
5858
private Boolean stream;
5959

60+
@JsonProperty("tools")
61+
private List<ContentGenerationTool> tools;
62+
63+
@JsonProperty("output_format")
64+
private String outputFormat;
65+
66+
@JsonIgnoreProperties(ignoreUnknown = true)
67+
public static class ContentGenerationTool {
68+
@JsonProperty("type")
69+
private String type;
70+
71+
public String getType() {
72+
return type;
73+
}
74+
75+
public void setType(String type) {
76+
this.type = type;
77+
}
78+
79+
@Override
80+
public String toString() {
81+
return "ContentGenerationTool{" +
82+
"type='" + type + '\'' +
83+
'}';
84+
}
85+
86+
public static ContentGenerationTool.Builder builder() {
87+
return new ContentGenerationTool.Builder();
88+
}
89+
90+
public static class Builder {
91+
private String type;
92+
}
93+
94+
public ContentGenerationTool build() {
95+
ContentGenerationTool contentGenerationTool = new ContentGenerationTool();
96+
contentGenerationTool.setType(type);
97+
return contentGenerationTool;
98+
}
99+
}
100+
60101
@JsonIgnoreProperties(ignoreUnknown = true)
61102
public static class OptimizePromptOptions {
62103
private String thinking;
@@ -111,7 +152,7 @@ public String toString() {
111152
public GenerateImagesRequest() {
112153
}
113154

114-
public GenerateImagesRequest(String model, String prompt, List<String> image, String responseFormat, Integer seed, Double guidanceScale, String size, Boolean watermark, String sequentialImageGeneration, SequentialImageGenerationOptions sequentialImageGenerationOptions, Boolean optimizePrompt, OptimizePromptOptions optimizePromptOptions, Boolean stream) {
155+
public GenerateImagesRequest(String model, String prompt, List<String> image, String responseFormat, Integer seed, Double guidanceScale, String size, Boolean watermark, String sequentialImageGeneration, SequentialImageGenerationOptions sequentialImageGenerationOptions, Boolean optimizePrompt, OptimizePromptOptions optimizePromptOptions, Boolean stream, List<ContentGenerationTool> tools, String outputFormat) {
115156
this.model = model;
116157
this.prompt = prompt;
117158
this.image = image;
@@ -125,6 +166,8 @@ public GenerateImagesRequest(String model, String prompt, List<String> image, St
125166
this.sequentialImageGeneration = sequentialImageGeneration;
126167
this.sequentialImageGenerationOptions = sequentialImageGenerationOptions;
127168
this.stream = stream;
169+
this.tools = tools;
170+
this.outputFormat = outputFormat;
128171
}
129172

130173
public String getModel() {
@@ -212,6 +255,22 @@ public void setOptimizePromptOptions(OptimizePromptOptions optimizePromptOptions
212255
this.optimizePromptOptions = optimizePromptOptions;
213256
}
214257

258+
public List<ContentGenerationTool> getTools() {
259+
return this.tools;
260+
}
261+
262+
public void setTools(List<ContentGenerationTool> tools) {
263+
this.tools = tools;
264+
}
265+
266+
public String getOutputFormat() {
267+
return this.outputFormat;
268+
}
269+
270+
public void setOutputFormat(String outputFormat) {
271+
this.outputFormat = outputFormat;
272+
}
273+
215274
public Boolean getStream() {
216275
return this.stream;
217276
}
@@ -252,6 +311,8 @@ public String toString() {
252311
", stream=" + stream +
253312
", sequentialImageGeneration=" + sequentialImageGeneration +
254313
", sequentialImageGenerationOptions=" + sequentialImageGenerationOptions +
314+
", tools=" + tools +
315+
", outputFormat=" + outputFormat +
255316
'}';
256317
}
257318

@@ -275,6 +336,10 @@ public static class Builder {
275336

276337
private SequentialImageGenerationOptions sequentialImageGenerationOptions;
277338

339+
private List<ContentGenerationTool> tools;
340+
341+
private String outputFormat;
342+
278343
private Boolean stream;
279344

280345
private Builder() {
@@ -350,6 +415,16 @@ public GenerateImagesRequest.Builder stream(Boolean stream) {
350415
return this;
351416
}
352417

418+
public GenerateImagesRequest.Builder tools(List<ContentGenerationTool> tools) {
419+
this.tools = tools;
420+
return this;
421+
}
422+
423+
public GenerateImagesRequest.Builder outputFormat(String outputFormat) {
424+
this.outputFormat = outputFormat;
425+
return this;
426+
}
427+
353428
public GenerateImagesRequest build() {
354429
GenerateImagesRequest generateImagesRequest = new GenerateImagesRequest();
355430
generateImagesRequest.setModel(model);
@@ -365,6 +440,8 @@ public GenerateImagesRequest build() {
365440
generateImagesRequest.setSequentialImageGeneration(sequentialImageGeneration);
366441
generateImagesRequest.setSequentialImageGenerationOptions(sequentialImageGenerationOptions);
367442
generateImagesRequest.setStream(stream);
443+
generateImagesRequest.setTools(tools);
444+
generateImagesRequest.setOutputFormat(outputFormat);
368445
return generateImagesRequest;
369446
}
370447
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/images/generation/ImageGenStreamEvent.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public class ImageGenStreamEvent {
6262
@JsonProperty("created")
6363
private long created;
6464

65+
@JsonProperty("tools")
66+
private List<GenerateImagesRequest.ContentGenerationTool> tools;
67+
6568
// Getters and setters
6669

6770
public String getType() {
@@ -136,6 +139,14 @@ public void setCreated(long created) {
136139
this.created = created;
137140
}
138141

142+
public List<GenerateImagesRequest.ContentGenerationTool> getTools() {
143+
return this.tools;
144+
}
145+
146+
public void setTools(List<GenerateImagesRequest.ContentGenerationTool> tools) {
147+
this.tools = tools;
148+
}
149+
139150
@Override
140151
public String toString() {
141152
return "ImageGenGeneratingEvent{" +
@@ -148,6 +159,7 @@ public String toString() {
148159
", usage=" + usage +
149160
", imageIndex=" + imageIndex +
150161
", created=" + created +
162+
", tools=" + tools +
151163
'}';
152164
}
153165

@@ -192,12 +204,24 @@ public void setTotalTokens(int totalTokens) {
192204
this.totalTokens = totalTokens;
193205
}
194206

207+
@JsonProperty("tool_usage")
208+
private ImagesResponse.Usage.ToolUsage toolUsage;
209+
210+
public ImagesResponse.Usage.ToolUsage getToolUsage() {
211+
return toolUsage;
212+
}
213+
214+
public void setToolUsage(ImagesResponse.Usage.ToolUsage toolUsage) {
215+
this.toolUsage = toolUsage;
216+
}
217+
195218
@Override
196219
public String toString() {
197220
return "Usage{" +
198221
"generatedImages=" + generatedImages +
199222
"outputTokens=" + outputTokens +
200223
"totalTokens=" + totalTokens +
224+
"toolUsage=" + toolUsage +
201225
'}';
202226
}
203227
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/images/generation/ImagesResponse.java‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
import com.volcengine.ark.runtime.model.content.generation.CreateContentGenerationTaskResult;
65

76
import java.util.List;
87

@@ -23,6 +22,9 @@ public class ImagesResponse {
2322
@JsonProperty("error")
2423
private Error error;
2524

25+
@JsonProperty("tools")
26+
private List<GenerateImagesRequest.ContentGenerationTool> tools;
27+
2628
public String getModel() {
2729
return model;
2830
}
@@ -63,6 +65,14 @@ public void setError(Error error) {
6365
this.error = error;
6466
}
6567

68+
public List<GenerateImagesRequest.ContentGenerationTool> getTools() {
69+
return this.tools;
70+
}
71+
72+
public void setTools(List<GenerateImagesRequest.ContentGenerationTool> tools) {
73+
this.tools = tools;
74+
}
75+
6676
@JsonIgnoreProperties(ignoreUnknown = true)
6777
public static class Image {
6878

@@ -112,6 +122,28 @@ public String toString() {
112122
@JsonIgnoreProperties(ignoreUnknown = true)
113123
public static class Usage {
114124

125+
@JsonIgnoreProperties(ignoreUnknown = true)
126+
public static class ToolUsage {
127+
128+
@JsonProperty("web_search")
129+
private Integer webSearch;
130+
131+
public Integer getWebSearch() {
132+
return webSearch;
133+
}
134+
135+
public void setWebSearch(Integer webSearch) {
136+
this.webSearch = webSearch;
137+
}
138+
139+
@Override
140+
public String toString() {
141+
return "ToolUsage{" +
142+
"webSearch=" + webSearch +
143+
'}';
144+
}
145+
}
146+
115147
@JsonProperty("generated_images")
116148
private Integer generatedImages;
117149

@@ -123,10 +155,46 @@ public void setGeneratedImages(Integer generatedImages) {
123155
this.generatedImages = generatedImages;
124156
}
125157

158+
@JsonProperty("output_tokens")
159+
private Integer outputTokens;
160+
161+
public Integer getOutputTokens() {
162+
return outputTokens;
163+
}
164+
165+
public void setOutputTokens(Integer outputTokens) {
166+
this.outputTokens = outputTokens;
167+
}
168+
169+
@JsonProperty("total_tokens")
170+
private Integer totalTokens;
171+
172+
public Integer getTotalTokens() {
173+
return totalTokens;
174+
}
175+
176+
public void setTotalTokens(Integer totalTokens) {
177+
this.totalTokens = totalTokens;
178+
}
179+
180+
@JsonProperty("tool_usage")
181+
private ToolUsage toolUsage;
182+
183+
public ToolUsage getToolUsage() {
184+
return toolUsage;
185+
}
186+
187+
public void setToolUsage(ToolUsage toolUsage) {
188+
this.toolUsage = toolUsage;
189+
}
190+
126191
@Override
127192
public String toString() {
128193
return "Usage{" +
129194
"generatedImages=" + generatedImages +
195+
"outputTokens=" + outputTokens +
196+
"totalTokens=" + totalTokens +
197+
"toolUsage=" + toolUsage +
130198
'}';
131199
}
132200
}
@@ -173,6 +241,7 @@ public String toString() {
173241
"data=" + data +
174242
"usage=" + usage +
175243
"error=" + error +
244+
"tools=" + tools +
176245
'}';
177246
}
178247

@@ -182,6 +251,7 @@ public static class Builder {
182251
private List<Image> data;
183252
private Usage usage;
184253
private Error error;
254+
private List<GenerateImagesRequest.ContentGenerationTool> tools;
185255

186256
private Builder() {
187257
}
@@ -211,13 +281,19 @@ public ImagesResponse.Builder error(Error error) {
211281
return this;
212282
}
213283

284+
public ImagesResponse.Builder tools(List<GenerateImagesRequest.ContentGenerationTool> tools) {
285+
this.tools = tools;
286+
return this;
287+
}
288+
214289
public ImagesResponse build() {
215290
ImagesResponse imagesResponse = new ImagesResponse();
216291
imagesResponse.setModel(model);
217292
imagesResponse.setCreated(created);
218293
imagesResponse.setData(data);
219294
imagesResponse.setUsage(usage);
220295
imagesResponse.setError(error);
296+
imagesResponse.setTools(tools);
221297
return imagesResponse;
222298
}
223299
}

0 commit comments

Comments
 (0)