From 0d5d7c6fc83a97f76153e101b1330aeda23b87ae Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 20 May 2026 10:47:54 -0400 Subject: [PATCH] byteplus enum rename (#1542) --- .../src/api/common_video_model.rs | 16 ++-- .../generate_video_request_builder.rs | 36 ++++----- .../providers/artcraft/mod.rs | 8 +- .../build.rs | 22 ++--- .../cost.rs | 10 +-- .../mod.rs | 0 .../request.rs | 4 +- .../build.rs | 30 +++---- .../cost.rs | 10 +-- .../mod.rs | 0 .../request.rs | 4 +- .../build.rs | 20 ++--- .../cost.rs | 10 +-- .../{seedance_2p0_p => seedance_2p0_u}/mod.rs | 0 .../request.rs | 4 +- .../build.rs | 28 +++---- .../cost.rs | 12 +-- .../mod.rs | 0 .../request.rs | 6 +- .../gmicloud/seedance_2p0_fast_g/build.rs | 18 ++--- .../gmicloud/seedance_2p0_fast_g/cost.rs | 14 ++-- .../gmicloud/seedance_2p0_fast_g/request.rs | 6 +- .../gmicloud/seedance_2p0_g/build.rs | 20 ++--- .../providers/gmicloud/seedance_2p0_g/cost.rs | 12 +-- .../gmicloud/seedance_2p0_g/request.rs | 6 +- .../video_generation_request.rs | 72 ++++++++--------- .../common/generation/common_model_type.rs | 80 +++++++++---------- .../common/generation/common_video_model.rs | 58 +++++++------- .../src/configs/omni_gen/video_models.rs | 8 +- .../video/estimate_video_cost_handler.rs | 8 +- .../video/omni_gen_video_generate_handler.rs | 12 +-- .../video/pipeline_v2/run_pipeline_v2.rs | 8 +- .../permissions/schemas/schema.json | 4 +- 33 files changed, 272 insertions(+), 274 deletions(-) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_p => seedance_2p0_bp}/build.rs (88%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_p => seedance_2p0_bp}/cost.rs (94%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_fast_g => seedance_2p0_bp}/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_p => seedance_2p0_bp}/request.rs (87%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_p_fast => seedance_2p0_bp_fast}/build.rs (85%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_p_fast => seedance_2p0_bp_fast}/cost.rs (93%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_g => seedance_2p0_bp_fast}/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_p_fast => seedance_2p0_bp_fast}/request.rs (86%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_g => seedance_2p0_u}/build.rs (91%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_g => seedance_2p0_u}/cost.rs (95%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_p => seedance_2p0_u}/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_g => seedance_2p0_u}/request.rs (98%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_fast_g => seedance_2p0_u_fast}/build.rs (91%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_fast_g => seedance_2p0_u_fast}/cost.rs (93%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_p_fast => seedance_2p0_u_fast}/mod.rs (100%) rename crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/{seedance_2p0_fast_g => seedance_2p0_u_fast}/request.rs (98%) diff --git a/crates/api_clients/artcraft/artcraft_router/src/api/common_video_model.rs b/crates/api_clients/artcraft/artcraft_router/src/api/common_video_model.rs index 023d6d7c8b..2cebae5c1c 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/api/common_video_model.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/api/common_video_model.rs @@ -41,17 +41,17 @@ pub enum CommonVideoModel { #[serde(rename = "seedance_2p0_fast")] Seedance2p0Fast, - #[serde(rename = "seedance_2p0_p")] - Seedance2p0Plus, + #[serde(rename = "seedance_2p0_bp")] + Seedance2p0BytePlus, - #[serde(rename = "seedance_2p0_p_fast")] - Seedance2p0PlusFast, + #[serde(rename = "seedance_2p0_bp_fast")] + Seedance2p0BytePlusFast, - #[serde(rename = "seedance_2p0_g")] - Seedance2p0Global, + #[serde(rename = "seedance_2p0_u")] + Seedance2p0Ultra, - #[serde(rename = "seedance_2p0_fast_g")] - Seedance2p0FastGlobal, + #[serde(rename = "seedance_2p0_u_fast")] + Seedance2p0UltraFast, #[serde(rename = "happy_horse_1p0")] HappyHorse1p0, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs index cdfd56b634..360bbad81d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs @@ -52,14 +52,14 @@ use crate::generate::generate_video_v2::providers::artcraft::preview_model::buil use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::build::build_artcraft_preview_model_fast; use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::build::build_artcraft_seedance_2p0; use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::build::build_artcraft_seedance_2p0_fast; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_g::build::build_artcraft_seedance_2p0_g; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast_g::build::build_artcraft_seedance_2p0_fast_g; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p::build::build_artcraft_seedance_2p0_p; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p_fast::build::build_artcraft_seedance_2p0_p_fast; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::build::build_artcraft_seedance_2p0_u; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::build::build_artcraft_seedance_2p0_u_fast; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::build::build_artcraft_seedance_2p0_bp; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::build::build_artcraft_seedance_2p0_bp_fast; use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::build::build_kinovi_happy_horse_1p0; use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::build::build_kinovi_seedance_2p0; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::build::build_gmicloud_seedance_2p0_g; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::build::build_gmicloud_seedance_2p0_fast_g; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::build::build_gmicloud_seedance_2p0_u; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::build::build_gmicloud_seedance_2p0_u_fast; use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::build::build_kinovi_seedance_2p0_fast; use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; @@ -156,15 +156,15 @@ impl GenerateVideoRequestBuilder { (Provider::Artcraft, CommonVideoModel::HappyHorse1p0) => true, (Provider::Artcraft, CommonVideoModel::Seedance2p0) => true, (Provider::Artcraft, CommonVideoModel::Seedance2p0Fast) => true, - (Provider::Artcraft, CommonVideoModel::Seedance2p0Global) => true, - (Provider::Artcraft, CommonVideoModel::Seedance2p0FastGlobal) => true, - (Provider::Artcraft, CommonVideoModel::Seedance2p0Plus) => true, - (Provider::Artcraft, CommonVideoModel::Seedance2p0PlusFast) => true, + (Provider::Artcraft, CommonVideoModel::Seedance2p0Ultra) => true, + (Provider::Artcraft, CommonVideoModel::Seedance2p0UltraFast) => true, + (Provider::Artcraft, CommonVideoModel::Seedance2p0BytePlus) => true, + (Provider::Artcraft, CommonVideoModel::Seedance2p0BytePlusFast) => true, (Provider::Artcraft, CommonVideoModel::PreviewModel) => true, (Provider::Artcraft, CommonVideoModel::PreviewModelFast) => true, // GmiCloud - (Provider::GmiCloud, CommonVideoModel::Seedance2p0Global) => true, - (Provider::GmiCloud, CommonVideoModel::Seedance2p0FastGlobal) => true, + (Provider::GmiCloud, CommonVideoModel::Seedance2p0Ultra) => true, + (Provider::GmiCloud, CommonVideoModel::Seedance2p0UltraFast) => true, // Kinovi (Provider::Seedance2Pro, CommonVideoModel::HappyHorse1p0) => true, (Provider::Seedance2Pro, CommonVideoModel::Seedance2p0) => true, @@ -180,15 +180,15 @@ impl GenerateVideoRequestBuilder { (Provider::Artcraft, CommonVideoModel::HappyHorse1p0) => build_artcraft_happy_horse_1p0(self), (Provider::Artcraft, CommonVideoModel::Seedance2p0) => build_artcraft_seedance_2p0(self), (Provider::Artcraft, CommonVideoModel::Seedance2p0Fast) => build_artcraft_seedance_2p0_fast(self), - (Provider::Artcraft, CommonVideoModel::Seedance2p0Global) => build_artcraft_seedance_2p0_g(self), - (Provider::Artcraft, CommonVideoModel::Seedance2p0FastGlobal) => build_artcraft_seedance_2p0_fast_g(self), - (Provider::Artcraft, CommonVideoModel::Seedance2p0Plus) => build_artcraft_seedance_2p0_p(self), - (Provider::Artcraft, CommonVideoModel::Seedance2p0PlusFast) => build_artcraft_seedance_2p0_p_fast(self), + (Provider::Artcraft, CommonVideoModel::Seedance2p0Ultra) => build_artcraft_seedance_2p0_u(self), + (Provider::Artcraft, CommonVideoModel::Seedance2p0UltraFast) => build_artcraft_seedance_2p0_u_fast(self), + (Provider::Artcraft, CommonVideoModel::Seedance2p0BytePlus) => build_artcraft_seedance_2p0_bp(self), + (Provider::Artcraft, CommonVideoModel::Seedance2p0BytePlusFast) => build_artcraft_seedance_2p0_bp_fast(self), (Provider::Artcraft, CommonVideoModel::PreviewModel) => build_artcraft_preview_model(self), (Provider::Artcraft, CommonVideoModel::PreviewModelFast) => build_artcraft_preview_model_fast(self), // GmiCloud - (Provider::GmiCloud, CommonVideoModel::Seedance2p0Global) => build_gmicloud_seedance_2p0_g(self), - (Provider::GmiCloud, CommonVideoModel::Seedance2p0FastGlobal) => build_gmicloud_seedance_2p0_fast_g(self), + (Provider::GmiCloud, CommonVideoModel::Seedance2p0Ultra) => build_gmicloud_seedance_2p0_u(self), + (Provider::GmiCloud, CommonVideoModel::Seedance2p0UltraFast) => build_gmicloud_seedance_2p0_u_fast(self), // Kinovi (Provider::Seedance2Pro, CommonVideoModel::HappyHorse1p0) => build_kinovi_happy_horse_1p0(self), (Provider::Seedance2Pro, CommonVideoModel::Seedance2p0) => build_kinovi_seedance_2p0(self), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/mod.rs index 2f031cee71..0fefac7a9a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/mod.rs @@ -6,7 +6,7 @@ pub(crate) mod request_common; pub(crate) mod resolve; pub mod seedance_2p0; pub mod seedance_2p0_fast; -pub mod seedance_2p0_fast_g; -pub mod seedance_2p0_g; -pub mod seedance_2p0_p; -pub mod seedance_2p0_p_fast; +pub mod seedance_2p0_u_fast; +pub mod seedance_2p0_u; +pub mod seedance_2p0_bp; +pub mod seedance_2p0_bp_fast; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/build.rs similarity index 88% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/build.rs index 5f6d1535fd..c644b1b033 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/build.rs @@ -5,19 +5,19 @@ use crate::generate::generate_video::generate_video_request_builder::GenerateVid use crate::generate::generate_video_v2::providers::artcraft::build_common::{ build_artcraft_omni_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p::request::ArtcraftSeedance2p0PlusRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; -pub fn build_artcraft_seedance_2p0_p(builder: GenerateVideoRequestBuilder) -> Result { +pub fn build_artcraft_seedance_2p0_bp(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_request( builder, - CommonVideoModelEnum::Seedance2p0Plus, + CommonVideoModelEnum::Seedance2p0BytePlus, SupportedResolutions::Full, UltraWideSupport::Supported, )?; - let state = ArtcraftSeedance2p0PlusRequestState { request }; - Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0Plus(state))) + let state = ArtcraftSeedance2p0BytePlusRequestState { request }; + Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0BytePlus(state))) } #[cfg(test)] @@ -44,7 +44,7 @@ mod tests { #[test] fn model_is_seedance_2p0_plus() { let req = unwrap_request(make_builder(|_| {})); - assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0Plus))); + assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0BytePlus))); } #[test] @@ -114,7 +114,7 @@ mod tests { #[test] fn url_start_frame_rejected() { - let result = build_artcraft_seedance_2p0_p(GenerateVideoRequestBuilder { + let result = build_artcraft_seedance_2p0_bp(GenerateVideoRequestBuilder { start_frame: Some(ImageRef::Url("https://example.com".to_string())), ..base_builder() }); @@ -155,13 +155,13 @@ mod tests { builder } - fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0PlusRequestState { - let result = build_artcraft_seedance_2p0_p(builder).expect("build should succeed"); + fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0BytePlusRequestState { + let result = build_artcraft_seedance_2p0_bp(builder).expect("build should succeed"); match result { VideoGenerationDraftOrRequest::Request( - VideoGenerationRequest::ArtcraftSeedance2p0Plus(state) + VideoGenerationRequest::ArtcraftSeedance2p0BytePlus(state) ) => state, - _ => panic!("expected ArtcraftSeedance2p0Plus request"), + _ => panic!("expected ArtcraftSeedance2p0BytePlus request"), } } } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/cost.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/cost.rs index 4a911d534a..b06b3f50c3 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p::request::ArtcraftSeedance2p0PlusRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; /// USD cents per second by resolution: /// 480p: $0.10/s = 10.0 ¢/s @@ -11,14 +11,14 @@ const CENTS_PER_SECOND_480P: f64 = 10.0; const CENTS_PER_SECOND_720P: f64 = 25.0; const CENTS_PER_SECOND_1080P: f64 = 50.0; -pub struct ArtcraftSeedance2p0PlusCostState { +pub struct ArtcraftSeedance2p0BytePlusCostState { pub resolution: CommonResolution, pub duration_seconds: u16, pub batch_count: u16, } -impl ArtcraftSeedance2p0PlusCostState { - pub fn from_request(request: &ArtcraftSeedance2p0PlusRequestState) -> Self { +impl ArtcraftSeedance2p0BytePlusCostState { + pub fn from_request(request: &ArtcraftSeedance2p0BytePlusRequestState) -> Self { let resolution = request.request.resolution .unwrap_or(CommonResolution::SevenTwentyP); let duration_seconds = request.request.duration_seconds.unwrap_or(5); @@ -160,7 +160,7 @@ mod tests { video_batch_count: u16, ) -> crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate { GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0Plus, + model: CommonVideoModel::Seedance2p0BytePlus, provider: Provider::Artcraft, resolution, duration_seconds: Some(duration_seconds), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/request.rs similarity index 87% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/request.rs index 69b28146c9..d4ff2cf083 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp/request.rs @@ -6,11 +6,11 @@ use crate::generate::generate_video::generate_video_response::GenerateVideoRespo use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_request; #[derive(Clone, Debug)] -pub struct ArtcraftSeedance2p0PlusRequestState { +pub struct ArtcraftSeedance2p0BytePlusRequestState { pub request: OmniGenVideoCostAndGenerateRequest, } -impl ArtcraftSeedance2p0PlusRequestState { +impl ArtcraftSeedance2p0BytePlusRequestState { pub async fn send(&self, client: &RouterArtcraftClient) -> Result { send_artcraft_omni_request(&self.request, client).await } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/build.rs similarity index 85% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/build.rs index 836681c0eb..0bec0ba4f9 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/build.rs @@ -5,19 +5,19 @@ use crate::generate::generate_video::generate_video_request_builder::GenerateVid use crate::generate::generate_video_v2::providers::artcraft::build_common::{ build_artcraft_omni_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p_fast::request::ArtcraftSeedance2p0PlusFastRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; -pub fn build_artcraft_seedance_2p0_p_fast(builder: GenerateVideoRequestBuilder) -> Result { +pub fn build_artcraft_seedance_2p0_bp_fast(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_request( builder, - CommonVideoModelEnum::Seedance2p0PlusFast, + CommonVideoModelEnum::Seedance2p0BytePlusFast, SupportedResolutions::Fast, UltraWideSupport::Supported, )?; - let state = ArtcraftSeedance2p0PlusFastRequestState { request }; - Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0PlusFast(state))) + let state = ArtcraftSeedance2p0BytePlusFastRequestState { request }; + Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0BytePlusFast(state))) } #[cfg(test)] @@ -46,7 +46,7 @@ mod tests { #[test] fn model_is_seedance_2p0_plus_fast() { let req = unwrap_request(make_builder(|_| {})); - assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0PlusFast))); + assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0BytePlusFast))); } #[test] @@ -97,8 +97,8 @@ mod tests { #[test] fn res_1080p_error_out() { - let result = build_artcraft_seedance_2p0_p_fast(GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0PlusFast, + let result = build_artcraft_seedance_2p0_bp_fast(GenerateVideoRequestBuilder { + model: CommonVideoModel::Seedance2p0BytePlusFast, provider: Provider::Artcraft, resolution: Some(CommonResolution::TenEightyP), request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut, @@ -128,8 +128,8 @@ mod tests { #[test] fn url_start_frame_rejected() { - let result = build_artcraft_seedance_2p0_p_fast(GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0PlusFast, + let result = build_artcraft_seedance_2p0_bp_fast(GenerateVideoRequestBuilder { + model: CommonVideoModel::Seedance2p0BytePlusFast, provider: Provider::Artcraft, start_frame: Some(ImageRef::Url("https://example.com".to_string())), ..Default::default() @@ -158,7 +158,7 @@ mod tests { fn make_builder(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> GenerateVideoRequestBuilder { let mut builder = GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0PlusFast, + model: CommonVideoModel::Seedance2p0BytePlusFast, provider: Provider::Artcraft, duration_seconds: Some(5), video_batch_count: Some(1), @@ -168,13 +168,13 @@ mod tests { builder } - fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0PlusFastRequestState { - let result = build_artcraft_seedance_2p0_p_fast(builder).expect("build should succeed"); + fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0BytePlusFastRequestState { + let result = build_artcraft_seedance_2p0_bp_fast(builder).expect("build should succeed"); match result { VideoGenerationDraftOrRequest::Request( - VideoGenerationRequest::ArtcraftSeedance2p0PlusFast(state) + VideoGenerationRequest::ArtcraftSeedance2p0BytePlusFast(state) ) => state, - _ => panic!("expected ArtcraftSeedance2p0PlusFast request"), + _ => panic!("expected ArtcraftSeedance2p0BytePlusFast request"), } } } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/cost.rs similarity index 93% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/cost.rs index a951a24de9..9c07584123 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p_fast::request::ArtcraftSeedance2p0PlusFastRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; /// USD cents per second by resolution: /// 480p: $0.09/s = 9.0 ¢/s @@ -9,14 +9,14 @@ use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p_fast const CENTS_PER_SECOND_480P: f64 = 9.0; const CENTS_PER_SECOND_720P: f64 = 20.0; -pub struct ArtcraftSeedance2p0PlusFastCostState { +pub struct ArtcraftSeedance2p0BytePlusFastCostState { pub resolution: CommonResolution, pub duration_seconds: u16, pub batch_count: u16, } -impl ArtcraftSeedance2p0PlusFastCostState { - pub fn from_request(request: &ArtcraftSeedance2p0PlusFastRequestState) -> Self { +impl ArtcraftSeedance2p0BytePlusFastCostState { + pub fn from_request(request: &ArtcraftSeedance2p0BytePlusFastRequestState) -> Self { let resolution = request.request.resolution .unwrap_or(CommonResolution::SevenTwentyP); let duration_seconds = request.request.duration_seconds.unwrap_or(5); @@ -131,7 +131,7 @@ mod tests { video_batch_count: u16, ) -> crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate { GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0PlusFast, + model: CommonVideoModel::Seedance2p0BytePlusFast, provider: Provider::Artcraft, resolution, duration_seconds: Some(duration_seconds), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/request.rs index cac2084660..6d0a7d382f 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_bp_fast/request.rs @@ -6,11 +6,11 @@ use crate::generate::generate_video::generate_video_response::GenerateVideoRespo use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_request; #[derive(Clone, Debug)] -pub struct ArtcraftSeedance2p0PlusFastRequestState { +pub struct ArtcraftSeedance2p0BytePlusFastRequestState { pub request: OmniGenVideoCostAndGenerateRequest, } -impl ArtcraftSeedance2p0PlusFastRequestState { +impl ArtcraftSeedance2p0BytePlusFastRequestState { pub async fn send(&self, client: &RouterArtcraftClient) -> Result { send_artcraft_omni_request(&self.request, client).await } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/build.rs similarity index 91% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/build.rs index a4f11f4554..c4ed48c311 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/build.rs @@ -5,19 +5,19 @@ use crate::generate::generate_video::generate_video_request_builder::GenerateVid use crate::generate::generate_video_v2::providers::artcraft::build_common::{ build_artcraft_omni_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_g::request::ArtcraftSeedance2p0GRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; -pub fn build_artcraft_seedance_2p0_g(builder: GenerateVideoRequestBuilder) -> Result { +pub fn build_artcraft_seedance_2p0_u(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_request( builder, - CommonVideoModelEnum::Seedance2p0Global, + CommonVideoModelEnum::Seedance2p0Ultra, SupportedResolutions::Full, UltraWideSupport::Supported, )?; - let state = ArtcraftSeedance2p0GRequestState { request }; - Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0G(state))) + let state = ArtcraftSeedance2p0UltraRequestState { request }; + Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0Ultra(state))) } #[cfg(test)] @@ -46,7 +46,7 @@ mod tests { #[test] fn model_is_seedance_2p0() { let req = unwrap_request(make_builder(|_| {})); - assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0Global))); + assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0Ultra))); } #[test] @@ -120,7 +120,7 @@ mod tests { #[test] fn url_start_frame_rejected() { - let result = build_artcraft_seedance_2p0_g(GenerateVideoRequestBuilder { + let result = build_artcraft_seedance_2p0_u(GenerateVideoRequestBuilder { start_frame: Some(ImageRef::Url("https://example.com".to_string())), ..base_builder() }); @@ -163,11 +163,11 @@ mod tests { builder } - fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0GRequestState { - let result = build_artcraft_seedance_2p0_g(builder).expect("build should succeed"); + fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0UltraRequestState { + let result = build_artcraft_seedance_2p0_u(builder).expect("build should succeed"); match result { VideoGenerationDraftOrRequest::Request( - VideoGenerationRequest::ArtcraftSeedance2p0G(state) + VideoGenerationRequest::ArtcraftSeedance2p0Ultra(state) ) => state, _ => panic!("expected ArtcraftSeedance2p0 request"), } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/cost.rs similarity index 95% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/cost.rs index afaae86232..846f7cb74b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/cost.rs @@ -1,7 +1,7 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_g::request::ArtcraftSeedance2p0GRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; // ── Pricing constants ── @@ -9,14 +9,14 @@ const CENTS_PER_SECOND_480P: f64 = 5.4404; const CENTS_PER_SECOND_720P: f64 = 11.2; const CENTS_PER_SECOND_1080P: f64 = 32.6424; -pub struct ArtcraftSeedance2p0GCostState { +pub struct ArtcraftSeedance2p0UltraCostState { pub resolution: CommonResolution, pub duration_seconds: u16, pub batch_count: u16, } -impl ArtcraftSeedance2p0GCostState { - pub fn from_request(request: &ArtcraftSeedance2p0GRequestState) -> Self { +impl ArtcraftSeedance2p0UltraCostState { + pub fn from_request(request: &ArtcraftSeedance2p0UltraRequestState) -> Self { let resolution = request.request.resolution .unwrap_or(CommonResolution::SevenTwentyP); let duration_seconds = request.request.duration_seconds.unwrap_or(5); @@ -165,7 +165,7 @@ mod tests { video_batch_count: u16, ) -> crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate { let builder = GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0Global, + model: CommonVideoModel::Seedance2p0Ultra, provider: Provider::Artcraft, resolution, duration_seconds: Some(duration_seconds), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/request.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/request.rs index f655a32851..82184c11ef 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_g/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u/request.rs @@ -6,11 +6,11 @@ use crate::generate::generate_video::generate_video_response::GenerateVideoRespo use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_request; #[derive(Clone, Debug)] -pub struct ArtcraftSeedance2p0GRequestState { +pub struct ArtcraftSeedance2p0UltraRequestState { pub request: OmniGenVideoCostAndGenerateRequest, } -impl ArtcraftSeedance2p0GRequestState { +impl ArtcraftSeedance2p0UltraRequestState { pub async fn send(&self, client: &RouterArtcraftClient) -> Result { send_artcraft_omni_request(&self.request, client).await } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/build.rs similarity index 91% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/build.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/build.rs index ea4b4e003f..7e9454e5bf 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/build.rs @@ -5,19 +5,19 @@ use crate::generate::generate_video::generate_video_request_builder::GenerateVid use crate::generate::generate_video_v2::providers::artcraft::build_common::{ build_artcraft_omni_request, SupportedResolutions, UltraWideSupport, }; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast_g::request::ArtcraftSeedance2p0FastGRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; -pub fn build_artcraft_seedance_2p0_fast_g(builder: GenerateVideoRequestBuilder) -> Result { +pub fn build_artcraft_seedance_2p0_u_fast(builder: GenerateVideoRequestBuilder) -> Result { let request = build_artcraft_omni_request( builder, - CommonVideoModelEnum::Seedance2p0FastGlobal, + CommonVideoModelEnum::Seedance2p0UltraFast, SupportedResolutions::Fast, UltraWideSupport::Supported, )?; - let state = ArtcraftSeedance2p0FastGRequestState { request }; - Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0FastG(state))) + let state = ArtcraftSeedance2p0UltraFastRequestState { request }; + Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0UltraFast(state))) } #[cfg(test)] @@ -63,7 +63,7 @@ mod tests { #[test] fn model_is_seedance_2p0_fast() { let req = unwrap_request(artcraft_fast_builder_with(|_| {})); - assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0FastGlobal))); + assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0UltraFast))); } #[test] @@ -152,8 +152,8 @@ mod tests { #[test] fn res_1080p_error_out() { - let result = build_artcraft_seedance_2p0_fast_g(GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0FastGlobal, + let result = build_artcraft_seedance_2p0_u_fast(GenerateVideoRequestBuilder { + model: CommonVideoModel::Seedance2p0UltraFast, provider: Provider::Artcraft, resolution: Some(CommonResolution::TenEightyP), request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut, @@ -185,8 +185,8 @@ mod tests { #[test] fn url_start_frame_rejected() { - let result = build_artcraft_seedance_2p0_fast_g(GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0FastGlobal, + let result = build_artcraft_seedance_2p0_u_fast(GenerateVideoRequestBuilder { + model: CommonVideoModel::Seedance2p0UltraFast, provider: Provider::Artcraft, start_frame: Some(ImageRef::Url("https://example.com".to_string())), ..Default::default() @@ -223,7 +223,7 @@ mod tests { fn artcraft_fast_builder_with(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> GenerateVideoRequestBuilder { let mut builder = GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0FastGlobal, + model: CommonVideoModel::Seedance2p0UltraFast, provider: Provider::Artcraft, duration_seconds: Some(5), video_batch_count: Some(1), @@ -233,11 +233,11 @@ mod tests { builder } - fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0FastGRequestState { - let result = build_artcraft_seedance_2p0_fast_g(builder).expect("build should succeed"); + fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0UltraFastRequestState { + let result = build_artcraft_seedance_2p0_u_fast(builder).expect("build should succeed"); match result { VideoGenerationDraftOrRequest::Request( - VideoGenerationRequest::ArtcraftSeedance2p0FastG(state) + VideoGenerationRequest::ArtcraftSeedance2p0UltraFast(state) ) => state, _ => panic!("expected ArtcraftSeedance2p0Fast request"), } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/cost.rs similarity index 93% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/cost.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/cost.rs index ea13d0d631..684da99835 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/cost.rs @@ -1,21 +1,21 @@ use enums::common::generation::common_resolution::CommonResolution; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast_g::request::ArtcraftSeedance2p0FastGRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; // ── Pricing constants ── const CENTS_PER_SECOND_480P: f64 = 3.6267; const CENTS_PER_SECOND_720P: f64 = 8.9089; -pub struct ArtcraftSeedance2p0FastGCostState { +pub struct ArtcraftSeedance2p0UltraFastCostState { pub resolution: CommonResolution, pub duration_seconds: u16, pub batch_count: u16, } -impl ArtcraftSeedance2p0FastGCostState { - pub fn from_request(request: &ArtcraftSeedance2p0FastGRequestState) -> Self { +impl ArtcraftSeedance2p0UltraFastCostState { + pub fn from_request(request: &ArtcraftSeedance2p0UltraFastRequestState) -> Self { let resolution = request.request.resolution .unwrap_or(CommonResolution::SevenTwentyP); let duration_seconds = request.request.duration_seconds.unwrap_or(5); @@ -125,7 +125,7 @@ mod tests { let fast = cost_cents(Some(CommonResolution::SevenTwentyP), 10, 1); let standard = { let builder = GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0Global, + model: CommonVideoModel::Seedance2p0Ultra, provider: Provider::Artcraft, resolution: Some(CommonResolution::SevenTwentyP), duration_seconds: Some(10), @@ -150,7 +150,7 @@ mod tests { video_batch_count: u16, ) -> crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate { let builder = GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0FastGlobal, + model: CommonVideoModel::Seedance2p0UltraFast, provider: Provider::Artcraft, resolution, duration_seconds: Some(duration_seconds), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_p_fast/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/request.rs similarity index 98% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/request.rs index 12b4cad0e8..fd1e433553 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_fast_g/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/artcraft/seedance_2p0_u_fast/request.rs @@ -6,11 +6,11 @@ use crate::generate::generate_video::generate_video_response::GenerateVideoRespo use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_request; #[derive(Clone, Debug)] -pub struct ArtcraftSeedance2p0FastGRequestState { +pub struct ArtcraftSeedance2p0UltraFastRequestState { pub request: OmniGenVideoCostAndGenerateRequest, } -impl ArtcraftSeedance2p0FastGRequestState { +impl ArtcraftSeedance2p0UltraFastRequestState { pub async fn send(&self, client: &RouterArtcraftClient) -> Result { send_artcraft_omni_request(&self.request, client).await } @@ -185,7 +185,7 @@ mod tests { fn artcraft_fast_builder() -> GenerateVideoRequestBuilder { GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0FastGlobal, + model: CommonVideoModel::Seedance2p0UltraFast, provider: Provider::Artcraft, duration_seconds: Some(4), video_batch_count: Some(1), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/build.rs index a8136fa987..bb52dadf80 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/build.rs @@ -12,11 +12,11 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0FastGRequestState; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; -pub fn build_gmicloud_seedance_2p0_fast_g( +pub fn build_gmicloud_seedance_2p0_u_fast( mut builder: GenerateVideoRequestBuilder, ) -> Result { let strategy = builder.request_mismatch_mitigation_strategy; @@ -49,8 +49,8 @@ pub fn build_gmicloud_seedance_2p0_fast_g( reference_asset_ids: None, }; - let state = GmiCloudSeedance2p0FastGRequestState { request }; - Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::GmiCloudSeedance2p0FastG(state))) + let state = GmiCloudSeedance2p0UltraFastRequestState { request }; + Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::GmiCloudSeedance2p0UltraFast(state))) } fn plan_ratio( @@ -247,7 +247,7 @@ mod tests { #[test] fn media_file_token_rejected() { - let result = build_gmicloud_seedance_2p0_fast_g(GenerateVideoRequestBuilder { + let result = build_gmicloud_seedance_2p0_u_fast(GenerateVideoRequestBuilder { start_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_x".to_string()))), ..base_builder() }); @@ -284,7 +284,7 @@ mod tests { fn base_builder() -> GenerateVideoRequestBuilder { GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0FastGlobal, + model: CommonVideoModel::Seedance2p0UltraFast, provider: Provider::GmiCloud, duration_seconds: Some(5), video_batch_count: Some(1), @@ -298,10 +298,10 @@ mod tests { builder } - fn unwrap_request(builder: GenerateVideoRequestBuilder) -> GmiCloudSeedance2p0FastGRequestState { - let result = build_gmicloud_seedance_2p0_fast_g(builder).expect("build should succeed"); + fn unwrap_request(builder: GenerateVideoRequestBuilder) -> GmiCloudSeedance2p0UltraFastRequestState { + let result = build_gmicloud_seedance_2p0_u_fast(builder).expect("build should succeed"); match result { - VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::GmiCloudSeedance2p0FastG(state)) => state, + VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::GmiCloudSeedance2p0UltraFast(state)) => state, _ => panic!("expected GmiCloudSeedance2p0FastG request"), } } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/cost.rs index 3d8406fbc8..efd4d706f1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/cost.rs @@ -1,14 +1,14 @@ use gmicloud_client::traits::gmicloud_request_cost_calculator_trait::GmiCloudRequestCostCalculator; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0FastGRequestState; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; -pub struct GmiCloudSeedance2p0FastGCostState { - request: GmiCloudSeedance2p0FastGRequestState, +pub struct GmiCloudSeedance2p0UltraFastCostState { + request: GmiCloudSeedance2p0UltraFastRequestState, } -impl GmiCloudSeedance2p0FastGCostState { - pub fn from_request(request: &GmiCloudSeedance2p0FastGRequestState) -> Self { +impl GmiCloudSeedance2p0UltraFastCostState { + pub fn from_request(request: &GmiCloudSeedance2p0UltraFastRequestState) -> Self { Self { request: request.clone() } } @@ -93,7 +93,7 @@ mod tests { let fast = cost_cents(Some(CommonResolution::SevenTwentyP), 10); let standard = { let builder = GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0Global, + model: CommonVideoModel::Seedance2p0Ultra, provider: Provider::GmiCloud, resolution: Some(CommonResolution::SevenTwentyP), duration_seconds: Some(10), @@ -108,7 +108,7 @@ mod tests { fn cost_cents(resolution: Option, duration_seconds: u16) -> u64 { let builder = GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0FastGlobal, + model: CommonVideoModel::Seedance2p0UltraFast, provider: Provider::GmiCloud, resolution, duration_seconds: Some(duration_seconds), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/request.rs index 958765c1e0..fc62c4a306 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_fast_g/request.rs @@ -8,11 +8,11 @@ use crate::generate::generate_video::generate_video_response::{ }; #[derive(Clone, Debug)] -pub struct GmiCloudSeedance2p0FastGRequestState { +pub struct GmiCloudSeedance2p0UltraFastRequestState { pub request: Seedance20FastRequest, } -impl GmiCloudSeedance2p0FastGRequestState { +impl GmiCloudSeedance2p0UltraFastRequestState { pub async fn send(&self, client: &RouterGmiCloudClient) -> Result { let response = self.request.send_request(&client.api_key) .await @@ -69,7 +69,7 @@ mod tests { fn gmicloud_fast_builder() -> GenerateVideoRequestBuilder { GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0FastGlobal, + model: CommonVideoModel::Seedance2p0UltraFast, provider: Provider::GmiCloud, video_batch_count: Some(1), ..Default::default() diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/build.rs index daf1849c1d..7092535711 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/build.rs @@ -12,11 +12,11 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::client_error::ClientError; use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0GRequestState; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest; -pub fn build_gmicloud_seedance_2p0_g( +pub fn build_gmicloud_seedance_2p0_u( mut builder: GenerateVideoRequestBuilder, ) -> Result { let strategy = builder.request_mismatch_mitigation_strategy; @@ -49,8 +49,8 @@ pub fn build_gmicloud_seedance_2p0_g( reference_asset_ids: None, }; - let state = GmiCloudSeedance2p0GRequestState { request }; - Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::GmiCloudSeedance2p0G(state))) + let state = GmiCloudSeedance2p0UltraRequestState { request }; + Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::GmiCloudSeedance2p0Ultra(state))) } fn plan_ratio( @@ -270,7 +270,7 @@ mod tests { #[test] fn media_file_token_rejected_for_start_frame() { - let result = build_gmicloud_seedance_2p0_g(GenerateVideoRequestBuilder { + let result = build_gmicloud_seedance_2p0_u(GenerateVideoRequestBuilder { start_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_test".to_string()))), ..base_builder() }); @@ -288,7 +288,7 @@ mod tests { #[test] fn reference_image_tokens_rejected() { - let result = build_gmicloud_seedance_2p0_g(GenerateVideoRequestBuilder { + let result = build_gmicloud_seedance_2p0_u(GenerateVideoRequestBuilder { reference_images: Some(ImageListRef::MediaFileTokens(vec![MediaFileToken::new("mf_a".to_string())])), ..base_builder() }); @@ -316,7 +316,7 @@ mod tests { fn base_builder() -> GenerateVideoRequestBuilder { GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0Global, + model: CommonVideoModel::Seedance2p0Ultra, provider: Provider::GmiCloud, duration_seconds: Some(5), video_batch_count: Some(1), @@ -330,10 +330,10 @@ mod tests { builder } - fn unwrap_request(builder: GenerateVideoRequestBuilder) -> GmiCloudSeedance2p0GRequestState { - let result = build_gmicloud_seedance_2p0_g(builder).expect("build should succeed"); + fn unwrap_request(builder: GenerateVideoRequestBuilder) -> GmiCloudSeedance2p0UltraRequestState { + let result = build_gmicloud_seedance_2p0_u(builder).expect("build should succeed"); match result { - VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::GmiCloudSeedance2p0G(state)) => state, + VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::GmiCloudSeedance2p0Ultra(state)) => state, _ => panic!("expected GmiCloudSeedance2p0G request"), } } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/cost.rs index 321b3d9bdd..3da990c5a7 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/cost.rs @@ -1,14 +1,14 @@ use gmicloud_client::traits::gmicloud_request_cost_calculator_trait::GmiCloudRequestCostCalculator; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0GRequestState; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; -pub struct GmiCloudSeedance2p0GCostState { - request: GmiCloudSeedance2p0GRequestState, +pub struct GmiCloudSeedance2p0UltraCostState { + request: GmiCloudSeedance2p0UltraRequestState, } -impl GmiCloudSeedance2p0GCostState { - pub fn from_request(request: &GmiCloudSeedance2p0GRequestState) -> Self { +impl GmiCloudSeedance2p0UltraCostState { + pub fn from_request(request: &GmiCloudSeedance2p0UltraRequestState) -> Self { Self { request: request.clone() } } @@ -116,7 +116,7 @@ mod tests { fn cost_cents(resolution: Option, duration_seconds: u16) -> u64 { let builder = GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0Global, + model: CommonVideoModel::Seedance2p0Ultra, provider: Provider::GmiCloud, resolution, duration_seconds: Some(duration_seconds), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/request.rs index 3b8b761d78..4dbdfedbbb 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/gmicloud/seedance_2p0_g/request.rs @@ -8,11 +8,11 @@ use crate::generate::generate_video::generate_video_response::{ }; #[derive(Clone, Debug)] -pub struct GmiCloudSeedance2p0GRequestState { +pub struct GmiCloudSeedance2p0UltraRequestState { pub request: Seedance20Request, } -impl GmiCloudSeedance2p0GRequestState { +impl GmiCloudSeedance2p0UltraRequestState { pub async fn send(&self, client: &RouterGmiCloudClient) -> Result { let response = self.request.send_request(&client.api_key) .await @@ -67,7 +67,7 @@ mod tests { fn gmicloud_builder() -> GenerateVideoRequestBuilder { GenerateVideoRequestBuilder { - model: CommonVideoModel::Seedance2p0Global, + model: CommonVideoModel::Seedance2p0Ultra, provider: Provider::GmiCloud, video_batch_count: Some(1), ..Default::default() diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_request.rs index 61f27ab5e6..d3452e2318 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_request.rs @@ -13,18 +13,18 @@ use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::cost: use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState; use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::cost::ArtcraftSeedance2p0FastCostState; use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_g::cost::ArtcraftSeedance2p0GCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_g::request::ArtcraftSeedance2p0GRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast_g::cost::ArtcraftSeedance2p0FastGCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast_g::request::ArtcraftSeedance2p0FastGRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p::cost::ArtcraftSeedance2p0PlusCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p::request::ArtcraftSeedance2p0PlusRequestState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p_fast::cost::ArtcraftSeedance2p0PlusFastCostState; -use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_p_fast::request::ArtcraftSeedance2p0PlusFastRequestState; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::cost::GmiCloudSeedance2p0GCostState; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0GRequestState; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::cost::GmiCloudSeedance2p0FastGCostState; -use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0FastGRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::cost::ArtcraftSeedance2p0UltraCostState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::cost::ArtcraftSeedance2p0UltraFastCostState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::cost::ArtcraftSeedance2p0BytePlusCostState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::cost::ArtcraftSeedance2p0BytePlusFastCostState; +use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::cost::GmiCloudSeedance2p0UltraCostState; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::request::GmiCloudSeedance2p0UltraRequestState; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::cost::GmiCloudSeedance2p0UltraFastCostState; +use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::request::GmiCloudSeedance2p0UltraFastRequestState; use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::cost::KinoviHappyHorse1p0CostState; use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::request::KinoviHappyHorse1p0RequestState; use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::cost::KinoviSeedance2p0CostState; @@ -39,12 +39,12 @@ pub enum VideoGenerationRequest { ArtcraftPreviewModelFast(ArtcraftPreviewModelFastRequestState), ArtcraftSeedance2p0(ArtcraftSeedance2p0RequestState), ArtcraftSeedance2p0Fast(ArtcraftSeedance2p0FastRequestState), - ArtcraftSeedance2p0G(ArtcraftSeedance2p0GRequestState), - ArtcraftSeedance2p0FastG(ArtcraftSeedance2p0FastGRequestState), - ArtcraftSeedance2p0Plus(ArtcraftSeedance2p0PlusRequestState), - ArtcraftSeedance2p0PlusFast(ArtcraftSeedance2p0PlusFastRequestState), - GmiCloudSeedance2p0G(GmiCloudSeedance2p0GRequestState), - GmiCloudSeedance2p0FastG(GmiCloudSeedance2p0FastGRequestState), + ArtcraftSeedance2p0Ultra(ArtcraftSeedance2p0UltraRequestState), + ArtcraftSeedance2p0UltraFast(ArtcraftSeedance2p0UltraFastRequestState), + ArtcraftSeedance2p0BytePlus(ArtcraftSeedance2p0BytePlusRequestState), + ArtcraftSeedance2p0BytePlusFast(ArtcraftSeedance2p0BytePlusFastRequestState), + GmiCloudSeedance2p0Ultra(GmiCloudSeedance2p0UltraRequestState), + GmiCloudSeedance2p0UltraFast(GmiCloudSeedance2p0UltraFastRequestState), KinoviHappyHorse1p0(KinoviHappyHorse1p0RequestState), KinoviSeedance2p0(KinoviSeedance2p0RequestState), KinoviSeedance2p0Fast(KinoviSeedance2p0FastRequestState), @@ -59,12 +59,12 @@ impl VideoGenerationRequest { Self::ArtcraftPreviewModelFast(_) => Provider::Artcraft, Self::ArtcraftSeedance2p0(_) => Provider::Artcraft, Self::ArtcraftSeedance2p0Fast(_) => Provider::Artcraft, - Self::ArtcraftSeedance2p0G(_) => Provider::Artcraft, - Self::ArtcraftSeedance2p0FastG(_) => Provider::Artcraft, - Self::ArtcraftSeedance2p0Plus(_) => Provider::Artcraft, - Self::ArtcraftSeedance2p0PlusFast(_) => Provider::Artcraft, - Self::GmiCloudSeedance2p0G(_) => Provider::GmiCloud, - Self::GmiCloudSeedance2p0FastG(_) => Provider::GmiCloud, + Self::ArtcraftSeedance2p0Ultra(_) => Provider::Artcraft, + Self::ArtcraftSeedance2p0UltraFast(_) => Provider::Artcraft, + Self::ArtcraftSeedance2p0BytePlus(_) => Provider::Artcraft, + Self::ArtcraftSeedance2p0BytePlusFast(_) => Provider::Artcraft, + Self::GmiCloudSeedance2p0Ultra(_) => Provider::GmiCloud, + Self::GmiCloudSeedance2p0UltraFast(_) => Provider::GmiCloud, Self::KinoviHappyHorse1p0(_) => Provider::Seedance2Pro, Self::KinoviSeedance2p0(_) => Provider::Seedance2Pro, Self::KinoviSeedance2p0Fast(_) => Provider::Seedance2Pro, @@ -79,12 +79,12 @@ impl VideoGenerationRequest { VideoGenerationRequest::ArtcraftPreviewModelFast(request) => Ok(ArtcraftPreviewModelFastCostState::from_request(request).estimate_cost()), VideoGenerationRequest::ArtcraftSeedance2p0(request) => Ok(ArtcraftSeedance2p0CostState::from_request(request).estimate_cost()), VideoGenerationRequest::ArtcraftSeedance2p0Fast(request) => Ok(ArtcraftSeedance2p0FastCostState::from_request(request).estimate_cost()), - VideoGenerationRequest::ArtcraftSeedance2p0G(request) => Ok(ArtcraftSeedance2p0GCostState::from_request(request).estimate_cost()), - VideoGenerationRequest::ArtcraftSeedance2p0FastG(request) => Ok(ArtcraftSeedance2p0FastGCostState::from_request(request).estimate_cost()), - VideoGenerationRequest::ArtcraftSeedance2p0Plus(request) => Ok(ArtcraftSeedance2p0PlusCostState::from_request(request).estimate_cost()), - VideoGenerationRequest::ArtcraftSeedance2p0PlusFast(request) => Ok(ArtcraftSeedance2p0PlusFastCostState::from_request(request).estimate_cost()), - VideoGenerationRequest::GmiCloudSeedance2p0G(request) => Ok(GmiCloudSeedance2p0GCostState::from_request(request).estimate_cost()), - VideoGenerationRequest::GmiCloudSeedance2p0FastG(request) => Ok(GmiCloudSeedance2p0FastGCostState::from_request(request).estimate_cost()), + VideoGenerationRequest::ArtcraftSeedance2p0Ultra(request) => Ok(ArtcraftSeedance2p0UltraCostState::from_request(request).estimate_cost()), + VideoGenerationRequest::ArtcraftSeedance2p0UltraFast(request) => Ok(ArtcraftSeedance2p0UltraFastCostState::from_request(request).estimate_cost()), + VideoGenerationRequest::ArtcraftSeedance2p0BytePlus(request) => Ok(ArtcraftSeedance2p0BytePlusCostState::from_request(request).estimate_cost()), + VideoGenerationRequest::ArtcraftSeedance2p0BytePlusFast(request) => Ok(ArtcraftSeedance2p0BytePlusFastCostState::from_request(request).estimate_cost()), + VideoGenerationRequest::GmiCloudSeedance2p0Ultra(request) => Ok(GmiCloudSeedance2p0UltraCostState::from_request(request).estimate_cost()), + VideoGenerationRequest::GmiCloudSeedance2p0UltraFast(request) => Ok(GmiCloudSeedance2p0UltraFastCostState::from_request(request).estimate_cost()), VideoGenerationRequest::KinoviHappyHorse1p0(request) => Ok(KinoviHappyHorse1p0CostState::from_request(request).estimate_cost()), VideoGenerationRequest::KinoviSeedance2p0(request) => Ok(KinoviSeedance2p0CostState::from_request(request).estimate_cost()), VideoGenerationRequest::KinoviSeedance2p0Fast(request) => Ok(KinoviSeedance2p0FastCostState::from_request(request).estimate_cost()), @@ -115,27 +115,27 @@ impl VideoGenerationRequest { let client_ref = client.get_artcraft_client_ref()?; request.send(client_ref).await }, - VideoGenerationRequest::ArtcraftSeedance2p0G(request) => { + VideoGenerationRequest::ArtcraftSeedance2p0Ultra(request) => { let client_ref = client.get_artcraft_client_ref()?; request.send(client_ref).await }, - VideoGenerationRequest::ArtcraftSeedance2p0FastG(request) => { + VideoGenerationRequest::ArtcraftSeedance2p0UltraFast(request) => { let client_ref = client.get_artcraft_client_ref()?; request.send(client_ref).await }, - VideoGenerationRequest::ArtcraftSeedance2p0Plus(request) => { + VideoGenerationRequest::ArtcraftSeedance2p0BytePlus(request) => { let client_ref = client.get_artcraft_client_ref()?; request.send(client_ref).await }, - VideoGenerationRequest::ArtcraftSeedance2p0PlusFast(request) => { + VideoGenerationRequest::ArtcraftSeedance2p0BytePlusFast(request) => { let client_ref = client.get_artcraft_client_ref()?; request.send(client_ref).await }, - VideoGenerationRequest::GmiCloudSeedance2p0G(request) => { + VideoGenerationRequest::GmiCloudSeedance2p0Ultra(request) => { let client_ref = client.get_gmicloud_client_ref()?; request.send(client_ref).await }, - VideoGenerationRequest::GmiCloudSeedance2p0FastG(request) => { + VideoGenerationRequest::GmiCloudSeedance2p0UltraFast(request) => { let client_ref = client.get_gmicloud_client_ref()?; request.send(client_ref).await }, diff --git a/crates/schema/public/enums/src/common/generation/common_model_type.rs b/crates/schema/public/enums/src/common/generation/common_model_type.rs index f288ecef3f..7fb37aba71 100644 --- a/crates/schema/public/enums/src/common/generation/common_model_type.rs +++ b/crates/schema/public/enums/src/common/generation/common_model_type.rs @@ -130,14 +130,14 @@ pub enum CommonModelType { Seedance2p0, #[serde(rename = "seedance_2p0_fast")] Seedance2p0Fast, - #[serde(rename = "seedance_2p0_p")] - Seedance2p0Plus, - #[serde(rename = "seedance_2p0_p_fast")] - Seedance2p0PlusFast, - #[serde(rename = "seedance_2p0_g")] - Seedance2p0Global, - #[serde(rename = "seedance_2p0_fast_g")] - Seedance2p0FastGlobal, + #[serde(rename = "seedance_2p0_bp")] + Seedance2p0BytePlus, + #[serde(rename = "seedance_2p0_bp_fast")] + Seedance2p0BytePlusFast, + #[serde(rename = "seedance_2p0_u")] + Seedance2p0Ultra, + #[serde(rename = "seedance_2p0_u_fast")] + Seedance2p0UltraFast, #[serde(rename = "sora_2")] Sora2, #[serde(rename = "sora_2_pro")] @@ -231,10 +231,10 @@ impl CommonModelType { Self::Seedance1p5Pro => "seedance_1p5_pro", Self::Seedance2p0 => "seedance_2p0", Self::Seedance2p0Fast => "seedance_2p0_fast", - Self::Seedance2p0Plus => "seedance_2p0_p", - Self::Seedance2p0PlusFast => "seedance_2p0_p_fast", - Self::Seedance2p0Global => "seedance_2p0_g", - Self::Seedance2p0FastGlobal => "seedance_2p0_fast_g", + Self::Seedance2p0BytePlus => "seedance_2p0_bp", + Self::Seedance2p0BytePlusFast => "seedance_2p0_bp_fast", + Self::Seedance2p0Ultra => "seedance_2p0_u", + Self::Seedance2p0UltraFast => "seedance_2p0_u_fast", Self::Sora2 => "sora_2", Self::Sora2Pro => "sora_2_pro", Self::Veo2 => "veo_2", @@ -307,10 +307,10 @@ impl CommonModelType { "seedance_1p5_pro" => Ok(Self::Seedance1p5Pro), "seedance_2p0" => Ok(Self::Seedance2p0), "seedance_2p0_fast" => Ok(Self::Seedance2p0Fast), - "seedance_2p0_p" => Ok(Self::Seedance2p0Plus), - "seedance_2p0_p_fast" => Ok(Self::Seedance2p0PlusFast), - "seedance_2p0_g" => Ok(Self::Seedance2p0Global), - "seedance_2p0_fast_g" => Ok(Self::Seedance2p0FastGlobal), + "seedance_2p0_bp" => Ok(Self::Seedance2p0BytePlus), + "seedance_2p0_bp_fast" => Ok(Self::Seedance2p0BytePlusFast), + "seedance_2p0_u" => Ok(Self::Seedance2p0Ultra), + "seedance_2p0_u_fast" => Ok(Self::Seedance2p0UltraFast), "sora_2" => Ok(Self::Sora2), "sora_2_pro" => Ok(Self::Sora2Pro), "veo_2" => Ok(Self::Veo2), @@ -387,10 +387,10 @@ impl CommonModelType { Self::Seedance1p5Pro, Self::Seedance2p0, Self::Seedance2p0Fast, - Self::Seedance2p0Plus, - Self::Seedance2p0PlusFast, - Self::Seedance2p0Global, - Self::Seedance2p0FastGlobal, + Self::Seedance2p0BytePlus, + Self::Seedance2p0BytePlusFast, + Self::Seedance2p0Ultra, + Self::Seedance2p0UltraFast, Self::Sora2, Self::Sora2Pro, Self::Veo2, @@ -464,10 +464,10 @@ impl CommonModelType { Self::Seedance1p5Pro => CommonModelClass::Video, Self::Seedance2p0 => CommonModelClass::Video, Self::Seedance2p0Fast => CommonModelClass::Video, - Self::Seedance2p0Plus => CommonModelClass::Video, - Self::Seedance2p0PlusFast => CommonModelClass::Video, - Self::Seedance2p0Global => CommonModelClass::Video, - Self::Seedance2p0FastGlobal => CommonModelClass::Video, + Self::Seedance2p0BytePlus => CommonModelClass::Video, + Self::Seedance2p0BytePlusFast => CommonModelClass::Video, + Self::Seedance2p0Ultra => CommonModelClass::Video, + Self::Seedance2p0UltraFast => CommonModelClass::Video, Self::Sora2 => CommonModelClass::Video, Self::Sora2Pro => CommonModelClass::Video, Self::Veo2 => CommonModelClass::Video, @@ -550,10 +550,10 @@ mod tests { assert_serialization(CommonModelType::Seedance1p5Pro, "seedance_1p5_pro"); assert_serialization(CommonModelType::Seedance2p0, "seedance_2p0"); assert_serialization(CommonModelType::Seedance2p0Fast, "seedance_2p0_fast"); - assert_serialization(CommonModelType::Seedance2p0Plus, "seedance_2p0_p"); - assert_serialization(CommonModelType::Seedance2p0PlusFast, "seedance_2p0_p_fast"); - assert_serialization(CommonModelType::Seedance2p0Global, "seedance_2p0_g"); - assert_serialization(CommonModelType::Seedance2p0FastGlobal, "seedance_2p0_fast_g"); + assert_serialization(CommonModelType::Seedance2p0BytePlus, "seedance_2p0_bp"); + assert_serialization(CommonModelType::Seedance2p0BytePlusFast, "seedance_2p0_bp_fast"); + assert_serialization(CommonModelType::Seedance2p0Ultra, "seedance_2p0_u"); + assert_serialization(CommonModelType::Seedance2p0UltraFast, "seedance_2p0_u_fast"); assert_serialization(CommonModelType::Sora2, "sora_2"); assert_serialization(CommonModelType::Sora2Pro, "sora_2_pro"); assert_serialization(CommonModelType::Veo2, "veo_2"); @@ -623,10 +623,10 @@ mod tests { assert_eq!(CommonModelType::Seedance1p5Pro.to_str(), "seedance_1p5_pro"); assert_eq!(CommonModelType::Seedance2p0.to_str(), "seedance_2p0"); assert_eq!(CommonModelType::Seedance2p0Fast.to_str(), "seedance_2p0_fast"); - assert_eq!(CommonModelType::Seedance2p0Plus.to_str(), "seedance_2p0_p"); - assert_eq!(CommonModelType::Seedance2p0PlusFast.to_str(), "seedance_2p0_p_fast"); - assert_eq!(CommonModelType::Seedance2p0Global.to_str(), "seedance_2p0_g"); - assert_eq!(CommonModelType::Seedance2p0FastGlobal.to_str(), "seedance_2p0_fast_g"); + assert_eq!(CommonModelType::Seedance2p0BytePlus.to_str(), "seedance_2p0_bp"); + assert_eq!(CommonModelType::Seedance2p0BytePlusFast.to_str(), "seedance_2p0_bp_fast"); + assert_eq!(CommonModelType::Seedance2p0Ultra.to_str(), "seedance_2p0_u"); + assert_eq!(CommonModelType::Seedance2p0UltraFast.to_str(), "seedance_2p0_u_fast"); assert_eq!(CommonModelType::Sora2.to_str(), "sora_2"); assert_eq!(CommonModelType::Sora2Pro.to_str(), "sora_2_pro"); assert_eq!(CommonModelType::Veo2.to_str(), "veo_2"); @@ -696,10 +696,10 @@ mod tests { assert_eq!(CommonModelType::from_str("seedance_1p5_pro").unwrap(), CommonModelType::Seedance1p5Pro); assert_eq!(CommonModelType::from_str("seedance_2p0").unwrap(), CommonModelType::Seedance2p0); assert_eq!(CommonModelType::from_str("seedance_2p0_fast").unwrap(), CommonModelType::Seedance2p0Fast); - assert_eq!(CommonModelType::from_str("seedance_2p0_p").unwrap(), CommonModelType::Seedance2p0Plus); - assert_eq!(CommonModelType::from_str("seedance_2p0_p_fast").unwrap(), CommonModelType::Seedance2p0PlusFast); - assert_eq!(CommonModelType::from_str("seedance_2p0_g").unwrap(), CommonModelType::Seedance2p0Global); - assert_eq!(CommonModelType::from_str("seedance_2p0_fast_g").unwrap(), CommonModelType::Seedance2p0FastGlobal); + assert_eq!(CommonModelType::from_str("seedance_2p0_bp").unwrap(), CommonModelType::Seedance2p0BytePlus); + assert_eq!(CommonModelType::from_str("seedance_2p0_bp_fast").unwrap(), CommonModelType::Seedance2p0BytePlusFast); + assert_eq!(CommonModelType::from_str("seedance_2p0_u").unwrap(), CommonModelType::Seedance2p0Ultra); + assert_eq!(CommonModelType::from_str("seedance_2p0_u_fast").unwrap(), CommonModelType::Seedance2p0UltraFast); assert_eq!(CommonModelType::from_str("sora_2").unwrap(), CommonModelType::Sora2); assert_eq!(CommonModelType::from_str("sora_2_pro").unwrap(), CommonModelType::Sora2Pro); assert_eq!(CommonModelType::from_str("veo_2").unwrap(), CommonModelType::Veo2); @@ -771,10 +771,10 @@ mod tests { assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance1p5Pro)); assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0)); assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0Fast)); - assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0Plus)); - assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0PlusFast)); - assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0Global)); - assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0FastGlobal)); + assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0BytePlus)); + assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0BytePlusFast)); + assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0Ultra)); + assert_eq!(variants.pop_first(), Some(CommonModelType::Seedance2p0UltraFast)); assert_eq!(variants.pop_first(), Some(CommonModelType::Sora2)); assert_eq!(variants.pop_first(), Some(CommonModelType::Sora2Pro)); assert_eq!(variants.pop_first(), Some(CommonModelType::Veo2)); diff --git a/crates/schema/public/enums/src/common/generation/common_video_model.rs b/crates/schema/public/enums/src/common/generation/common_video_model.rs index d747cc23dc..73e7a13305 100644 --- a/crates/schema/public/enums/src/common/generation/common_video_model.rs +++ b/crates/schema/public/enums/src/common/generation/common_video_model.rs @@ -44,19 +44,17 @@ pub enum CommonVideoModel { #[serde(rename = "seedance_2p0_fast")] Seedance2p0Fast, - #[serde(rename = "seedance_2p0_p")] - Seedance2p0Plus, + #[serde(rename = "seedance_2p0_bp")] + Seedance2p0BytePlus, - #[serde(rename = "seedance_2p0_p_fast")] - Seedance2p0PlusFast, + #[serde(rename = "seedance_2p0_bp_fast")] + Seedance2p0BytePlusFast, - // NB: Not in use - #[serde(rename = "seedance_2p0_g")] - Seedance2p0Global, + #[serde(rename = "seedance_2p0_u")] + Seedance2p0Ultra, - // NB: Not in use - #[serde(rename = "seedance_2p0_fast_g")] - Seedance2p0FastGlobal, + #[serde(rename = "seedance_2p0_u_fast")] + Seedance2p0UltraFast, #[serde(rename = "sora_2")] Sora2, @@ -107,10 +105,10 @@ impl CommonVideoModel { Self::Seedance1p5Pro => CommonModelType::Seedance1p5Pro, Self::Seedance2p0 => CommonModelType::Seedance2p0, Self::Seedance2p0Fast => CommonModelType::Seedance2p0Fast, - Self::Seedance2p0Plus => CommonModelType::Seedance2p0Plus, - Self::Seedance2p0PlusFast => CommonModelType::Seedance2p0PlusFast, - Self::Seedance2p0Global => CommonModelType::Seedance2p0Global, - Self::Seedance2p0FastGlobal => CommonModelType::Seedance2p0FastGlobal, + Self::Seedance2p0BytePlus => CommonModelType::Seedance2p0BytePlus, + Self::Seedance2p0BytePlusFast => CommonModelType::Seedance2p0BytePlusFast, + Self::Seedance2p0Ultra => CommonModelType::Seedance2p0Ultra, + Self::Seedance2p0UltraFast => CommonModelType::Seedance2p0UltraFast, Self::Sora2 => CommonModelType::Sora2, Self::Sora2Pro => CommonModelType::Sora2Pro, Self::Veo2 => CommonModelType::Veo2, @@ -145,10 +143,10 @@ mod tests { assert_serialization(CommonVideoModel::Seedance1p5Pro, "seedance_1p5_pro"); assert_serialization(CommonVideoModel::Seedance2p0, "seedance_2p0"); assert_serialization(CommonVideoModel::Seedance2p0Fast, "seedance_2p0_fast"); - assert_serialization(CommonVideoModel::Seedance2p0Plus, "seedance_2p0_p"); - assert_serialization(CommonVideoModel::Seedance2p0PlusFast, "seedance_2p0_p_fast"); - assert_serialization(CommonVideoModel::Seedance2p0Global, "seedance_2p0_g"); - assert_serialization(CommonVideoModel::Seedance2p0FastGlobal, "seedance_2p0_fast_g"); + assert_serialization(CommonVideoModel::Seedance2p0BytePlus, "seedance_2p0_bp"); + assert_serialization(CommonVideoModel::Seedance2p0BytePlusFast, "seedance_2p0_bp_fast"); + assert_serialization(CommonVideoModel::Seedance2p0Ultra, "seedance_2p0_u"); + assert_serialization(CommonVideoModel::Seedance2p0UltraFast, "seedance_2p0_u_fast"); assert_serialization(CommonVideoModel::Sora2, "sora_2"); assert_serialization(CommonVideoModel::Sora2Pro, "sora_2_pro"); assert_serialization(CommonVideoModel::Veo2, "veo_2"); @@ -176,10 +174,10 @@ mod tests { ("seedance_1p5_pro", CommonVideoModel::Seedance1p5Pro), ("seedance_2p0", CommonVideoModel::Seedance2p0), ("seedance_2p0_fast", CommonVideoModel::Seedance2p0Fast), - ("seedance_2p0_p", CommonVideoModel::Seedance2p0Plus), - ("seedance_2p0_p_fast", CommonVideoModel::Seedance2p0PlusFast), - ("seedance_2p0_g", CommonVideoModel::Seedance2p0Global), - ("seedance_2p0_fast_g", CommonVideoModel::Seedance2p0FastGlobal), + ("seedance_2p0_bp", CommonVideoModel::Seedance2p0BytePlus), + ("seedance_2p0_bp_fast", CommonVideoModel::Seedance2p0BytePlusFast), + ("seedance_2p0_u", CommonVideoModel::Seedance2p0Ultra), + ("seedance_2p0_u_fast", CommonVideoModel::Seedance2p0UltraFast), ("sora_2", CommonVideoModel::Sora2), ("sora_2_pro", CommonVideoModel::Sora2Pro), ("veo_2", CommonVideoModel::Veo2), @@ -214,10 +212,10 @@ mod tests { CommonVideoModel::Seedance1p5Pro, CommonVideoModel::Seedance2p0, CommonVideoModel::Seedance2p0Fast, - CommonVideoModel::Seedance2p0Plus, - CommonVideoModel::Seedance2p0PlusFast, - CommonVideoModel::Seedance2p0Global, - CommonVideoModel::Seedance2p0FastGlobal, + CommonVideoModel::Seedance2p0BytePlus, + CommonVideoModel::Seedance2p0BytePlusFast, + CommonVideoModel::Seedance2p0Ultra, + CommonVideoModel::Seedance2p0UltraFast, CommonVideoModel::Sora2, CommonVideoModel::Sora2Pro, CommonVideoModel::Veo2, @@ -251,10 +249,10 @@ mod tests { (CommonVideoModel::Seedance1p5Pro, CommonModelType::Seedance1p5Pro), (CommonVideoModel::Seedance2p0, CommonModelType::Seedance2p0), (CommonVideoModel::Seedance2p0Fast, CommonModelType::Seedance2p0Fast), - (CommonVideoModel::Seedance2p0Plus, CommonModelType::Seedance2p0Plus), - (CommonVideoModel::Seedance2p0PlusFast, CommonModelType::Seedance2p0PlusFast), - (CommonVideoModel::Seedance2p0Global, CommonModelType::Seedance2p0Global), - (CommonVideoModel::Seedance2p0FastGlobal, CommonModelType::Seedance2p0FastGlobal), + (CommonVideoModel::Seedance2p0BytePlus, CommonModelType::Seedance2p0BytePlus), + (CommonVideoModel::Seedance2p0BytePlusFast, CommonModelType::Seedance2p0BytePlusFast), + (CommonVideoModel::Seedance2p0Ultra, CommonModelType::Seedance2p0Ultra), + (CommonVideoModel::Seedance2p0UltraFast, CommonModelType::Seedance2p0UltraFast), (CommonVideoModel::Sora2, CommonModelType::Sora2), (CommonVideoModel::Sora2Pro, CommonModelType::Sora2Pro), (CommonVideoModel::Veo2, CommonModelType::Veo2), diff --git a/crates/service/web/storyteller_web/src/configs/omni_gen/video_models.rs b/crates/service/web/storyteller_web/src/configs/omni_gen/video_models.rs index 5812056499..9ecf8dd750 100644 --- a/crates/service/web/storyteller_web/src/configs/omni_gen/video_models.rs +++ b/crates/service/web/storyteller_web/src/configs/omni_gen/video_models.rs @@ -156,7 +156,7 @@ fn build_omni_gen_video_models() -> Vec { }); // models.push(OmniGenVideoModelDetails { -// model: CommonVideoModel::Seedance2p0Global, +// model: CommonVideoModel::Seedance2p0Ultra, // model_creator: Some(ModelCreator::Bytedance), // full_name: Some("Seedance 2.0 (Global)".to_string()), // text_prompt_supported: Some(true), @@ -196,7 +196,7 @@ fn build_omni_gen_video_models() -> Vec { // }); // // models.push(OmniGenVideoModelDetails { -// model: CommonVideoModel::Seedance2p0FastGlobal, +// model: CommonVideoModel::Seedance2p0UltraFast, // model_creator: Some(ModelCreator::Bytedance), // full_name: Some("Seedance 2.0 Fast (Global)".to_string()), // text_prompt_supported: Some(true), @@ -235,7 +235,7 @@ fn build_omni_gen_video_models() -> Vec { // }); models.push(OmniGenVideoModelDetails { - model: CommonVideoModel::Seedance2p0Plus, + model: CommonVideoModel::Seedance2p0BytePlus, model_creator: Some(ModelCreator::Bytedance), full_name: Some("Seedance 2.0 Plus".to_string()), text_prompt_supported: Some(true), @@ -275,7 +275,7 @@ fn build_omni_gen_video_models() -> Vec { }); models.push(OmniGenVideoModelDetails { - model: CommonVideoModel::Seedance2p0PlusFast, + model: CommonVideoModel::Seedance2p0BytePlusFast, model_creator: Some(ModelCreator::Bytedance), full_name: Some("Seedance 2.0 Plus Fast".to_string()), text_prompt_supported: Some(true), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/video/estimate_video_cost_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/video/estimate_video_cost_handler.rs index 4ac371e0f7..0a465279d3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/video/estimate_video_cost_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/cost_estimate/video/estimate_video_cost_handler.rs @@ -141,10 +141,10 @@ fn map_video_model(model: CommonVideoModel) -> Result RouterVideoModel::Seedance1p5Pro, CommonVideoModel::Seedance2p0 => RouterVideoModel::Seedance2p0, CommonVideoModel::Seedance2p0Fast => RouterVideoModel::Seedance2p0Fast, - CommonVideoModel::Seedance2p0Global => RouterVideoModel::Seedance2p0Global, - CommonVideoModel::Seedance2p0FastGlobal => RouterVideoModel::Seedance2p0FastGlobal, - CommonVideoModel::Seedance2p0Plus=> RouterVideoModel::Seedance2p0Plus, - CommonVideoModel::Seedance2p0PlusFast=> RouterVideoModel::Seedance2p0PlusFast, + CommonVideoModel::Seedance2p0Ultra => RouterVideoModel::Seedance2p0Ultra, + CommonVideoModel::Seedance2p0UltraFast => RouterVideoModel::Seedance2p0UltraFast, + CommonVideoModel::Seedance2p0BytePlus=> RouterVideoModel::Seedance2p0BytePlus, + CommonVideoModel::Seedance2p0BytePlusFast=> RouterVideoModel::Seedance2p0BytePlusFast, CommonVideoModel::HappyHorse1p0 => RouterVideoModel::HappyHorse1p0, CommonVideoModel::Sora2 => RouterVideoModel::Sora2, CommonVideoModel::Sora2Pro => RouterVideoModel::Sora2Pro, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs index 415495f70e..2b3db0e211 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs @@ -187,18 +187,18 @@ pub async fn omni_gen_video_generate_handler( Some(CommonVideoModel::HappyHorse1p0) => true, Some(CommonVideoModel::Seedance2p0) => true, Some(CommonVideoModel::Seedance2p0Fast) => true, - Some(CommonVideoModel::Seedance2p0Global) => true, - Some(CommonVideoModel::Seedance2p0FastGlobal) => true, - Some(CommonVideoModel::Seedance2p0Plus) => true, - Some(CommonVideoModel::Seedance2p0PlusFast) => true, + Some(CommonVideoModel::Seedance2p0Ultra) => true, + Some(CommonVideoModel::Seedance2p0UltraFast) => true, + Some(CommonVideoModel::Seedance2p0BytePlus) => true, + Some(CommonVideoModel::Seedance2p0BytePlusFast) => true, Some(CommonVideoModel::PreviewModel) => true, Some(CommonVideoModel::PreviewModelFast) => true, _ => false, }; let use_alternate_kinovi = match request.model { - Some(CommonVideoModel::Seedance2p0Plus) => true, - Some(CommonVideoModel::Seedance2p0PlusFast) => true, + Some(CommonVideoModel::Seedance2p0BytePlus) => true, + Some(CommonVideoModel::Seedance2p0BytePlusFast) => true, Some(CommonVideoModel::PreviewModel) => true, Some(CommonVideoModel::PreviewModelFast) => true, _ => false, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs index b835d9d2ec..8a973f75cb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs @@ -45,11 +45,11 @@ pub async fn run_pipeline_v2(args: RunPipelineV2Args<'_>) -> Result { + CommonVideoModel::Seedance2p0BytePlus => { router_builder.model = CommonVideoModel::Seedance2p0; }, CommonVideoModel::PreviewModelFast | - CommonVideoModel::Seedance2p0PlusFast => { + CommonVideoModel::Seedance2p0BytePlusFast => { router_builder.model = CommonVideoModel::Seedance2p0Fast; }, _ => {}, // Fall-through @@ -59,8 +59,8 @@ pub async fn run_pipeline_v2(args: RunPipelineV2Args<'_>) -> Result Provider::Seedance2Pro, CommonVideoModel::Seedance2p0 => Provider::Seedance2Pro, CommonVideoModel::Seedance2p0Fast => Provider::Seedance2Pro, - CommonVideoModel::Seedance2p0Global => Provider::GmiCloud, - CommonVideoModel::Seedance2p0FastGlobal => Provider::GmiCloud, + CommonVideoModel::Seedance2p0Ultra => Provider::GmiCloud, + CommonVideoModel::Seedance2p0UltraFast => Provider::GmiCloud, _ => Provider::Fal, }; diff --git a/crates/vendor/tauri-plugin-http/permissions/schemas/schema.json b/crates/vendor/tauri-plugin-http/permissions/schemas/schema.json index 31640bee16..ea774399d5 100644 --- a/crates/vendor/tauri-plugin-http/permissions/schemas/schema.json +++ b/crates/vendor/tauri-plugin-http/permissions/schemas/schema.json @@ -343,10 +343,10 @@ "markdownDescription": "Denies the fetch_send command without any pre-configured scope." }, { - "description": "This permission set configures what kind of\r\nfetch operations are available from the http plugin.\r\n\r\nThis enables all fetch operations but does not\r\nallow explicitly any origins to be fetched. This needs to\r\nbe manually configured before usage.\r\n\r\n#### Granted Permissions\r\n\r\nAll fetch operations are enabled.\r\n\r\n\n#### This default permission set includes:\n\n- `allow-fetch`\n- `allow-fetch-cancel`\n- `allow-fetch-read-body`\n- `allow-fetch-send`", + "description": "This permission set configures what kind of\nfetch operations are available from the http plugin.\n\nThis enables all fetch operations but does not\nallow explicitly any origins to be fetched. This needs to\nbe manually configured before usage.\n\n#### Granted Permissions\n\nAll fetch operations are enabled.\n\n\n#### This default permission set includes:\n\n- `allow-fetch`\n- `allow-fetch-cancel`\n- `allow-fetch-read-body`\n- `allow-fetch-send`", "type": "string", "const": "default", - "markdownDescription": "This permission set configures what kind of\r\nfetch operations are available from the http plugin.\r\n\r\nThis enables all fetch operations but does not\r\nallow explicitly any origins to be fetched. This needs to\r\nbe manually configured before usage.\r\n\r\n#### Granted Permissions\r\n\r\nAll fetch operations are enabled.\r\n\r\n\n#### This default permission set includes:\n\n- `allow-fetch`\n- `allow-fetch-cancel`\n- `allow-fetch-read-body`\n- `allow-fetch-send`" + "markdownDescription": "This permission set configures what kind of\nfetch operations are available from the http plugin.\n\nThis enables all fetch operations but does not\nallow explicitly any origins to be fetched. This needs to\nbe manually configured before usage.\n\n#### Granted Permissions\n\nAll fetch operations are enabled.\n\n\n#### This default permission set includes:\n\n- `allow-fetch`\n- `allow-fetch-cancel`\n- `allow-fetch-read-body`\n- `allow-fetch-send`" } ] }