完善分镜台

This commit is contained in:
ACT丶流星雨 2026-04-01 03:26:54 +08:00
parent 880e16228c
commit d85d98f3a5
9 changed files with 220 additions and 177 deletions

View File

@ -167,7 +167,6 @@ export default (toolCpnfig: ToolConfig) => {
ids: z.array(z.number()).describe("必须获取真实的分镜ID支持批量生成"), ids: z.array(z.number()).describe("必须获取真实的分镜ID支持批量生成"),
}), }),
execute: async ({ ids }) => { execute: async ({ ids }) => {
console.log("%c Line:176 🍒 ids", "background:#ea7e5c", ids);
const thinking = msg.thinking("正在生成分镜..."); const thinking = msg.thinking("正在生成分镜...");
new Promise((resolve) => socket.emit("generateStoryboard", { ids }, (res: any) => resolve(res))) new Promise((resolve) => socket.emit("generateStoryboard", { ids }, (res: any) => resolve(res)))
.then((res) => { .then((res) => {

View File

@ -1,4 +1,4 @@
// @routes-hash 39d27430eb844d91284da0877818f52f // @routes-hash 2f412a40ddea26311bf541e94d48eb0f
import { Express } from "express"; import { Express } from "express";
import route1 from "./routes/agents/clearMemory"; import route1 from "./routes/agents/clearMemory";
@ -69,64 +69,63 @@ import route65 from "./routes/production/storyboard/previewImage";
import route66 from "./routes/production/storyboard/removeFrame"; import route66 from "./routes/production/storyboard/removeFrame";
import route67 from "./routes/production/storyboard/updateStoryboardUrl"; import route67 from "./routes/production/storyboard/updateStoryboardUrl";
import route68 from "./routes/production/workbench/addTrack"; import route68 from "./routes/production/workbench/addTrack";
import route69 from "./routes/production/workbench/confirmSelection"; import route69 from "./routes/production/workbench/delVideo";
import route70 from "./routes/production/workbench/delVideo"; import route70 from "./routes/production/workbench/generateVideo";
import route71 from "./routes/production/workbench/generateVideo"; import route71 from "./routes/production/workbench/generateVideoPrompt";
import route72 from "./routes/production/workbench/generateVideoPrompt"; import route72 from "./routes/production/workbench/getGenerateData";
import route73 from "./routes/production/workbench/getGenerateData"; import route73 from "./routes/production/workbench/getVideoList";
import route74 from "./routes/production/workbench/getVideoModelDetail"; import route74 from "./routes/production/workbench/getVideoModelDetail";
import route75 from "./routes/production/workbench/videoPolling"; import route75 from "./routes/project/addProject";
import route76 from "./routes/project/addProject"; import route76 from "./routes/project/addVisual";
import route77 from "./routes/project/addVisual"; import route77 from "./routes/project/addVisualManual";
import route78 from "./routes/project/addVisualManual"; import route78 from "./routes/project/deleteVisualManual";
import route79 from "./routes/project/deleteVisualManual"; import route79 from "./routes/project/delProject";
import route80 from "./routes/project/delProject"; import route80 from "./routes/project/editProject";
import route81 from "./routes/project/editProject"; import route81 from "./routes/project/editVisualManual";
import route82 from "./routes/project/editVisualManual"; import route82 from "./routes/project/getProject";
import route83 from "./routes/project/getProject"; import route83 from "./routes/project/getVisualManual";
import route84 from "./routes/project/getVisualManual"; import route84 from "./routes/project/visualManual";
import route85 from "./routes/project/visualManual"; import route85 from "./routes/script/addScript";
import route86 from "./routes/script/addScript"; import route86 from "./routes/script/delScript";
import route87 from "./routes/script/delScript"; import route87 from "./routes/script/exportScript";
import route88 from "./routes/script/exportScript"; import route88 from "./routes/script/extractAssets";
import route89 from "./routes/script/extractAssets"; import route89 from "./routes/script/getScrptApi";
import route90 from "./routes/script/getScrptApi"; import route90 from "./routes/script/pollScriptAssets";
import route91 from "./routes/script/pollScriptAssets"; import route91 from "./routes/script/updateScript";
import route92 from "./routes/script/updateScript"; import route92 from "./routes/scriptAgent/getPlanData";
import route93 from "./routes/scriptAgent/getPlanData"; import route93 from "./routes/scriptAgent/setPlanData";
import route94 from "./routes/scriptAgent/setPlanData"; import route94 from "./routes/scriptAgent/updateData";
import route95 from "./routes/scriptAgent/updateData"; import route95 from "./routes/setting/about/checkUpdate";
import route96 from "./routes/setting/about/checkUpdate"; import route96 from "./routes/setting/about/downloadApp";
import route97 from "./routes/setting/about/downloadApp"; import route97 from "./routes/setting/agentDeploy/agentSetKey";
import route98 from "./routes/setting/agentDeploy/agentSetKey"; import route98 from "./routes/setting/agentDeploy/deployAgentModel";
import route99 from "./routes/setting/agentDeploy/deployAgentModel"; import route99 from "./routes/setting/agentDeploy/getAgentDeploy";
import route100 from "./routes/setting/agentDeploy/getAgentDeploy"; import route100 from "./routes/setting/dbConfig/clearData";
import route101 from "./routes/setting/dbConfig/clearData"; import route101 from "./routes/setting/dev/getSwitchAiDevTool";
import route102 from "./routes/setting/dev/getSwitchAiDevTool"; import route102 from "./routes/setting/dev/updateSwitchAiDevTool";
import route103 from "./routes/setting/dev/updateSwitchAiDevTool"; import route103 from "./routes/setting/fileManagement/openFolder";
import route104 from "./routes/setting/fileManagement/openFolder"; import route104 from "./routes/setting/getTextModel";
import route105 from "./routes/setting/getTextModel"; import route105 from "./routes/setting/loginConfig/getUser";
import route106 from "./routes/setting/loginConfig/getUser"; import route106 from "./routes/setting/loginConfig/updateUserPwd";
import route107 from "./routes/setting/loginConfig/updateUserPwd"; import route107 from "./routes/setting/memoryConfig/delAllMemory";
import route108 from "./routes/setting/memoryConfig/delAllMemory"; import route108 from "./routes/setting/memoryConfig/getMemory";
import route109 from "./routes/setting/memoryConfig/getMemory"; import route109 from "./routes/setting/memoryConfig/sureMemory";
import route110 from "./routes/setting/memoryConfig/sureMemory"; import route110 from "./routes/setting/promptManage/getPrompt";
import route111 from "./routes/setting/promptManage/getPrompt"; import route111 from "./routes/setting/promptManage/updatePrompt";
import route112 from "./routes/setting/promptManage/updatePrompt"; import route112 from "./routes/setting/skillManagement/getSkillContent";
import route113 from "./routes/setting/skillManagement/getSkillContent"; import route113 from "./routes/setting/skillManagement/getSkillList";
import route114 from "./routes/setting/skillManagement/getSkillList"; import route114 from "./routes/setting/skillManagement/saveSkillContent";
import route115 from "./routes/setting/skillManagement/saveSkillContent"; import route115 from "./routes/setting/vendorConfig/addVendor";
import route116 from "./routes/setting/vendorConfig/addVendor"; import route116 from "./routes/setting/vendorConfig/deleteVendor";
import route117 from "./routes/setting/vendorConfig/deleteVendor"; import route117 from "./routes/setting/vendorConfig/getVendorList";
import route118 from "./routes/setting/vendorConfig/getVendorList"; import route118 from "./routes/setting/vendorConfig/modelTest";
import route119 from "./routes/setting/vendorConfig/modelTest"; import route119 from "./routes/setting/vendorConfig/updateCode";
import route120 from "./routes/setting/vendorConfig/updateCode"; import route120 from "./routes/setting/vendorConfig/updateVendor";
import route121 from "./routes/setting/vendorConfig/updateVendor"; import route121 from "./routes/task/getProject";
import route122 from "./routes/task/getProject"; import route122 from "./routes/task/getTaskApi";
import route123 from "./routes/task/getTaskApi"; import route123 from "./routes/task/getTaskCategories";
import route124 from "./routes/task/getTaskCategories"; import route124 from "./routes/task/taskDetails";
import route125 from "./routes/task/taskDetails"; import route125 from "./routes/test/test";
import route126 from "./routes/test/test";
export default async (app: Express) => { export default async (app: Express) => {
app.use("/api/agents/clearMemory", route1); app.use("/api/agents/clearMemory", route1);
@ -197,62 +196,61 @@ export default async (app: Express) => {
app.use("/api/production/storyboard/removeFrame", route66); app.use("/api/production/storyboard/removeFrame", route66);
app.use("/api/production/storyboard/updateStoryboardUrl", route67); app.use("/api/production/storyboard/updateStoryboardUrl", route67);
app.use("/api/production/workbench/addTrack", route68); app.use("/api/production/workbench/addTrack", route68);
app.use("/api/production/workbench/confirmSelection", route69); app.use("/api/production/workbench/delVideo", route69);
app.use("/api/production/workbench/delVideo", route70); app.use("/api/production/workbench/generateVideo", route70);
app.use("/api/production/workbench/generateVideo", route71); app.use("/api/production/workbench/generateVideoPrompt", route71);
app.use("/api/production/workbench/generateVideoPrompt", route72); app.use("/api/production/workbench/getGenerateData", route72);
app.use("/api/production/workbench/getGenerateData", route73); app.use("/api/production/workbench/getVideoList", route73);
app.use("/api/production/workbench/getVideoModelDetail", route74); app.use("/api/production/workbench/getVideoModelDetail", route74);
app.use("/api/production/workbench/videoPolling", route75); app.use("/api/project/addProject", route75);
app.use("/api/project/addProject", route76); app.use("/api/project/addVisual", route76);
app.use("/api/project/addVisual", route77); app.use("/api/project/addVisualManual", route77);
app.use("/api/project/addVisualManual", route78); app.use("/api/project/deleteVisualManual", route78);
app.use("/api/project/deleteVisualManual", route79); app.use("/api/project/delProject", route79);
app.use("/api/project/delProject", route80); app.use("/api/project/editProject", route80);
app.use("/api/project/editProject", route81); app.use("/api/project/editVisualManual", route81);
app.use("/api/project/editVisualManual", route82); app.use("/api/project/getProject", route82);
app.use("/api/project/getProject", route83); app.use("/api/project/getVisualManual", route83);
app.use("/api/project/getVisualManual", route84); app.use("/api/project/visualManual", route84);
app.use("/api/project/visualManual", route85); app.use("/api/script/addScript", route85);
app.use("/api/script/addScript", route86); app.use("/api/script/delScript", route86);
app.use("/api/script/delScript", route87); app.use("/api/script/exportScript", route87);
app.use("/api/script/exportScript", route88); app.use("/api/script/extractAssets", route88);
app.use("/api/script/extractAssets", route89); app.use("/api/script/getScrptApi", route89);
app.use("/api/script/getScrptApi", route90); app.use("/api/script/pollScriptAssets", route90);
app.use("/api/script/pollScriptAssets", route91); app.use("/api/script/updateScript", route91);
app.use("/api/script/updateScript", route92); app.use("/api/scriptAgent/getPlanData", route92);
app.use("/api/scriptAgent/getPlanData", route93); app.use("/api/scriptAgent/setPlanData", route93);
app.use("/api/scriptAgent/setPlanData", route94); app.use("/api/scriptAgent/updateData", route94);
app.use("/api/scriptAgent/updateData", route95); app.use("/api/setting/about/checkUpdate", route95);
app.use("/api/setting/about/checkUpdate", route96); app.use("/api/setting/about/downloadApp", route96);
app.use("/api/setting/about/downloadApp", route97); app.use("/api/setting/agentDeploy/agentSetKey", route97);
app.use("/api/setting/agentDeploy/agentSetKey", route98); app.use("/api/setting/agentDeploy/deployAgentModel", route98);
app.use("/api/setting/agentDeploy/deployAgentModel", route99); app.use("/api/setting/agentDeploy/getAgentDeploy", route99);
app.use("/api/setting/agentDeploy/getAgentDeploy", route100); app.use("/api/setting/dbConfig/clearData", route100);
app.use("/api/setting/dbConfig/clearData", route101); app.use("/api/setting/dev/getSwitchAiDevTool", route101);
app.use("/api/setting/dev/getSwitchAiDevTool", route102); app.use("/api/setting/dev/updateSwitchAiDevTool", route102);
app.use("/api/setting/dev/updateSwitchAiDevTool", route103); app.use("/api/setting/fileManagement/openFolder", route103);
app.use("/api/setting/fileManagement/openFolder", route104); app.use("/api/setting/getTextModel", route104);
app.use("/api/setting/getTextModel", route105); app.use("/api/setting/loginConfig/getUser", route105);
app.use("/api/setting/loginConfig/getUser", route106); app.use("/api/setting/loginConfig/updateUserPwd", route106);
app.use("/api/setting/loginConfig/updateUserPwd", route107); app.use("/api/setting/memoryConfig/delAllMemory", route107);
app.use("/api/setting/memoryConfig/delAllMemory", route108); app.use("/api/setting/memoryConfig/getMemory", route108);
app.use("/api/setting/memoryConfig/getMemory", route109); app.use("/api/setting/memoryConfig/sureMemory", route109);
app.use("/api/setting/memoryConfig/sureMemory", route110); app.use("/api/setting/promptManage/getPrompt", route110);
app.use("/api/setting/promptManage/getPrompt", route111); app.use("/api/setting/promptManage/updatePrompt", route111);
app.use("/api/setting/promptManage/updatePrompt", route112); app.use("/api/setting/skillManagement/getSkillContent", route112);
app.use("/api/setting/skillManagement/getSkillContent", route113); app.use("/api/setting/skillManagement/getSkillList", route113);
app.use("/api/setting/skillManagement/getSkillList", route114); app.use("/api/setting/skillManagement/saveSkillContent", route114);
app.use("/api/setting/skillManagement/saveSkillContent", route115); app.use("/api/setting/vendorConfig/addVendor", route115);
app.use("/api/setting/vendorConfig/addVendor", route116); app.use("/api/setting/vendorConfig/deleteVendor", route116);
app.use("/api/setting/vendorConfig/deleteVendor", route117); app.use("/api/setting/vendorConfig/getVendorList", route117);
app.use("/api/setting/vendorConfig/getVendorList", route118); app.use("/api/setting/vendorConfig/modelTest", route118);
app.use("/api/setting/vendorConfig/modelTest", route119); app.use("/api/setting/vendorConfig/updateCode", route119);
app.use("/api/setting/vendorConfig/updateCode", route120); app.use("/api/setting/vendorConfig/updateVendor", route120);
app.use("/api/setting/vendorConfig/updateVendor", route121); app.use("/api/task/getProject", route121);
app.use("/api/task/getProject", route122); app.use("/api/task/getTaskApi", route122);
app.use("/api/task/getTaskApi", route123); app.use("/api/task/getTaskCategories", route123);
app.use("/api/task/getTaskCategories", route124); app.use("/api/task/taskDetails", route124);
app.use("/api/task/taskDetails", route125); app.use("/api/test/test", route125);
app.use("/api/test/test", route126);
} }

View File

@ -1,19 +0,0 @@
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({
storyboardId: z.number(),
videoId: z.number(),
}),
async (req, res) => {
const { storyboardId, videoId } = req.body;
await u.db("o_videoConfig").where("storyboardId", storyboardId).update({ videoId, updateTime: Date.now() });
res.status(200).send(success({ message: "选择确认成功" }));
},
);

View File

@ -22,21 +22,22 @@ export default router.post(
resolution: z.string(), resolution: z.string(),
duration: z.number(), duration: z.number(),
audio: z.boolean().optional(), audio: z.boolean().optional(),
trackId: z.number(),
}), }),
async (req, res) => { async (req, res) => {
const { scriptId, projectId, prompt, uploadData, model, duration, resolution, audio, mode } = req.body; const { scriptId, projectId, prompt, uploadData, model, duration, resolution, audio, mode, trackId } = req.body;
//获取生成视频比例 //获取生成视频比例
const ratio = await u.db("o_project").select("videoRatio").where("id", projectId).first(); const ratio = await u.db("o_project").select("videoRatio").where("id", projectId).first();
const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径 const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径
//新增 //新增
const videoData = { const [videoId] = await u.db("o_video").insert({
filePath: videoPath, filePath: videoPath,
time: Date.now(), time: Date.now(),
state: "生成中", state: "生成中",
scriptId, scriptId,
projectId, projectId,
}; videoTrackId: trackId,
const [videoId] = await u.db("o_video").insert(videoData); });
//查询出图片数据 //查询出图片数据
const images = await Promise.all( const images = await Promise.all(
uploadData.map(async (item: { id: number; type: string }) => { uploadData.map(async (item: { id: number; type: string }) => {

View File

@ -8,25 +8,31 @@ const router = express.Router();
export default router.post( export default router.post(
"/", "/",
validateFields({ validateFields({
trackId: z.number(),
projectId: z.number(), projectId: z.number(),
prompt: z.array(z.string()), prompt: z.array(z.string()),
model: z.string(), model: z.string(),
}), }),
async (req, res) => { async (req, res) => {
const { projectId, prompt, model } = req.body; const { trackId, projectId, prompt, model } = req.body;
const [id, modelData] = model.split(":"); const [id, modelData] = model.split(":");
const projectData = await u.db("o_project").select("*").where({ id: projectId }).first(); const projectData = await u.db("o_project").select("*").where({ id: projectId }).first();
const artStyle = projectData?.artStyle || "无"; const artStyle = projectData?.artStyle || "无";
const visualManual = await u.getArtPrompt(artStyle, "art_storyboard_video"); const visualManual = u.getArtPrompt(artStyle, "art_storyboard_video");
const { text } = await u.Ai.Text("universalAi").invoke({ const { text } = await u.Ai.Text("universalAi").invoke({
system: visualManual, system: visualManual,
messages: [ messages: [
{ {
role: "user", role: "user",
content: `你是一个专业的${modelData}视频生成助手。请根据以下提示词,生成一段完整的、可直接用于视频生成模型的中文提示词。${prompt.join(",")}`, content: `你是一个专业的${modelData}视频生成助手。请根据以下提示词,生成一段完整的、可直接用于视频生成模型的中文提示词。${prompt.join(
",",
)}`,
}, },
], ],
}); });
await u.db("o_videoTrack").where({ id: trackId }).update({
prompt: text,
});
res.status(200).send(success(text)); res.status(200).send(success(text));
}, },
); );

View File

@ -15,10 +15,14 @@ interface TrackMedia {
src: string; src: string;
id?: number; id?: number;
fileType: "image" | "video" | "audio"; fileType: "image" | "video" | "audio";
prompt?: string;
} }
interface TrackItem { interface TrackItem {
id?: number; id?: number;
prompt: string;
state: "未生成" | "生成中" | "已完成" | "生成失败";
reason?: string;
medias: TrackMedia[]; medias: TrackMedia[];
videoList: VideoItem[]; videoList: VideoItem[];
} }
@ -31,21 +35,59 @@ export default router.post(
}), }),
async (req, res) => { async (req, res) => {
const { projectId, scriptId } = req.body; const { projectId, scriptId } = req.body;
// const data = await u.db("o_videoTrack").where({ projectId, scriptId }); const storyboardList = await u.db("o_storyboard").where({ scriptId, projectId }).orderBy("index", "asc");
const storyboardList = await u.db("o_storyboard").where({ scriptId }).orderBy("index", "asc"); const videoList = await u.db("o_video").whereIn(
console.log("%c Line:17 🥝 storyboardList", "background:#ea7e5c", storyboardList); "videoTrackId",
// const data = await u.db("o_video").where({ projectId, scriptId }); storyboardList.map((s) => s.trackId),
const trackList: TrackItem[] = [ );
{ console.log("%c Line:40 🌽 videoList", "background:#ffdd4d", videoList);
id: 1, const trackData = await u.db("o_videoTrack").whereIn(
medias: [{ src: "https://example.com/image1.jpg", fileType: "image", id: 1 }], //@ts-ignore
videoList: [ "id",
{ id: 1, src: "https://example.com/video1.mp4", state: "已完成" }, storyboardList.map((s) => s.trackId),
{ id: 2, src: "https://example.com/video2.mp4", state: "生成中" }, );
],
},
];
res.status(200).send(success(trackList)); const trackList: TrackItem[] = [];
const trackIdMap = [...new Set<number>(storyboardList.map((s) => s.trackId!))];
for (const trackId of trackIdMap) {
const item = trackData.find((t) => t.id === trackId);
trackList.push({
id: trackId,
prompt: item?.prompt || "",
state: (item?.state as "未生成" | "生成中" | "已完成" | "生成失败") ?? "未生成",
reason: item?.reason ?? "",
medias: await Promise.all(
storyboardList
.filter((s) => s.trackId === trackId)
.map(async (s): Promise<TrackMedia> => ({
src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "",
fileType: "image",
...(s.prompt != null ? { prompt: s.prompt } : {}),
...(s.id != null ? { id: s.id } : {}),
})),
),
videoList: await Promise.all(
videoList
.filter((v) => v.videoTrackId === trackId)
.map(async (v) => ({
id: v.id!,
src: v.filePath ? await u.oss.getFileUrl(v.filePath) : "",
state: v.state === "done" ? "已完成" : v.state === "generating" ? "生成中" : v.state === "error" ? "生成失败" : "未生成",
})),
),
});
}
res.status(200).send(
success({
storyboardList: await Promise.all(
storyboardList.map(async (s) => ({
...s,
src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "",
})),
),
trackList,
}),
);
}, },
); );

View File

@ -0,0 +1,32 @@
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(),
scriptId: z.number(),
}),
async (req, res) => {
const { projectId, scriptId } = req.body;
const storyboardList = await u.db("o_storyboard").where({ scriptId, projectId }).orderBy("index", "asc");
const videoList = await u.db("o_video").whereIn(
"videoTrackId",
storyboardList.map((s) => s.trackId),
);
res.status(200).send(
success(
await Promise.all(
videoList.map(async (s) => ({
...s,
src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "",
})),
),
),
);
},
);

View File

@ -1,19 +0,0 @@
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({
id: z.number(),
specifyIds: z.array(z.number()),
}),
async (req, res) => {
const { id, specifyIds } = req.body;
const data = await u.db("o_video").where("id", id).whereIn("id", specifyIds).andWhere("state", "生成中").select("*");
res.status(200).send(success(data));
},
);

View File

@ -1,4 +1,4 @@
// @db-hash ae0b5b1d792b614db036441010965ace // @db-hash 2c7f828da2621d74d1b0d147d4ba4342
//该文件由脚本自动生成,请勿手动修改 //该文件由脚本自动生成,请勿手动修改
export interface memories { export interface memories {
@ -217,7 +217,10 @@ export interface o_video {
export interface o_videoTrack { export interface o_videoTrack {
'id'?: number; 'id'?: number;
'projectId'?: number | null; 'projectId'?: number | null;
'prompt'?: string | null;
'reason'?: string | null;
'scriptId'?: number | null; 'scriptId'?: number | null;
'state'?: string | null;
'videoId'?: number | null; 'videoId'?: number | null;
} }