diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4.rs index 9f9595cec6..179bb46bc6 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4.rs @@ -7,6 +7,7 @@ use crate::generate::generate_image::generate_image_response::{ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4::PlanFalSeedream4; use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4_edit_image_webhook::{ enqueue_bytedance_seedream_v4_edit_image_webhook, EnqueueBytedanceSeedreamV4EditImageArgs, + EnqueueBytedanceSeedreamV4EditImageRequest, }; use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4_text_to_image_webhook::{ enqueue_bytedance_seedream_v4_text_to_image_webhook, EnqueueBytedanceSeedreamV4TextToImageArgs, @@ -30,11 +31,13 @@ pub async fn execute_fal_seedream_4( .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))? } else { let args = EnqueueBytedanceSeedreamV4EditImageArgs { - prompt: plan.prompt.as_deref().unwrap_or(""), - image_urls: plan.image_urls.clone(), - num_images: Some(plan.num_images.to_edit()), - max_images: None, - image_size: plan.image_size.map(|s| s.to_edit()), + request: EnqueueBytedanceSeedreamV4EditImageRequest { + prompt: plan.prompt.clone().unwrap_or_default(), + image_urls: plan.image_urls.clone(), + num_images: Some(plan.num_images.to_edit()), + max_images: None, + image_size: plan.image_size.map(|s| s.to_edit()), + }, webhook_url: fal_client.webhook_url.as_str(), api_key: &fal_client.api_key, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4p5.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4p5.rs index 3cb767f99d..e69aba3bdf 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4p5.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4p5.rs @@ -7,6 +7,7 @@ use crate::generate::generate_image::generate_image_response::{ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4p5::PlanFalSeedream4p5; use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_edit_image_webhook::{ enqueue_bytedance_seedream_v4p5_edit_image_webhook, EnqueueBytedanceSeedreamV4p5EditImageArgs, + EnqueueBytedanceSeedreamV4p5EditImageRequest, }; use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4p5_text_to_image_webhook::{ enqueue_bytedance_seedream_v4p5_text_to_image_webhook, EnqueueBytedanceSeedreamV4p5TextToImageArgs, @@ -30,11 +31,13 @@ pub async fn execute_fal_seedream_4p5( .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))? } else { let args = EnqueueBytedanceSeedreamV4p5EditImageArgs { - prompt: plan.prompt.as_deref().unwrap_or(""), - image_urls: plan.image_urls.clone(), - num_images: Some(plan.num_images.to_edit()), - max_images: None, - image_size: plan.image_size.map(|s| s.to_edit()), + request: EnqueueBytedanceSeedreamV4p5EditImageRequest { + prompt: plan.prompt.clone().unwrap_or_default(), + image_urls: plan.image_urls.clone(), + num_images: Some(plan.num_images.to_edit()), + max_images: None, + image_size: plan.image_size.map(|s| s.to_edit()), + }, webhook_url: fal_client.webhook_url.as_str(), api_key: &fal_client.api_key, }; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_5_lite.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_5_lite.rs index faf1eb1da3..2f7f66259a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_5_lite.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_5_lite.rs @@ -7,6 +7,7 @@ use crate::generate::generate_image::generate_image_response::{ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_5_lite::PlanFalSeedream5Lite; use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v5_lite_edit_image_webhook::{ enqueue_bytedance_seedream_v5_lite_edit_image_webhook, EnqueueBytedanceSeedreamV5LiteEditImageArgs, + EnqueueBytedanceSeedreamV5LiteEditImageRequest, }; use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v5_lite_text_to_image_webhook::{ enqueue_bytedance_seedream_v5_lite_text_to_image_webhook, EnqueueBytedanceSeedreamV5LiteTextToImageArgs, @@ -30,11 +31,13 @@ pub async fn execute_fal_seedream_5_lite( .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))? } else { let args = EnqueueBytedanceSeedreamV5LiteEditImageArgs { - prompt: plan.prompt.as_deref().unwrap_or(""), - image_urls: plan.image_urls.clone(), - num_images: Some(plan.num_images.to_edit()), - max_images: None, - image_size: plan.image_size.map(|s| s.to_edit()), + request: EnqueueBytedanceSeedreamV5LiteEditImageRequest { + prompt: plan.prompt.clone().unwrap_or_default(), + image_urls: plan.image_urls.clone(), + num_images: Some(plan.num_images.to_edit()), + max_images: None, + image_size: plan.image_size.map(|s| s.to_edit()), + }, webhook_url: fal_client.webhook_url.as_str(), api_key: &fal_client.api_key, }; diff --git a/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v4_edit_image_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v4_edit_image_webhook.rs index 47c9ed58bb..4a1109fadb 100644 --- a/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v4_edit_image_webhook.rs +++ b/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v4_edit_image_webhook.rs @@ -7,18 +7,18 @@ use crate::requests::api::webhook_response::WebhookResponse; use reqwest::IntoUrl; pub struct EnqueueBytedanceSeedreamV4EditImageArgs<'a, R: IntoUrl> { - // Request required - pub prompt: &'a str, - pub image_urls: Vec, + pub request: EnqueueBytedanceSeedreamV4EditImageRequest, + pub webhook_url: R, + pub api_key: &'a FalApiKey, +} - // Optional args +#[derive(Clone, Debug)] +pub struct EnqueueBytedanceSeedreamV4EditImageRequest { + pub prompt: String, + pub image_urls: Vec, pub num_images: Option, pub max_images: Option, pub image_size: Option, - - // Fulfillment - pub webhook_url: R, - pub api_key: &'a FalApiKey, } #[derive(Copy, Clone, Debug)] @@ -39,23 +39,18 @@ pub enum EnqueueBytedanceSeedreamV4EditImageMaxImages { #[derive(Copy, Clone, Debug)] pub enum EnqueueBytedanceSeedreamV4EditImageSize { - // Square Square, SquareHd, - // Tall PortraitFourThree, PortraitSixteenNine, - // Wide LandscapeFourThree, LandscapeSixteenNine, - // Auto Auto, Auto2k, Auto4k, } - -impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV4EditImageArgs<'_, U> { +impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV4EditImageRequest { fn calculate_cost_in_cents(&self) -> UsdCents { // Your request will cost $0.03 per image. let unit_cost = 3; @@ -70,29 +65,29 @@ impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV4EditIma } } - pub async fn enqueue_bytedance_seedream_v4_edit_image_webhook( args: EnqueueBytedanceSeedreamV4EditImageArgs<'_, R> ) -> Result { + let req = args.request; - let num_images = args.num_images - .map(|num_images| match num_images { + let num_images = req.num_images + .map(|n| match n { EnqueueBytedanceSeedreamV4EditImageNumImages::One => 1, EnqueueBytedanceSeedreamV4EditImageNumImages::Two => 2, EnqueueBytedanceSeedreamV4EditImageNumImages::Three => 3, EnqueueBytedanceSeedreamV4EditImageNumImages::Four => 4, }); - let max_images = args.max_images - .map(|num_images| match num_images { + let max_images = req.max_images + .map(|n| match n { EnqueueBytedanceSeedreamV4EditImageMaxImages::One => 1, EnqueueBytedanceSeedreamV4EditImageMaxImages::Two => 2, EnqueueBytedanceSeedreamV4EditImageMaxImages::Three => 3, EnqueueBytedanceSeedreamV4EditImageMaxImages::Four => 4, }); - let image_size = args.image_size - .map(|image_size| match image_size { + let image_size = req.image_size + .map(|s| match s { EnqueueBytedanceSeedreamV4EditImageSize::Square => "square", EnqueueBytedanceSeedreamV4EditImageSize::SquareHd => "square_hd", EnqueueBytedanceSeedreamV4EditImageSize::PortraitFourThree => "portrait_4_3", @@ -103,32 +98,29 @@ pub async fn enqueue_bytedance_seedream_v4_edit_image_webhook( EnqueueBytedanceSeedreamV4EditImageSize::Auto2k => "auto_2K", EnqueueBytedanceSeedreamV4EditImageSize::Auto4k => "auto_4K", }) - .map(|resolution| resolution.to_string()); + .map(|s| s.to_string()); - let request = SeedreamV4EditImageInput { - prompt: args.prompt.to_string(), - image_urls: args.image_urls, - // Optionals + let input = SeedreamV4EditImageInput { + prompt: req.prompt, + image_urls: req.image_urls, num_images, max_images, image_size, - // Constants enhance_prompt_mode: Some("standard".to_string()), enable_safety_checker: Some(false), }; - let result = seedream_4_edit_image(request) + seedream_4_edit_image(input) .with_api_key(&args.api_key.0) .queue_webhook(args.webhook_url) - .await; - - result.map_err(|err| classify_fal_error(err)) + .await + .map_err(|err| classify_fal_error(err)) } #[cfg(test)] mod tests { + use super::*; use crate::creds::fal_api_key::FalApiKey; - use crate::requests::webhook::image::edit::enqueue_bytedance_seedream_v4_edit_image_webhook::{enqueue_bytedance_seedream_v4_edit_image_webhook, EnqueueBytedanceSeedreamV4EditImageArgs, EnqueueBytedanceSeedreamV4EditImageMaxImages, EnqueueBytedanceSeedreamV4EditImageNumImages, EnqueueBytedanceSeedreamV4EditImageSize}; use errors::AnyhowResult; use std::fs::read_to_string; use test_data::web::image_urls::{GHOST_IMAGE_URL, TREX_SKELETON_IMAGE_URL}; @@ -136,26 +128,22 @@ mod tests { #[tokio::test] #[ignore] async fn test() -> AnyhowResult<()> { - // XXX: Don't commit secrets! let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?; - let api_key = FalApiKey::from_str(&secret); let args = EnqueueBytedanceSeedreamV4EditImageArgs { - image_urls: vec![ - GHOST_IMAGE_URL.to_string(), - TREX_SKELETON_IMAGE_URL.to_string(), - ], - prompt: "add the ghost to the image of the t-rex skeleton, make it look spooky but friendly", - num_images: Some(EnqueueBytedanceSeedreamV4EditImageNumImages::Two), - max_images: Some(EnqueueBytedanceSeedreamV4EditImageMaxImages::Two), - image_size: Some(EnqueueBytedanceSeedreamV4EditImageSize::Auto2k), + request: EnqueueBytedanceSeedreamV4EditImageRequest { + prompt: "add the ghost to the image of the t-rex skeleton, make it look spooky but friendly".to_string(), + image_urls: vec![GHOST_IMAGE_URL.to_string(), TREX_SKELETON_IMAGE_URL.to_string()], + num_images: Some(EnqueueBytedanceSeedreamV4EditImageNumImages::Two), + max_images: Some(EnqueueBytedanceSeedreamV4EditImageMaxImages::Two), + image_size: Some(EnqueueBytedanceSeedreamV4EditImageSize::Auto2k), + }, api_key: &api_key, webhook_url: "https://example.com/webhook", }; - let result = enqueue_bytedance_seedream_v4_edit_image_webhook(args).await?; - + let _result = enqueue_bytedance_seedream_v4_edit_image_webhook(args).await?; Ok(()) } } diff --git a/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v4p5_edit_image_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v4p5_edit_image_webhook.rs index 1199e3fb39..f89fa7a1c6 100644 --- a/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v4p5_edit_image_webhook.rs +++ b/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v4p5_edit_image_webhook.rs @@ -7,18 +7,18 @@ use crate::requests::api::webhook_response::WebhookResponse; use reqwest::IntoUrl; pub struct EnqueueBytedanceSeedreamV4p5EditImageArgs<'a, R: IntoUrl> { - // Request required - pub prompt: &'a str, - pub image_urls: Vec, + pub request: EnqueueBytedanceSeedreamV4p5EditImageRequest, + pub webhook_url: R, + pub api_key: &'a FalApiKey, +} - // Optional args +#[derive(Clone, Debug)] +pub struct EnqueueBytedanceSeedreamV4p5EditImageRequest { + pub prompt: String, + pub image_urls: Vec, pub num_images: Option, pub max_images: Option, pub image_size: Option, - - // Fulfillment - pub webhook_url: R, - pub api_key: &'a FalApiKey, } #[derive(Copy, Clone, Debug)] @@ -39,22 +39,17 @@ pub enum EnqueueBytedanceSeedreamV4p5EditImageMaxImages { #[derive(Copy, Clone, Debug)] pub enum EnqueueBytedanceSeedreamV4p5EditImageSize { - // Square Square, SquareHd, - // Tall PortraitFourThree, PortraitSixteenNine, - // Wide LandscapeFourThree, LandscapeSixteenNine, - // Auto Auto2k, Auto4k, } - -impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV4p5EditImageArgs<'_, U> { +impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV4p5EditImageRequest { fn calculate_cost_in_cents(&self) -> UsdCents { // Your request will cost $0.04 per image. let unit_cost = 4; @@ -69,29 +64,29 @@ impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV4p5EditI } } - pub async fn enqueue_bytedance_seedream_v4p5_edit_image_webhook( args: EnqueueBytedanceSeedreamV4p5EditImageArgs<'_, R> ) -> Result { + let req = args.request; - let num_images = args.num_images - .map(|num_images| match num_images { + let num_images = req.num_images + .map(|n| match n { EnqueueBytedanceSeedreamV4p5EditImageNumImages::One => 1, EnqueueBytedanceSeedreamV4p5EditImageNumImages::Two => 2, EnqueueBytedanceSeedreamV4p5EditImageNumImages::Three => 3, EnqueueBytedanceSeedreamV4p5EditImageNumImages::Four => 4, }); - let max_images = args.max_images - .map(|num_images| match num_images { + let max_images = req.max_images + .map(|n| match n { EnqueueBytedanceSeedreamV4p5EditImageMaxImages::One => 1, EnqueueBytedanceSeedreamV4p5EditImageMaxImages::Two => 2, EnqueueBytedanceSeedreamV4p5EditImageMaxImages::Three => 3, EnqueueBytedanceSeedreamV4p5EditImageMaxImages::Four => 4, }); - let image_size = args.image_size - .map(|image_size| match image_size { + let image_size = req.image_size + .map(|s| match s { EnqueueBytedanceSeedreamV4p5EditImageSize::Square => "square", EnqueueBytedanceSeedreamV4p5EditImageSize::SquareHd => "square_hd", EnqueueBytedanceSeedreamV4p5EditImageSize::PortraitFourThree => "portrait_4_3", @@ -101,32 +96,29 @@ pub async fn enqueue_bytedance_seedream_v4p5_edit_image_webhook( EnqueueBytedanceSeedreamV4p5EditImageSize::Auto2k => "auto_2K", EnqueueBytedanceSeedreamV4p5EditImageSize::Auto4k => "auto_4K", }) - .map(|resolution| resolution.to_string()); + .map(|s| s.to_string()); - let request = SeedreamV4p5EditImageInput { - prompt: args.prompt.to_string(), - image_urls: args.image_urls, - // Optionals + let input = SeedreamV4p5EditImageInput { + prompt: req.prompt, + image_urls: req.image_urls, num_images, max_images, image_size, - // Constants enable_safety_checker: Some(false), seed: None, }; - let result = seedream_4p5_edit_image(request) + seedream_4p5_edit_image(input) .with_api_key(&args.api_key.0) .queue_webhook(args.webhook_url) - .await; - - result.map_err(|err| classify_fal_error(err)) + .await + .map_err(|err| classify_fal_error(err)) } #[cfg(test)] mod tests { + use super::*; use crate::creds::fal_api_key::FalApiKey; - use crate::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_edit_image_webhook::{enqueue_bytedance_seedream_v4p5_edit_image_webhook, EnqueueBytedanceSeedreamV4p5EditImageArgs, EnqueueBytedanceSeedreamV4p5EditImageMaxImages, EnqueueBytedanceSeedreamV4p5EditImageNumImages, EnqueueBytedanceSeedreamV4p5EditImageSize}; use errors::AnyhowResult; use std::fs::read_to_string; use test_data::web::image_urls::{GHOST_IMAGE_URL, TREX_SKELETON_IMAGE_URL}; @@ -134,27 +126,22 @@ mod tests { #[tokio::test] #[ignore] async fn test() -> AnyhowResult<()> { - // XXX: Don't commit secrets! let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?; - //let secret = read_to_string("/home/bt/Artcraft/credentials/fal_api_key.txt")?; - let api_key = FalApiKey::from_str(&secret); let args = EnqueueBytedanceSeedreamV4p5EditImageArgs { - image_urls: vec![ - GHOST_IMAGE_URL.to_string(), - TREX_SKELETON_IMAGE_URL.to_string(), - ], - prompt: "add the ghost to the image of the t-rex skeleton, make it look spooky but friendly", - num_images: Some(EnqueueBytedanceSeedreamV4p5EditImageNumImages::Two), - max_images: Some(EnqueueBytedanceSeedreamV4p5EditImageMaxImages::Two), - image_size: Some(EnqueueBytedanceSeedreamV4p5EditImageSize::Auto2k), + request: EnqueueBytedanceSeedreamV4p5EditImageRequest { + prompt: "add the ghost to the image of the t-rex skeleton, make it look spooky but friendly".to_string(), + image_urls: vec![GHOST_IMAGE_URL.to_string(), TREX_SKELETON_IMAGE_URL.to_string()], + num_images: Some(EnqueueBytedanceSeedreamV4p5EditImageNumImages::Two), + max_images: Some(EnqueueBytedanceSeedreamV4p5EditImageMaxImages::Two), + image_size: Some(EnqueueBytedanceSeedreamV4p5EditImageSize::Auto2k), + }, api_key: &api_key, webhook_url: "https://example.com/webhook", }; - let result = enqueue_bytedance_seedream_v4p5_edit_image_webhook(args).await?; - + let _result = enqueue_bytedance_seedream_v4p5_edit_image_webhook(args).await?; Ok(()) } } diff --git a/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v5_lite_edit_image_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v5_lite_edit_image_webhook.rs index f612b27ba4..28d244d190 100644 --- a/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v5_lite_edit_image_webhook.rs +++ b/crates/api_clients/fal_client/src/requests/webhook/image/edit/enqueue_bytedance_seedream_v5_lite_edit_image_webhook.rs @@ -7,18 +7,18 @@ use crate::requests::api::webhook_response::WebhookResponse; use reqwest::IntoUrl; pub struct EnqueueBytedanceSeedreamV5LiteEditImageArgs<'a, R: IntoUrl> { - // Request required - pub prompt: &'a str, - pub image_urls: Vec, + pub request: EnqueueBytedanceSeedreamV5LiteEditImageRequest, + pub webhook_url: R, + pub api_key: &'a FalApiKey, +} - // Optional args +#[derive(Clone, Debug)] +pub struct EnqueueBytedanceSeedreamV5LiteEditImageRequest { + pub prompt: String, + pub image_urls: Vec, pub num_images: Option, pub max_images: Option, pub image_size: Option, - - // Fulfillment - pub webhook_url: R, - pub api_key: &'a FalApiKey, } #[derive(Copy, Clone, Debug)] @@ -39,22 +39,17 @@ pub enum EnqueueBytedanceSeedreamV5LiteEditImageMaxImages { #[derive(Copy, Clone, Debug)] pub enum EnqueueBytedanceSeedreamV5LiteEditImageSize { - // Square Square, SquareHd, - // Tall PortraitFourThree, PortraitSixteenNine, - // Wide LandscapeFourThree, LandscapeSixteenNine, - // Auto Auto2k, Auto3k, // NB: v5 uses auto_3K instead of v4's auto_4K } - -impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV5LiteEditImageArgs<'_, U> { +impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV5LiteEditImageRequest { fn calculate_cost_in_cents(&self) -> UsdCents { // TODO(bt): Verify actual pricing for Seedream v5 Lite on fal.ai. let unit_cost = 4; @@ -69,12 +64,12 @@ impl FalRequestCostCalculator for EnqueueBytedanceSeedreamV5LiteEdi } } - pub async fn enqueue_bytedance_seedream_v5_lite_edit_image_webhook( args: EnqueueBytedanceSeedreamV5LiteEditImageArgs<'_, R> ) -> Result { + let req = args.request; - let num_images = args.num_images + let num_images = req.num_images .map(|n| match n { EnqueueBytedanceSeedreamV5LiteEditImageNumImages::One => 1, EnqueueBytedanceSeedreamV5LiteEditImageNumImages::Two => 2, @@ -82,7 +77,7 @@ pub async fn enqueue_bytedance_seedream_v5_lite_edit_image_webhook( EnqueueBytedanceSeedreamV5LiteEditImageNumImages::Four => 4, }); - let max_images = args.max_images + let max_images = req.max_images .map(|n| match n { EnqueueBytedanceSeedreamV5LiteEditImageMaxImages::One => 1, EnqueueBytedanceSeedreamV5LiteEditImageMaxImages::Two => 2, @@ -90,7 +85,7 @@ pub async fn enqueue_bytedance_seedream_v5_lite_edit_image_webhook( EnqueueBytedanceSeedreamV5LiteEditImageMaxImages::Four => 4, }); - let image_size = args.image_size + let image_size = req.image_size .map(|s| match s { EnqueueBytedanceSeedreamV5LiteEditImageSize::Square => "square", EnqueueBytedanceSeedreamV5LiteEditImageSize::SquareHd => "square_hd", @@ -103,29 +98,26 @@ pub async fn enqueue_bytedance_seedream_v5_lite_edit_image_webhook( }) .map(|s| s.to_string()); - let request = SeedreamV5LiteEditImageInput { - prompt: args.prompt.to_string(), - image_urls: args.image_urls, - // Optionals + let input = SeedreamV5LiteEditImageInput { + prompt: req.prompt, + image_urls: req.image_urls, num_images, max_images, image_size, - // Constants enable_safety_checker: Some(false), }; - let result = http_seedream_5_edit_image(request) + http_seedream_5_edit_image(input) .with_api_key(&args.api_key.0) .queue_webhook(args.webhook_url) - .await; - - result.map_err(|err| classify_fal_error(err)) + .await + .map_err(|err| classify_fal_error(err)) } #[cfg(test)] mod tests { + use super::*; use crate::creds::fal_api_key::FalApiKey; - use crate::requests::webhook::image::edit::enqueue_bytedance_seedream_v5_lite_edit_image_webhook::{enqueue_bytedance_seedream_v5_lite_edit_image_webhook, EnqueueBytedanceSeedreamV5LiteEditImageArgs, EnqueueBytedanceSeedreamV5LiteEditImageMaxImages, EnqueueBytedanceSeedreamV5LiteEditImageNumImages, EnqueueBytedanceSeedreamV5LiteEditImageSize}; use errors::AnyhowResult; use std::fs::read_to_string; use test_data::web::image_urls::{GHOST_IMAGE_URL, TREX_SKELETON_IMAGE_URL}; @@ -133,26 +125,22 @@ mod tests { #[tokio::test] #[ignore] async fn test() -> AnyhowResult<()> { - // XXX: Don't commit secrets! let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?; - let api_key = FalApiKey::from_str(&secret); let args = EnqueueBytedanceSeedreamV5LiteEditImageArgs { - image_urls: vec![ - GHOST_IMAGE_URL.to_string(), - TREX_SKELETON_IMAGE_URL.to_string(), - ], - prompt: "add the ghost to the image of the t-rex skeleton, make it look spooky but friendly", - num_images: Some(EnqueueBytedanceSeedreamV5LiteEditImageNumImages::Two), - max_images: Some(EnqueueBytedanceSeedreamV5LiteEditImageMaxImages::Two), - image_size: Some(EnqueueBytedanceSeedreamV5LiteEditImageSize::Auto2k), + request: EnqueueBytedanceSeedreamV5LiteEditImageRequest { + prompt: "add the ghost to the image of the t-rex skeleton, make it look spooky but friendly".to_string(), + image_urls: vec![GHOST_IMAGE_URL.to_string(), TREX_SKELETON_IMAGE_URL.to_string()], + num_images: Some(EnqueueBytedanceSeedreamV5LiteEditImageNumImages::Two), + max_images: Some(EnqueueBytedanceSeedreamV5LiteEditImageMaxImages::Two), + image_size: Some(EnqueueBytedanceSeedreamV5LiteEditImageSize::Auto2k), + }, api_key: &api_key, webhook_url: "https://example.com/webhook", }; - let result = enqueue_bytedance_seedream_v5_lite_edit_image_webhook(args).await?; - + let _result = enqueue_bytedance_seedream_v5_lite_edit_image_webhook(args).await?; Ok(()) } } diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs index d96bb92864..9210ee355c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs @@ -18,7 +18,7 @@ use enums::common::generation::common_aspect_ratio::CommonAspectRatio; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_resolution::CommonResolution; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; -use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v5_lite_edit_image_webhook::{enqueue_bytedance_seedream_v5_lite_edit_image_webhook, EnqueueBytedanceSeedreamV5LiteEditImageArgs, EnqueueBytedanceSeedreamV5LiteEditImageNumImages, EnqueueBytedanceSeedreamV5LiteEditImageSize}; +use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v5_lite_edit_image_webhook::{enqueue_bytedance_seedream_v5_lite_edit_image_webhook, EnqueueBytedanceSeedreamV5LiteEditImageArgs, EnqueueBytedanceSeedreamV5LiteEditImageRequest, EnqueueBytedanceSeedreamV5LiteEditImageNumImages, EnqueueBytedanceSeedreamV5LiteEditImageSize}; use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v5_lite_text_to_image_webhook::{enqueue_bytedance_seedream_v5_lite_text_to_image_webhook, EnqueueBytedanceSeedreamV5LiteTextToImageArgs, EnqueueBytedanceSeedreamV5LiteTextToImageNumImages, EnqueueBytedanceSeedreamV5LiteTextToImageSize}; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; @@ -129,18 +129,22 @@ pub async fn bytedance_seedream_5_lite_multi_function_image_gen_handler( None => EnqueueBytedanceSeedreamV5LiteEditImageSize::SquareHd, }; - let args = EnqueueBytedanceSeedreamV5LiteEditImageArgs { - prompt: request.prompt.as_deref().unwrap_or(""), + let edit_request = EnqueueBytedanceSeedreamV5LiteEditImageRequest { + prompt: request.prompt.clone().unwrap_or_default(), image_urls: input_image_urls.to_owned(), num_images: Some(num_images), max_images: None, image_size: Some(image_size), + }; + + let cost = edit_request.calculate_cost_in_cents(); + + let args = EnqueueBytedanceSeedreamV5LiteEditImageArgs { + request: edit_request, webhook_url: &server_state.fal.webhook_url, api_key: &server_state.fal.api_key, }; - let cost = args.calculate_cost_in_cents(); - info!("Charging wallet: {}", cost); attempt_wallet_deduction_else_common_web_error( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs index 1205f4f940..b431bfcd63 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs @@ -23,7 +23,7 @@ use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; -use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4_edit_image_webhook::{enqueue_bytedance_seedream_v4_edit_image_webhook, EnqueueBytedanceSeedreamV4EditImageArgs, EnqueueBytedanceSeedreamV4EditImageNumImages, EnqueueBytedanceSeedreamV4EditImageSize}; +use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4_edit_image_webhook::{enqueue_bytedance_seedream_v4_edit_image_webhook, EnqueueBytedanceSeedreamV4EditImageArgs, EnqueueBytedanceSeedreamV4EditImageRequest, EnqueueBytedanceSeedreamV4EditImageNumImages, EnqueueBytedanceSeedreamV4EditImageSize}; use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4_text_to_image_webhook::{enqueue_bytedance_seedream_v4_text_to_image_webhook, EnqueueBytedanceSeedreamV4TextToImageArgs, EnqueueBytedanceSeedreamV4TextToImageNumImages, EnqueueBytedanceSeedreamV4TextToImageSize}; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; @@ -146,18 +146,22 @@ pub async fn bytedance_seedream_v4_multi_function_image_gen_handler( None => EnqueueBytedanceSeedreamV4EditImageSize::SquareHd, }; - let args = EnqueueBytedanceSeedreamV4EditImageArgs { - prompt: request.prompt.as_deref().unwrap_or(""), + let edit_request = EnqueueBytedanceSeedreamV4EditImageRequest { + prompt: request.prompt.clone().unwrap_or_default(), image_urls: input_image_urls.to_owned(), num_images: Some(num_images), image_size: Some(image_size), max_images: None, + }; + + let cost = edit_request.calculate_cost_in_cents(); + + let args = EnqueueBytedanceSeedreamV4EditImageArgs { + request: edit_request, webhook_url: &server_state.fal.webhook_url, api_key: &server_state.fal.api_key, }; - let cost = args.calculate_cost_in_cents(); - info!("Charging wallet: {}", cost); attempt_wallet_deduction_else_common_web_error( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs index a203af4d52..7045dcbac8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs @@ -23,7 +23,7 @@ use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; use fal_client::creds::open_ai_api_key::OpenAiApiKey; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; -use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_edit_image_webhook::{enqueue_bytedance_seedream_v4p5_edit_image_webhook, EnqueueBytedanceSeedreamV4p5EditImageArgs, EnqueueBytedanceSeedreamV4p5EditImageNumImages, EnqueueBytedanceSeedreamV4p5EditImageSize}; +use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_edit_image_webhook::{enqueue_bytedance_seedream_v4p5_edit_image_webhook, EnqueueBytedanceSeedreamV4p5EditImageArgs, EnqueueBytedanceSeedreamV4p5EditImageRequest, EnqueueBytedanceSeedreamV4p5EditImageNumImages, EnqueueBytedanceSeedreamV4p5EditImageSize}; use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4p5_text_to_image_webhook::{enqueue_bytedance_seedream_v4p5_text_to_image_webhook, EnqueueBytedanceSeedreamV4p5TextToImageArgs, EnqueueBytedanceSeedreamV4p5TextToImageNumImages, EnqueueBytedanceSeedreamV4p5TextToImageSize}; use http_server_common::request::get_request_ip::get_request_ip; use log::{error, info, warn}; @@ -145,18 +145,22 @@ pub async fn bytedance_seedream_v4p5_multi_function_image_gen_handler( None => EnqueueBytedanceSeedreamV4p5EditImageSize::SquareHd, }; - let args = EnqueueBytedanceSeedreamV4p5EditImageArgs { - prompt: request.prompt.as_deref().unwrap_or(""), + let edit_request = EnqueueBytedanceSeedreamV4p5EditImageRequest { + prompt: request.prompt.clone().unwrap_or_default(), image_urls: input_image_urls.to_owned(), num_images: Some(num_images), image_size: Some(image_size), max_images: None, + }; + + let cost = edit_request.calculate_cost_in_cents(); + + let args = EnqueueBytedanceSeedreamV4p5EditImageArgs { + request: edit_request, webhook_url: &server_state.fal.webhook_url, api_key: &server_state.fal.api_key, }; - let cost = args.calculate_cost_in_cents(); - info!("Charging wallet: {}", cost); attempt_wallet_deduction_else_common_web_error(