Skip to content

Commit 2f2633d

Browse files
mose-zmmose-x.zm
andauthored
support wan30 (#261)
Co-authored-by: mose-x.zm <zm02074348@alibaba-inc.com>
1 parent 98c8e6a commit 2f2633d

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

src/main/java/com/alibaba/dashscope/aigc/videosynthesis/VideoSynthesis.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,12 @@ public static class MediaType {
7676
public static final String REFERENCE_IMAGE = "reference_image";
7777
public static final String REFERENCE_VIDEO = "reference_video";
7878
public static final String REFERENCE_VOICE = "reference_voice";
79+
public static final String REFERENCE_AUDIO = "reference_audio";
7980
public static final String VIDEO = "video";
8081
public static final String FIRST_CLIP = "first_clip";
8182
public static final String DRIVING_AUDIO = "driving_audio";
83+
public static final String FILE = "file";
84+
public static final String LINK = "link";
8285
}
8386

8487
public static class AudioSetting {

src/main/java/com/alibaba/dashscope/aigc/videosynthesis/VideoSynthesisParam.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ public static class Media {
121121

122122
@Builder.Default private String audioSetting = null;
123123

124+
@Builder.Default private Boolean enableThinking = null;
125+
124126
/** The inputs of the model. */
125127
@Override
126128
public JsonObject getInput() {
@@ -235,6 +237,9 @@ public Map<String, Object> getParameters() {
235237
if (audioSetting != null && !audioSetting.isEmpty()) {
236238
params.put(AUDIO_SETTING, audioSetting);
237239
}
240+
if (enableThinking != null) {
241+
params.put(ENABLE_THINKING, enableThinking);
242+
}
238243

239244
params.putAll(super.getParameters());
240245
return params;
@@ -346,7 +351,8 @@ String getFullKey() {
346351
for (int i = 0; i < this.media.size(); i++) {
347352
Media media = this.media.get(i);
348353
if (media != null) {
349-
if (media.getUrl() != null) {
354+
// exclude when media is a link
355+
if (media.getUrl() != null && !VideoSynthesis.MediaType.LINK.equals(media.getType())) {
350356
itemsToProcess.add(new TaskItem(MEDIA_URLS, "_URL", media.getUrl(), i));
351357
}
352358
if (media.getReferenceVoice() != null) {

src/main/java/com/alibaba/dashscope/utils/ApiKeywords.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,6 @@ public class ApiKeywords {
211211
public static final String SHOT_TYPE = "shot_type";
212212

213213
public static final String ENABLE_OVERLAYS = "enable_overlays";
214+
215+
public static final String ENABLE_THINKING = "enable_thinking";
214216
}

0 commit comments

Comments
 (0)