From f828cd29808e2b40d8cbe09f0628c2703012fbf5 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 1 Mar 2026 02:38:34 -0500 Subject: [PATCH] refactor how router plans are built --- .../generate_video/begin_video_generation.rs | 20 ------------- ...stimate_video_cost_artcraft_seedance2p0.rs | 5 ++-- .../generate_video/generate_video_request.rs | 17 ++++++++++- .../src/generate/generate_video/mod.rs | 1 - .../tests/artcraft_seedance_2p0.rs | 29 +++++++++---------- .../artcraft/handle_artcraft_seedance_2p0.rs | 3 +- .../video/estimate_video_cost_handler.rs | 3 +- 7 files changed, 34 insertions(+), 44 deletions(-) delete mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/begin_video_generation.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/begin_video_generation.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/begin_video_generation.rs deleted file mode 100644 index 31d57ed810..0000000000 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/begin_video_generation.rs +++ /dev/null @@ -1,20 +0,0 @@ -use crate::api::common_video_model::CommonVideoModel; -use crate::api::provider::Provider; -use crate::errors::artcraft_router_error::ArtcraftRouterError; -use crate::generate::generate_video::generate_video_request::GenerateVideoRequest; -use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::plan_generate_video_artcraft_seedance2p0; -use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan; - -/// Read the video generation request, construct a plan, then yield a means to execute it. -pub fn begin_video_generation<'a>( - request: &'a GenerateVideoRequest<'a>, -) -> Result, ArtcraftRouterError> { - match request.provider { - Provider::Artcraft => match request.model { - CommonVideoModel::Seedance2p0 => { - plan_generate_video_artcraft_seedance2p0(request).map(VideoGenerationPlan::ArtcraftSeedance2p0) - } - _ => Err(ArtcraftRouterError::UnsupportedModel(format!("{:?}", request.model))), - }, - } -} diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance2p0.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance2p0.rs index 2e258e596e..5157a0b489 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance2p0.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance2p0.rs @@ -50,7 +50,6 @@ mod tests { use crate::api::common_video_model::CommonVideoModel; use crate::api::provider::Provider; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; - use crate::generate::generate_video::begin_video_generation::begin_video_generation; use crate::generate::generate_video::generate_video_request::GenerateVideoRequest; fn estimate_usd_cents(duration_seconds: u16, video_batch_count: u16) -> u64 { @@ -68,8 +67,8 @@ mod tests { request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut, idempotency_token: None, }; - begin_video_generation(&request) - .expect("begin_video_generation should succeed") + request.build() + .expect("build should succeed") .estimate_costs() .cost_in_usd_cents .expect("cost_in_usd_cents should be present") diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request.rs index 1e66e42ac6..73233156c3 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request.rs @@ -5,6 +5,9 @@ use crate::api::image_list_ref::ImageListRef; use crate::api::image_ref::ImageRef; use crate::api::provider::Provider; use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; +use crate::errors::artcraft_router_error::ArtcraftRouterError; +use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::plan_generate_video_artcraft_seedance2p0; +use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan; pub struct GenerateVideoRequest<'a> { /// Which model to use. @@ -52,7 +55,19 @@ pub struct GenerateVideoRequest<'a> { pub idempotency_token: Option<&'a str>, } -impl <'a> GenerateVideoRequest<'a> { +impl<'a> GenerateVideoRequest<'a> { + /// Read the video generation request, construct a plan, then yield a means to execute it. + pub fn build(&self) -> Result, ArtcraftRouterError> { + match self.provider { + Provider::Artcraft => match self.model { + CommonVideoModel::Seedance2p0 => { + plan_generate_video_artcraft_seedance2p0(self).map(VideoGenerationPlan::ArtcraftSeedance2p0) + } + _ => Err(ArtcraftRouterError::UnsupportedModel(format!("{:?}", self.model))), + }, + } + } + pub fn get_or_generate_idempotency_token(&self) -> String { self.idempotency_token.map(|t| t.to_string()) .unwrap_or_else(|| uuid::Uuid::new_v4().to_string()) diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs index b6991fc9a5..fb88613c8d 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs @@ -1,4 +1,3 @@ -pub mod begin_video_generation; pub mod cost; pub mod execute; pub mod generate_video_request; diff --git a/crates/api_clients/artcraft/artcraft_router/tests/artcraft_seedance_2p0.rs b/crates/api_clients/artcraft/artcraft_router/tests/artcraft_seedance_2p0.rs index 31da994c22..bd30ab0032 100644 --- a/crates/api_clients/artcraft/artcraft_router/tests/artcraft_seedance_2p0.rs +++ b/crates/api_clients/artcraft/artcraft_router/tests/artcraft_seedance_2p0.rs @@ -7,7 +7,6 @@ use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; use artcraft_router::errors::artcraft_router_error::ArtcraftRouterError; use artcraft_router::errors::client_error::ClientError; -use artcraft_router::generate::generate_video::begin_video_generation::begin_video_generation; use artcraft_router::generate::generate_video::generate_video_request::GenerateVideoRequest; use artcraft_router::generate::generate_video::video_generation_plan::VideoGenerationPlan; use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{ @@ -53,7 +52,7 @@ mod plan_tests { aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine), ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&request).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap(); assert!(matches!(plan.aspect_ratio, Some(Seedance2p0AspectRatio::Landscape16x9))); } @@ -63,7 +62,7 @@ mod plan_tests { aspect_ratio: Some(CommonAspectRatio::TallNineBySixteen), ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&request).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap(); assert!(matches!(plan.aspect_ratio, Some(Seedance2p0AspectRatio::Portrait9x16))); } @@ -73,7 +72,7 @@ mod plan_tests { aspect_ratio: Some(CommonAspectRatio::Square), ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&request).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap(); assert!(matches!(plan.aspect_ratio, Some(Seedance2p0AspectRatio::Square1x1))); } @@ -89,7 +88,7 @@ mod plan_tests { request_mismatch_mitigation_strategy: strategy, ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&request).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap(); assert!( matches!(plan.aspect_ratio, Some(Seedance2p0AspectRatio::Standard4x3)), "Expected Standard4x3 for WideThreeByTwo with {:?}", strategy, @@ -104,7 +103,7 @@ mod plan_tests { request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut, ..base_request() }; - let result = begin_video_generation(&request); + let result = request.build(); assert!(matches!( result, Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. })) @@ -123,7 +122,7 @@ mod plan_tests { request_mismatch_mitigation_strategy: strategy, ..base_request() }; - let result = begin_video_generation(&request); + let result = request.build(); assert!( matches!(result, Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))), "Expected UserRequestedZeroGenerations with {:?}", strategy, @@ -134,15 +133,15 @@ mod plan_tests { #[test] fn batch_count_direct_mapping() { let req = GenerateVideoRequest { video_batch_count: Some(1), ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&req).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = req.build().unwrap(); assert!(matches!(plan.batch_count, Seedance2p0BatchCount::One)); let req = GenerateVideoRequest { video_batch_count: Some(2), ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&req).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = req.build().unwrap(); assert!(matches!(plan.batch_count, Seedance2p0BatchCount::Two)); let req = GenerateVideoRequest { video_batch_count: Some(4), ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&req).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = req.build().unwrap(); assert!(matches!(plan.batch_count, Seedance2p0BatchCount::Four)); } @@ -153,7 +152,7 @@ mod plan_tests { request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade, ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&request).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap(); assert!(matches!(plan.batch_count, Seedance2p0BatchCount::Four)); } @@ -164,7 +163,7 @@ mod plan_tests { request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayLessDowngrade, ..base_request() }; - let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = begin_video_generation(&request).unwrap(); + let VideoGenerationPlan::ArtcraftSeedance2p0(plan) = request.build().unwrap(); assert!(matches!(plan.batch_count, Seedance2p0BatchCount::Two)); } @@ -174,7 +173,7 @@ mod plan_tests { start_frame: Some(ImageRef::Url("https://example.com/image.jpg")), ..base_request() }; - let result = begin_video_generation(&request); + let result = request.build(); assert!(matches!( result, Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens)) @@ -196,7 +195,7 @@ mod real_requests { ..base_request() }; - let plan = begin_video_generation(&request).unwrap(); + let plan = request.build().unwrap(); let result = plan.generate_video(&client).await; println!("Result: {:?}", result); @@ -218,7 +217,7 @@ mod real_requests { ..base_request() }; - let plan = begin_video_generation(&request).unwrap(); + let plan = request.build().unwrap(); let result = plan.generate_video(&client).await; println!("Result: {:?}", result); diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_2p0.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_2p0.rs index 62b0e8e660..b3c857c1fb 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_2p0.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_seedance_2p0.rs @@ -10,7 +10,6 @@ use artcraft_router::api::provider::Provider; use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; use artcraft_router::client::router_artcraft_client::RouterArtcraftClient; use artcraft_router::client::router_client::RouterClient; -use artcraft_router::generate::generate_video::begin_video_generation::begin_video_generation; use artcraft_router::generate::generate_video::generate_video_request::GenerateVideoRequest; use enums::common::generation_provider::GenerationProvider; use enums::tauri::tasks::task_type::TaskType; @@ -46,7 +45,7 @@ pub(super) async fn handle_artcraft_seedance_2p0( idempotency_token: None, }; - let plan = begin_video_generation(&router_request)?; + let plan = router_request.build()?; info!("Video Generation Plan: {:?}", plan); 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 ac9be13f92..0dd9d7c8a8 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 @@ -12,7 +12,6 @@ use artcraft_router::api::common_resolution::CommonVideoResolution as RouterReso use artcraft_router::api::common_video_model::CommonVideoModel as RouterVideoModel; use artcraft_router::api::provider::Provider as RouterProvider; use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; -use artcraft_router::generate::generate_video::begin_video_generation::begin_video_generation; use artcraft_router::generate::generate_video::generate_video_request::GenerateVideoRequest; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; use enums::common::generation::common_video_model::CommonVideoModel; @@ -54,7 +53,7 @@ pub async fn estimate_video_cost_handler( idempotency_token: None, }; - let plan = begin_video_generation(&router_request) + let plan = router_request.build() .map_err(|e| HandlerError::InvalidInput(format!("{}", e)))?; let estimate = plan.estimate_costs();