From 1367e9c04e151c2c5b4cf05282879f0574c45c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= Date: Fri, 18 Sep 2026 16:50:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=8E=86=E5=8F=B2=20GPT=20Im?= =?UTF-8?q?age=202-c=20=E6=8F=90=E4=BA=A4=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 读取历史 gpt-image-2-c 时按当前 GPT Image 2.5 业务任务处理 保留历史字符串不改写并沿用新的生成与编辑定价路由 --- .../crates/api-server/src/editor_generation_config.rs | 3 +++ server-rs/crates/api-server/src/editor_project.rs | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server-rs/crates/api-server/src/editor_generation_config.rs b/server-rs/crates/api-server/src/editor_generation_config.rs index 71e961d35..610731d80 100644 --- a/server-rs/crates/api-server/src/editor_generation_config.rs +++ b/server-rs/crates/api-server/src/editor_generation_config.rs @@ -17,6 +17,7 @@ pub(crate) const EDITOR_GENERATION_PRICING_DEFAULT_JSON: &str = include_str!("../config/editor-generation-pricing.default.json"); const EDITOR_IMAGE_MODEL_GPT_IMAGE_2: &str = "gpt-image-2"; +const EDITOR_IMAGE_MODEL_GPT_IMAGE_2_C: &str = "gpt-image-2-c"; pub(crate) const EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_BUSINESS: &str = "gpt-image-2.5"; pub(crate) const EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_GENERATION: &str = "gpt-image-2.5-flare-c"; pub(crate) const EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_EDIT: &str = "gpt-image-2.5-sunburst-c"; @@ -525,6 +526,7 @@ fn normalize_editor_image_model(model: Option<&str>) -> &'static str { match model.map(str::trim).filter(|value| !value.is_empty()) { Some( EDITOR_IMAGE_MODEL_GPT_IMAGE_2 + | EDITOR_IMAGE_MODEL_GPT_IMAGE_2_C | EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_BUSINESS | EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_GENERATION, ) => EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_GENERATION, @@ -541,6 +543,7 @@ fn normalize_editor_image_edit_model(model: Option<&str>) -> &'static str { Some(EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_EDIT) => EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_EDIT, Some( EDITOR_IMAGE_MODEL_GPT_IMAGE_2 + | EDITOR_IMAGE_MODEL_GPT_IMAGE_2_C | EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_BUSINESS | EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_GENERATION, ) => EDITOR_IMAGE_MODEL_GPT_IMAGE_2_5_EDIT, diff --git a/server-rs/crates/api-server/src/editor_project.rs b/server-rs/crates/api-server/src/editor_project.rs index 0e1a041b3..8d5b94b48 100644 --- a/server-rs/crates/api-server/src/editor_project.rs +++ b/server-rs/crates/api-server/src/editor_project.rs @@ -113,9 +113,9 @@ use crate::{ http_error::AppError, openai_image_generation::{ DownloadedOpenAiImage, GPT_IMAGE_2_5_BUSINESS_NAME, GPT_IMAGE_2_5_EDIT_MODEL, - GPT_IMAGE_2_5_GENERATION_MODEL, GPT_IMAGE_2_MODEL, OpenAiGeneratedImages, - OpenAiImageSettings, OpenAiReferenceImage, build_openai_image_http_client, - create_openai_image_edit_with_references_and_model, + GPT_IMAGE_2_5_GENERATION_MODEL, GPT_IMAGE_2_C_MODEL, GPT_IMAGE_2_MODEL, + OpenAiGeneratedImages, OpenAiImageSettings, OpenAiReferenceImage, + build_openai_image_http_client, create_openai_image_edit_with_references_and_model, create_openai_image_generation_with_model, create_openai_nanobanana_generate_content, require_openai_image_settings, }, @@ -3992,6 +3992,7 @@ pub(crate) fn normalize_editor_generation_options( // new task is submitted. Some( GPT_IMAGE_2_MODEL + | GPT_IMAGE_2_C_MODEL | GPT_IMAGE_2_5_BUSINESS_NAME | "gpt-image-2.5-flare-c" | "gpt-image-2.5-sunburst-c",