Upload 52 files

jimeng-api/Skill.md

@@ -107,12 +107,12 @@ python scripts/generate_image.py text \
 - `prompt` (required): Text description of the desired image
 - `--session-id`: Jimeng session ID (required)
 - `--model`: Model to use (default: `jimeng-4.0`)
-  - Options: `jimeng-4.0`, `jimeng-3.1`, `jimeng-3.0`, `jimeng-2.1`, `jimeng-xl-pro`, `nanobanana` (international only)
+  - Options: `jimeng-4.5`, `jimeng-4.0`, `jimeng-3.1`, `jimeng-3.0`, `jimeng-2.1`, `jimeng-xl-pro`, `nanobanana` (international only)
 - `--ratio`: Aspect ratio (default: `1:1`)
   - Options: `1:1`, `4:3`, `3:4`, `16:9`, `9:16`, `3:2`, `2:3`, `21:9`
 - `--resolution`: Resolution level (default: `2k`)
   - Options: `1k`, `2k`, `4k`
-- `--intelligent-ratio`: Enable smart ratio detection based on prompt keywords **⚠️ Only works for jimeng-4.0 model; other models will ignore this parameter**
+- `--intelligent-ratio`: Enable smart ratio detection based on prompt keywords **⚠️ Only works for jimeng-4.0/jimeng-4.1/jimeng-4.5 models; other models will ignore this parameter**
 - `--negative-prompt`: Negative prompt (elements to avoid)
 - `--sample-strength`: Sampling strength (0.0-1.0)
 - `--api-url`: Custom API URL (default: `http://localhost:5100`)
@@ -155,7 +155,7 @@ python scripts/generate_image.py image \
 
 ### Intelligent Ratio Detection
 
-**⚠️ IMPORTANT**: This feature only works with the `jimeng-4.0` model. Other models (jimeng-3.0, nanobanana, etc.) will ignore the `--intelligent-ratio` flag.
+**⚠️ IMPORTANT**: This feature only works with the `jimeng-4.0`, `jimeng-4.1`, and `jimeng-4.5` models. Other models (jimeng-3.0, nanobanana, etc.) will ignore the `--intelligent-ratio` flag.
 
 Use `--intelligent-ratio` to automatically select the best aspect ratio based on prompt keywords.
 
@@ -276,9 +276,9 @@ Script executes:
 - If you need full control over resolution and ratio, use `jimeng-4.0` model instead
 
 **"intelligent_ratio not working"**
-- The `--intelligent-ratio` flag only works with `jimeng-4.0` model
+- The `--intelligent-ratio` flag only works with `jimeng-4.0`, `jimeng-4.1`, and `jimeng-4.5` models
 - Other models (jimeng-3.0, nanobanana, etc.) will ignore this parameter
-- Solution: Use `jimeng-4.0` if you need intelligent ratio detection
+- Solution: Use `jimeng-4.0`, `jimeng-4.1`, or `jimeng-4.5` if you need intelligent ratio detection
 
 ## Best Practices
 

jimeng-api/scripts/generate_image.py

@@ -352,8 +352,8 @@ def main():
             "--model",
             type=str,
             default="jimeng-4.0",
-            choices=["jimeng-4.0", "jimeng-3.1", "jimeng-3.0", "jimeng-2.1", "jimeng-xl-pro", "nanobanana"],
-            help="Model to use (default: jimeng-4.0)"
+            choices=["jimeng-4.5", "jimeng-4.0", "jimeng-3.1", "jimeng-3.0", "jimeng-2.1", "jimeng-xl-pro", "nanobanana"],
+            help="Model to use (default: jimeng-4.0; jimeng-4.5 is domestic only and supports intelligent ratio)"
         )
         subparser.add_argument(
             "--ratio",

src/api/builders/payload-builder.ts

@@ -144,7 +144,7 @@ export interface BuildCoreParamOptions {
  * 构建 core_param
  * - 图生图: image_ratio 始终保留，prompt 前缀为 ## * imageCount
  * - 文生图: intelligent_ratio=true 时移除 image_ratio
- * - intelligent_ratio 仅对 jimeng-4.0/jimeng-4.1 模型有效，其他模型忽略此参数
+ * - intelligent_ratio 仅对 jimeng-4.0/jimeng-4.1/jimeng-4.5 模型有效，其他模型忽略此参数
  */
 export function buildCoreParam(options: BuildCoreParamOptions) {
   const {
@@ -160,8 +160,8 @@ export function buildCoreParam(options: BuildCoreParamOptions) {
     mode = "text2img",
   } = options;
 
-  // ⚠️ intelligent_ratio 仅对 jimeng-4.0/jimeng-4.1 模型有效
-  const effectiveIntelligentRatio = ['jimeng-4.0', 'jimeng-4.1'].includes(userModel) ? intelligentRatio : false;
+  // ⚠️ intelligent_ratio 仅对 jimeng-4.0/jimeng-4.1/jimeng-4.5 模型有效
+  const effectiveIntelligentRatio = ['jimeng-4.0', 'jimeng-4.1', 'jimeng-4.5'].includes(userModel) ? intelligentRatio : false;
 
   // 图生图时，prompt 前缀规则: 每张图片对应 2 个 #
   // 1张图 → ##, 2张图 → ####, 3张图 → ######
@@ -176,6 +176,7 @@ export function buildCoreParam(options: BuildCoreParamOptions) {
     large_image_info: {
       type: "",
       id: util.uuid(),
+      min_version: DRAFT_MIN_VERSION,
       height: resolution.height,
       width: resolution.width,
       resolution_type: resolution.resolutionType,

src/api/consts/common.ts

@@ -30,7 +30,8 @@ export const PLATFORM_CODE = "7";
 export const VERSION_CODE = "5.8.0";
 
 // 默认模型
-export const DEFAULT_IMAGE_MODEL = "jimeng-4.1";
+export const DEFAULT_IMAGE_MODEL = "jimeng-4.5";
+export const DEFAULT_IMAGE_MODEL_US = "jimeng-4.0";
 export const DEFAULT_VIDEO_MODEL = "jimeng-video-3.0";
 
 // 草稿版本
@@ -39,6 +40,7 @@ export const DRAFT_MIN_VERSION = "3.0.2";
 
 // 图像模型映射
 export const IMAGE_MODEL_MAP = {
+  "jimeng-4.5": "high_aes_general_v40l",
   "jimeng-4.1": "high_aes_general_v41",
   "jimeng-4.0": "high_aes_general_v40",
   "jimeng-3.1": "high_aes_general_v30l_art_fangzhou:general_v3.0_18b",

src/api/controllers/images.ts

@@ -6,7 +6,7 @@ import util from "@/lib/util.ts";
 import { getCredit, receiveCredit, request, parseRegionFromToken, getAssistantId, RegionInfo } from "./core.ts";
 import logger from "@/lib/logger.ts";
 import { SmartPoller, PollingStatus } from "@/lib/smart-poller.ts";
-import { DEFAULT_IMAGE_MODEL, IMAGE_MODEL_MAP, IMAGE_MODEL_MAP_US } from "@/api/consts/common.ts";
+import { DEFAULT_IMAGE_MODEL, DEFAULT_IMAGE_MODEL_US, IMAGE_MODEL_MAP, IMAGE_MODEL_MAP_US } from "@/api/consts/common.ts";
 import { uploadImageFromUrl, uploadImageBuffer } from "@/lib/image-uploader.ts";
 import { extractImageUrls } from "@/lib/image-utils.ts";
 import {
@@ -22,26 +22,43 @@ import {
 } from "@/api/builders/payload-builder.ts";
 
 export const DEFAULT_MODEL = DEFAULT_IMAGE_MODEL;
+export const DEFAULT_MODEL_US = DEFAULT_IMAGE_MODEL_US;
+
+export interface ModelResult {
+  model: string;
+  userModel: string;
+}
 
 /**
  * 获取模型映射
+ * - 国际站不支持的模型会抛出错误
+ * - 但如果传入的是国内站默认模型，国际站会自动回退到国际站默认模型
  */
-export function getModel(model: string, isInternational: boolean) {
+export function getModel(model: string, isInternational: boolean): ModelResult {
   const modelMap = isInternational ? IMAGE_MODEL_MAP_US : IMAGE_MODEL_MAP;
+  const defaultModel = isInternational ? DEFAULT_MODEL_US : DEFAULT_MODEL;
+
   if (isInternational && !modelMap[model]) {
+    // 如果传入的是国内站默认模型，回退到国际站默认模型
+    if (model === DEFAULT_MODEL) {
+      logger.info(`国际站不支持默认模型 "${model}"，回退到 "${defaultModel}"`);
+      return { model: modelMap[defaultModel], userModel: defaultModel };
+    }
     const supportedModels = Object.keys(modelMap).join(', ');
     throw new Error(`国际版不支持模型 "${model}"。支持的模型: ${supportedModels}`);
   }
-  return modelMap[model] || modelMap[DEFAULT_MODEL];
+
+  const effectiveUserModel = modelMap[model] ? model : defaultModel;
+  return { model: modelMap[effectiveUserModel], userModel: effectiveUserModel };
 }
 
 /**
  * 记录分辨率信息
  */
-function logResolutionInfo(_model: string, resolution: ResolutionResult, regionInfo: RegionInfo) {
+function logResolutionInfo(userModel: string, resolution: ResolutionResult, regionInfo: RegionInfo) {
   if (!resolution.isForced) return;
 
-  if (_model === 'nanobanana') {
+  if (userModel === 'nanobanana') {
     if (regionInfo.isUS) {
       logger.warn('美区 nanobanana 模型固定使用1024x1024分辨率和2k的清晰度，比例固定为1:1。');
     } else if (regionInfo.isHK || regionInfo.isJP || regionInfo.isSG) {
@@ -74,14 +91,14 @@ export async function generateImageComposition(
   refreshToken: string
 ) {
   const regionInfo = parseRegionFromToken(refreshToken);
-  const model = getModel(_model, regionInfo.isInternational);
+  const { model, userModel } = getModel(_model, regionInfo.isInternational);
 
   // 使用 payload-builder 处理分辨率
-  const resolutionResult = resolveResolution(_model, regionInfo, resolution, ratio);
-  logResolutionInfo(_model, resolutionResult, regionInfo);
+  const resolutionResult = resolveResolution(userModel, regionInfo, resolution, ratio);
+  logResolutionInfo(userModel, resolutionResult, regionInfo);
 
   const imageCount = images.length;
-  logger.info(`使用模型: ${_model} 映射模型: ${model} 图生图功能 ${imageCount}张图片 ${resolutionResult.width}x${resolutionResult.height} 精细度: ${sampleStrength}`);
+  logger.info(`使用模型: ${userModel} 映射模型: ${model} 图生图功能 ${imageCount}张图片 ${resolutionResult.width}x${resolutionResult.height} 精细度: ${sampleStrength}`);
 
   // 获取积分
   try {
@@ -120,7 +137,7 @@ export async function generateImageComposition(
 
   // 使用 payload-builder 构建 core_param
   const coreParam = buildCoreParam({
-    userModel: _model,
+    userModel,
     model,
     prompt,
     imageCount,
@@ -141,7 +158,7 @@ export async function generateImageComposition(
 
   // 使用 payload-builder 构建 metrics_extra
   const metricsExtra = buildMetricsExtra({
-    userModel: _model,
+    userModel,
     regionInfo,
     submitId,
     scene: "ImageBasicGenerate",
@@ -272,10 +289,10 @@ export async function generateImages(
   refreshToken: string
 ) {
   const regionInfo = parseRegionFromToken(refreshToken);
-  const model = getModel(_model, regionInfo.isInternational);
-  logger.info(`使用模型: ${_model} 映射模型: ${model} 分辨率: ${resolution} 比例: ${ratio} 精细度: ${sampleStrength} 智能比例: ${intelligentRatio}`);
+  const { model, userModel } = getModel(_model, regionInfo.isInternational);
+  logger.info(`使用模型: ${userModel} 映射模型: ${model} 分辨率: ${resolution} 比例: ${ratio} 精细度: ${sampleStrength} 智能比例: ${intelligentRatio}`);
 
-  return await generateImagesInternal(_model, prompt, { ratio, resolution, sampleStrength, negativePrompt, intelligentRatio }, refreshToken);
+  return await generateImagesInternal(userModel, prompt, { ratio, resolution, sampleStrength, negativePrompt, intelligentRatio }, refreshToken);
 }
 
 /**
@@ -300,11 +317,11 @@ async function generateImagesInternal(
   refreshToken: string
 ) {
   const regionInfo = parseRegionFromToken(refreshToken);
-  const model = getModel(_model, regionInfo.isInternational);
+  const { model, userModel } = getModel(_model, regionInfo.isInternational);
 
   // 使用 payload-builder 处理分辨率
-  const resolutionResult = resolveResolution(_model, regionInfo, resolution, ratio);
-  logResolutionInfo(_model, resolutionResult, regionInfo);
+  const resolutionResult = resolveResolution(userModel, regionInfo, resolution, ratio);
+  logResolutionInfo(userModel, resolutionResult, regionInfo);
 
   // 获取积分
   const { totalCredit, giftCredit, purchaseCredit, vipCredit } = await getCredit(refreshToken);
@@ -313,8 +330,8 @@ async function generateImagesInternal(
 
   logger.info(`当前积分状态: 总计=${totalCredit}, 赠送=${giftCredit}, 购买=${purchaseCredit}, VIP=${vipCredit}`);
 
-  // 检查是否为多图生成模式 (jimeng-4.0/jimeng-4.1 支持)
-  const isJimeng4xMultiImage = ['jimeng-4.0', 'jimeng-4.1'].includes(_model) && (
+  // 检查是否为多图生成模式 (jimeng-4.0/jimeng-4.1/jimeng-4.5 支持)
+  const isJimeng4xMultiImage = ['jimeng-4.0', 'jimeng-4.1', 'jimeng-4.5'].includes(userModel) && (
     prompt.includes("连续") ||
     prompt.includes("绘本") ||
     prompt.includes("故事") ||
@@ -322,7 +339,7 @@ async function generateImagesInternal(
   );
 
   if (isJimeng4xMultiImage) {
-    return await generateJimeng4xMultiImages(_model, prompt, { ratio, resolution, sampleStrength, negativePrompt, intelligentRatio }, refreshToken);
+    return await generateJimeng4xMultiImages(userModel, prompt, { ratio, resolution, sampleStrength, negativePrompt, intelligentRatio }, refreshToken);
   }
 
   const componentId = util.uuid();
@@ -330,7 +347,7 @@ async function generateImagesInternal(
 
   // 使用 payload-builder 构建 core_param
   const coreParam = buildCoreParam({
-    userModel: _model,
+    userModel,
     model,
     prompt,
     negativePrompt,
@@ -343,7 +360,7 @@ async function generateImagesInternal(
 
   // 使用 payload-builder 构建 metrics_extra
   const metricsExtra = buildMetricsExtra({
-    userModel: _model,
+    userModel,
     regionInfo,
     submitId,
     scene: "ImageBasicGenerate",
@@ -442,7 +459,7 @@ async function generateImagesInternal(
 }
 
 /**
- * jimeng-4.0/jimeng-4.1 多图生成
+ * jimeng-4.0/jimeng-4.1/jimeng-4.5 多图生成
  */
 async function generateJimeng4xMultiImages(
   _model: string,
@@ -463,10 +480,10 @@ async function generateJimeng4xMultiImages(
   refreshToken: string
 ) {
   const regionInfo = parseRegionFromToken(refreshToken);
-  const model = getModel(_model, regionInfo.isInternational);
+  const { model, userModel } = getModel(_model, regionInfo.isInternational);
 
   // 使用 payload-builder 处理分辨率
-  const resolutionResult = resolveResolution(_model, regionInfo, resolution, ratio);
+  const resolutionResult = resolveResolution(userModel, regionInfo, resolution, ratio);
 
   const targetImageCount = prompt.match(/(\d+)张/) ? parseInt(prompt.match(/(\d+)张/)[1]) : 4;
 
@@ -477,7 +494,7 @@ async function generateJimeng4xMultiImages(
 
   // 使用 payload-builder 构建 core_param
   const coreParam = buildCoreParam({
-    userModel: _model,
+    userModel,
     model,
     prompt,
     negativePrompt,
@@ -490,7 +507,7 @@ async function generateJimeng4xMultiImages(
 
   // 使用 payload-builder 构建 metrics_extra (多图模式)
   const metricsExtra = buildMetricsExtra({
-    userModel: _model,
+    userModel,
     regionInfo,
     submitId,
     scene: "ImageMultiGenerate",