This commit is contained in:
jonathang4 2025-12-13 10:51:43 +08:00
parent e9454d095c
commit c6bf89e328
3 changed files with 7 additions and 5 deletions

View File

@ -11,6 +11,7 @@ const DEFAULT_ASSISTANT_ID = "513695";
export const DEFAULT_MODEL = "jimeng-3.0"; export const DEFAULT_MODEL = "jimeng-3.0";
const DRAFT_VERSION = "3.0.2"; const DRAFT_VERSION = "3.0.2";
const MODEL_MAP = { 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.1": "high_aes_general_v30l_art_fangzhou:general_v3.0_18b",
"jimeng-3.0": "high_aes_general_v30l: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", "jimeng-2.1": "high_aes_general_v21_L:general_v2.1_L",

View File

@ -61,7 +61,7 @@ export default {
post: { post: {
"/generations": async (request: Request) => { "/generations": async (request: 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.task_id", _.isString)
.validate("body.prompt", _.isString) .validate("body.prompt", _.isString)
// .validate("body.negative_prompt", v => _.isUndefined(v) || _.isString(v)) // .validate("body.negative_prompt", v => _.isUndefined(v) || _.isString(v))
@ -75,7 +75,7 @@ export default {
// 随机挑选一个refresh_token // 随机挑选一个refresh_token
const token = _.sample(tokens); const token = _.sample(tokens);
const { const {
// model, model,
task_id, task_id,
prompt, prompt,
// negative_prompt: negativePrompt, // negative_prompt: negativePrompt,
@ -85,10 +85,10 @@ export default {
response_format, response_format,
} = request.body; } = request.body;
const responseFormat = _.defaultTo(response_format, "url"); const responseFormat = _.defaultTo(response_format, "url");
console.log("图片生成", model, task_id, prompt, width, height, responseFormat);
if (USE_DATABASE_MODE) { if (USE_DATABASE_MODE) {
// 使用新的数据库方法 // 使用新的数据库方法
await DatabaseGenerationService.generateImagesV2('jimeng-3.0', task_id, prompt, { await DatabaseGenerationService.generateImagesV2(model||'jimeng-3.0', task_id, prompt, {
width, width,
height, height,
sampleStrength: 0.5, sampleStrength: 0.5,
@ -97,7 +97,7 @@ export default {
}, token); }, token);
} else { } else {
// 使用原有方法(不等待结果) // 使用原有方法(不等待结果)
generateImages('jimeng-3.0', task_id, prompt, { generateImages(model||'jimeng-3.0', task_id, prompt, {
width, width,
height, height,
sampleStrength: 0.5, sampleStrength: 0.5,

View File

@ -771,6 +771,7 @@ export class TaskPollingService {
// 映射模型 // 映射模型
const MODEL_MAP = { 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.1": "high_aes_general_v30l_art_fangzhou:general_v3.0_18b",
"jimeng-3.0": "high_aes_general_v30l: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", "jimeng-2.1": "high_aes_general_v21_L:general_v2.1_L",