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 3aa28f560f..a631f59199 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 @@ -4,5 +4,4 @@ pub mod generate_video_request_builder; pub mod generate_video_response; pub mod plan; pub mod video_generation_cost_estimate; -pub mod video_generation_plan; -pub mod providers; \ No newline at end of file +pub mod video_generation_plan; \ No newline at end of file diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/mod.rs new file mode 100644 index 0000000000..684a452e4e --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/mod.rs @@ -0,0 +1,3 @@ +pub mod providers; +pub mod video_generation_ready_request; +pub mod video_generation_draft; \ No newline at end of file diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/draft_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/draft_request.rs similarity index 89% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/draft_request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/draft_request.rs index a53d731979..87926d4a51 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/draft_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/draft_request.rs @@ -1,10 +1,8 @@ use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::generate::generate_video::generate_video_request::GenerateVideoRequest; -use crate::generate::generate_video::providers::kinovi::seedance_2p0::type_conversions::{map_common_resolution_to_kinovi, plan_aspect_ratio, plan_batch_count, plan_duration}; +use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::type_conversions::{map_common_resolution_to_kinovi, plan_aspect_ratio, plan_batch_count, plan_duration}; use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; -use seedance2pro_client::requests::generate_video::generate_video::{ - GenerateVideoRequest as SeedanceGenerateVideoRequest, - KinoviAspectRatio, KinoviBatchCount, KinoviModelType, KinoviOutputResolution}; +use seedance2pro_client::requests::generate_video::generate_video::{KinoviAspectRatio, KinoviBatchCount, KinoviGenerateVideoRequest, KinoviModelType, KinoviOutputResolution}; #[derive(Debug, Clone)] pub struct KinoviSeedance2p0DraftRequest { @@ -58,7 +56,7 @@ impl KinoviSeedance2p0DraftRequest { } pub fn estimate_cost(&self) -> VideoGenerationCostEstimate { - let request = SeedanceGenerateVideoRequest { + let request = KinoviGenerateVideoRequest { model_type: KinoviModelType::Seedance2Pro, prompt: self.prompt.clone(), aspect_ratio: self.aspect_ratio, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/ready_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/ready_request.rs similarity index 86% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/ready_request.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/ready_request.rs index 2b169426f8..7b90b87545 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/ready_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/ready_request.rs @@ -2,14 +2,13 @@ use crate::client::router_seedance2pro_client::RouterSeedance2ProClient; use crate::errors::artcraft_router_error::ArtcraftRouterError; use crate::errors::provider_error::ProviderError; use crate::generate::generate_video::generate_video_response::{GenerateVideoResponse, Seedance2proVideoResponsePayload}; -use crate::generate::generate_video::providers::kinovi::seedance_2p0::draft_request::KinoviSeedance2p0DraftRequest; -use seedance2pro_client::requests::generate_video::generate_video::{generate_video, GenerateVideoArgs, GenerateVideoRequest as SeedanceGenerateVideoRequest, KinoviModelType}; -use crate::generate::generate_video::providers::kinovi::upload::{upload_optional_url, upload_optional_url_list}; +use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::draft_request::KinoviSeedance2p0DraftRequest; +use seedance2pro_client::requests::generate_video::generate_video::{generate_video, GenerateVideoArgs, KinoviGenerateVideoRequest, KinoviModelType}; #[derive(Debug, Clone)] pub struct KinoviSeedance2p0ReadyRequest { /// Final materialized request; ready to fire. - pub request: SeedanceGenerateVideoRequest, + pub request: KinoviGenerateVideoRequest, } impl KinoviSeedance2p0ReadyRequest { @@ -36,7 +35,7 @@ impl KinoviSeedance2p0ReadyRequest { //reference_audio_urls = upload_optional_url_list(session, remaining_request.reference_audio_urls.as_deref()).await?; } - let request = SeedanceGenerateVideoRequest { + let request = KinoviGenerateVideoRequest { model_type: KinoviModelType::Seedance2Pro, prompt: request.prompt.clone(), aspect_ratio: request.aspect_ratio, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/type_conversions.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/type_conversions.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/seedance_2p0/type_conversions.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/seedance_2p0/type_conversions.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/upload.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/kinovi/upload.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/mod.rs rename to crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/providers/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft.rs new file mode 100644 index 0000000000..e220d205c3 --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_draft.rs @@ -0,0 +1,23 @@ +use crate::errors::artcraft_router_error::ArtcraftRouterError; +use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate; +use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::draft_request::KinoviSeedance2p0DraftRequest; + +#[derive(Clone, Debug)] +pub enum VideoGenerationDraft { + KinoviSeedance2p0(KinoviSeedance2p0DraftRequest), +} + +impl VideoGenerationDraft { + + pub fn estimate_cost(&self) -> Result { + match self { + VideoGenerationDraft::KinoviSeedance2p0(draft) => Ok(draft.estimate_cost()), + } + } + + pub fn prepare_final(&self) -> Result<(), String> { + match self { + VideoGenerationDraft::KinoviSeedance2p0(plan) => plan.prepare_final(), + } + } +} diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_ready_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_ready_request.rs new file mode 100644 index 0000000000..b82a8fb046 --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video_v2/video_generation_ready_request.rs @@ -0,0 +1,15 @@ +use crate::errors::artcraft_router_error::ArtcraftRouterError; +use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::ready_request::KinoviSeedance2p0ReadyRequest; + +#[derive(Clone, Debug)] +pub enum VideoGenerationReadyRequest { + KinoviSeedance2p0(KinoviSeedance2p0ReadyRequest), +} + +impl VideoGenerationReadyRequest { + pub async fn send_request(&self) -> Result<(), ArtcraftRouterError> { + match self { + VideoGenerationReadyRequest::KinoviSeedance2p0(request) => request.send().await, + } + } +} diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/mod.rs index b2fbf76e49..eb82637105 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/mod.rs @@ -1,3 +1,4 @@ pub mod generate_image; pub mod generate_splat; pub mod generate_video; +pub mod generate_video_v2;