refactor redesign

This commit is contained in:
Brandon Thomas committed 2026-04-20 18:14:42 -04:00
1 parent c6d62eda05
commit fa12020e8a
12 files changed
+50 -12

No files matched your search

@@ -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;
pub mod video_generation_plan;
@@ -0,0 +1,3 @@
pub mod providers;
pub mod video_generation_ready_request;
pub mod video_generation_draft;
@@ -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,
@@ -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,
@@ -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<VideoGenerationCostEstimate, ArtcraftRouterError> {
match self {
VideoGenerationDraft::KinoviSeedance2p0(draft) => Ok(draft.estimate_cost()),
}
}
pub fn prepare_final(&self) -> Result<(), String> {
match self {
VideoGenerationDraft::KinoviSeedance2p0(plan) => plan.prepare_final(),
}
}
}
@@ -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,
}
}
}
@@ -1,3 +1,4 @@
pub mod generate_image;
pub mod generate_splat;
pub mod generate_video;
pub mod generate_video_v2;