diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs index 3496d8e526..9fdfd8f9c2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs @@ -14,8 +14,6 @@ use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptC 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::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; use enums::common::visibility::Visibility; use enums::common::generation::common_generation_mode::CommonGenerationMode; use fal_client::creds::open_ai_api_key::OpenAiApiKey; @@ -32,7 +30,6 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, batch_get_media_files_by_tokens_with_connection}; use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{insert_batch_prompt_context_items, InsertBatchArgs, PromptContextItem}; use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; -use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; use sqlx::Acquire; use utoipa::ToSchema; use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator; @@ -89,28 +86,6 @@ pub async fn gemini_25_flash_edit_image_handler( } }; - let mut downgrade_for_free_user = true; - - let result = find_subscription_for_owner_user_using_connection( - user_token, - PaymentsNamespace::Artcraft, - &mut mysql_connection, - ).await; - - if let Ok(Some(subscription)) = result { - info!("User {:?} has subscription: {:?} (stripe customer: {:?}, status: {:?})", - user_token, - subscription.token, - subscription.stripe_customer_id, - subscription.stripe_subscription_status); - // NB: Failing open means subscribers might get fewer results, but they're free right now. - if subscription.stripe_subscription_status == StripeSubscriptionStatus::Active { - downgrade_for_free_user = false; - } - } - - info!("downgrade_for_free_user: {}", downgrade_for_free_user); - const CAN_SEE_DELETED: bool = false; let tokens = match request.image_media_tokens.as_ref() { @@ -177,9 +152,6 @@ pub async fn gemini_25_flash_edit_image_handler( None => Gemini25FlashEditNumImages::One, // Default to One }; - if downgrade_for_free_user { - num_images = Gemini25FlashEditNumImages::One; - } let args = Gemini25FlashEditArgs { image_urls, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs index dd1bf1f03d..d8b9e7ee27 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs @@ -15,8 +15,6 @@ use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptC 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::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; use enums::common::visibility::Visibility; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; @@ -34,7 +32,6 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, batch_get_media_files_by_tokens_with_connection}; use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{insert_batch_prompt_context_items, InsertBatchArgs, PromptContextItem}; use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; -use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; use sqlx::Acquire; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use utoipa::ToSchema; @@ -88,29 +85,6 @@ pub async fn gpt_image_1_edit_image_handler( } }; - let mut downgrade_for_free_user = true; - - let result = find_subscription_for_owner_user_using_connection( - &user_token, - PaymentsNamespace::Artcraft, - &mut mysql_connection, - ).await; - - if let Ok(Some(subscription)) = result { - info!("User {:?} has subscription: {:?} (stripe customer: {:?}, status: {:?})", - &user_token, - subscription.token, - subscription.stripe_customer_id, - subscription.stripe_subscription_status); - - // NB: Failing open means subscribers might get fewer results, but they're free right now. - if subscription.stripe_subscription_status == StripeSubscriptionStatus::Active { - downgrade_for_free_user = false; - } - } - - info!("downgrade_for_free_user: {}", downgrade_for_free_user); - const CAN_SEE_DELETED: bool = false; let tokens = match request.image_media_tokens.as_ref() { @@ -196,9 +170,6 @@ pub async fn gpt_image_1_edit_image_handler( let openai_api_key = OpenAiApiKey::from_str(&server_state.openai.api_key); - if downgrade_for_free_user { - num_images = GptEditImageNumImages::One; - } let args = GptEditImageByokArgs { image_urls, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs index 77d4bc0fd7..263ccbc163 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs @@ -18,8 +18,6 @@ use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptC 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::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; use enums::common::visibility::Visibility; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; @@ -37,7 +35,6 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, batch_get_media_files_by_tokens_with_connection}; use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{insert_batch_prompt_context_items, InsertBatchArgs, PromptContextItem}; use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; -use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; use server_environment::ServerEnvironment; use sqlx::pool::PoolConnection; use sqlx::{Acquire, MySql}; @@ -93,29 +90,6 @@ pub async fn gpt_image_1p5_multi_function_image_gen_handler( } }; - let mut downgrade_for_free_user = true; - - let result = find_subscription_for_owner_user_using_connection( - user_token, - PaymentsNamespace::Artcraft, - &mut mysql_connection, - ).await; - - if let Ok(Some(subscription)) = result { - info!("User {:?} has subscription: {:?} (stripe customer: {:?}, status: {:?})", - user_token, - subscription.token, - subscription.stripe_customer_id, - subscription.stripe_subscription_status); - - // NB: Failing open means subscribers might get fewer results, but they're free right now. - if subscription.stripe_subscription_status == StripeSubscriptionStatus::Active { - downgrade_for_free_user = false; - } - } - - info!("downgrade_for_free_user: {}", downgrade_for_free_user); - let mut query_media_tokens = None; if let Some(media_tokens) = request.image_media_tokens.as_ref() { @@ -216,10 +190,6 @@ pub async fn gpt_image_1p5_multi_function_image_gen_handler( None => EnqueueGptImage1p5EditImageInputFidelity::High, }; - if downgrade_for_free_user { - num_images = EnqueueGptImage1p5EditImageNumImages::One; - } - let args = EnqueueGptImage1p5EditImageArgs { prompt: request.prompt.as_deref().unwrap_or(""), image_urls: input_image_urls.to_owned(), @@ -285,10 +255,6 @@ pub async fn gpt_image_1p5_multi_function_image_gen_handler( None => EnqueueGptImage1p5TextToImageQuality::High, }; - if downgrade_for_free_user { - num_images = EnqueueGptImage1p5TextToImageNumImages::One; - } - let args = EnqueueGptImage1p5TextToImageArgs { prompt: request.prompt.as_deref().unwrap_or(""), num_images, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs index e3e65e2afe..d1d689e19e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs @@ -19,8 +19,6 @@ use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptC 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::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; use enums::common::visibility::Visibility; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; @@ -40,7 +38,6 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, batch_get_media_files_by_tokens_with_connection}; use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{insert_batch_prompt_context_items, InsertBatchArgs, PromptContextItem}; use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; -use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; use server_environment::ServerEnvironment; use sqlx::pool::PoolConnection; use sqlx::{Acquire, MySql}; @@ -96,29 +93,6 @@ pub async fn nano_banana_multi_function_image_gen_handler( } }; - let mut downgrade_for_free_user = true; - - let result = find_subscription_for_owner_user_using_connection( - user_token, - PaymentsNamespace::Artcraft, - &mut mysql_connection, - ).await; - - if let Ok(Some(subscription)) = result { - info!("User {:?} has subscription: {:?} (stripe customer: {:?}, status: {:?})", - user_token, - subscription.token, - subscription.stripe_customer_id, - subscription.stripe_subscription_status); - - // NB: Failing open means subscribers might get fewer results, but they're free right now. - if subscription.stripe_subscription_status == StripeSubscriptionStatus::Active { - downgrade_for_free_user = false; - } - } - - info!("downgrade_for_free_user: {}", downgrade_for_free_user); - let image_urls = match request.image_media_tokens.as_ref() { Some(media_tokens) => { info!("Looking up image media tokens: {:?}", media_tokens); @@ -173,10 +147,6 @@ pub async fn nano_banana_multi_function_image_gen_handler( None => Gemini25FlashEditAspectRatio::OneByOne, }; - if downgrade_for_free_user { - num_images = Gemini25FlashEditNumImages::One; - } - let args = Gemini25FlashEditArgs { prompt: request.prompt.as_deref().unwrap_or(""), image_urls: input_image_urls.to_owned(), @@ -231,10 +201,6 @@ pub async fn nano_banana_multi_function_image_gen_handler( None => Gemini25FlashTextToImageAspectRatio::OneByOne, }; - if downgrade_for_free_user { - num_images = Gemini25FlashTextToImageNumImages::One; - } - let args = Gemini25FlashTextToImageArgs { prompt: request.prompt.as_deref().unwrap_or(""), num_images, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs index 21c4d2d68a..be4819d10d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs @@ -18,8 +18,6 @@ use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptC 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::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; use enums::common::visibility::Visibility; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; @@ -38,7 +36,6 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, batch_get_media_files_by_tokens_with_connection}; use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{insert_batch_prompt_context_items, InsertBatchArgs, PromptContextItem}; use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; -use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; use server_environment::ServerEnvironment; use sqlx::pool::PoolConnection; use sqlx::{Acquire, MySql}; @@ -94,29 +91,6 @@ pub async fn nano_banana_pro_multi_function_image_gen_handler( } }; - let mut downgrade_for_free_user = true; - - let result = find_subscription_for_owner_user_using_connection( - user_token, - PaymentsNamespace::Artcraft, - &mut mysql_connection, - ).await; - - if let Ok(Some(subscription)) = result { - info!("User {:?} has subscription: {:?} (stripe customer: {:?}, status: {:?})", - user_token, - subscription.token, - subscription.stripe_customer_id, - subscription.stripe_subscription_status); - - // NB: Failing open means subscribers might get fewer results, but they're free right now. - if subscription.stripe_subscription_status == StripeSubscriptionStatus::Active { - downgrade_for_free_user = false; - } - } - - info!("downgrade_for_free_user: {}", downgrade_for_free_user); - let image_urls = match request.image_media_tokens.as_ref() { Some(media_tokens) => { info!("Looking up image media tokens: {:?}", media_tokens); @@ -178,11 +152,6 @@ pub async fn nano_banana_pro_multi_function_image_gen_handler( None => EnqueueNanoBananaProEditImageAspectRatio::OneByOne, }; - if downgrade_for_free_user { - num_images = EnqueueNanoBananaProEditImageNumImages::One; - resolution = EnqueueNanoBananaProEditImageResolution::OneK; - } - let args = EnqueueNanoBananaProEditImageArgs { prompt: request.prompt.as_deref().unwrap_or(""), image_urls: input_image_urls.to_owned(), @@ -245,11 +214,6 @@ pub async fn nano_banana_pro_multi_function_image_gen_handler( None => EnqueueNanoBananaProTextToImageAspectRatio::OneByOne, }; - if downgrade_for_free_user { - num_images = EnqueueNanoBananaProTextToImageNumImages::One; - resolution = EnqueueNanoBananaProTextToImageResolution::OneK; - } - let args = EnqueueNanoBananaProTextToImageArgs { prompt: request.prompt.as_deref().unwrap_or(""), num_images, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/text/generate_gpt_image_1_text_to_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/text/generate_gpt_image_1_text_to_image_handler.rs index a7c08c93aa..ef7f9ebe50 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/text/generate_gpt_image_1_text_to_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/text/generate_gpt_image_1_text_to_image_handler.rs @@ -14,8 +14,6 @@ use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path: 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::payments_namespace::PaymentsNamespace; -use enums::common::stripe_subscription_status::StripeSubscriptionStatus; use enums::common::visibility::Visibility; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; @@ -32,7 +30,6 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_ use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, batch_get_media_files_by_tokens_with_connection}; use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{insert_batch_prompt_context_items, InsertBatchArgs, PromptContextItem}; use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; -use mysql_queries::queries::users::user_subscriptions::find_subscription_for_owner_user::find_subscription_for_owner_user_using_connection; use sqlx::Acquire; use tokens::tokens::generic_inference_jobs::InferenceJobToken; use utoipa::ToSchema; @@ -85,29 +82,6 @@ pub async fn generate_gpt_image_1_text_to_image_handler( } }; - let mut downgrade_for_free_user = true; - - let result = find_subscription_for_owner_user_using_connection( - &user_token, - PaymentsNamespace::Artcraft, - &mut mysql_connection, - ).await; - - if let Ok(Some(subscription)) = result { - info!("User {:?} has subscription: {:?} (stripe customer: {:?}, status: {:?})", - &user_token, - subscription.token, - subscription.stripe_customer_id, - subscription.stripe_subscription_status); - - // NB: Failing open means subscribers might get fewer results, but they're free right now. - if subscription.stripe_subscription_status == StripeSubscriptionStatus::Active { - downgrade_for_free_user = false; - } - } - - info!("downgrade_for_free_user: {}", downgrade_for_free_user); - const CAN_SEE_DELETED: bool = false; let media_domain = get_media_domain(&http_request); @@ -146,10 +120,6 @@ pub async fn generate_gpt_image_1_text_to_image_handler( None => GptTextToImageQuality::High, // Default to High }; - if downgrade_for_free_user { - num_images = GptTextToImageNumImages::One; - } - let openai_api_key = OpenAiApiKey::from_str(&server_state.openai.api_key); let args = GptTextToImageByokArgs {