Feat/gpt-image-2.5 集成 #422

Open
k88936 wants to merge 88 commits from feat/gptimage2to2.5 into master
Showing only changes of commit 2e2ed47bec - Show all commits
@@ -57,7 +57,10 @@ use crate::{
normalize_generated_image_asset_mime,
},
http_error::AppError,
openai_image_generation::{build_openai_image_http_client, require_openai_image_settings},
openai_image_generation::{
GPT_IMAGE_2_5_EDIT_MODEL, GPT_IMAGE_2_5_GENERATION_MODEL, build_openai_image_http_client,
require_openai_image_settings,
},
platform_errors::{is_retryable_llm_error, map_llm_error, map_oss_error},
prompt::icon_spec::{PROMPT_MAX_LEN, build_extra_param_prompt, get_gen_icon_spec_prompt},
request_context::RequestContext,
@@ -1719,6 +1722,15 @@ pub(crate) async fn generate_editor_icon_spritesheet_for_owner(
&settings,
EditorImageProviderRequest {
model: generation_options.model,
provider_model: if generation_options.model
== EDITOR_IMAGE_MODEL_NANOBANANA2
{
generation_options.model
} else if reference_images.is_empty() {
GPT_IMAGE_2_5_GENERATION_MODEL
} else {
GPT_IMAGE_2_5_EDIT_MODEL
},
prompt: prompt.as_str(),
negative_prompt: None,
size,