From 7eedc347860222d2ab5498985e95a47de10505cb Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 29 Dec 2025 23:02:53 -0500 Subject: [PATCH] aspect ratio controls in tauri --- .../aspect_ratio/common_aspect_ratio.rs | 25 +++++++++++++ ...spect_ratio_to_artcraft_nano_banana_pro.rs | 23 ++++++++++++ .../api_adapters/aspect_ratio/convert/mod.rs | 1 + .../src/core/api_adapters/aspect_ratio/mod.rs | 2 + .../artcraft/src/core/api_adapters/mod.rs | 1 + .../src/core/commands/enqueue/common/mod.rs | 4 +- .../handle_artcraft_nano_banana_pro_edit.rs | 37 +++++++++++++------ .../image_edit/enqueue_edit_image_command.rs | 6 +++ ..._artcraft_nano_banana_pro_text_to_image.rs | 31 ++++++++++++---- .../enqueue_text_to_image_command.rs | 6 +++ crates/desktop/artcraft/src/core/mod.rs | 1 + 11 files changed, 116 insertions(+), 21 deletions(-) create mode 100644 crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/common_aspect_ratio.rs create mode 100644 crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/convert/aspect_ratio_to_artcraft_nano_banana_pro.rs create mode 100644 crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/convert/mod.rs create mode 100644 crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/mod.rs create mode 100644 crates/desktop/artcraft/src/core/api_adapters/mod.rs diff --git a/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/common_aspect_ratio.rs b/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/common_aspect_ratio.rs new file mode 100644 index 0000000000..c61910bd1f --- /dev/null +++ b/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/common_aspect_ratio.rs @@ -0,0 +1,25 @@ +use serde_derive::{Deserialize, Serialize}; + +/// This is a comprehensive list of common aspect ratios. +/// Not every model will support every aspect ratio. +/// In the case a model doesn't support the aspect ratio, pick the nearest option. +#[derive(Copy, Clone, Debug, Serialize, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum CommonAspectRatio { + // Auto (eg. for image editing to use the source; used by Nano Banana Pro edit image, but not text-to-image) + Auto, + // Square + Square, + // Wide + WideFiveByFour, + WideFourByThree, + WideThreeByTwo, + WideSixteenByNine, + WideTwentyOneByNine, + // Tall + TallFourByFive, + TallThreeByFour, + TallTwoByThree, + TallNineBySixteen, + TallNineByTwentyOne, +} diff --git a/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/convert/aspect_ratio_to_artcraft_nano_banana_pro.rs b/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/convert/aspect_ratio_to_artcraft_nano_banana_pro.rs new file mode 100644 index 0000000000..a784aadabc --- /dev/null +++ b/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/convert/aspect_ratio_to_artcraft_nano_banana_pro.rs @@ -0,0 +1,23 @@ +use crate::core::api_adapters::aspect_ratio::common_aspect_ratio::CommonAspectRatio; +use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::NanoBananaProMultiFunctionImageGenAspectRatio; + +pub fn aspect_ratio_to_artcraft_nano_banana_pro(aspect_ratio: CommonAspectRatio) -> NanoBananaProMultiFunctionImageGenAspectRatio { + match aspect_ratio { + // Exact + CommonAspectRatio::Square => NanoBananaProMultiFunctionImageGenAspectRatio::OneByOne, + CommonAspectRatio::WideFiveByFour => NanoBananaProMultiFunctionImageGenAspectRatio::FiveByFour, + CommonAspectRatio::WideFourByThree => NanoBananaProMultiFunctionImageGenAspectRatio::FourByThree, + CommonAspectRatio::WideThreeByTwo => NanoBananaProMultiFunctionImageGenAspectRatio::ThreeByTwo, + CommonAspectRatio::WideSixteenByNine => NanoBananaProMultiFunctionImageGenAspectRatio::SixteenByNine, + CommonAspectRatio::WideTwentyOneByNine => NanoBananaProMultiFunctionImageGenAspectRatio::TwentyOneByNine, + CommonAspectRatio::TallFourByFive => NanoBananaProMultiFunctionImageGenAspectRatio::FourByFive, + CommonAspectRatio::TallThreeByFour => NanoBananaProMultiFunctionImageGenAspectRatio::ThreeByFour, + CommonAspectRatio::TallTwoByThree => NanoBananaProMultiFunctionImageGenAspectRatio::TwoByThree, + CommonAspectRatio::TallNineBySixteen => NanoBananaProMultiFunctionImageGenAspectRatio::NineBySixteen, + // Special + // NB: this is only for image-to-image editing, not text-to-image. + CommonAspectRatio::Auto => NanoBananaProMultiFunctionImageGenAspectRatio::Auto, + // NB: "9:21" value does not exist. Interpolated. + CommonAspectRatio::TallNineByTwentyOne => NanoBananaProMultiFunctionImageGenAspectRatio::NineBySixteen, + } +} diff --git a/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/convert/mod.rs b/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/convert/mod.rs new file mode 100644 index 0000000000..7cd722714f --- /dev/null +++ b/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/convert/mod.rs @@ -0,0 +1 @@ +pub mod aspect_ratio_to_artcraft_nano_banana_pro; \ No newline at end of file diff --git a/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/mod.rs b/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/mod.rs new file mode 100644 index 0000000000..9dbd41f347 --- /dev/null +++ b/crates/desktop/artcraft/src/core/api_adapters/aspect_ratio/mod.rs @@ -0,0 +1,2 @@ +pub mod common_aspect_ratio; +pub mod convert; diff --git a/crates/desktop/artcraft/src/core/api_adapters/mod.rs b/crates/desktop/artcraft/src/core/api_adapters/mod.rs new file mode 100644 index 0000000000..02401adae4 --- /dev/null +++ b/crates/desktop/artcraft/src/core/api_adapters/mod.rs @@ -0,0 +1 @@ +pub mod aspect_ratio; \ No newline at end of file diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/common/mod.rs b/crates/desktop/artcraft/src/core/commands/enqueue/common/mod.rs index 2ad065a846..d81449e79c 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/common/mod.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/common/mod.rs @@ -1,3 +1,3 @@ -pub mod notify_frontend_of_errors; mod maybe_notify_frontend_of_billing_errors; -mod maybe_notify_frontend_of_grok_errors; \ No newline at end of file +mod maybe_notify_frontend_of_grok_errors; +pub mod notify_frontend_of_errors; \ No newline at end of file diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_nano_banana_pro_edit.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_nano_banana_pro_edit.rs index 3af27c4cfb..0bec15e383 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_nano_banana_pro_edit.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/artcraft/handle_artcraft_nano_banana_pro_edit.rs @@ -1,6 +1,9 @@ +use crate::core::api_adapters::aspect_ratio::convert::aspect_ratio_to_artcraft_nano_banana_pro::aspect_ratio_to_artcraft_nano_banana_pro; use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; +use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::ImageEditModel::NanoBanana; use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageResolution, EditImageSize, EnqueueEditImageCommand}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; +use crate::core::commands::enqueue::text_to_image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, TextToImageSize}; use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider}; use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent; @@ -18,6 +21,7 @@ use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::Gener use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest; use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest; use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest; +use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::{NanoBananaProMultiFunctionImageGenAspectRatio, NanoBananaProMultiFunctionImageGenImageResolution, NanoBananaProMultiFunctionImageGenNumImages, NanoBananaProMultiFunctionImageGenRequest}; use enums::common::generation_provider::GenerationProvider; use enums::tauri::tasks::task_type::TaskType; use idempotency::uuid::generate_random_uuid; @@ -25,10 +29,8 @@ use log::{error, info}; use storyteller_client::endpoints::generate::image::edit::flux_pro_kontext_max_edit_image::flux_pro_kontext_max_edit_image; use storyteller_client::endpoints::generate::image::edit::gemini_25_flash_edit_image::gemini_25_flash_edit_image; use storyteller_client::endpoints::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image; -use tauri::AppHandle; -use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::{NanoBananaProMultiFunctionImageGenAspectRatio, NanoBananaProMultiFunctionImageGenImageResolution, NanoBananaProMultiFunctionImageGenNumImages, NanoBananaProMultiFunctionImageGenRequest}; use storyteller_client::endpoints::generate::image::multi_function::nano_banana_pro_multi_function_image_gen_image::nano_banana_pro_multi_function_image_gen; -use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::ImageEditModel::NanoBanana; +use tauri::AppHandle; pub(super) const MAX_IMAGES: usize = 10; @@ -66,14 +68,7 @@ pub async fn handle_artcraft_nano_banana_pro_edit( }, }; - let aspect_ratio = request.aspect_ratio - .map(|aspect_ratio| match aspect_ratio { - EditImageSize::Auto => None, - EditImageSize::Square => Some(NanoBananaProMultiFunctionImageGenAspectRatio::OneByOne), - EditImageSize::Wide => Some(NanoBananaProMultiFunctionImageGenAspectRatio::SixteenByNine), - EditImageSize::Tall => Some(NanoBananaProMultiFunctionImageGenAspectRatio::NineBySixteen), - }) - .flatten(); + let aspect_ratio = get_aspect_ratio(request); let resolution = request.image_resolution .map(|image_resolution| match image_resolution { @@ -135,3 +130,23 @@ pub async fn handle_artcraft_nano_banana_pro_edit( task_type: TaskType::ImageGeneration, }) } + +fn get_aspect_ratio(request: &EnqueueEditImageCommand) -> Option { + if let Some(common_aspect_ratio) = request.common_aspect_ratio { + // Handle modern aspect ratio + let aspect = aspect_ratio_to_artcraft_nano_banana_pro(common_aspect_ratio); + return Some(aspect); + } + + if let Some(aspect_ratio) = request.aspect_ratio { + // Handle deprecated aspect ratio + return match aspect_ratio { + EditImageSize::Auto => Some(NanoBananaProMultiFunctionImageGenAspectRatio::Auto), + EditImageSize::Square => Some(NanoBananaProMultiFunctionImageGenAspectRatio::OneByOne), + EditImageSize::Wide => Some(NanoBananaProMultiFunctionImageGenAspectRatio::SixteenByNine), + EditImageSize::Tall => Some(NanoBananaProMultiFunctionImageGenAspectRatio::NineBySixteen), + } + } + + None +} diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs index 7e6fd0d75a..d740ec276b 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_edit/enqueue_edit_image_command.rs @@ -1,3 +1,4 @@ +use crate::core::api_adapters::aspect_ratio::common_aspect_ratio::CommonAspectRatio; use crate::core::commands::enqueue::common::notify_frontend_of_errors::notify_frontend_of_errors; use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError}; use crate::core::commands::enqueue::image_edit::artcraft::handle_image_edit_artcraft::handle_image_edit_artcraft; @@ -108,8 +109,13 @@ pub struct EnqueueEditImageCommand { pub image_count: Option, /// Aspect ratio. + #[deprecated(note="use common_aspect_ratio")] pub aspect_ratio: Option, + /// New field for aspect ratio. + /// Not all models support each of these aspect ratios, but we can choose or interpolate sensibly. + pub common_aspect_ratio: Option, + /// Image quality. pub image_quality: Option, diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_nano_banana_pro_text_to_image.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_nano_banana_pro_text_to_image.rs index 0e6d6d6324..ab60e53a23 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_nano_banana_pro_text_to_image.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/artcraft/handle_artcraft_nano_banana_pro_text_to_image.rs @@ -1,3 +1,5 @@ +use crate::core::api_adapters::aspect_ratio::common_aspect_ratio::CommonAspectRatio; +use crate::core::api_adapters::aspect_ratio::convert::aspect_ratio_to_artcraft_nano_banana_pro::aspect_ratio_to_artcraft_nano_banana_pro; use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError, MissingCredentialsReason, ProviderFailureReason}; use crate::core::commands::enqueue::image_edit::enqueue_edit_image_command::{EditImageQuality, EditImageResolution, EditImageSize}; use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess; @@ -58,14 +60,7 @@ pub async fn handle_artcraft_nano_banana_pro_text_to_image( }, }; - let aspect_ratio = request.aspect_ratio - .map(|aspect_ratio| match aspect_ratio { - TextToImageSize::Auto => None, - TextToImageSize::Square => Some(NanoBananaProMultiFunctionImageGenAspectRatio::OneByOne), - TextToImageSize::Wide => Some(NanoBananaProMultiFunctionImageGenAspectRatio::SixteenByNine), - TextToImageSize::Tall => Some(NanoBananaProMultiFunctionImageGenAspectRatio::NineBySixteen), - }) - .flatten(); + let aspect_ratio = get_aspect_ratio(request); let resolution = request.image_resolution .map(|image_resolution| match image_resolution { @@ -109,3 +104,23 @@ pub async fn handle_artcraft_nano_banana_pro_text_to_image( task_type: TaskType::ImageGeneration, }) } + +fn get_aspect_ratio(request: &EnqueueTextToImageRequest) -> Option { + if let Some(common_aspect_ratio) = request.common_aspect_ratio { + // Handle modern aspect ratio + let aspect = aspect_ratio_to_artcraft_nano_banana_pro(common_aspect_ratio); + return Some(aspect); + } + + if let Some(aspect_ratio) = request.aspect_ratio { + // Handle deprecated aspect ratio + return match aspect_ratio { + TextToImageSize::Auto => Some(NanoBananaProMultiFunctionImageGenAspectRatio::Auto), + TextToImageSize::Square => Some(NanoBananaProMultiFunctionImageGenAspectRatio::OneByOne), + TextToImageSize::Wide => Some(NanoBananaProMultiFunctionImageGenAspectRatio::SixteenByNine), + TextToImageSize::Tall => Some(NanoBananaProMultiFunctionImageGenAspectRatio::NineBySixteen), + } + } + + None +} diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs index 947d607fbc..1c0153ef69 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/text_to_image/enqueue_text_to_image_command.rs @@ -34,6 +34,7 @@ use serde::{Deserialize, Serialize}; use sqlite_tasks::queries::create_task::{create_task, CreateTaskArgs}; use tauri::{AppHandle, State}; use tokens::tokens::media_files::MediaFileToken; +use crate::core::api_adapters::aspect_ratio::common_aspect_ratio::CommonAspectRatio; /// This is used in the Tauri command bridge. /// Don't change the serializations without coordinating with the frontend. @@ -86,7 +87,12 @@ pub struct EnqueueTextToImageRequest { pub prompt: Option, /// Aspect ratio. + #[deprecated(note="use common_aspect_ratio")] pub aspect_ratio: Option, + + /// New field for aspect ratio. + /// Not all models support each of these aspect ratios, but we can choose or interpolate sensibly. + pub common_aspect_ratio: Option, /// Aspect ratio. pub image_resolution: Option, diff --git a/crates/desktop/artcraft/src/core/mod.rs b/crates/desktop/artcraft/src/core/mod.rs index e2998e8f92..810a551526 100644 --- a/crates/desktop/artcraft/src/core/mod.rs +++ b/crates/desktop/artcraft/src/core/mod.rs @@ -1,3 +1,4 @@ +pub mod api_adapters; pub mod artcraft_error; pub mod commands; pub mod events;