Skip to content

Add Seedance 2.5 desktop wire contracts #1889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthewpenkala wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Seedance 2.5 desktop wire contracts #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ...ktop/artcraft/src/core/api_adapters/models/video/tauri_video_model_to_generation_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ pub fn tauri_video_model_to_generation_model(model: TauriVideoModel) -> Generati
TauriVideoModel::Seedance1p5Pro => GenerationModel::Seedance1p5Pro,
TauriVideoModel::Seedance2p0 => GenerationModel::Seedance2p0,
TauriVideoModel::Seedance2p0Fast => GenerationModel::Seedance2p0Fast,
TauriVideoModel::Seedance2p5Preview => GenerationModel::Seedance2p5Preview,
TauriVideoModel::Seedance2p5 => GenerationModel::Seedance2p5,
TauriVideoModel::Seedance2p5Ultra => GenerationModel::Seedance2p5Ultra,
TauriVideoModel::Sora2 => GenerationModel::Sora2,
TauriVideoModel::Sora2Pro => GenerationModel::Sora2Pro,
TauriVideoModel::Veo2 => GenerationModel::Veo2,
Expand All @@ -29,3 +32,20 @@ pub fn tauri_video_model_to_generation_model(model: TauriVideoModel) -> Generati
TauriVideoModel::Veo3p1Fast => GenerationModel::Veo3p1Fast,
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn seedance_2p5_models_map_to_generation_event_identifiers() {
for (model, expected) in [
(TauriVideoModel::Seedance2p5Preview, r#""seedance_2p5_preview""#),
(TauriVideoModel::Seedance2p5, r#""seedance_2p5""#),
(TauriVideoModel::Seedance2p5Ultra, r#""seedance_2p5_u""#),
] {
let generation_model = tauri_video_model_to_generation_model(model);
assert_eq!(serde_json::to_string(&generation_model).unwrap(), expected);
}
}
}
24 changes: 24 additions & 0 deletions .../desktop/artcraft/src/core/api_adapters/models/video/tauri_video_model_to_router_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ pub fn tauri_video_model_to_router_model(model: TauriVideoModel) -> RouterVideoM
TauriVideoModel::Seedance1p5Pro => RouterVideoModel::Seedance1p5Pro,
TauriVideoModel::Seedance2p0 => RouterVideoModel::Seedance2p0,
TauriVideoModel::Seedance2p0Fast => RouterVideoModel::Seedance2p0Fast,
TauriVideoModel::Seedance2p5Preview => RouterVideoModel::Seedance2p5Preview,
TauriVideoModel::Seedance2p5 => RouterVideoModel::Seedance2p5,
TauriVideoModel::Seedance2p5Ultra => RouterVideoModel::Seedance2p5Ultra,
TauriVideoModel::Sora2 => RouterVideoModel::Sora2,
TauriVideoModel::Sora2Pro => RouterVideoModel::Sora2Pro,
TauriVideoModel::Veo2 => RouterVideoModel::Veo2,
Expand All @@ -28,3 +31,24 @@ pub fn tauri_video_model_to_router_model(model: TauriVideoModel) -> RouterVideoM
TauriVideoModel::Veo3p1Fast => RouterVideoModel::Veo3p1Fast,
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn seedance_2p5_models_map_to_router_models() {
assert!(matches!(
tauri_video_model_to_router_model(TauriVideoModel::Seedance2p5Preview),
RouterVideoModel::Seedance2p5Preview
));
assert!(matches!(
tauri_video_model_to_router_model(TauriVideoModel::Seedance2p5),
RouterVideoModel::Seedance2p5
));
assert!(matches!(
tauri_video_model_to_router_model(TauriVideoModel::Seedance2p5Ultra),
RouterVideoModel::Seedance2p5Ultra
));
}
}
151 changes: 90 additions & 61 deletions crates/desktop/artcraft/src/core/commands/enqueue/task_enqueue_success.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,70 @@ pub struct TaskEnqueueSuccess {
pub maybe_prompt_token: Option<PromptToken>,
}

fn generation_model_to_task_model_type(model: GenerationModel) -> Option<TaskModelType> {
match model {
GenerationModel::Flux1Dev => Some(TaskModelType::Flux1Dev),
GenerationModel::FluxDevJuggernaut => Some(TaskModelType::FluxDevJuggernaut),
GenerationModel::Flux1Schnell => Some(TaskModelType::Flux1Schnell),
GenerationModel::FluxPro1 => Some(TaskModelType::FluxPro1), // NB: This is for inpainting.
GenerationModel::FluxPro11 => Some(TaskModelType::FluxPro11),
GenerationModel::FluxPro11Ultra => Some(TaskModelType::FluxPro11Ultra),
GenerationModel::FluxProKontextMax => Some(TaskModelType::FluxProKontextMax),
GenerationModel::Gemini25Flash => Some(TaskModelType::Gemini25Flash),
GenerationModel::NanoBanana => Some(TaskModelType::NanoBanana),
GenerationModel::NanoBanana2 => Some(TaskModelType::NanoBanana2),
GenerationModel::NanoBananaPro => Some(TaskModelType::NanoBananaPro),
GenerationModel::GptImage1 => Some(TaskModelType::GptImage1),
GenerationModel::GptImage1p5 => Some(TaskModelType::GptImage1p5),
GenerationModel::GptImage2 => Some(TaskModelType::GptImage2),
GenerationModel::Seedream4 => Some(TaskModelType::Seedream4),
GenerationModel::Seedream4p5 => Some(TaskModelType::Seedream4p5),
GenerationModel::Seedream5Lite => Some(TaskModelType::Seedream5Lite),
GenerationModel::QwenEdit2511Angles => Some(TaskModelType::QwenEdit2511Angles),
GenerationModel::Flux2LoraAngles => Some(TaskModelType::Flux2LoraAngles),
GenerationModel::GrokImage => Some(TaskModelType::GrokImage),
GenerationModel::Recraft3 => Some(TaskModelType::Recraft3),
GenerationModel::GrokVideo => Some(TaskModelType::GrokVideo),
GenerationModel::GrokImagineVideo1p5 => Some(TaskModelType::GrokImagineVideo1p5),
GenerationModel::Kling21Pro => Some(TaskModelType::Kling21Pro),
GenerationModel::Kling21Master => Some(TaskModelType::Kling21Master),
GenerationModel::Kling2p5TurboPro => Some(TaskModelType::Kling2p5TurboPro),
GenerationModel::Kling2p6Pro => Some(TaskModelType::Kling2p6Pro),
GenerationModel::Kling3p0Standard => Some(TaskModelType::Kling3p0Standard),
GenerationModel::Kling3p0Pro => Some(TaskModelType::Kling3p0Pro),
GenerationModel::HappyHorse1p0 => Some(TaskModelType::HappyHorse1p0),
GenerationModel::Seedance10Lite => Some(TaskModelType::Seedance10Lite),
GenerationModel::Seedance1p5Pro => Some(TaskModelType::Seedance1p5Pro),
GenerationModel::Seedance2p0 => Some(TaskModelType::Seedance2p0),
GenerationModel::Seedance2p0Fast => Some(TaskModelType::Seedance2p0Fast),
GenerationModel::Seedance2p5Preview => Some(TaskModelType::Seedance2p5Preview),
GenerationModel::Seedance2p5 => Some(TaskModelType::Seedance2p5),
GenerationModel::Seedance2p5Ultra => Some(TaskModelType::Seedance2p5Ultra),
GenerationModel::Sora2 => Some(TaskModelType::Sora2),
GenerationModel::Sora2Pro => Some(TaskModelType::Sora2Pro),
GenerationModel::Veo2 => Some(TaskModelType::Veo2),
GenerationModel::Veo3 => Some(TaskModelType::Veo3),
GenerationModel::Veo3p1 => Some(TaskModelType::Veo3p1),
GenerationModel::Veo3p1Fast => Some(TaskModelType::Veo3p1Fast),
GenerationModel::Veo3Fast => Some(TaskModelType::Veo3Fast),
GenerationModel::Hunyuan3d2_0 => Some(TaskModelType::Hunyuan3d2_0),
GenerationModel::Hunyuan3d2_1 => Some(TaskModelType::Hunyuan3d2_1),
GenerationModel::Hunyuan3d3 => Some(TaskModelType::Hunyuan3d3),
GenerationModel::WorldlabsMarble => Some(TaskModelType::WorldlabsMarble),
GenerationModel::WorldlabsMarble0p1Mini => Some(TaskModelType::WorldlabsMarble0p1Mini),
GenerationModel::WorldlabsMarble0p1Plus => Some(TaskModelType::WorldlabsMarble0p1Plus),
GenerationModel::Midjourney => Some(TaskModelType::Midjourney), // NB: This is a generic Midjourney model, version unknown.
GenerationModel::Midjourney7 => Some(TaskModelType::Midjourney7),
GenerationModel::Midjourney7Niji => Some(TaskModelType::Midjourney7Niji),
GenerationModel::Midjourney8 => Some(TaskModelType::Midjourney8),

// TODO: These seem wrong -
GenerationModel::Kling1_6 => Some(TaskModelType::Kling16Pro), // NB: `VideoModel::Kling16Pro`.
GenerationModel::Kling2_0 => None, // TODO: unused elsewhere?
GenerationModel::Sora => None, // TODO: unused elsewhere?
}
}

impl TaskEnqueueSuccess{
pub fn to_frontend_event_action(&self) -> GenerationAction {
match self.task_type {
Expand Down Expand Up @@ -60,66 +124,7 @@ impl TaskEnqueueSuccess{
frontend_subscriber_id: Option<&str>,
frontend_subscriber_payload: Option<&str>,
) -> Result<TaskId, SqliteTasksError> {
// TODO: Move this mapping elsewhere, or remove the other models.
let model_type = match self.model {
None => None,
Some(GenerationModel::Flux1Dev) => Some(TaskModelType::Flux1Dev),
Some(GenerationModel::FluxDevJuggernaut) => Some(TaskModelType::FluxDevJuggernaut),
Some(GenerationModel::Flux1Schnell) => Some(TaskModelType::Flux1Schnell),
Some(GenerationModel::FluxPro1) => Some(TaskModelType::FluxPro1), // NB: This is for inpainting.
Some(GenerationModel::FluxPro11) => Some(TaskModelType::FluxPro11),
Some(GenerationModel::FluxPro11Ultra) => Some(TaskModelType::FluxPro11Ultra),
Some(GenerationModel::FluxProKontextMax) => Some(TaskModelType::FluxProKontextMax),
Some(GenerationModel::Gemini25Flash) => Some(TaskModelType::Gemini25Flash),
Some(GenerationModel::NanoBanana) => Some(TaskModelType::NanoBanana),
Some(GenerationModel::NanoBanana2) => Some(TaskModelType::NanoBanana2),
Some(GenerationModel::NanoBananaPro) => Some(TaskModelType::NanoBananaPro),
Some(GenerationModel::GptImage1) => Some(TaskModelType::GptImage1),
Some(GenerationModel::GptImage1p5) => Some(TaskModelType::GptImage1p5),
Some(GenerationModel::GptImage2) => Some(TaskModelType::GptImage2),
Some(GenerationModel::Seedream4) => Some(TaskModelType::Seedream4),
Some(GenerationModel::Seedream4p5) => Some(TaskModelType::Seedream4p5),
Some(GenerationModel::Seedream5Lite) => Some(TaskModelType::Seedream5Lite),
Some(GenerationModel::QwenEdit2511Angles) => Some(TaskModelType::QwenEdit2511Angles),
Some(GenerationModel::Flux2LoraAngles) => Some(TaskModelType::Flux2LoraAngles),
Some(GenerationModel::GrokImage) => Some(TaskModelType::GrokImage),
Some(GenerationModel::Recraft3) => Some(TaskModelType::Recraft3),
Some(GenerationModel::GrokVideo) => Some(TaskModelType::GrokVideo),
Some(GenerationModel::GrokImagineVideo1p5) => Some(TaskModelType::GrokImagineVideo1p5),
Some(GenerationModel::Kling21Pro) => Some(TaskModelType::Kling21Pro),
Some(GenerationModel::Kling21Master) => Some(TaskModelType::Kling21Master),
Some(GenerationModel::Kling2p5TurboPro) => Some(TaskModelType::Kling2p5TurboPro),
Some(GenerationModel::Kling2p6Pro) => Some(TaskModelType::Kling2p6Pro),
Some(GenerationModel::Kling3p0Standard) => Some(TaskModelType::Kling3p0Standard),
Some(GenerationModel::Kling3p0Pro) => Some(TaskModelType::Kling3p0Pro),
Some(GenerationModel::HappyHorse1p0) => Some(TaskModelType::HappyHorse1p0),
Some(GenerationModel::Seedance10Lite) => Some(TaskModelType::Seedance10Lite),
Some(GenerationModel::Seedance1p5Pro) => Some(TaskModelType::Seedance1p5Pro),
Some(GenerationModel::Seedance2p0) => Some(TaskModelType::Seedance2p0),
Some(GenerationModel::Seedance2p0Fast) => Some(TaskModelType::Seedance2p0Fast),
Some(GenerationModel::Sora2) => Some(TaskModelType::Sora2),
Some(GenerationModel::Sora2Pro) => Some(TaskModelType::Sora2Pro),
Some(GenerationModel::Veo2) => Some(TaskModelType::Veo2),
Some(GenerationModel::Veo3) => Some(TaskModelType::Veo3),
Some(GenerationModel::Veo3p1) => Some(TaskModelType::Veo3p1),
Some(GenerationModel::Veo3p1Fast) => Some(TaskModelType::Veo3p1Fast),
Some(GenerationModel::Veo3Fast) => Some(TaskModelType::Veo3Fast),
Some(GenerationModel::Hunyuan3d2_0) => Some(TaskModelType::Hunyuan3d2_0),
Some(GenerationModel::Hunyuan3d2_1) => Some(TaskModelType::Hunyuan3d2_1),
Some(GenerationModel::Hunyuan3d3) => Some(TaskModelType::Hunyuan3d3),
Some(GenerationModel::WorldlabsMarble) => Some(TaskModelType::WorldlabsMarble),
Some(GenerationModel::WorldlabsMarble0p1Mini) => Some(TaskModelType::WorldlabsMarble0p1Mini),
Some(GenerationModel::WorldlabsMarble0p1Plus) => Some(TaskModelType::WorldlabsMarble0p1Plus),
Some(GenerationModel::Midjourney) => Some(TaskModelType::Midjourney), // NB: This is a generic Midjourney model, version unknown.
Some(GenerationModel::Midjourney7) => Some(TaskModelType::Midjourney7),
Some(GenerationModel::Midjourney7Niji) => Some(TaskModelType::Midjourney7Niji),
Some(GenerationModel::Midjourney8) => Some(TaskModelType::Midjourney8),

// TODO: These seem wrong -
Some(GenerationModel::Kling1_6) => Some(TaskModelType::Kling16Pro), // NB: `VideoModel::Kling16Pro`.
Some(GenerationModel::Kling2_0) => None, // TODO: unused elsewhere?
Some(GenerationModel::Sora) => None, // TODO: unused elsewhere?
};
let model_type = self.model.and_then(generation_model_to_task_model_type);

create_task(CreateTaskArgs {
db: task_database.get_connection(),
Expand All @@ -136,4 +141,28 @@ impl TaskEnqueueSuccess{
frontend_subscriber_payload,
}).await
}
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn seedance_2p5_generation_models_map_to_persisted_task_models() {
for (generation_model, expected) in [
(GenerationModel::Seedance2p5Preview, "seedance_2p5_preview"),
(GenerationModel::Seedance2p5, "seedance_2p5"),
(GenerationModel::Seedance2p5Ultra, "seedance_2p5_u"),
] {
let task_model = generation_model_to_task_model_type(generation_model).unwrap();
assert_eq!(task_model.to_str(), expected);
}
}

#[test]
fn extracted_mapping_preserves_legacy_special_cases() {
assert_eq!(generation_model_to_task_model_type(GenerationModel::Kling1_6).unwrap().to_str(), "kling_1.6_pro");
assert!(generation_model_to_task_model_type(GenerationModel::Kling2_0).is_none());
assert!(generation_model_to_task_model_type(GenerationModel::Sora).is_none());
}
}
33 changes: 33 additions & 0 deletions crates/desktop/artcraft/src/core/commands/generate/generate_video/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ pub enum TauriVideoModel {
#[serde(rename = "seedance_2p0_fast")]
Seedance2p0Fast,

#[serde(rename = "seedance_2p5_preview")]
Seedance2p5Preview,

#[serde(rename = "seedance_2p5")]
Seedance2p5,

#[serde(rename = "seedance_2p5_u")]
Seedance2p5Ultra,

#[serde(rename = "sora_2")]
Sora2,

Expand Down Expand Up @@ -150,3 +159,27 @@ pub enum TauriGenerateVideoErrorType {
FalError,
NeedsStorytellerCredentials,
}

#[cfg(test)]
mod tests {
use super::{TauriGenerateVideoRequest, TauriVideoModel};

#[test]
fn seedance_2p5_models_deserialize_at_tauri_command_boundary() {
let preview: TauriGenerateVideoRequest = serde_json::from_str(r#"{"model":"seedance_2p5_preview"}"#).unwrap();
let full: TauriGenerateVideoRequest = serde_json::from_str(r#"{"model":"seedance_2p5"}"#).unwrap();
let ultra: TauriGenerateVideoRequest = serde_json::from_str(r#"{"model":"seedance_2p5_u"}"#).unwrap();

assert!(matches!(preview.model, Some(TauriVideoModel::Seedance2p5Preview)));
assert!(matches!(full.model, Some(TauriVideoModel::Seedance2p5)));
assert!(matches!(ultra.model, Some(TauriVideoModel::Seedance2p5Ultra)));
}

#[test]
fn unsupported_seedance_2p5_spellings_are_rejected() {
for model in ["seedance_2p5_fast", "seedance_2p5_ultra"] {
let request = format!(r#"{{"model":"{model}"}}"#);
assert!(serde_json::from_str::<TauriGenerateVideoRequest>(&request).is_err());
}
}
}
6 changes: 6 additions & 0 deletions crates/desktop/artcraft/src/core/events/generation_events/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ pub enum GenerationModel {
Seedance2p0,
#[serde(rename = "seedance_2p0_fast")]
Seedance2p0Fast,
#[serde(rename = "seedance_2p5_preview")]
Seedance2p5Preview,
#[serde(rename = "seedance_2p5")]
Seedance2p5,
#[serde(rename = "seedance_2p5_u")]
Seedance2p5Ultra,
#[serde(rename = "veo_2")]
Veo2,
#[serde(rename = "veo_3")]
Expand Down
20 changes: 20 additions & 0 deletions .../src/core/threads/third_party_task_polling_thread/events/notify_frontend_of_completion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,9 @@ fn task_model_type_to_generation_model(model: TaskModelType) -> Option<Generatio
TaskModelType::Seedance1p5Pro => Some(GenerationModel::Seedance1p5Pro),
TaskModelType::Seedance2p0 => Some(GenerationModel::Seedance2p0),
TaskModelType::Seedance2p0Fast => Some(GenerationModel::Seedance2p0Fast),
TaskModelType::Seedance2p5Preview => Some(GenerationModel::Seedance2p5Preview),
TaskModelType::Seedance2p5 => Some(GenerationModel::Seedance2p5),
TaskModelType::Seedance2p5Ultra => Some(GenerationModel::Seedance2p5Ultra),
TaskModelType::Sora2 => Some(GenerationModel::Sora2),
TaskModelType::Sora2Pro => Some(GenerationModel::Sora2Pro),
TaskModelType::Veo2 => Some(GenerationModel::Veo2),
Expand All @@ -333,3 +336,20 @@ fn task_model_type_to_generation_model(model: TaskModelType) -> Option<Generatio
TaskModelType::WorldlabsMarble0p1Plus => Some(GenerationModel::WorldlabsMarble0p1Plus),
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn seedance_2p5_task_models_map_to_completion_event_identifiers() {
for (task_model, expected) in [
(TaskModelType::Seedance2p5Preview, r#""seedance_2p5_preview""#),
(TaskModelType::Seedance2p5, r#""seedance_2p5""#),
(TaskModelType::Seedance2p5Ultra, r#""seedance_2p5_u""#),
] {
let generation_model = task_model_type_to_generation_model(task_model).unwrap();
assert_eq!(serde_json::to_string(&generation_model).unwrap(), expected);
}
}
}
Loading