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 index 5f23a1abfd..35f8719a11 100644 --- 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 @@ -7,6 +7,7 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job InsertGenericInferenceForFalWithAprioriJobTokenArgs, }; use tokens::tokens::generic_inference_jobs::InferenceJobToken; +use tokens::tokens::prompts::PromptToken; use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; @@ -17,6 +18,7 @@ pub async fn insert_fal_job( idempotency_token: &str, user_token: &tokens::tokens::users::UserToken, maybe_avt_token: Option<&tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken>, + maybe_prompt_token: Option<&PromptToken>, ip_address: &str, transaction: &mut sqlx::Transaction<'_, sqlx::MySql>, ) -> Result { @@ -27,7 +29,7 @@ pub async fn insert_fal_job( maybe_external_third_party_id: external_job_id, fal_category: FalCategory::VideoGeneration, maybe_inference_args: None, - maybe_prompt_token: None, + maybe_prompt_token, maybe_creator_user_token: Some(user_token), maybe_avt_token, creator_ip_address: ip_address, 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 index be04917d1d..9922e7e5b7 100644 --- 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 @@ -6,6 +6,7 @@ use mysql_queries::queries::generic_inference::seedance2pro::insert_generic_infe InsertGenericInferenceForSeedance2ProWithAprioriJobTokenArgs, }; use tokens::tokens::generic_inference_jobs::InferenceJobToken; +use tokens::tokens::prompts::PromptToken; use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError; @@ -18,6 +19,7 @@ pub async fn insert_seedance2pro_jobs( 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>, + maybe_prompt_token: Option<&PromptToken>, ip_address: &str, transaction: &mut sqlx::Transaction<'_, sqlx::MySql>, ) -> Result { @@ -36,7 +38,7 @@ pub async fn insert_seedance2pro_jobs( uuid_idempotency_token: &idempotency_str, maybe_external_third_party_id: order_id, maybe_inference_args: None, - maybe_prompt_token: None, + maybe_prompt_token, maybe_wallet_ledger_entry_token, maybe_creator_user_token: Some(user_token), maybe_avt_token, 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 2e3fcf89cf..87030f994d 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 @@ -205,7 +205,7 @@ pub async fn omni_gen_video_generate_handler( // -- Prompt -- - let prompt_result = insert_prompt(InsertPromptArgs { + let prompt_token = match insert_prompt(InsertPromptArgs { maybe_apriori_prompt_token: None, prompt_type: PromptType::ArtcraftApp, maybe_creator_user_token: Some(user_token), @@ -223,9 +223,7 @@ pub async fn omni_gen_video_generate_handler( creator_ip_address: &ip_address, mysql_executor: &mut *transaction, phantom: Default::default(), - }).await; - - let prompt_token = match prompt_result { + }).await { Ok(token) => Some(token), Err(err) => { warn!("Error inserting prompt: {:?}", err); @@ -286,7 +284,8 @@ pub async fn omni_gen_video_generate_handler( &payload.order_id, None, &pipeline_result.billing.apriori_job_token, &idempotency_token, pipeline_result.billing.maybe_wallet_ledger_entry_token.as_ref(), - user_token, maybe_avt_token.as_ref(), &ip_address, + user_token, maybe_avt_token.as_ref(), + prompt_token.as_ref(), &ip_address, &mut transaction, ).await? } @@ -294,7 +293,8 @@ pub async fn omni_gen_video_generate_handler( let external_id = payload.request_id.clone().unwrap_or_default(); insert_fal_job( &external_id, &pipeline_result.billing.apriori_job_token, &idempotency_token, - user_token, maybe_avt_token.as_ref(), &ip_address, + user_token, maybe_avt_token.as_ref(), + prompt_token.as_ref(), &ip_address, &mut transaction, ).await? }