diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs index 3d89054c2b..0cf0b57423 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs @@ -10,7 +10,7 @@ use enums::common::generation_provider::GenerationProvider; pub const ESTIMATE_IMAGE_COST_PATH: &str = "/v1/generate/cost_estimate/image"; /// Request body for the image cost estimate endpoint. -#[derive(Serialize, Deserialize, ToSchema)] +#[derive(Serialize, Deserialize, ToSchema, Debug)] pub struct EstimateImageCostRequest { /// The image model to estimate costs for. pub model: CommonImageModel, @@ -38,7 +38,7 @@ pub struct EstimateImageCostRequest { } /// Describes the type of image generation being requested. -#[derive(Serialize, Deserialize, ToSchema)] +#[derive(Serialize, Deserialize, ToSchema, Debug)] #[serde(tag = "type", rename_all = "snake_case")] pub enum GenerationMode { /// No input images — generate from prompt only. diff --git a/crates/desktop/artcraft/src/core/commands/cost_estimate/estimate_image_cost_command.rs b/crates/desktop/artcraft/src/core/commands/cost_estimate/estimate_image_cost_command.rs index 086e8acf8b..7c32ac0dea 100644 --- a/crates/desktop/artcraft/src/core/commands/cost_estimate/estimate_image_cost_command.rs +++ b/crates/desktop/artcraft/src/core/commands/cost_estimate/estimate_image_cost_command.rs @@ -17,7 +17,7 @@ pub async fn estimate_image_cost_command( request: EstimateImageCostRequest, app_env_configs: State<'_, AppEnvConfigs>, ) -> ResponseOrError { - debug!("estimate_image_cost_command called"); + info!("estimate_image_cost_command called: {:?}", request); let result = estimate_image_cost( &app_env_configs.storyteller_host, diff --git a/frontend/libs/api-enums/src/lib/common/generation/CommonImageModel.ts b/frontend/libs/api-enums/src/lib/common/generation/CommonImageModel.ts index 425a515cba..4a92dda42d 100644 --- a/frontend/libs/api-enums/src/lib/common/generation/CommonImageModel.ts +++ b/frontend/libs/api-enums/src/lib/common/generation/CommonImageModel.ts @@ -9,6 +9,7 @@ export enum CommonImageModel { FluxPro11Ultra = "flux_pro_1p1_ultra", GptImage1 = "gpt_image_1", GptImage1p5 = "gpt_image_1p5", + GptImage2 = "gpt_image_2", NanaBanana = "nano_banana", NanaBanana2 = "nano_banana_2", NanaBananaPro = "nano_banana_pro", diff --git a/frontend/libs/components/pricing-modal/src/lib/convert/imageModelToCommonImageModel.ts b/frontend/libs/components/pricing-modal/src/lib/convert/imageModelToCommonImageModel.ts index 9db84918ba..f77934a630 100644 --- a/frontend/libs/components/pricing-modal/src/lib/convert/imageModelToCommonImageModel.ts +++ b/frontend/libs/components/pricing-modal/src/lib/convert/imageModelToCommonImageModel.ts @@ -14,8 +14,12 @@ export function imageModelToCommonImageModel( return CommonImageModel.FluxPro11; case "flux_pro_11_ultra": return CommonImageModel.FluxPro11Ultra; + case "gpt_image_1": + return CommonImageModel.GptImage1; case "gpt_image_1p5": return CommonImageModel.GptImage1p5; + case "gpt_image_2": + return CommonImageModel.GptImage2; case "nano_banana": return CommonImageModel.NanaBanana; case "nano_banana_2": diff --git a/frontend/libs/components/pricing-modal/src/lib/cost-breakdown-modal.tsx b/frontend/libs/components/pricing-modal/src/lib/cost-breakdown-modal.tsx index b11990deea..0ed6eb4058 100644 --- a/frontend/libs/components/pricing-modal/src/lib/cost-breakdown-modal.tsx +++ b/frontend/libs/components/pricing-modal/src/lib/cost-breakdown-modal.tsx @@ -277,6 +277,7 @@ export function CostBreakdownModal({ activeTabId }: CostBreakdownModalProps) { "flux_pro_11", "flux_pro_11_ultra", "gpt_image_1p5", + "gpt_image_2", "nano_banana", "nano_banana_2", "nano_banana_pro",