From 784f38220b622d66ab01e0bc28a44304e0ccf344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= Date: Mon, 21 Sep 2026 20:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=20provider=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E6=8B=92=E7=BB=9D=E5=B7=B2=E9=80=80=E5=BD=B9=E7=9A=84?= =?UTF-8?q?=20gpt-image-2-c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gpt-image-2-c 仅保留历史 fallback 与审计字符串 resolve_image_provider 白名单不再接受该值 补充拒绝断言 --- .../platform-image/src/image_provider/protocol/request.rs | 7 +++---- server-rs/crates/platform-image/tests/image_provider.rs | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server-rs/crates/platform-image/src/image_provider/protocol/request.rs b/server-rs/crates/platform-image/src/image_provider/protocol/request.rs index e5132386d..fb6f8878c 100644 --- a/server-rs/crates/platform-image/src/image_provider/protocol/request.rs +++ b/server-rs/crates/platform-image/src/image_provider/protocol/request.rs @@ -110,10 +110,9 @@ pub fn normalize_image_model(model: &str) -> &str { /// 命中即拒绝。`gpt-image-2` 仍按历史可读值接受。 pub fn resolve_image_provider(model: &str) -> Result { match normalize_image_model(model) { - GPT_IMAGE_2_MODEL - | GPT_IMAGE_2_C_MODEL - | GPT_IMAGE_2_5_GENERATION_MODEL - | GPT_IMAGE_2_5_EDIT_MODEL => Ok(ImageProvider::Tiantoken), + GPT_IMAGE_2_MODEL | GPT_IMAGE_2_5_GENERATION_MODEL | GPT_IMAGE_2_5_EDIT_MODEL => { + Ok(ImageProvider::Tiantoken) + } NANOBANANA_2_MODEL => Ok(ImageProvider::VectorEngine), _ => Err("不支持的图片模型"), } diff --git a/server-rs/crates/platform-image/tests/image_provider.rs b/server-rs/crates/platform-image/tests/image_provider.rs index f4d84c3f4..2111bfc13 100644 --- a/server-rs/crates/platform-image/tests/image_provider.rs +++ b/server-rs/crates/platform-image/tests/image_provider.rs @@ -232,6 +232,8 @@ fn nanobanana_generate_content_url_blank_model_falls_back_to_nanobanana_model() fn resolve_image_provider_rejects_business_model_and_accepts_concrete_models() { // 中文注释：业务模型名不是 provider model，必须在 api-server 任务边界先解析成具体 model。 assert!(resolve_image_provider(GPT_IMAGE_2_5_BUSINESS_NAME).is_err()); + // 中文注释：`gpt-image-2-c` 只是历史 fallback / 审计字符串，永不作为 provider model。 + assert!(resolve_image_provider(GPT_IMAGE_2_C_MODEL).is_err()); assert_eq!( resolve_image_provider(GPT_IMAGE_2_5_GENERATION_MODEL),