Skip to content

Commit e4d0f9d

Browse files
author
lmh
committed
fix: preprocess configs
1 parent 927f518 commit e4d0f9d

File tree

5 files changed

+128
-8
lines changed

5 files changed

+128
-8
lines changed
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package com.volcengine.ark.runtime.model.files;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
6+
@JsonIgnoreProperties(ignoreUnknown = true)
7+
public class PreprocessConfigs {
8+
public PreprocessConfigs() {
9+
}
10+
11+
@JsonProperty(value = "video")
12+
private Video video;
13+
14+
public static PreprocessConfigs.PreprocessConfigsBuilder builder() {
15+
return new PreprocessConfigs.PreprocessConfigsBuilder();
16+
}
17+
18+
public Video getVideo() {
19+
return video;
20+
}
21+
22+
public void setVideo(Video video) {
23+
this.video = video;
24+
}
25+
26+
public static final class PreprocessConfigsBuilder {
27+
private Video video;
28+
29+
private PreprocessConfigsBuilder() {
30+
}
31+
32+
public static PreprocessConfigsBuilder aPreprocessConfigs() {
33+
return new PreprocessConfigsBuilder();
34+
}
35+
36+
public PreprocessConfigsBuilder video(Video video) {
37+
this.video = video;
38+
return this;
39+
}
40+
41+
public PreprocessConfigs build() {
42+
PreprocessConfigs preprocessConfigs = new PreprocessConfigs();
43+
preprocessConfigs.setVideo(video);
44+
return preprocessConfigs;
45+
}
46+
}
47+
}

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/files/UploadFileRequest.java

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,27 @@
88

99
@JsonIgnoreProperties(ignoreUnknown = true)
1010
public class UploadFileRequest {
11+
12+
@JsonProperty(value = "file")
13+
private File file;
14+
@JsonProperty(value = "purpose")
15+
private String purpose;
16+
@JsonProperty(value = "expire_at")
17+
private Integer expireAt;
18+
19+
@JsonProperty(value = "preprocess_configs")
20+
private PreprocessConfigs preprocessConfigs;
21+
1122
@Override
1223
public String toString() {
1324
return "UploadFileRequest{" +
1425
"file=" + file +
1526
", purpose='" + purpose + '\'' +
1627
", expireAt=" + expireAt +
28+
", preprocessConfigs=" + preprocessConfigs +
1729
'}';
1830
}
1931

20-
@JsonProperty(value = "file")
21-
private File file;
22-
@JsonProperty(value = "purpose")
23-
private String purpose;
24-
@JsonProperty(value = "expire_at")
25-
private Integer expireAt;
26-
2732
public File getFile() {
2833
return file;
2934
}
@@ -48,6 +53,14 @@ public void setExpireAt(Integer expireAt) {
4853
this.expireAt = expireAt;
4954
}
5055

56+
public PreprocessConfigs getPreprocessConfigs() {
57+
return preprocessConfigs;
58+
}
59+
60+
public void setPreprocessConfigs(PreprocessConfigs preprocessConfigs) {
61+
this.preprocessConfigs = preprocessConfigs;
62+
}
63+
5164
public static UploadFileRequestBuilder builder() {
5265
return new UploadFileRequestBuilder();
5366
}
@@ -56,6 +69,7 @@ public static final class UploadFileRequestBuilder {
5669
private File file;
5770
private String purpose;
5871
private Integer expireAt;
72+
private PreprocessConfigs preprocessConfigs;
5973

6074
private UploadFileRequestBuilder() {
6175
}
@@ -79,11 +93,17 @@ public UploadFileRequestBuilder expireAt(Integer expireAt) {
7993
return this;
8094
}
8195

96+
public UploadFileRequestBuilder preprocessConfigs(PreprocessConfigs preprocessConfigs) {
97+
this.preprocessConfigs = preprocessConfigs;
98+
return this;
99+
}
100+
82101
public UploadFileRequest build() {
83102
UploadFileRequest uploadFileRequest = new UploadFileRequest();
84103
uploadFileRequest.setFile(file);
85104
uploadFileRequest.setPurpose(purpose);
86105
uploadFileRequest.setExpireAt(expireAt);
106+
uploadFileRequest.setPreprocessConfigs(preprocessConfigs);
87107
return uploadFileRequest;
88108
}
89109
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package com.volcengine.ark.runtime.model.files;
2+
3+
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
6+
7+
@JsonIgnoreProperties(ignoreUnknown = true)
8+
public class Video {
9+
public Video(Double fps) {
10+
this.fps = fps;
11+
}
12+
13+
@JsonProperty(value = "fps")
14+
private Double fps;
15+
16+
public Double getFps() {
17+
return fps;
18+
}
19+
20+
public void setFps(Double fps) {
21+
this.fps = fps;
22+
}
23+
24+
public Video() {
25+
}
26+
27+
public static final class VideoBuilder {
28+
private Double fps;
29+
30+
private VideoBuilder() {
31+
}
32+
33+
public static VideoBuilder aVideo() {
34+
return new VideoBuilder();
35+
}
36+
37+
public VideoBuilder fps(Double fps) {
38+
this.fps = fps;
39+
return this;
40+
}
41+
42+
public Video build() {
43+
Video video = new Video();
44+
video.setFps(fps);
45+
return video;
46+
}
47+
}
48+
}

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkApi.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ Single<ListInputItemsResponse> listResponseInputItems(
136136
Single<FileMeta> uploadFile(@Part MultipartBody.Part file,
137137
@Part("purpose") RequestBody purpose,
138138
@Part("expire_at") RequestBody expireAt,
139+
@Part("preprocess_configs[video][fps]") RequestBody fps,
139140
@HeaderMap Map<String, String> customHeaders);
140141

141142
@DELETE("/api/v3/files/{fileId}")

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkService.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,11 @@ public FileMeta uploadFile(UploadFileRequest request) {
415415
if (request.getExpireAt() != null) {
416416
expireAt = RequestBody.create(MultipartBodyUtils.TYPE, String.valueOf(request.getExpireAt()));
417417
}
418-
return execute(api.uploadFile(fileBody, purpose, expireAt, new HashMap<>()));
418+
RequestBody fps = null;
419+
if (request.getPreprocessConfigs() != null && request.getPreprocessConfigs().getVideo() != null && request.getPreprocessConfigs().getVideo().getFps() != null) {
420+
fps = RequestBody.create(MultipartBodyUtils.TYPE, String.valueOf(request.getPreprocessConfigs().getVideo().getFps()));
421+
}
422+
return execute(api.uploadFile(fileBody, purpose, expireAt, fps, new HashMap<>()));
419423
}
420424

421425
@Override

0 commit comments

Comments
 (0)