diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index b9587e4..6f7827b 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -894,6 +894,7 @@ Lone figure on city wall, then arrival of a companion. Tension between determina table.text("state"); table.integer("trackId"); table.text("reason"); + table.text("track"); table.text("videoDesc"); table.integer("shouldGenerateImage"); // 0 否 1 是 table.integer("projectId"); diff --git a/src/routes/production/editImage/generateFlowImage.ts b/src/routes/production/editImage/generateFlowImage.ts index 1c16c4f..3c4a1b5 100644 --- a/src/routes/production/editImage/generateFlowImage.ts +++ b/src/routes/production/editImage/generateFlowImage.ts @@ -23,7 +23,7 @@ export default router.post( projectId: z.number(), }), async (req, res) => { - const { model, references = [], quality, ratio, prompt, projectId, type } = req.body; + const { model, references = [], quality, ratio, prompt, projectId } = req.body; const imageClass = await u.Ai.Image(model).run( { @@ -39,7 +39,7 @@ export default router.post( projectId: projectId, }, ); - const savePath = `${projectId}/${type}/${u.uuid()}.jpg`; + const savePath = `${projectId}/workFlow/${u.uuid()}.jpg`; await imageClass.save(savePath); const url = await u.oss.getFileUrl(savePath); diff --git a/src/routes/production/workbench/generateVideoPrompt.ts b/src/routes/production/workbench/generateVideoPrompt.ts index 79fe8d9..fd15828 100644 --- a/src/routes/production/workbench/generateVideoPrompt.ts +++ b/src/routes/production/workbench/generateVideoPrompt.ts @@ -79,19 +79,31 @@ export default router.post( const data = projectData?.directorManual || "无"; const visualManual = u.getArtPrompt(artStyle, "art_skills", "art_storyboard_video"); const directorManual = u.getArtPrompt(data, "story_skills", "narrative_sweet_romance"); + const content = ` + **模型名称**:${modelData}, + **资产信息**(角色、场景、道具):${assets.map((i) => `[id:${i.id},type:${i.type},name:${i.name}]`).join(",")}, + **分镜信息**:${storyboard.map( + (i) => ``, + )}, + `; const { text } = await u.Ai.Text("universalAi").invoke({ system: `${videoPrompt?.data}\n${visualManual}\n${directorManual}`, messages: [ { role: "user", - content: ` - **模型名称**:${modelData}, - **资产信息**(角色、场景、道具):${JSON.stringify(assets)}, - **分镜信息**:${JSON.stringify(storyboard)}, - `, + content: content, }, ], }); + console.log("%c Line:83 🍷 text", "background:#3f7cff", text); + await u.db("o_videoTrack").where({ id: trackId }).update({ prompt: text, });