From 95975b9afba465ce479a67000aba7620ae9940c7 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 22 Apr 2026 23:58:27 -0400 Subject: [PATCH] wip --- .../generate/video/helpers/insert_fal_job.rs | 50 +++ .../helpers/insert_prompt_and_context.rs | 90 +++++ .../video/helpers/insert_seedance2pro_jobs.rs | 63 ++++ .../omni_gen/generate/video/helpers/mod.rs | 3 + .../endpoints/omni_gen/generate/video/mod.rs | 3 +- .../video/omni_gen_video_generate_handler.rs | 346 +----------------- .../generate/video/pipeline_result.rs | 9 + .../generate/video/pipeline_v1/mod.rs | 1 + .../video/pipeline_v1/run_pipeline_v1.rs | 68 ++++ .../generate/video/pipeline_v2/mod.rs | 1 + .../video/pipeline_v2/run_pipeline_v2.rs | 98 +++++ 11 files changed, 391 insertions(+), 341 deletions(-) create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_fal_job.rs create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_prompt_and_context.rs create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_seedance2pro_jobs.rs create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_result.rs create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/run_pipeline_v1.rs create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_fal_job.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_fal_job.rs new file mode 100644 index 0000000000..5f23a1abfd --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_fal_job.rs @@ -0,0 +1,50 @@ +use log::warn; + +use enums::common::visibility::Visibility; +use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; +use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue_with_apriori_job_token::{ + insert_generic_inference_job_for_fal_queue_with_apriori_job_token, + InsertGenericInferenceForFalWithAprioriJobTokenArgs, +}; +use tokens::tokens::generic_inference_jobs::InferenceJobToken; + +use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; + +#[allow(clippy::too_many_arguments)] +pub async fn insert_fal_job( + external_job_id: &str, + apriori_job_token: &InferenceJobToken, + idempotency_token: &str, + user_token: &tokens::tokens::users::UserToken, + maybe_avt_token: Option<&tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken>, + ip_address: &str, + transaction: &mut sqlx::Transaction<'_, sqlx::MySql>, +) -> Result { + let db_result = insert_generic_inference_job_for_fal_queue_with_apriori_job_token( + InsertGenericInferenceForFalWithAprioriJobTokenArgs { + apriori_job_token, + uuid_idempotency_token: idempotency_token, + maybe_external_third_party_id: external_job_id, + fal_category: FalCategory::VideoGeneration, + maybe_inference_args: None, + maybe_prompt_token: None, + maybe_creator_user_token: Some(user_token), + maybe_avt_token, + creator_ip_address: ip_address, + creator_set_visibility: Visibility::Public, + mysql_executor: &mut **transaction, + starting_job_status_override: None, + maybe_frontend_failure_category: None, + maybe_failure_reason: None, + phantom: Default::default(), + } + ).await; + + match db_result { + Ok(token) => Ok(token), + Err(err) => { + warn!("Error inserting fal inference job: {:?}", err); + Err(AdvancedCommonWebError::from_error(err)) + } + } +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_prompt_and_context.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_prompt_and_context.rs new file mode 100644 index 0000000000..0cdfd20836 --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_prompt_and_context.rs @@ -0,0 +1,90 @@ +use log::warn; + +use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest; +use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; +use enums::by_table::prompts::prompt_type::PromptType; +use enums::common::generation::common_model_type::CommonModelType; +use enums::common::generation_provider::GenerationProvider; +use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{ + insert_batch_prompt_context_items, InsertBatchArgs, PromptContextItem, +}; +use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; + +pub async fn insert_prompt_and_context( + request: &OmniGenVideoCostAndGenerateRequest, + transaction: &mut sqlx::Transaction<'_, sqlx::MySql>, + user_token: &tokens::tokens::users::UserToken, + maybe_prompt_model_type: Option, + ip_address: &str, +) { + let prompt_result = insert_prompt(InsertPromptArgs { + maybe_apriori_prompt_token: None, + prompt_type: PromptType::ArtcraftApp, + maybe_creator_user_token: Some(user_token), + maybe_model_type: maybe_prompt_model_type, + maybe_generation_provider: Some(GenerationProvider::Artcraft), + maybe_positive_prompt: request.prompt.as_deref(), + maybe_negative_prompt: request.negative_prompt.as_deref(), + maybe_other_args: None, + maybe_generation_mode: None, + maybe_aspect_ratio: None, + maybe_resolution: None, + maybe_batch_count: request.video_batch_count.map(|c| c as u8), + maybe_generate_audio: request.generate_audio, + maybe_duration_seconds: request.duration_seconds.map(|d| d as u32), + creator_ip_address: ip_address, + mysql_executor: &mut **transaction, + phantom: Default::default(), + }).await; + + let prompt_token = match prompt_result { + Ok(token) => Some(token), + Err(err) => { + warn!("Error inserting prompt: {:?}", err); + None + } + }; + + if let Some(token) = prompt_token.as_ref() { + let mut context_items = Vec::new(); + + if let Some(media_token) = &request.start_frame_image_media_token { + context_items.push(PromptContextItem { + media_token: media_token.clone(), + context_semantic_type: PromptContextSemanticType::VidStartFrame, + }); + } + if let Some(media_token) = &request.end_frame_image_media_token { + context_items.push(PromptContextItem { + media_token: media_token.clone(), + context_semantic_type: PromptContextSemanticType::VidEndFrame, + }); + } + if let Some(ref_tokens) = &request.reference_image_media_tokens { + for media_token in ref_tokens { + context_items.push(PromptContextItem { + media_token: media_token.clone(), + context_semantic_type: PromptContextSemanticType::Imgref, + }); + } + } + if let Some(ref_tokens) = &request.reference_video_media_tokens { + for media_token in ref_tokens { + context_items.push(PromptContextItem { + media_token: media_token.clone(), + context_semantic_type: PromptContextSemanticType::VidRef, + }); + } + } + + if !context_items.is_empty() { + if let Err(err) = insert_batch_prompt_context_items(InsertBatchArgs { + prompt_token: token.clone(), + items: context_items, + transaction, + }).await { + warn!("Error inserting batch prompt context items: {:?}", err); + } + } + } +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_seedance2pro_jobs.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_seedance2pro_jobs.rs new file mode 100644 index 0000000000..be04917d1d --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/insert_seedance2pro_jobs.rs @@ -0,0 +1,63 @@ +use log::{error, warn}; + +use enums::common::visibility::Visibility; +use mysql_queries::queries::generic_inference::seedance2pro::insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token::{ + insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token, + InsertGenericInferenceForSeedance2ProWithAprioriJobTokenArgs, +}; +use tokens::tokens::generic_inference_jobs::InferenceJobToken; + +use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; + +#[allow(clippy::too_many_arguments)] +pub async fn insert_seedance2pro_jobs( + primary_order_id: &str, + maybe_additional_order_ids: Option<&[String]>, + apriori_job_token: &InferenceJobToken, + idempotency_token: &str, + maybe_wallet_ledger_entry_token: Option<&tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken>, + user_token: &tokens::tokens::users::UserToken, + maybe_avt_token: Option<&tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken>, + ip_address: &str, + transaction: &mut sqlx::Transaction<'_, sqlx::MySql>, +) -> Result { + let fallback_ids = vec![primary_order_id.to_string()]; + let order_ids = maybe_additional_order_ids.unwrap_or(&fallback_ids); + + let mut all_job_tokens: Vec = Vec::with_capacity(order_ids.len()); + + for (i, order_id) in order_ids.iter().enumerate() { + let job_token = if i == 0 { apriori_job_token.clone() } else { InferenceJobToken::generate() }; + let idempotency_str = if i == 0 { idempotency_token.to_string() } else { format!("{}-batch-{}", idempotency_token, i) }; + + let db_result = insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token( + InsertGenericInferenceForSeedance2ProWithAprioriJobTokenArgs { + apriori_job_token: &job_token, + uuid_idempotency_token: &idempotency_str, + maybe_external_third_party_id: order_id, + maybe_inference_args: None, + maybe_prompt_token: None, + maybe_wallet_ledger_entry_token, + maybe_creator_user_token: Some(user_token), + maybe_avt_token, + creator_ip_address: ip_address, + creator_set_visibility: Visibility::Public, + mysql_executor: &mut **transaction, + phantom: Default::default(), + } + ).await; + + match db_result { + Ok(token) => all_job_tokens.push(token), + Err(err) => { + warn!("Error inserting seedance2pro inference job (order_id={}): {:?}", order_id, err); + if i == 0 { return Err(AdvancedCommonWebError::from_error(err)); } + } + } + } + + all_job_tokens.first().cloned().ok_or_else(|| { + error!("No inference job token was created"); + AdvancedCommonWebError::server_error_with_message("No inference job token was created") + }) +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/mod.rs index e343232fde..4fe40b07af 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/helpers/mod.rs @@ -1 +1,4 @@ pub mod bill_wallet; +pub mod insert_fal_job; +pub mod insert_prompt_and_context; +pub mod insert_seedance2pro_jobs; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs index b69ae9ed49..02b1044cb9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/mod.rs @@ -1,5 +1,6 @@ pub mod omni_gen_video_generate_handler; -mod helpers; +pub mod helpers; +pub mod pipeline_result; pub mod pipeline_v1; pub mod pipeline_v2; mod request_helper; 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 c64691cc65..0f48905ca8 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 @@ -9,51 +9,24 @@ use url::Url; use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest; use artcraft_api_defs::omni_gen::generate_response::omni_gen_video_generate_response::OmniGenVideoGenerateResponse; -use artcraft_router::api::provider::Provider; use artcraft_router::generate::generate_video::generate_video_response::GenerateVideoResponse; -use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; -use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation::common_model_type::CommonModelType; use enums::common::generation::common_video_model::CommonVideoModel; -use enums::common::generation_provider::GenerationProvider; -use enums::common::visibility::Visibility; use http_server_common::request::get_request_ip::get_request_ip; -use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory; -use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue_with_apriori_job_token::{ - insert_generic_inference_job_for_fal_queue_with_apriori_job_token, - InsertGenericInferenceForFalWithAprioriJobTokenArgs, -}; -use mysql_queries::queries::generic_inference::seedance2pro::insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token::{ - insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token, - InsertGenericInferenceForSeedance2ProWithAprioriJobTokenArgs, -}; use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token; -use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{ - insert_batch_prompt_context_items, InsertBatchArgs, PromptContextItem, -}; -use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; -use tokens::tokens::characters::CharacterToken; -use tokens::tokens::generic_inference_jobs::InferenceJobToken; use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; use crate::http_server::endpoints::generate::common::payments_error_test::payments_error_test; -use crate::http_server::endpoints::omni_gen::generate::video::helpers::bill_wallet::{bill_wallet, BillWalletResult}; -use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::distill_helper::hydrate_to_router_request::hydrate_to_router_request; -use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::distill_video_request::distill_video_request; -use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::execute::execute_generation::execute_generation; -use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v2::execute::execute_pipeline_v2; -use crate::http_server::endpoints::omni_gen::generate::video::request_helper::resolve_kinovi_character_ids::resolve_kinovi_character_ids; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::insert_fal_job::insert_fal_job; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::insert_prompt_and_context::insert_prompt_and_context; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::insert_seedance2pro_jobs::insert_seedance2pro_jobs; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::run_pipeline_v1::run_pipeline_v1; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v2::run_pipeline_v2::run_pipeline_v2; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use crate::util::lookup::lookup_image_urls_as_map::lookup_image_urls_as_map; -/// Both pipelines produce this, then the shared suffix handles DB writes. -struct PipelineResult { - billing: BillWalletResult, - response: GenerateVideoResponse, -} - /// Generate a video using the omni-gen unified endpoint. #[utoipa::path( post, @@ -178,7 +151,7 @@ pub async fn omni_gen_video_generate_handler( run_pipeline_v1(&request, &server_state, &mut mysql_connection, user_token, &media_file_hydration_map).await? }; - // ==================== SHARED: DB WRITES ==================== // + // ==================== WRITE RESULT ==================== // let ip_address = get_request_ip(&http_request); @@ -228,310 +201,3 @@ pub async fn omni_gen_video_generate_handler( inference_job_token: job_token, })) } - -// ==================== PIPELINE V1 ==================== // - -async fn run_pipeline_v1( - request: &OmniGenVideoCostAndGenerateRequest, - server_state: &ServerState, - mysql_connection: &mut sqlx::pool::PoolConnection, - user_token: &tokens::tokens::users::UserToken, - media_file_hydration_map: &Option>, -) -> Result { - let kinovi_character_ids = resolve_kinovi_character_ids( - request.reference_character_tokens.as_deref(), - mysql_connection, - ).await?; - - let execution_provider = match request.model { - Some(CommonVideoModel::Seedance2p0) => Provider::Seedance2Pro, - Some(CommonVideoModel::Seedance2p0Fast) => Provider::Seedance2Pro, - _ => Provider::Fal, - }; - - let distilled = distill_video_request(request, media_file_hydration_map.as_ref(), execution_provider)?; - info!("v1 distilled plan: {:?}", distilled.plan); - - let cost = distilled.cost.cost_in_credits.unwrap_or(0); - let billing = bill_wallet(user_token, cost, mysql_connection).await?; - - let gen_result = execute_generation( - &distilled, request, server_state, media_file_hydration_map.as_ref(), - kinovi_character_ids, billing.maybe_wallet_ledger_entry_token.as_ref(), mysql_connection, - ).await?; - - // Map v1 GenerationResult → GenerateVideoResponse for the shared suffix - let response = if gen_result.is_seedance2pro { - GenerateVideoResponse::Seedance2Pro( - artcraft_router::generate::generate_video::generate_video_response::Seedance2proVideoResponsePayload { - order_id: gen_result.external_job_id, - task_id: String::new(), - } - ) - } else { - GenerateVideoResponse::Fal( - artcraft_router::generate::generate_video::generate_video_response::FalVideoResponsePayload { - request_id: Some(gen_result.external_job_id), - gateway_request_id: None, - } - ) - }; - - Ok(PipelineResult { billing, response }) -} - -// ==================== PIPELINE V2 ==================== // - -async fn run_pipeline_v2( - request: &OmniGenVideoCostAndGenerateRequest, - server_state: &ServerState, - mysql_connection: &mut sqlx::pool::PoolConnection, - user_token: &tokens::tokens::users::UserToken, - media_file_hydration_map: &Option>, -) -> Result { - // 1. Build execution request (provider = Seedance2Pro for Kinovi) - let mut exec_builder = hydrate_to_router_request(request)?; - exec_builder.provider = Provider::Seedance2Pro; - - let draft_or_request = exec_builder.build2().map_err(|e| { - warn!("Failed to build2 for v2 pipeline: {}", e); - AdvancedCommonWebError::from_error(e) - })?; - - // 2. Calculate cost (swap provider to Artcraft for billing) - let mut cost_builder = hydrate_to_router_request(request)?; - cost_builder.provider = Provider::Artcraft; - - let cost = cost_builder.build2() - .map_err(|e| { - warn!("Failed to build2 cost estimate for v2: {}", e); - AdvancedCommonWebError::from_error(e) - })? - .estimate_cost() - .map_err(|e| { - warn!("Failed to estimate cost for v2: {}", e); - AdvancedCommonWebError::from_error(e) - })? - .cost_in_credits - .unwrap_or(0); - - info!("v2 estimated cost: {} credits", cost); - - // 3. Bill wallet - let billing = bill_wallet(user_token, cost, mysql_connection).await?; - - // 4. Build context maps for draft finalization - let media_file_urls_as_strings: Option> = - media_file_hydration_map.as_ref().map(|map| { - map.iter().map(|(k, v)| (k.clone(), v.to_string())).collect() - }); - - let kinovi_character_id_map: Option> = - resolve_kinovi_character_id_map( - request.reference_character_tokens.as_deref(), mysql_connection, - ).await?; - - // 5. Execute: finalize draft → send - let response = execute_pipeline_v2( - draft_or_request, server_state, - media_file_urls_as_strings.as_ref(), kinovi_character_id_map.as_ref(), - billing.maybe_wallet_ledger_entry_token.as_ref(), mysql_connection, - ).await?; - - Ok(PipelineResult { billing, response }) -} - -// ==================== SHARED DB HELPERS ==================== // - -async fn insert_prompt_and_context( - request: &OmniGenVideoCostAndGenerateRequest, - transaction: &mut sqlx::Transaction<'_, sqlx::MySql>, - user_token: &tokens::tokens::users::UserToken, - maybe_prompt_model_type: Option, - ip_address: &str, -) { - let prompt_result = insert_prompt(InsertPromptArgs { - maybe_apriori_prompt_token: None, - prompt_type: PromptType::ArtcraftApp, - maybe_creator_user_token: Some(user_token), - maybe_model_type: maybe_prompt_model_type, - maybe_generation_provider: Some(GenerationProvider::Artcraft), - maybe_positive_prompt: request.prompt.as_deref(), - maybe_negative_prompt: request.negative_prompt.as_deref(), - maybe_other_args: None, - maybe_generation_mode: None, - maybe_aspect_ratio: None, - maybe_resolution: None, - maybe_batch_count: request.video_batch_count.map(|c| c as u8), - maybe_generate_audio: request.generate_audio, - maybe_duration_seconds: request.duration_seconds.map(|d| d as u32), - creator_ip_address: ip_address, - mysql_executor: &mut **transaction, - phantom: Default::default(), - }).await; - - let prompt_token = match prompt_result { - Ok(token) => Some(token), - Err(err) => { - warn!("Error inserting prompt: {:?}", err); - None - } - }; - - if let Some(token) = prompt_token.as_ref() { - let mut context_items = Vec::new(); - - if let Some(media_token) = &request.start_frame_image_media_token { - context_items.push(PromptContextItem { - media_token: media_token.clone(), - context_semantic_type: PromptContextSemanticType::VidStartFrame, - }); - } - if let Some(media_token) = &request.end_frame_image_media_token { - context_items.push(PromptContextItem { - media_token: media_token.clone(), - context_semantic_type: PromptContextSemanticType::VidEndFrame, - }); - } - if let Some(ref_tokens) = &request.reference_image_media_tokens { - for media_token in ref_tokens { - context_items.push(PromptContextItem { - media_token: media_token.clone(), - context_semantic_type: PromptContextSemanticType::Imgref, - }); - } - } - if let Some(ref_tokens) = &request.reference_video_media_tokens { - for media_token in ref_tokens { - context_items.push(PromptContextItem { - media_token: media_token.clone(), - context_semantic_type: PromptContextSemanticType::VidRef, - }); - } - } - - if !context_items.is_empty() { - if let Err(err) = insert_batch_prompt_context_items(InsertBatchArgs { - prompt_token: token.clone(), - items: context_items, - transaction, - }).await { - warn!("Error inserting batch prompt context items: {:?}", err); - } - } - } -} - -#[allow(clippy::too_many_arguments)] -async fn insert_seedance2pro_jobs( - primary_order_id: &str, - maybe_additional_order_ids: Option<&[String]>, - apriori_job_token: &InferenceJobToken, - idempotency_token: &str, - maybe_wallet_ledger_entry_token: Option<&tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken>, - user_token: &tokens::tokens::users::UserToken, - maybe_avt_token: Option<&tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken>, - ip_address: &str, - transaction: &mut sqlx::Transaction<'_, sqlx::MySql>, -) -> Result { - let fallback_ids = vec![primary_order_id.to_string()]; - let order_ids = maybe_additional_order_ids.unwrap_or(&fallback_ids); - - let mut all_job_tokens: Vec = Vec::with_capacity(order_ids.len()); - - for (i, order_id) in order_ids.iter().enumerate() { - let job_token = if i == 0 { apriori_job_token.clone() } else { InferenceJobToken::generate() }; - let idempotency_str = if i == 0 { idempotency_token.to_string() } else { format!("{}-batch-{}", idempotency_token, i) }; - - let db_result = insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token( - InsertGenericInferenceForSeedance2ProWithAprioriJobTokenArgs { - apriori_job_token: &job_token, - uuid_idempotency_token: &idempotency_str, - maybe_external_third_party_id: order_id, - maybe_inference_args: None, - maybe_prompt_token: None, - maybe_wallet_ledger_entry_token, - maybe_creator_user_token: Some(user_token), - maybe_avt_token, - creator_ip_address: ip_address, - creator_set_visibility: Visibility::Public, - mysql_executor: &mut **transaction, - phantom: Default::default(), - } - ).await; - - match db_result { - Ok(token) => all_job_tokens.push(token), - Err(err) => { - warn!("Error inserting seedance2pro inference job (order_id={}): {:?}", order_id, err); - if i == 0 { return Err(AdvancedCommonWebError::from_error(err)); } - } - } - } - - all_job_tokens.first().cloned().ok_or_else(|| { - error!("No inference job token was created"); - AdvancedCommonWebError::server_error_with_message("No inference job token was created") - }) -} - -#[allow(clippy::too_many_arguments)] -async fn insert_fal_job( - external_job_id: &str, - apriori_job_token: &InferenceJobToken, - idempotency_token: &str, - user_token: &tokens::tokens::users::UserToken, - maybe_avt_token: Option<&tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken>, - ip_address: &str, - transaction: &mut sqlx::Transaction<'_, sqlx::MySql>, -) -> Result { - let db_result = insert_generic_inference_job_for_fal_queue_with_apriori_job_token( - InsertGenericInferenceForFalWithAprioriJobTokenArgs { - apriori_job_token, - uuid_idempotency_token: idempotency_token, - maybe_external_third_party_id: external_job_id, - fal_category: FalCategory::VideoGeneration, - maybe_inference_args: None, - maybe_prompt_token: None, - maybe_creator_user_token: Some(user_token), - maybe_avt_token, - creator_ip_address: ip_address, - creator_set_visibility: Visibility::Public, - mysql_executor: &mut **transaction, - starting_job_status_override: None, - maybe_frontend_failure_category: None, - maybe_failure_reason: None, - phantom: Default::default(), - } - ).await; - - match db_result { - Ok(token) => Ok(token), - Err(err) => { - warn!("Error inserting fal inference job: {:?}", err); - Err(AdvancedCommonWebError::from_error(err)) - } - } -} - -async fn resolve_kinovi_character_id_map( - maybe_tokens: Option<&[CharacterToken]>, - connection: &mut sqlx::pool::PoolConnection, -) -> Result>, AdvancedCommonWebError> { - use mysql_queries::queries::characters::batch_lookup_characters_by_token_for_prompting::batch_lookup_characters_by_token_for_prompting; - - let tokens = match maybe_tokens { - None => return Ok(None), - Some(tokens) if tokens.is_empty() => return Ok(None), - Some(tokens) => tokens, - }; - - let characters = batch_lookup_characters_by_token_for_prompting(tokens, connection).await?; - - let map: HashMap = characters.iter() - .filter(|c| c.is_active) - .filter_map(|c| c.kinovi_character_id.as_ref().map(|kid| (c.token.clone(), kid.clone()))) - .collect(); - - if map.is_empty() { Ok(None) } else { Ok(Some(map)) } -} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_result.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_result.rs new file mode 100644 index 0000000000..e427a68e32 --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_result.rs @@ -0,0 +1,9 @@ +use artcraft_router::generate::generate_video::generate_video_response::GenerateVideoResponse; + +use crate::http_server::endpoints::omni_gen::generate::video::helpers::bill_wallet::BillWalletResult; + +/// Both pipelines produce this, then the shared suffix handles DB writes. +pub struct PipelineResult { + pub billing: BillWalletResult, + pub response: GenerateVideoResponse, +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/mod.rs index abedd3fe83..21df8fefd6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/mod.rs @@ -1,3 +1,4 @@ pub mod distill_helper; pub mod distill_video_request; pub mod execute; +pub mod run_pipeline_v1; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/run_pipeline_v1.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/run_pipeline_v1.rs new file mode 100644 index 0000000000..88796026de --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v1/run_pipeline_v1.rs @@ -0,0 +1,68 @@ +use std::collections::HashMap; + +use log::info; +use url::Url; + +use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest; +use artcraft_router::api::provider::Provider; +use artcraft_router::generate::generate_video::generate_video_response::GenerateVideoResponse; +use enums::common::generation::common_video_model::CommonVideoModel; +use tokens::tokens::media_files::MediaFileToken; + +use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::bill_wallet::bill_wallet; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_result::PipelineResult; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::distill_helper::hydrate_to_router_request::hydrate_to_router_request; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::distill_video_request::distill_video_request; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::execute::execute_generation::execute_generation; +use crate::http_server::endpoints::omni_gen::generate::video::request_helper::resolve_kinovi_character_ids::resolve_kinovi_character_ids; +use crate::state::server_state::ServerState; + +pub async fn run_pipeline_v1( + request: &OmniGenVideoCostAndGenerateRequest, + server_state: &ServerState, + mysql_connection: &mut sqlx::pool::PoolConnection, + user_token: &tokens::tokens::users::UserToken, + media_file_hydration_map: &Option>, +) -> Result { + let kinovi_character_ids = resolve_kinovi_character_ids( + request.reference_character_tokens.as_deref(), + mysql_connection, + ).await?; + + let execution_provider = match request.model { + Some(CommonVideoModel::Seedance2p0) => Provider::Seedance2Pro, + Some(CommonVideoModel::Seedance2p0Fast) => Provider::Seedance2Pro, + _ => Provider::Fal, + }; + + let distilled = distill_video_request(request, media_file_hydration_map.as_ref(), execution_provider)?; + info!("v1 distilled plan: {:?}", distilled.plan); + + let cost = distilled.cost.cost_in_credits.unwrap_or(0); + let billing = bill_wallet(user_token, cost, mysql_connection).await?; + + let gen_result = execute_generation( + &distilled, request, server_state, media_file_hydration_map.as_ref(), + kinovi_character_ids, billing.maybe_wallet_ledger_entry_token.as_ref(), mysql_connection, + ).await?; + + // Map v1 GenerationResult -> GenerateVideoResponse for the shared suffix + let response = if gen_result.is_seedance2pro { + GenerateVideoResponse::Seedance2Pro( + artcraft_router::generate::generate_video::generate_video_response::Seedance2proVideoResponsePayload { + order_id: gen_result.external_job_id, + task_id: String::new(), + } + ) + } else { + GenerateVideoResponse::Fal( + artcraft_router::generate::generate_video::generate_video_response::FalVideoResponsePayload { + request_id: Some(gen_result.external_job_id), + gateway_request_id: None, + } + ) + }; + + Ok(PipelineResult { billing, response }) +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/mod.rs index 2e8bdddf98..361b218107 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/mod.rs @@ -1 +1,2 @@ pub mod execute; +pub mod run_pipeline_v2; 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 new file mode 100644 index 0000000000..469f550a9c --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/pipeline_v2/run_pipeline_v2.rs @@ -0,0 +1,98 @@ +use std::collections::HashMap; + +use log::{info, warn}; +use url::Url; + +use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest; +use artcraft_router::api::provider::Provider; +use artcraft_router::generate::generate_video::generate_video_response::GenerateVideoResponse; +use tokens::tokens::characters::CharacterToken; +use tokens::tokens::media_files::MediaFileToken; + +use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; +use crate::http_server::endpoints::omni_gen::generate::video::helpers::bill_wallet::bill_wallet; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_result::PipelineResult; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v1::distill_helper::hydrate_to_router_request::hydrate_to_router_request; +use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v2::execute::execute_pipeline_v2; +use crate::state::server_state::ServerState; + +pub async fn run_pipeline_v2( + request: &OmniGenVideoCostAndGenerateRequest, + server_state: &ServerState, + mysql_connection: &mut sqlx::pool::PoolConnection, + user_token: &tokens::tokens::users::UserToken, + media_file_hydration_map: &Option>, +) -> Result { + // 1. Build execution request (provider = Seedance2Pro for Kinovi) + let mut exec_builder = hydrate_to_router_request(request)?; + exec_builder.provider = Provider::Seedance2Pro; + + let draft_or_request = exec_builder.build2().map_err(|e| { + warn!("Failed to build2 for v2 pipeline: {}", e); + AdvancedCommonWebError::from_error(e) + })?; + + // 2. Calculate cost (swap provider to Artcraft for billing) + let mut cost_builder = hydrate_to_router_request(request)?; + cost_builder.provider = Provider::Artcraft; + + let cost = cost_builder.build2() + .map_err(|e| { + warn!("Failed to build2 cost estimate for v2: {}", e); + AdvancedCommonWebError::from_error(e) + })? + .estimate_cost() + .map_err(|e| { + warn!("Failed to estimate cost for v2: {}", e); + AdvancedCommonWebError::from_error(e) + })? + .cost_in_credits + .unwrap_or(0); + + info!("v2 estimated cost: {} credits", cost); + + // 3. Bill wallet + let billing = bill_wallet(user_token, cost, mysql_connection).await?; + + // 4. Build context maps for draft finalization + let media_file_urls_as_strings: Option> = + media_file_hydration_map.as_ref().map(|map| { + map.iter().map(|(k, v)| (k.clone(), v.to_string())).collect() + }); + + let kinovi_character_id_map: Option> = + resolve_kinovi_character_id_map( + request.reference_character_tokens.as_deref(), mysql_connection, + ).await?; + + // 5. Execute: finalize draft -> send + let response = execute_pipeline_v2( + draft_or_request, server_state, + media_file_urls_as_strings.as_ref(), kinovi_character_id_map.as_ref(), + billing.maybe_wallet_ledger_entry_token.as_ref(), mysql_connection, + ).await?; + + Ok(PipelineResult { billing, response }) +} + +async fn resolve_kinovi_character_id_map( + maybe_tokens: Option<&[CharacterToken]>, + connection: &mut sqlx::pool::PoolConnection, +) -> Result>, AdvancedCommonWebError> { + use mysql_queries::queries::characters::batch_lookup_characters_by_token_for_prompting::batch_lookup_characters_by_token_for_prompting; + + let tokens = match maybe_tokens { + None => return Ok(None), + Some(tokens) if tokens.is_empty() => return Ok(None), + Some(tokens) => tokens, + }; + + let characters = batch_lookup_characters_by_token_for_prompting(tokens, connection).await?; + + let map: HashMap = characters.iter() + .filter(|c| c.is_active) + .filter_map(|c| c.kinovi_character_id.as_ref().map(|kid| (c.token.clone(), kid.clone()))) + .collect(); + + if map.is_empty() { Ok(None) } else { Ok(Some(map)) } +}