diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs index 1745003198..3a115d8dba 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs @@ -14,6 +14,7 @@ use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation_provider::GenerationProvider; use enums::common::generation::common_model_type::CommonModelType; use enums::common::visibility::Visibility; +use enums::common::generation::common_aspect_ratio::CommonAspectRatio; use enums::common::generation::common_generation_mode::CommonGenerationMode; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::angle::enqueue_flux_2_lora_edit_image_angle_webhook::{enqueue_flux_2_lora_edit_image_angle_webhook, EnqueueFlux2LoraEditImageAngleArgs, EnqueueFlux2LoraAngleNumImages, EnqueueFlux2LoraAngleImageSize}; @@ -175,9 +176,21 @@ pub async fn flux_2_lora_edit_image_angle_handler( maybe_negative_prompt: None, maybe_other_args: None, maybe_generation_mode: Some(CommonGenerationMode::Edit), - maybe_aspect_ratio: None, + maybe_aspect_ratio: request.image_size.map(|size| match size { + Flux2LoraEditImageAngleImageSize::Square => CommonAspectRatio::Square, + Flux2LoraEditImageAngleImageSize::SquareHd => CommonAspectRatio::SquareHd, + Flux2LoraEditImageAngleImageSize::PortraitFourThree => CommonAspectRatio::TallThreeByFour, + Flux2LoraEditImageAngleImageSize::PortraitSixteenNine => CommonAspectRatio::TallNineBySixteen, + Flux2LoraEditImageAngleImageSize::LandscapeFourThree => CommonAspectRatio::WideFourByThree, + Flux2LoraEditImageAngleImageSize::LandscapeSixteenNine => CommonAspectRatio::WideSixteenByNine, + }), maybe_resolution: None, - maybe_batch_count: None, + maybe_batch_count: request.num_images.map(|n| match n { + Flux2LoraEditImageAngleNumImages::One => 1, + Flux2LoraEditImageAngleNumImages::Two => 2, + Flux2LoraEditImageAngleNumImages::Three => 3, + Flux2LoraEditImageAngleNumImages::Four => 4, + }), maybe_generate_audio: None, creator_ip_address: &ip_address, mysql_executor: &mut *transaction, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs index e1f2c08dad..ec947bbc5e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs @@ -14,6 +14,7 @@ use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation_provider::GenerationProvider; use enums::common::generation::common_model_type::CommonModelType; use enums::common::visibility::Visibility; +use enums::common::generation::common_aspect_ratio::CommonAspectRatio; use enums::common::generation::common_generation_mode::CommonGenerationMode; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; use fal_client::requests::webhook::image::angle::enqueue_qwen_edit_2511_edit_image_angle_webhook::{enqueue_qwen_edit_2511_edit_image_angle_webhook, EnqueueQwenEdit2511EditImageAngleArgs, EnqueueQwenEdit2511AngleNumImages, EnqueueQwenEdit2511AngleImageSize}; @@ -176,9 +177,21 @@ pub async fn qwen_edit_2511_edit_image_angle_handler( maybe_negative_prompt: None, maybe_other_args: None, maybe_generation_mode: Some(CommonGenerationMode::Edit), - maybe_aspect_ratio: None, + maybe_aspect_ratio: request.image_size.map(|size| match size { + QwenEdit2511EditImageAngleImageSize::Square => CommonAspectRatio::Square, + QwenEdit2511EditImageAngleImageSize::SquareHd => CommonAspectRatio::SquareHd, + QwenEdit2511EditImageAngleImageSize::PortraitFourThree => CommonAspectRatio::TallThreeByFour, + QwenEdit2511EditImageAngleImageSize::PortraitSixteenNine => CommonAspectRatio::TallNineBySixteen, + QwenEdit2511EditImageAngleImageSize::LandscapeFourThree => CommonAspectRatio::WideFourByThree, + QwenEdit2511EditImageAngleImageSize::LandscapeSixteenNine => CommonAspectRatio::WideSixteenByNine, + }), maybe_resolution: None, - maybe_batch_count: None, + maybe_batch_count: request.num_images.map(|n| match n { + QwenEdit2511EditImageAngleNumImages::One => 1, + QwenEdit2511EditImageAngleNumImages::Two => 2, + QwenEdit2511EditImageAngleNumImages::Three => 3, + QwenEdit2511EditImageAngleNumImages::Four => 4, + }), maybe_generate_audio: None, creator_ip_address: &ip_address, mysql_executor: &mut *transaction, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs index 9ac6640d3a..4853509af2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs @@ -221,7 +221,12 @@ pub async fn flux_dev_juggernaut_inpaint_image_handler( maybe_generation_mode: Some(CommonGenerationMode::Inpaint), maybe_aspect_ratio: None, maybe_resolution: None, - maybe_batch_count: None, + maybe_batch_count: request.num_images.map(|n| match n { + FluxDevJuggernautInpaintImageNumImages::One => 1, + FluxDevJuggernautInpaintImageNumImages::Two => 2, + FluxDevJuggernautInpaintImageNumImages::Three => 3, + FluxDevJuggernautInpaintImageNumImages::Four => 4, + }), maybe_generate_audio: None, creator_ip_address: &ip_address, mysql_executor: &mut *transaction, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs index 314effd5ec..8f712b2b88 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs @@ -221,7 +221,12 @@ pub async fn flux_pro_1_inpaint_image_handler( maybe_generation_mode: Some(CommonGenerationMode::Inpaint), maybe_aspect_ratio: None, maybe_resolution: None, - maybe_batch_count: None, + maybe_batch_count: request.num_images.map(|n| match n { + FluxPro1InpaintImageNumImages::One => 1, + FluxPro1InpaintImageNumImages::Two => 2, + FluxPro1InpaintImageNumImages::Three => 3, + FluxPro1InpaintImageNumImages::Four => 4, + }), maybe_generate_audio: None, creator_ip_address: &ip_address, mysql_executor: &mut *transaction,