GenarrativeAI/Genarrative
11
0
Fork 0
Code Issues 24 Pull Requests 7 Actions Packages Projects 1 Releases Wiki Activity

兼容历史 GPT Image 2-c 提交模型

Browse Source 
读取历史 gpt-image-2-c 时按当前 GPT Image 2.5 业务任务处理

保留历史字符串不改写并沿用新的生成与编辑定价路由
This commit is contained in:
王德宇
2026-09-18 16:50:10 +08:00
parent b294cbc3db
commit 1367e9c04e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server-rs/crates/api-server/src/editor_generation_config.rs
+3
View File
@@ -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,
server-rs/crates/api-server/src/editor_project.rs
+4 -3
View File
@@ -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",