Skip to content

Commit 805b899

Browse files
author
BitsAdmin
committed
Merge branch 'feat/multimodal_embedding' into 'integration_2025-08-14_1031759586050'
feat: [development task] ark runtime (1553225) See merge request iaasng/volcengine-java-sdk!611
2 parents f6fc5c5 + c3f8f48 commit 805b899

File tree

11 files changed

+319
-3
lines changed

11 files changed

+319
-3
lines changed

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/CompletionTokensDetails.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ public class CompletionTokensDetails {
88
@JsonProperty("reasoning_tokens")
99
private Integer reasoningTokens;
1010

11+
@JsonProperty("provisioned_tokens")
12+
private Integer provisionedTokens;
13+
1114
public Integer getReasoningTokens() {
1215
return reasoningTokens;
1316
}
@@ -16,10 +19,19 @@ public void setReasoningTokens(Integer reasoningTokens) {
1619
this.reasoningTokens = reasoningTokens;
1720
}
1821

22+
public Integer getProvisionedTokens() {
23+
return provisionedTokens;
24+
}
25+
26+
public void setProvisionedTokens(Integer provisionedTokens) {
27+
this.provisionedTokens = provisionedTokens;
28+
}
29+
1930
@Override
2031
public String toString() {
2132
return "CompletionTokensDetails{" +
2233
"reasoningTokens=" + reasoningTokens +
34+
", provisionedTokens=" + provisionedTokens +
2335
'}';
2436
}
2537
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/PromptTokensDetails.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ public class PromptTokensDetails {
99
@JsonProperty("cached_tokens")
1010
private Integer cachedTokens;
1111

12+
@JsonProperty("provisioned_tokens")
13+
private Integer provisionedTokens;
14+
1215
public Integer getCachedTokens() {
1316
return cachedTokens;
1417
}
@@ -17,10 +20,19 @@ public void setCachedTokens(Integer cachedTokens) {
1720
this.cachedTokens = cachedTokens;
1821
}
1922

23+
public Integer getProvisionedTokens() {
24+
return provisionedTokens;
25+
}
26+
27+
public void setProvisionedTokens(Integer provisionedTokens) {
28+
this.provisionedTokens = provisionedTokens;
29+
}
30+
2031
@Override
2132
public String toString() {
2233
return "PromptTokensDetails{" +
2334
"cachedTokens=" + cachedTokens +
35+
", provisionedTokens=" + provisionedTokens +
2436
'}';
2537
}
26-
}
38+
}

‎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
@@ -17,6 +17,9 @@ public class CreateContentGenerationTaskRequest {
1717
@JsonProperty("callback_url")
1818
private String callbackUrl;
1919

20+
@JsonProperty("return_last_frame")
21+
private Boolean returnLastFrame;
22+
2023
public CreateContentGenerationTaskRequest() {
2124
}
2225

@@ -25,10 +28,11 @@ public CreateContentGenerationTaskRequest(String model, List<Content> content) {
2528
this.content = content;
2629
}
2730

28-
public CreateContentGenerationTaskRequest(String model, List<Content> content, String callbackUrl) {
31+
public CreateContentGenerationTaskRequest(String model, List<Content> content, String callbackUrl, Boolean returnLastFrame) {
2932
this.model = model;
3033
this.content = content;
3134
this.callbackUrl = callbackUrl;
35+
this.returnLastFrame = returnLastFrame;
3236
}
3337

3438
public String getModel() {
@@ -55,12 +59,21 @@ public void setCallbackUrl(String callbackUrl) {
5559
this.callbackUrl = callbackUrl;
5660
}
5761

62+
public Boolean getReturnLastFrame() {
63+
return returnLastFrame;
64+
}
65+
66+
public void setReturnLastFrame(Boolean returnLastFrame) {
67+
this.returnLastFrame = returnLastFrame;
68+
}
69+
5870
@Override
5971
public String toString() {
6072
return "CreateContentGenerationTaskRequest{" +
6173
"model='" + model + '\'' +
6274
", content=" + content +
6375
", callbackUrl='" + callbackUrl + '\'' +
76+
", returnLastFrame=" + returnLastFrame +
6477
'}';
6578
}
6679

@@ -72,6 +85,7 @@ public static class Builder {
7285
private String model;
7386
private List<Content> content;
7487
private String callbackUrl;
88+
private Boolean returnLastFrame;
7589

7690
private Builder() {
7791
}
@@ -91,11 +105,17 @@ public Builder callbackUrl(String callbackUrl) {
91105
return this;
92106
}
93107

108+
public Builder returnLastFrame(Boolean returnLastFrame) {
109+
this.returnLastFrame = returnLastFrame;
110+
return this;
111+
}
112+
94113
public CreateContentGenerationTaskRequest build() {
95114
CreateContentGenerationTaskRequest createContentGenerationTaskRequest = new CreateContentGenerationTaskRequest();
96115
createContentGenerationTaskRequest.setModel(model);
97116
createContentGenerationTaskRequest.setContent(content);
98117
createContentGenerationTaskRequest.setCallbackUrl(callbackUrl);
118+
createContentGenerationTaskRequest.setReturnLastFrame(returnLastFrame);
99119
return createContentGenerationTaskRequest;
100120
}
101121
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,22 @@ public void setVideoUrl(String videoUrl) {
133133
this.videoUrl = videoUrl;
134134
}
135135

136+
@JsonProperty("last_frame_url")
137+
private String lastFrameUrl;
138+
139+
public String getLastFrameUrl() {
140+
return lastFrameUrl;
141+
}
142+
143+
public void setLastFrameUrl(String lastFrameUrl) {
144+
this.lastFrameUrl = lastFrameUrl;
145+
}
146+
136147
@Override
137148
public String toString() {
138149
return "Content{" +
139150
"videoUrl='" + videoUrl + '\'' +
151+
", lastFrameUrl='" + lastFrameUrl + '\'' +
140152
'}';
141153
}
142154
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/multimodalembeddings/MultimodalEmbedding.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.volcengine.ark.runtime.model.multimodalembeddings;
22

3+
import com.fasterxml.jackson.annotation.JsonCreator;
34
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
46

57
import java.util.List;
68

@@ -16,6 +18,16 @@ public class MultimodalEmbedding {
1618
*/
1719
private List<Double> embedding;
1820

21+
@JsonProperty("sparse_embedding")
22+
private List<SparseEmbedding> sparseEmbedding;
23+
24+
public List<SparseEmbedding> getSparseEmbedding() {
25+
return sparseEmbedding;
26+
}
27+
28+
public void setSparseEmbedding(List<SparseEmbedding> sparseEmbedding) {
29+
this.sparseEmbedding = sparseEmbedding;
30+
}
1931

2032
public String getObject() {
2133
return object;
@@ -38,6 +50,7 @@ public String toString() {
3850
return "Embedding{" +
3951
"object='" + object + '\'' +
4052
", embedding=" + embedding +
53+
", sparseEmbedding=" + sparseEmbedding +
4154
'}';
4255
}
4356
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/multimodalembeddings/MultimodalEmbeddingInput.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ public class MultimodalEmbeddingInput {
1111

1212
MultimodalEmbeddingInput.MultiModalEmbeddingContentPartImageURL imageUrl;
1313

14+
MultimodalEmbeddingInput.MultiModalEmbeddingContentPartVideoURL videoUrl;
15+
1416
public String getType() {
1517
return type;
1618
}
@@ -35,6 +37,14 @@ public void setImageUrl(MultimodalEmbeddingInput.MultiModalEmbeddingContentPartI
3537
this.imageUrl = imageUrl;
3638
}
3739

40+
public MultimodalEmbeddingInput.MultiModalEmbeddingContentPartVideoURL getVideoUrl() {
41+
return videoUrl;
42+
}
43+
44+
public void setVideoUrl(MultimodalEmbeddingInput.MultiModalEmbeddingContentPartVideoURL videoUrl) {
45+
this.videoUrl = videoUrl;
46+
}
47+
3848
public static MultimodalEmbeddingInput.Builder builder() {
3949
return new MultimodalEmbeddingInput.Builder();
4050
}
@@ -45,6 +55,7 @@ public String toString() {
4555
"type='" + type + '\'' +
4656
", text='" + text + '\'' +
4757
", imageUrl=" + imageUrl +
58+
", videoUrl=" + videoUrl +
4859
'}';
4960
}
5061

@@ -90,10 +101,49 @@ public String toString() {
90101
}
91102
}
92103

104+
public static class MultiModalEmbeddingContentPartVideoURL {
105+
String url;
106+
double fps;
107+
108+
public MultiModalEmbeddingContentPartVideoURL(String url, double fps) {
109+
this.url = url;
110+
this.fps = fps;
111+
}
112+
public MultiModalEmbeddingContentPartVideoURL(String url) {
113+
this.url = url;
114+
}
115+
public MultiModalEmbeddingContentPartVideoURL() {}
116+
117+
public String getUrl() {
118+
return url;
119+
}
120+
121+
public void setUrl(String url) {
122+
this.url = url;
123+
}
124+
125+
public double getFps() {
126+
return fps;
127+
}
128+
129+
public void setFps(double fps) {
130+
this.fps = fps;
131+
}
132+
133+
@Override
134+
public String toString() {
135+
return "MultiModalEmbeddingContentPartVideoURL{" +
136+
"url='" + url + '\'' +
137+
", fps=" + fps +
138+
'}';
139+
}
140+
}
141+
93142
public static final class Builder {
94143
private String type;
95144
private String text;
96145
private MultimodalEmbeddingInput.MultiModalEmbeddingContentPartImageURL imageUrl;
146+
private MultimodalEmbeddingInput.MultiModalEmbeddingContentPartVideoURL videoUrl;
97147

98148
public MultimodalEmbeddingInput.Builder type(String type) {
99149
this.type = type;
@@ -110,11 +160,17 @@ public MultimodalEmbeddingInput.Builder imageUrl(MultimodalEmbeddingInput.MultiM
110160
return this;
111161
}
112162

163+
public MultimodalEmbeddingInput.Builder videoUrl(MultimodalEmbeddingInput.MultiModalEmbeddingContentPartVideoURL videoUrl) {
164+
this.videoUrl = videoUrl;
165+
return this;
166+
}
167+
113168
public MultimodalEmbeddingInput build() {
114169
MultimodalEmbeddingInput multiModalEmbeddingInput = new MultimodalEmbeddingInput();
115170
multiModalEmbeddingInput.setType(type);
116171
multiModalEmbeddingInput.setText(text);
117172
multiModalEmbeddingInput.setImageUrl(imageUrl);
173+
multiModalEmbeddingInput.setVideoUrl(videoUrl);
118174
return multiModalEmbeddingInput;
119175
}
120176
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/multimodalembeddings/MultimodalEmbeddingRequest.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@ public class MultimodalEmbeddingRequest {
3030
@JsonProperty("dimensions")
3131
private Integer dimensions;
3232

33+
@JsonProperty("sparse_embedding")
34+
private SparseEmbeddingInput sparseEmbedding;
35+
36+
37+
@Override
38+
public String toString() {
39+
return "MultimodalEmbeddingRequest{" +
40+
"model='" + model + '\'' +
41+
", input=" + input +
42+
", encodingFormat='" + encodingFormat + '\'' +
43+
", dimensions=" + dimensions +
44+
", sparseEmbedding=" + sparseEmbedding +
45+
'}';
46+
}
3347

3448
public MultimodalEmbeddingRequest() {
3549
}
@@ -66,6 +80,13 @@ public Integer getDimensions() {
6680
return dimensions;
6781
}
6882

83+
public void setSparseEmbedding(SparseEmbeddingInput sparseEmbedding) {
84+
this.sparseEmbedding = sparseEmbedding;
85+
}
86+
public SparseEmbeddingInput getSparseEmbedding() {
87+
return sparseEmbedding;
88+
}
89+
6990
public static MultimodalEmbeddingRequest.Builder builder() {
7091
return new MultimodalEmbeddingRequest.Builder();
7192
}
@@ -75,6 +96,7 @@ public static final class Builder {
7596
private List<MultimodalEmbeddingInput> input;
7697
private String encodingFormat;
7798
private Integer dimensions;
99+
private SparseEmbeddingInput sparseEmbedding;
78100

79101
private Builder() {
80102
}
@@ -99,12 +121,18 @@ public MultimodalEmbeddingRequest.Builder dimensions(Integer dimensions) {
99121
return this;
100122
}
101123

124+
public MultimodalEmbeddingRequest.Builder sparseEmbedding(SparseEmbeddingInput sparseEmbedding) {
125+
this.sparseEmbedding = sparseEmbedding;
126+
return this;
127+
}
128+
102129
public MultimodalEmbeddingRequest build() {
103130
MultimodalEmbeddingRequest embeddingRequest = new MultimodalEmbeddingRequest();
104131
embeddingRequest.setModel(model);
105132
embeddingRequest.setInput(input);
106133
embeddingRequest.setEncodingFormat(encodingFormat);
107134
embeddingRequest.setDimensions(dimensions);
135+
embeddingRequest.setSparseEmbedding(sparseEmbedding);
108136
return embeddingRequest;
109137
}
110138
}

0 commit comments

Comments
 (0)