From 32deedc6f885ea0b77ca8c2301116f53e19a5ac1 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 7 Apr 2026 02:43:41 -0400 Subject: [PATCH] flux 1.1 pro + ultra omni router --- .../estimate_image_cost_fal_flux_pro_1p1.rs | 21 +++ ...imate_image_cost_fal_flux_pro_1p1_ultra.rs | 20 +++ .../generate/generate_image/cost/fal/mod.rs | 2 + .../fal/generate_image_fal_flux_pro_1p1.rs | 32 +++++ .../generate_image_fal_flux_pro_1p1_ultra.rs | 32 +++++ .../generate_image/execute/fal/mod.rs | 2 + .../generate_image/generate_image_request.rs | 4 + .../generate_image/image_generation_plan.rs | 22 +++ .../generate/generate_image/plan/fal/mod.rs | 2 + .../plan_generate_image_fal_flux_pro_1p1.rs | 127 ++++++++++++++++++ ...n_generate_image_fal_flux_pro_1p1_ultra.rs | 126 +++++++++++++++++ ...queue_flux_pro_11_text_to_image_webhook.rs | 5 +- .../src/configs/omni_gen/image_models.rs | 49 ++++++- 13 files changed, 441 insertions(+), 3 deletions(-) create mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_flux_pro_1p1.rs create mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_flux_pro_1p1_ultra.rs create mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1.rs create mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1_ultra.rs create mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_flux_pro_1p1.rs create mode 100644 crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_flux_pro_1p1_ultra.rs diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_flux_pro_1p1.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_flux_pro_1p1.rs new file mode 100644 index 0000000000..6d2687c634 --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_flux_pro_1p1.rs @@ -0,0 +1,21 @@ +use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; +use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::PlanFalFluxPro11; + +pub(crate) fn estimate_image_cost_fal_flux_pro_1p1( + plan: &PlanFalFluxPro11<'_>, +) -> ImageGenerationCostEstimate { + // Pricing: $0.04 per megapixel, billed by rounding up to nearest megapixel. + // Default image sizes are ~1MP (1024x1024), so ~$0.04/image = 4 cents. + let cost_per_image: u64 = 4; + let num_images = plan.num_images.as_u64(); + let cost_in_usd_cents = cost_per_image * num_images; + + ImageGenerationCostEstimate { + cost_in_credits: Some(cost_in_usd_cents), + cost_in_usd_cents: Some(cost_in_usd_cents), + is_free: false, + is_unlimited: false, + is_rate_limited: false, + has_watermark: false, + } +} diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_flux_pro_1p1_ultra.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_flux_pro_1p1_ultra.rs new file mode 100644 index 0000000000..b9ea7f84a3 --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_flux_pro_1p1_ultra.rs @@ -0,0 +1,20 @@ +use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate; +use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra; + +pub(crate) fn estimate_image_cost_fal_flux_pro_1p1_ultra( + plan: &PlanFalFluxPro11Ultra<'_>, +) -> ImageGenerationCostEstimate { + // Pricing: $0.06 per image. + let cost_per_image: u64 = 6; + let num_images = plan.num_images.as_u64(); + let cost_in_usd_cents = cost_per_image * num_images; + + ImageGenerationCostEstimate { + cost_in_credits: Some(cost_in_usd_cents), + cost_in_usd_cents: Some(cost_in_usd_cents), + is_free: false, + is_unlimited: false, + is_rate_limited: false, + has_watermark: false, + } +} diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/mod.rs index 04ceba2786..bf8324980b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/mod.rs @@ -1,5 +1,7 @@ pub(crate) mod estimate_image_cost_fal_flux_1_dev; pub(crate) mod estimate_image_cost_fal_flux_1_schnell; +pub(crate) mod estimate_image_cost_fal_flux_pro_1p1; +pub(crate) mod estimate_image_cost_fal_flux_pro_1p1_ultra; pub(crate) mod estimate_image_cost_fal_nano_banana; pub(crate) mod estimate_image_cost_fal_nano_banana_2; pub(crate) mod estimate_image_cost_fal_nano_banana_pro; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1.rs new file mode 100644 index 0000000000..9aaa5342ce --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1.rs @@ -0,0 +1,32 @@ +use crate::client::router_fal_client::RouterFalClient; +use crate::errors::artcraft_router_error::ArtcraftRouterError; +use crate::errors::provider_error::ProviderError; +use crate::generate::generate_image::generate_image_response::{ + FalImageResponsePayload, GenerateImageResponse, +}; +use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::PlanFalFluxPro11; +use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_text_to_image_webhook::{ + enqueue_flux_pro_11_text_to_image_webhook, FluxPro11Args, +}; + +pub async fn execute_fal_flux_pro_1p1( + plan: &PlanFalFluxPro11<'_>, + fal_client: &RouterFalClient, +) -> Result { + let args = FluxPro11Args { + prompt: plan.prompt.unwrap_or(""), + aspect_ratio: plan.aspect_ratio, + num_images: plan.num_images.to_fal(), + webhook_url: fal_client.webhook_url.as_str(), + api_key: &fal_client.api_key, + }; + + let webhook_response = enqueue_flux_pro_11_text_to_image_webhook(args) + .await + .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?; + + Ok(GenerateImageResponse::Fal(FalImageResponsePayload { + request_id: webhook_response.request_id, + gateway_request_id: webhook_response.gateway_request_id, + })) +} diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1_ultra.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1_ultra.rs new file mode 100644 index 0000000000..6cdc7ec97c --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1_ultra.rs @@ -0,0 +1,32 @@ +use crate::client::router_fal_client::RouterFalClient; +use crate::errors::artcraft_router_error::ArtcraftRouterError; +use crate::errors::provider_error::ProviderError; +use crate::generate::generate_image::generate_image_response::{ + FalImageResponsePayload, GenerateImageResponse, +}; +use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra; +use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_ultra_text_to_image_webhook::{ + enqueue_flux_pro_11_ultra_text_to_image_webhook, FluxPro11UltraArgs, +}; + +pub async fn execute_fal_flux_pro_1p1_ultra( + plan: &PlanFalFluxPro11Ultra<'_>, + fal_client: &RouterFalClient, +) -> Result { + let args = FluxPro11UltraArgs { + prompt: plan.prompt.unwrap_or(""), + aspect_ratio: plan.aspect_ratio, + num_images: plan.num_images.to_fal(), + webhook_url: fal_client.webhook_url.as_str(), + api_key: &fal_client.api_key, + }; + + let webhook_response = enqueue_flux_pro_11_ultra_text_to_image_webhook(args) + .await + .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?; + + Ok(GenerateImageResponse::Fal(FalImageResponsePayload { + request_id: webhook_response.request_id, + gateway_request_id: webhook_response.gateway_request_id, + })) +} diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/mod.rs index 2316648143..5bf13dc34b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/mod.rs @@ -1,5 +1,7 @@ pub mod generate_image_fal_flux_1_dev; pub mod generate_image_fal_flux_1_schnell; +pub mod generate_image_fal_flux_pro_1p1; +pub mod generate_image_fal_flux_pro_1p1_ultra; pub mod generate_image_fal_nano_banana; pub mod generate_image_fal_nano_banana_2; pub mod generate_image_fal_nano_banana_pro; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request.rs index 9807b01dbd..9a249f1093 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request.rs @@ -23,6 +23,8 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_5_lite::plan_generate_image_artcraft_seedream_5_lite; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_dev::plan_generate_image_fal_flux_1_dev; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_schnell::plan_generate_image_fal_flux_1_schnell; +use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::plan_generate_image_fal_flux_pro_1p1; +use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::plan_generate_image_fal_flux_pro_1p1_ultra; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana::plan_generate_image_fal_nano_banana; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_2::plan_generate_image_fal_nano_banana_2; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::plan_generate_image_fal_nano_banana_pro; @@ -106,6 +108,8 @@ impl<'a> GenerateImageRequest<'a> { match self.model { CommonImageModel::Flux1Dev => plan_generate_image_fal_flux_1_dev(self), CommonImageModel::Flux1Schnell => plan_generate_image_fal_flux_1_schnell(self), + CommonImageModel::FluxPro11 => plan_generate_image_fal_flux_pro_1p1(self), + CommonImageModel::FluxPro11Ultra => plan_generate_image_fal_flux_pro_1p1_ultra(self), CommonImageModel::NanoBanana => plan_generate_image_fal_nano_banana(self), CommonImageModel::NanoBanana2 => plan_generate_image_fal_nano_banana_2(self), CommonImageModel::NanoBananaPro => plan_generate_image_fal_nano_banana_pro(self), diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_plan.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_plan.rs index b9630ff27b..792a5db121 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_plan.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/image_generation_plan.rs @@ -15,6 +15,8 @@ use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraf use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_flux_2_lora_angles::estimate_image_cost_artcraft_flux_2_lora_angles; use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_1_dev::estimate_image_cost_fal_flux_1_dev; use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_1_schnell::estimate_image_cost_fal_flux_1_schnell; +use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_pro_1p1::estimate_image_cost_fal_flux_pro_1p1; +use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_pro_1p1_ultra::estimate_image_cost_fal_flux_pro_1p1_ultra; use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_nano_banana::estimate_image_cost_fal_nano_banana; use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_nano_banana_2::estimate_image_cost_fal_nano_banana_2; use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_nano_banana_pro::estimate_image_cost_fal_nano_banana_pro; @@ -33,6 +35,8 @@ use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_ use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_flux_2_lora_angles::execute_artcraft_flux_2_lora_angles; use crate::generate::generate_image::execute::fal::generate_image_fal_flux_1_dev::execute_fal_flux_1_dev; use crate::generate::generate_image::execute::fal::generate_image_fal_flux_1_schnell::execute_fal_flux_1_schnell; +use crate::generate::generate_image::execute::fal::generate_image_fal_flux_pro_1p1::execute_fal_flux_pro_1p1; +use crate::generate::generate_image::execute::fal::generate_image_fal_flux_pro_1p1_ultra::execute_fal_flux_pro_1p1_ultra; use crate::generate::generate_image::execute::fal::generate_image_fal_nano_banana::execute_fal_nano_banana; use crate::generate::generate_image::execute::fal::generate_image_fal_nano_banana_2::execute_fal_nano_banana_2; use crate::generate::generate_image::execute::fal::generate_image_fal_nano_banana_pro::execute_fal_nano_banana_pro; @@ -53,6 +57,8 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::PlanArtcraftFlux2LoraAngles; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_dev::PlanFalFlux1Dev; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_schnell::PlanFalFlux1Schnell; +use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::PlanFalFluxPro11; +use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana::PlanFalNanoBanana; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_2::PlanFalNanaBanana2; use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::PlanFalNanaBananaPro; @@ -74,6 +80,8 @@ pub enum ImageGenerationPlan<'a> { ArtcraftFlux2LoraAngles(PlanArtcraftFlux2LoraAngles<'a>), FalFlux1Dev(PlanFalFlux1Dev<'a>), FalFlux1Schnell(PlanFalFlux1Schnell<'a>), + FalFluxPro11(PlanFalFluxPro11<'a>), + FalFluxPro11Ultra(PlanFalFluxPro11Ultra<'a>), FalNanoBanana(PlanFalNanoBanana<'a>), FalNanaBanana2(PlanFalNanaBanana2<'a>), FalNanaBananaPro(PlanFalNanaBananaPro<'a>), @@ -145,6 +153,14 @@ impl<'a> ImageGenerationPlan<'a> { let fal_client = client.get_fal_client_ref()?; execute_fal_flux_1_schnell(plan, fal_client).await } + ImageGenerationPlan::FalFluxPro11(plan) => { + let fal_client = client.get_fal_client_ref()?; + execute_fal_flux_pro_1p1(plan, fal_client).await + } + ImageGenerationPlan::FalFluxPro11Ultra(plan) => { + let fal_client = client.get_fal_client_ref()?; + execute_fal_flux_pro_1p1_ultra(plan, fal_client).await + } ImageGenerationPlan::FalNanoBanana(plan) => { let fal_client = client.get_fal_client_ref()?; execute_fal_nano_banana(plan, fal_client).await @@ -207,6 +223,12 @@ impl<'a> ImageGenerationPlan<'a> { ImageGenerationPlan::FalFlux1Schnell(plan) => { estimate_image_cost_fal_flux_1_schnell(plan) } + ImageGenerationPlan::FalFluxPro11(plan) => { + estimate_image_cost_fal_flux_pro_1p1(plan) + } + ImageGenerationPlan::FalFluxPro11Ultra(plan) => { + estimate_image_cost_fal_flux_pro_1p1_ultra(plan) + } ImageGenerationPlan::FalNanoBanana(plan) => { estimate_image_cost_fal_nano_banana(plan) } diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/mod.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/mod.rs index ede63ac3c9..08d536a5fa 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/mod.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/mod.rs @@ -1,5 +1,7 @@ pub mod plan_generate_image_fal_flux_1_dev; pub mod plan_generate_image_fal_flux_1_schnell; +pub mod plan_generate_image_fal_flux_pro_1p1; +pub mod plan_generate_image_fal_flux_pro_1p1_ultra; pub mod plan_generate_image_fal_nano_banana; pub mod plan_generate_image_fal_nano_banana_2; pub mod plan_generate_image_fal_nano_banana_pro; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_flux_pro_1p1.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_flux_pro_1p1.rs new file mode 100644 index 0000000000..13a5aedf7a --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_flux_pro_1p1.rs @@ -0,0 +1,127 @@ +use crate::api::common_aspect_ratio::CommonAspectRatio; +use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; +use crate::errors::artcraft_router_error::ArtcraftRouterError; +use crate::errors::client_error::ClientError; +use crate::generate::generate_image::generate_image_request::GenerateImageRequest; +use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan; +use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_text_to_image_webhook::{ + FluxPro11AspectRatio, FluxPro11NumImages, +}; + +#[derive(Debug, Clone, Copy)] +pub enum FalFluxPro11NumImages { + One, + Two, + Three, + Four, +} + +#[derive(Debug, Clone)] +pub struct PlanFalFluxPro11<'a> { + pub prompt: Option<&'a str>, + pub aspect_ratio: FluxPro11AspectRatio, + pub num_images: FalFluxPro11NumImages, +} + +pub fn plan_generate_image_fal_flux_pro_1p1<'a>( + request: &'a GenerateImageRequest<'a>, +) -> Result, ArtcraftRouterError> { + let strategy = request.request_mismatch_mitigation_strategy; + + if request.image_inputs.is_some() { + return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { + field: "image_inputs", + value: "Flux Pro 1.1 is text-to-image only".to_string(), + })); + } + + let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?; + let num_images = plan_num_images(request.image_batch_count, strategy)?; + + Ok(ImageGenerationPlan::FalFluxPro11(PlanFalFluxPro11 { + prompt: request.prompt, + aspect_ratio, + num_images, + })) +} + +fn plan_aspect_ratio( + aspect_ratio: Option, + strategy: RequestMismatchMitigationStrategy, +) -> Result { + use FluxPro11AspectRatio as Ar; + match aspect_ratio { + None => Ok(Ar::Square), + + Some(CommonAspectRatio::Auto) + | Some(CommonAspectRatio::Auto2k) + | Some(CommonAspectRatio::Auto4k) => Ok(Ar::Square), + + Some(CommonAspectRatio::Square) => Ok(Ar::Square), + Some(CommonAspectRatio::SquareHd) => Ok(Ar::SquareHd), + Some(CommonAspectRatio::WideFourByThree) => Ok(Ar::LandscapeFourByThree), + Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Ar::LandscapeSixteenByNine), + Some(CommonAspectRatio::TallThreeByFour) => Ok(Ar::PortraitThreeByFour), + Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Ar::PortraitNineBySixteen), + + Some(CommonAspectRatio::WideFiveByFour) => Ok(Ar::LandscapeFourByThree), + Some(CommonAspectRatio::WideThreeByTwo) => Ok(Ar::LandscapeFourByThree), + Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Ar::LandscapeSixteenByNine), + Some(CommonAspectRatio::TallFourByFive) => Ok(Ar::PortraitThreeByFour), + Some(CommonAspectRatio::TallTwoByThree) => Ok(Ar::PortraitThreeByFour), + Some(CommonAspectRatio::TallNineByTwentyOne) => Ok(Ar::PortraitNineBySixteen), + + Some(unsupported) => match strategy { + RequestMismatchMitigationStrategy::ErrorOut => { + Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { + field: "aspect_ratio", + value: format!("{:?}", unsupported), + })) + } + _ => Ok(Ar::Square), + }, + } +} + +fn plan_num_images( + image_batch_count: Option, + strategy: RequestMismatchMitigationStrategy, +) -> Result { + let count = image_batch_count.unwrap_or(1); + match count { + 0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)), + 1 => Ok(FalFluxPro11NumImages::One), + 2 => Ok(FalFluxPro11NumImages::Two), + 3 => Ok(FalFluxPro11NumImages::Three), + 4 => Ok(FalFluxPro11NumImages::Four), + _ => match strategy { + RequestMismatchMitigationStrategy::ErrorOut => { + Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { + field: "image_batch_count", + value: format!("{}", count), + })) + } + _ => Ok(FalFluxPro11NumImages::Four), + }, + } +} + +impl FalFluxPro11NumImages { + pub fn to_fal(self) -> FluxPro11NumImages { + match self { + Self::One => FluxPro11NumImages::One, + Self::Two => FluxPro11NumImages::Two, + Self::Three => FluxPro11NumImages::Three, + Self::Four => FluxPro11NumImages::Four, + } + } + + pub fn as_u64(self) -> u64 { + match self { + Self::One => 1, + Self::Two => 2, + Self::Three => 3, + Self::Four => 4, + } + } +} diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_flux_pro_1p1_ultra.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_flux_pro_1p1_ultra.rs new file mode 100644 index 0000000000..d8355de052 --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_flux_pro_1p1_ultra.rs @@ -0,0 +1,126 @@ +use crate::api::common_aspect_ratio::CommonAspectRatio; +use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy; +use crate::errors::artcraft_router_error::ArtcraftRouterError; +use crate::errors::client_error::ClientError; +use crate::generate::generate_image::generate_image_request::GenerateImageRequest; +use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan; +use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_ultra_text_to_image_webhook::{ + FluxPro11UltraAspectRatio, FluxPro11UltraNumImages, +}; + +#[derive(Debug, Clone, Copy)] +pub enum FalFluxPro11UltraNumImages { + One, + Two, + Three, + Four, +} + +#[derive(Debug, Clone)] +pub struct PlanFalFluxPro11Ultra<'a> { + pub prompt: Option<&'a str>, + pub aspect_ratio: FluxPro11UltraAspectRatio, + pub num_images: FalFluxPro11UltraNumImages, +} + +pub fn plan_generate_image_fal_flux_pro_1p1_ultra<'a>( + request: &'a GenerateImageRequest<'a>, +) -> Result, ArtcraftRouterError> { + let strategy = request.request_mismatch_mitigation_strategy; + + if request.image_inputs.is_some() { + return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { + field: "image_inputs", + value: "Flux Pro 1.1 Ultra is text-to-image only".to_string(), + })); + } + + let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?; + let num_images = plan_num_images(request.image_batch_count, strategy)?; + + Ok(ImageGenerationPlan::FalFluxPro11Ultra(PlanFalFluxPro11Ultra { + prompt: request.prompt, + aspect_ratio, + num_images, + })) +} + +fn plan_aspect_ratio( + aspect_ratio: Option, + strategy: RequestMismatchMitigationStrategy, +) -> Result { + use FluxPro11UltraAspectRatio as Ar; + match aspect_ratio { + None => Ok(Ar::Square), + + Some(CommonAspectRatio::Auto) + | Some(CommonAspectRatio::Auto2k) + | Some(CommonAspectRatio::Auto4k) => Ok(Ar::Square), + + Some(CommonAspectRatio::Square) | Some(CommonAspectRatio::SquareHd) => Ok(Ar::Square), + Some(CommonAspectRatio::WideFourByThree) => Ok(Ar::LandscapeFourByThree), + Some(CommonAspectRatio::WideThreeByTwo) => Ok(Ar::LandscapeThreeByTwo), + Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => Ok(Ar::LandscapeSixteenByNine), + Some(CommonAspectRatio::WideTwentyOneByNine) => Ok(Ar::LandscapeTwentyOneByNine), + Some(CommonAspectRatio::TallThreeByFour) => Ok(Ar::PortraitThreeByFour), + Some(CommonAspectRatio::TallTwoByThree) => Ok(Ar::PortraitTwoByThree), + Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => Ok(Ar::PortraitNineBySixteen), + Some(CommonAspectRatio::TallNineByTwentyOne) => Ok(Ar::PortraitNineByTwentyOne), + + Some(CommonAspectRatio::WideFiveByFour) => Ok(Ar::LandscapeFourByThree), + Some(CommonAspectRatio::TallFourByFive) => Ok(Ar::PortraitThreeByFour), + + Some(unsupported) => match strategy { + RequestMismatchMitigationStrategy::ErrorOut => { + Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { + field: "aspect_ratio", + value: format!("{:?}", unsupported), + })) + } + _ => Ok(Ar::Square), + }, + } +} + +fn plan_num_images( + image_batch_count: Option, + strategy: RequestMismatchMitigationStrategy, +) -> Result { + let count = image_batch_count.unwrap_or(1); + match count { + 0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)), + 1 => Ok(FalFluxPro11UltraNumImages::One), + 2 => Ok(FalFluxPro11UltraNumImages::Two), + 3 => Ok(FalFluxPro11UltraNumImages::Three), + 4 => Ok(FalFluxPro11UltraNumImages::Four), + _ => match strategy { + RequestMismatchMitigationStrategy::ErrorOut => { + Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { + field: "image_batch_count", + value: format!("{}", count), + })) + } + _ => Ok(FalFluxPro11UltraNumImages::Four), + }, + } +} + +impl FalFluxPro11UltraNumImages { + pub fn to_fal(self) -> FluxPro11UltraNumImages { + match self { + Self::One => FluxPro11UltraNumImages::One, + Self::Two => FluxPro11UltraNumImages::Two, + Self::Three => FluxPro11UltraNumImages::Three, + Self::Four => FluxPro11UltraNumImages::Four, + } + } + + pub fn as_u64(self) -> u64 { + match self { + Self::One => 1, + Self::Two => 2, + Self::Three => 3, + Self::Four => 4, + } + } +} diff --git a/crates/api_clients/fal_client/src/requests/webhook/image/text/enqueue_flux_pro_11_text_to_image_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/text/enqueue_flux_pro_11_text_to_image_webhook.rs index 7dd3d34163..999addf0c4 100644 --- a/crates/api_clients/fal_client/src/requests/webhook/image/text/enqueue_flux_pro_11_text_to_image_webhook.rs +++ b/crates/api_clients/fal_client/src/requests/webhook/image/text/enqueue_flux_pro_11_text_to_image_webhook.rs @@ -37,8 +37,9 @@ pub enum FluxPro11NumImages { impl FalRequestCostCalculator for FluxPro11Args<'_, U> { fn calculate_cost_in_cents(&self) -> UsdCents { - // Your request will cost $0.04 per megapixel. -- NB: What? Not going to calculate that. - let base_cost = 6; + // Your request will cost $0.04 per megapixel, billed by rounding up to the nearest + // megapixel. Default image_size values are ~1MP, so 4 cents per image. + let base_cost = 4; let cost = match self.num_images { FluxPro11NumImages::One => base_cost, FluxPro11NumImages::Two => base_cost * 2, diff --git a/crates/service/web/storyteller_web/src/configs/omni_gen/image_models.rs b/crates/service/web/storyteller_web/src/configs/omni_gen/image_models.rs index 2d8f7bee8f..8af17228b2 100644 --- a/crates/service/web/storyteller_web/src/configs/omni_gen/image_models.rs +++ b/crates/service/web/storyteller_web/src/configs/omni_gen/image_models.rs @@ -56,7 +56,46 @@ fn build_omni_gen_image_models() -> Vec { ..Default::default() }); - // ... + models.push(OmniGenImageModelDetails { + model: CommonImageModel::FluxPro11, + full_name: Some("FLUX 1.1 [pro]".to_string()), + text_prompt_supported: Some(true), + aspect_ratio_options: Some(vec![ + CommonAspectRatio::SquareHd, + CommonAspectRatio::Square, + CommonAspectRatio::TallThreeByFour, + CommonAspectRatio::TallNineBySixteen, + CommonAspectRatio::WideFourByThree, + CommonAspectRatio::WideSixteenByNine, + ]), + aspect_ratio_default: Some(CommonAspectRatio::Square), + batch_size_min: Some(1), + batch_size_max: Some(4), + batch_size_default: Some(1), + ..Default::default() + }); + + models.push(OmniGenImageModelDetails { + model: CommonImageModel::FluxPro11Ultra, + full_name: Some("FLUX 1.1 [pro] ultra".to_string()), + text_prompt_supported: Some(true), + aspect_ratio_options: Some(vec![ + CommonAspectRatio::Square, + CommonAspectRatio::WideTwentyOneByNine, + CommonAspectRatio::WideSixteenByNine, + CommonAspectRatio::WideThreeByTwo, + CommonAspectRatio::WideFourByThree, + CommonAspectRatio::TallThreeByFour, + CommonAspectRatio::TallTwoByThree, + CommonAspectRatio::TallNineBySixteen, + CommonAspectRatio::TallNineByTwentyOne, + ]), + aspect_ratio_default: Some(CommonAspectRatio::Square), + batch_size_min: Some(1), + batch_size_max: Some(4), + batch_size_default: Some(1), + ..Default::default() + }); models.push(OmniGenImageModelDetails { model: CommonImageModel::NanoBanana, // NB: currently Gemini25Flash in our system @@ -166,6 +205,14 @@ fn build_omni_gen_image_model_providers() -> Vec