diff --git a/src/api/controllers/images.ts b/src/api/controllers/images.ts index 41d6106..4c3f948 100644 --- a/src/api/controllers/images.ts +++ b/src/api/controllers/images.ts @@ -11,6 +11,7 @@ const DEFAULT_ASSISTANT_ID = "513695"; export const DEFAULT_MODEL = "jimeng-3.0"; const DRAFT_VERSION = "3.0.2"; const MODEL_MAP = { + "jimeng-4.1": "high_aes_general_v41", "jimeng-3.1": "high_aes_general_v30l_art_fangzhou:general_v3.0_18b", "jimeng-3.0": "high_aes_general_v30l:general_v3.0_18b", "jimeng-2.1": "high_aes_general_v21_L:general_v2.1_L", diff --git a/src/api/routes/images.ts b/src/api/routes/images.ts index 463d343..90ebdd0 100644 --- a/src/api/routes/images.ts +++ b/src/api/routes/images.ts @@ -61,7 +61,7 @@ export default { post: { "/generations": async (request: Request) => { request - // .validate("body.model", v => _.isUndefined(v) || _.isString(v)) + .validate("body.model", v => _.isUndefined(v) || _.isString(v)) .validate("body.task_id", _.isString) .validate("body.prompt", _.isString) // .validate("body.negative_prompt", v => _.isUndefined(v) || _.isString(v)) @@ -75,7 +75,7 @@ export default { // 随机挑选一个refresh_token const token = _.sample(tokens); const { - // model, + model, task_id, prompt, // negative_prompt: negativePrompt, @@ -85,10 +85,10 @@ export default { response_format, } = request.body; const responseFormat = _.defaultTo(response_format, "url"); - + console.log("图片生成", model, task_id, prompt, width, height, responseFormat); if (USE_DATABASE_MODE) { // 使用新的数据库方法 - await DatabaseGenerationService.generateImagesV2('jimeng-3.0', task_id, prompt, { + await DatabaseGenerationService.generateImagesV2(model||'jimeng-3.0', task_id, prompt, { width, height, sampleStrength: 0.5, @@ -97,7 +97,7 @@ export default { }, token); } else { // 使用原有方法(不等待结果) - generateImages('jimeng-3.0', task_id, prompt, { + generateImages(model||'jimeng-3.0', task_id, prompt, { width, height, sampleStrength: 0.5, diff --git a/src/lib/services/TaskPollingService.ts b/src/lib/services/TaskPollingService.ts index e5f8f06..52be279 100644 --- a/src/lib/services/TaskPollingService.ts +++ b/src/lib/services/TaskPollingService.ts @@ -771,6 +771,7 @@ export class TaskPollingService { // 映射模型 const MODEL_MAP = { + "jimeng-4.1": "high_aes_general_v41", "jimeng-3.1": "high_aes_general_v30l_art_fangzhou:general_v3.0_18b", "jimeng-3.0": "high_aes_general_v30l:general_v3.0_18b", "jimeng-2.1": "high_aes_general_v21_L:general_v2.1_L",