完善分镜flow

This commit is contained in:
zhishi 2026-03-21 14:45:42 +08:00
parent 4f3ba9502b
commit 84de8b0cd4
6 changed files with 254 additions and 135 deletions

View File

@ -1,132 +1,140 @@
// @routes-hash ee45dd26b9149e6eabf834c1fb5cfbb6
// @routes-hash 3d0673061005074e704638efccc539d1
import { Express } from "express";
import route1 from "./routes/agents/clearMemory";
import route2 from "./routes/agents/getMemory";
import route3 from "./routes/agents/productionAgent";
import route4 from "./routes/artStyle/getArtStyle";
import route5 from "./routes/assets/addAssets";
import route6 from "./routes/assets/batchDelete";
import route7 from "./routes/assets/batchGenerationData";
import route8 from "./routes/assets/delAssets";
import route9 from "./routes/assets/getAssetsApi";
import route10 from "./routes/assets/getImage";
import route11 from "./routes/assets/saveAssets";
import route12 from "./routes/assets/updateAssets";
import route13 from "./routes/assets/uploadClip";
import route14 from "./routes/assetsGenerate/generateAssets";
import route15 from "./routes/assetsGenerate/polishAssetsPrompt";
import route16 from "./routes/cornerScape/getAllAssets";
import route17 from "./routes/general/generalStatistics";
import route18 from "./routes/general/getSingleProject";
import route19 from "./routes/general/updateProject";
import route20 from "./routes/login/login";
import route21 from "./routes/migrate/migrateData";
import route22 from "./routes/modelSelect/getModelDetail";
import route23 from "./routes/modelSelect/getModelList";
import route24 from "./routes/novel/addNovel";
import route25 from "./routes/novel/batchDeleteNovel";
import route26 from "./routes/novel/delNovel";
import route27 from "./routes/novel/event/batchDeleteEvent";
import route28 from "./routes/novel/event/deletEvent";
import route29 from "./routes/novel/event/generateEvents";
import route30 from "./routes/novel/event/getEvent";
import route31 from "./routes/novel/getNovel";
import route32 from "./routes/novel/updateNovel";
import route33 from "./routes/other/deleteAllData";
import route34 from "./routes/other/getCaptcha";
import route35 from "./routes/production/getProductionData";
import route36 from "./routes/production/workbench/generateVideo";
import route37 from "./routes/production/workbench/getVideoModelDetail";
import route38 from "./routes/project/addProject";
import route39 from "./routes/project/delProject";
import route40 from "./routes/project/editProject";
import route41 from "./routes/project/getProject";
import route42 from "./routes/script/addScript";
import route43 from "./routes/script/delScript";
import route44 from "./routes/script/getScrptApi";
import route45 from "./routes/script/updateScript";
import route46 from "./routes/setting/agentDeploy/deployAgentModel";
import route47 from "./routes/setting/agentDeploy/getAgentDeploy";
import route48 from "./routes/setting/agentDeploy/updateKey";
import route49 from "./routes/setting/dbConfig/clearData";
import route50 from "./routes/setting/getTextModel";
import route51 from "./routes/setting/loginConfig/getUser";
import route52 from "./routes/setting/loginConfig/updateUserPwd";
import route53 from "./routes/setting/memoryConfig/getMemory";
import route54 from "./routes/setting/memoryConfig/sureMemory";
import route55 from "./routes/setting/vendorConfig/addVendor";
import route56 from "./routes/setting/vendorConfig/deleteVendor";
import route57 from "./routes/setting/vendorConfig/getVendorList";
import route58 from "./routes/setting/vendorConfig/modelTest";
import route59 from "./routes/setting/vendorConfig/updateVendor";
import route60 from "./routes/task/getMyTaskApi";
import route61 from "./routes/task/getTaskCategories";
import route62 from "./routes/task/taskDetails";
import route63 from "./routes/test/test";
import route3 from "./routes/artStyle/getArtStyle";
import route4 from "./routes/assets/addAssets";
import route5 from "./routes/assets/batchDelete";
import route6 from "./routes/assets/batchGenerationData";
import route7 from "./routes/assets/delAssets";
import route8 from "./routes/assets/getAssetsApi";
import route9 from "./routes/assets/getImage";
import route10 from "./routes/assets/saveAssets";
import route11 from "./routes/assets/updateAssets";
import route12 from "./routes/assets/uploadClip";
import route13 from "./routes/assetsGenerate/generateAssets";
import route14 from "./routes/assetsGenerate/polishAssetsPrompt";
import route15 from "./routes/cornerScape/getAllAssets";
import route16 from "./routes/general/generalStatistics";
import route17 from "./routes/general/getSingleProject";
import route18 from "./routes/general/updateProject";
import route19 from "./routes/login/login";
import route20 from "./routes/migrate/migrateData";
import route21 from "./routes/modelSelect/getModelDetail";
import route22 from "./routes/modelSelect/getModelList";
import route23 from "./routes/novel/addNovel";
import route24 from "./routes/novel/batchDeleteNovel";
import route25 from "./routes/novel/delNovel";
import route26 from "./routes/novel/event/batchDeleteEvent";
import route27 from "./routes/novel/event/deletEvent";
import route28 from "./routes/novel/event/generateEvents";
import route29 from "./routes/novel/event/getEvent";
import route30 from "./routes/novel/getNovel";
import route31 from "./routes/novel/updateNovel";
import route32 from "./routes/other/deleteAllData";
import route33 from "./routes/other/getCaptcha";
import route34 from "./routes/production/editStoryboard/generateStoryboardImage";
import route35 from "./routes/production/editStoryboard/getStoryboardFlow";
import route36 from "./routes/production/editStoryboard/saveStoryboardFlow";
import route37 from "./routes/production/editStoryboard/updateStoryboardFlow";
import route38 from "./routes/production/getProductionData";
import route39 from "./routes/production/getStoryboardData";
import route40 from "./routes/production/workbench/generateVideo";
import route41 from "./routes/production/workbench/getVideoModelDetail";
import route42 from "./routes/project/addProject";
import route43 from "./routes/project/delProject";
import route44 from "./routes/project/editProject";
import route45 from "./routes/project/getProject";
import route46 from "./routes/script/addScript";
import route47 from "./routes/script/delScript";
import route48 from "./routes/script/getScrptApi";
import route49 from "./routes/script/updateScript";
import route50 from "./routes/setting/agentDeploy/deployAgentModel";
import route51 from "./routes/setting/agentDeploy/getAgentDeploy";
import route52 from "./routes/setting/agentDeploy/updateKey";
import route53 from "./routes/setting/dbConfig/clearData";
import route54 from "./routes/setting/getTextModel";
import route55 from "./routes/setting/loginConfig/getUser";
import route56 from "./routes/setting/loginConfig/updateUserPwd";
import route57 from "./routes/setting/memoryConfig/getMemory";
import route58 from "./routes/setting/memoryConfig/sureMemory";
import route59 from "./routes/setting/vendorConfig/addVendor";
import route60 from "./routes/setting/vendorConfig/deleteVendor";
import route61 from "./routes/setting/vendorConfig/getVendorList";
import route62 from "./routes/setting/vendorConfig/modelTest";
import route63 from "./routes/setting/vendorConfig/updateVendor";
import route64 from "./routes/task/getMyTaskApi";
import route65 from "./routes/task/getTaskCategories";
import route66 from "./routes/task/taskDetails";
import route67 from "./routes/test/test";
export default async (app: Express) => {
app.use("/api/agents/clearMemory", route1);
app.use("/api/agents/getMemory", route2);
app.use("/api/agents/productionAgent", route3);
app.use("/api/artStyle/getArtStyle", route4);
app.use("/api/assets/addAssets", route5);
app.use("/api/assets/batchDelete", route6);
app.use("/api/assets/batchGenerationData", route7);
app.use("/api/assets/delAssets", route8);
app.use("/api/assets/getAssetsApi", route9);
app.use("/api/assets/getImage", route10);
app.use("/api/assets/saveAssets", route11);
app.use("/api/assets/updateAssets", route12);
app.use("/api/assets/uploadClip", route13);
app.use("/api/assetsGenerate/generateAssets", route14);
app.use("/api/assetsGenerate/polishAssetsPrompt", route15);
app.use("/api/cornerScape/getAllAssets", route16);
app.use("/api/general/generalStatistics", route17);
app.use("/api/general/getSingleProject", route18);
app.use("/api/general/updateProject", route19);
app.use("/api/login/login", route20);
app.use("/api/migrate/migrateData", route21);
app.use("/api/modelSelect/getModelDetail", route22);
app.use("/api/modelSelect/getModelList", route23);
app.use("/api/novel/addNovel", route24);
app.use("/api/novel/batchDeleteNovel", route25);
app.use("/api/novel/delNovel", route26);
app.use("/api/novel/event/batchDeleteEvent", route27);
app.use("/api/novel/event/deletEvent", route28);
app.use("/api/novel/event/generateEvents", route29);
app.use("/api/novel/event/getEvent", route30);
app.use("/api/novel/getNovel", route31);
app.use("/api/novel/updateNovel", route32);
app.use("/api/other/deleteAllData", route33);
app.use("/api/other/getCaptcha", route34);
app.use("/api/production/getProductionData", route35);
app.use("/api/production/workbench/generateVideo", route36);
app.use("/api/production/workbench/getVideoModelDetail", route37);
app.use("/api/project/addProject", route38);
app.use("/api/project/delProject", route39);
app.use("/api/project/editProject", route40);
app.use("/api/project/getProject", route41);
app.use("/api/script/addScript", route42);
app.use("/api/script/delScript", route43);
app.use("/api/script/getScrptApi", route44);
app.use("/api/script/updateScript", route45);
app.use("/api/setting/agentDeploy/deployAgentModel", route46);
app.use("/api/setting/agentDeploy/getAgentDeploy", route47);
app.use("/api/setting/agentDeploy/updateKey", route48);
app.use("/api/setting/dbConfig/clearData", route49);
app.use("/api/setting/getTextModel", route50);
app.use("/api/setting/loginConfig/getUser", route51);
app.use("/api/setting/loginConfig/updateUserPwd", route52);
app.use("/api/setting/memoryConfig/getMemory", route53);
app.use("/api/setting/memoryConfig/sureMemory", route54);
app.use("/api/setting/vendorConfig/addVendor", route55);
app.use("/api/setting/vendorConfig/deleteVendor", route56);
app.use("/api/setting/vendorConfig/getVendorList", route57);
app.use("/api/setting/vendorConfig/modelTest", route58);
app.use("/api/setting/vendorConfig/updateVendor", route59);
app.use("/api/task/getMyTaskApi", route60);
app.use("/api/task/getTaskCategories", route61);
app.use("/api/task/taskDetails", route62);
app.use("/api/test/test", route63);
app.use("/api/artStyle/getArtStyle", route3);
app.use("/api/assets/addAssets", route4);
app.use("/api/assets/batchDelete", route5);
app.use("/api/assets/batchGenerationData", route6);
app.use("/api/assets/delAssets", route7);
app.use("/api/assets/getAssetsApi", route8);
app.use("/api/assets/getImage", route9);
app.use("/api/assets/saveAssets", route10);
app.use("/api/assets/updateAssets", route11);
app.use("/api/assets/uploadClip", route12);
app.use("/api/assetsGenerate/generateAssets", route13);
app.use("/api/assetsGenerate/polishAssetsPrompt", route14);
app.use("/api/cornerScape/getAllAssets", route15);
app.use("/api/general/generalStatistics", route16);
app.use("/api/general/getSingleProject", route17);
app.use("/api/general/updateProject", route18);
app.use("/api/login/login", route19);
app.use("/api/migrate/migrateData", route20);
app.use("/api/modelSelect/getModelDetail", route21);
app.use("/api/modelSelect/getModelList", route22);
app.use("/api/novel/addNovel", route23);
app.use("/api/novel/batchDeleteNovel", route24);
app.use("/api/novel/delNovel", route25);
app.use("/api/novel/event/batchDeleteEvent", route26);
app.use("/api/novel/event/deletEvent", route27);
app.use("/api/novel/event/generateEvents", route28);
app.use("/api/novel/event/getEvent", route29);
app.use("/api/novel/getNovel", route30);
app.use("/api/novel/updateNovel", route31);
app.use("/api/other/deleteAllData", route32);
app.use("/api/other/getCaptcha", route33);
app.use("/api/production/editStoryboard/generateStoryboardImage", route34);
app.use("/api/production/editStoryboard/getStoryboardFlow", route35);
app.use("/api/production/editStoryboard/saveStoryboardFlow", route36);
app.use("/api/production/editStoryboard/updateStoryboardFlow", route37);
app.use("/api/production/getProductionData", route38);
app.use("/api/production/getStoryboardData", route39);
app.use("/api/production/workbench/generateVideo", route40);
app.use("/api/production/workbench/getVideoModelDetail", route41);
app.use("/api/project/addProject", route42);
app.use("/api/project/delProject", route43);
app.use("/api/project/editProject", route44);
app.use("/api/project/getProject", route45);
app.use("/api/script/addScript", route46);
app.use("/api/script/delScript", route47);
app.use("/api/script/getScrptApi", route48);
app.use("/api/script/updateScript", route49);
app.use("/api/setting/agentDeploy/deployAgentModel", route50);
app.use("/api/setting/agentDeploy/getAgentDeploy", route51);
app.use("/api/setting/agentDeploy/updateKey", route52);
app.use("/api/setting/dbConfig/clearData", route53);
app.use("/api/setting/getTextModel", route54);
app.use("/api/setting/loginConfig/getUser", route55);
app.use("/api/setting/loginConfig/updateUserPwd", route56);
app.use("/api/setting/memoryConfig/getMemory", route57);
app.use("/api/setting/memoryConfig/sureMemory", route58);
app.use("/api/setting/vendorConfig/addVendor", route59);
app.use("/api/setting/vendorConfig/deleteVendor", route60);
app.use("/api/setting/vendorConfig/getVendorList", route61);
app.use("/api/setting/vendorConfig/modelTest", route62);
app.use("/api/setting/vendorConfig/updateVendor", route63);
app.use("/api/task/getMyTaskApi", route64);
app.use("/api/task/getTaskCategories", route65);
app.use("/api/task/taskDetails", route66);
app.use("/api/test/test", route67);
}

View File

@ -3,23 +3,88 @@ import u from "@/utils";
import { z } from "zod";
import { success } from "@/lib/responseFormat";
import { validateFields } from "@/middleware/middleware";
import axios from "axios";
const router = express.Router();
async function getImageBase64ForId(imageId: string | number) {
const imagePath = await u
.db("o_image")
.select("filePath")
.where({ id: Number(imageId) })
.first();
if (!imagePath || !imagePath.filePath) return ""; // 未找到图片路径
const url = await u.oss.getFileUrl(imagePath.filePath);
return await urlToBase64(url);
}
async function urlToBase64(imageUrl: string): Promise<string> {
const response = await axios.get(imageUrl, { responseType: "arraybuffer" });
const contentType = response.headers["content-type"] || "image/png";
const base64 = Buffer.from(response.data, "binary").toString("base64");
return `data:${contentType};base64,${base64}`;
}
// 将图片ID和指令转换为base64数组和替换后的指令
async function convertDirectiveAndImages(images: Record<string, string>, directive: string) {
// step1: 列出所有别名
const aliasList = Object.keys(images);
// step2: 在指令中提取所有 @别名出现
const aliasRegex = /@[\u4e00-\u9fa5\w]+/g;
const referencedAliases = directive.match(aliasRegex) || [];
// step3: 检查别名
for (const alias of referencedAliases) {
if (!(alias in images)) {
throw new Error(`您引用了不存在的图片:${alias}`);
}
}
// step4: 构建别名与顺序编号映射
const aliasToIndex: Record<string, number> = {};
aliasList.forEach((alias, i) => {
aliasToIndex[alias] = i + 1;
});
// step5: 替换指令中的别名为"图N"
let prompt = directive;
for (const [alias, idx] of Object.entries(aliasToIndex)) {
// 转义alias可能含特殊字符
const reg = new RegExp(alias.replace(/([.*+?^${}()|\[\]\/\\])/g, "\\$1"), "g");
prompt = prompt.replace(reg, `${idx}`);
}
// step6: 依次获取图片 base64 内容区分id或者本身就是base64
const base64Images: string[] = [];
for (const imageVal of Object.values(images)) {
// 判断是否为base64串
const isBase64 = typeof imageVal === "string" && /^data:image\//.test(imageVal);
if (isBase64) {
base64Images.push(imageVal);
} else if (typeof imageVal === "number") {
const base64 = await getImageBase64ForId(imageVal);
base64Images.push(base64);
} else if (imageVal.includes("http")) {
const base64 = await urlToBase64(imageVal);
base64Images.push(base64);
}
}
return {
prompt,
images: base64Images,
};
}
export default router.post(
"/",
validateFields({
model: z.string(),
references: z.array(z.string()).optional(),
references: z.object().optional(),
quality: z.string(),
ratio: z.string(),
prompt: z.string(),
projectId: z.number(),
}),
async (req, res) => {
const { model, references = [], quality, ratio, prompt, projectId } = req.body;
const { model, references = {}, quality, ratio, prompt, projectId } = req.body;
const { prompt: userPrompt, images: base64Images } = await convertDirectiveAndImages(references, prompt);
const imageClass = await u.Ai.Image(model).run({
prompt: prompt,
imageBase64: references,
prompt: userPrompt,
imageBase64: base64Images,
size: quality,
aspectRatio: ratio,
taskClass: "分镜生成",

View File

@ -10,16 +10,18 @@ export default router.post(
validateFields({
edges: z.any(),
nodes: z.any(),
imageId: z.number(),
imageUrl: z.number(),
}),
async (req, res) => {
const { edges, nodes, imageId } = req.body;
const { edges, nodes, imageUrl } = req.body;
if (!imageUrl.includes("http")) {
return res.status(400).send({ message: "图片地址不合法" });
}
// if
const [id] = await u.db("o_storyboad").insert({
imageId,
filePath: new URL(imageUrl).pathname,
});
await u.db("o_storyboardFlow").insert({
id: 1,
stroryboardId: id,
flowData: JSON.stringify({ edges, nodes }),
});

View File

@ -11,12 +11,18 @@ export default router.post(
edges: z.any(),
nodes: z.any(),
id: z.number(),
imageId: z.number(),
imageUrl: z.number(),
}),
async (req, res) => {
const { edges, nodes, id, imageId } = req.body;
const { edges, nodes, id, imageUrl } = req.body;
if (!imageUrl.includes("http")) {
return res.status(400).send({ message: "图片地址不合法" });
}
// if
await u.db("o_storyboard").where("id", id).update({ imageId });
await u
.db("o_storyboard")
.where("id", id)
.update({ filePath: new URL(imageUrl).pathname });
await u
.db("o_storyboardFlow")
.where("stroryboardId", id)

View File

@ -0,0 +1,27 @@
import express from "express";
import u from "@/utils";
import { z } from "zod";
import { success } from "@/lib/responseFormat";
import { validateFields } from "@/middleware/middleware";
const router = express.Router();
export default router.post(
"/",
validateFields({
projectId: z.number(),
}),
async (req, res) => {
const { projectId } = req.body;
const storyboardData = await u.db("o_storyboard");
console.log("%c Line:16 🍖 storyboardData", "background:#ed9ec7", storyboardData);
const data = await Promise.all(
storyboardData.map(async (i) => {
return {
...i,
image: i.filePath ? await u.oss.getFileUrl(i.filePath!) : "",
};
}),
);
res.status(200).send(success(data));
},
);

View File

@ -1,4 +1,4 @@
// @db-hash feca77a2c2ec5b6a2989347f982558d5
// @db-hash 8af8e41e3ca0cb5ee554944515d72ba8
//该文件由脚本自动生成,请勿手动修改
export interface memories {
@ -163,8 +163,18 @@ export interface o_skills {
}
export interface o_storyboard {
'createTime'?: number | null;
'detail'?: string | null;
'filePath'?: string | null;
'frameType'?: string | null;
'id'?: number;
'name'?: string | null;
'prompt'?: string | null;
'seconds'?: string | null;
}
export interface o_storyboardFlow {
'flowData': string;
'id'?: number;
'stroryboardId': number;
}
export interface o_storyboardScript {
'id'?: number;
@ -254,6 +264,7 @@ export interface DB {
"o_setting": o_setting;
"o_skills": o_skills;
"o_storyboard": o_storyboard;
"o_storyboardFlow": o_storyboardFlow;
"o_storyboardScript": o_storyboardScript;
"o_tasks": o_tasks;
"o_user": o_user;