diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index de19a0e..0631fb6 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -307,6 +307,7 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => name: "o_storyboard", builder: (table) => { table.integer("id").notNullable(); + table.integer("scriptId"); table.text("name"); table.text("detail"); table.text("prompt"); @@ -334,11 +335,7 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => name: "o_video", builder: (table) => { table.integer("id").notNullable(); - table.text("resolution"); - table.text("prompt"); table.text("filePath"); - table.text("model"); - table.text("mode"); table.text("errorReason"); table.integer("time"); table.text("state"); @@ -348,15 +345,15 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.unique(["id"]); }, }, - //视频配置 { name: "o_videoConfig", builder: (table) => { table.integer("id").notNullable(); - table.integer("videoId"); //视频Id - table.integer("audio"); //声音 - table.text("model"); //模型 - table.text("mode"); // 模式：startEnd/multi/single + table.integer("storyboardId"); + table.integer("videoId"); + table.integer("audio"); // 声音 + table.text("model"); // 模型 + table.text("mode"); // 模式： table.text("data"); // 所选数据集图片 JSON table.text("resolution"); // 分辨率 table.integer("duration"); // 时长 diff --git a/src/router.ts b/src/router.ts index f65c868..714ac94 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash beeb358ee056d0414c7a2ca88bc9b566 +// @routes-hash a3ee46a441a84f41e515f5b26b9ccaa9 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -34,35 +34,39 @@ 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/getProductionData"; -import route35 from "./routes/production/workbench/generateVideo"; -import route36 from "./routes/production/workbench/getVideoModelDetail"; -import route37 from "./routes/project/addProject"; -import route38 from "./routes/project/delProject"; -import route39 from "./routes/project/editProject"; -import route40 from "./routes/project/getProject"; -import route41 from "./routes/script/addScript"; -import route42 from "./routes/script/delScript"; -import route43 from "./routes/script/getScrptApi"; -import route44 from "./routes/script/updateScript"; -import route45 from "./routes/setting/agentDeploy/deployAgentModel"; -import route46 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route47 from "./routes/setting/agentDeploy/updateKey"; -import route48 from "./routes/setting/dbConfig/clearData"; -import route49 from "./routes/setting/getTextModel"; -import route50 from "./routes/setting/loginConfig/getUser"; -import route51 from "./routes/setting/loginConfig/updateUserPwd"; -import route52 from "./routes/setting/memoryConfig/getMemory"; -import route53 from "./routes/setting/memoryConfig/sureMemory"; -import route54 from "./routes/setting/vendorConfig/addVendor"; -import route55 from "./routes/setting/vendorConfig/deleteVendor"; -import route56 from "./routes/setting/vendorConfig/getVendorList"; -import route57 from "./routes/setting/vendorConfig/modelTest"; -import route58 from "./routes/setting/vendorConfig/updateVendor"; -import route59 from "./routes/task/getMyTaskApi"; -import route60 from "./routes/task/getTaskCategories"; -import route61 from "./routes/task/taskDetails"; -import route62 from "./routes/test/test"; +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/workbench/generateVideo"; +import route40 from "./routes/production/workbench/getVideoModelDetail"; +import route41 from "./routes/project/addProject"; +import route42 from "./routes/project/delProject"; +import route43 from "./routes/project/editProject"; +import route44 from "./routes/project/getProject"; +import route45 from "./routes/script/addScript"; +import route46 from "./routes/script/delScript"; +import route47 from "./routes/script/getScrptApi"; +import route48 from "./routes/script/updateScript"; +import route49 from "./routes/setting/agentDeploy/deployAgentModel"; +import route50 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route51 from "./routes/setting/agentDeploy/updateKey"; +import route52 from "./routes/setting/dbConfig/clearData"; +import route53 from "./routes/setting/getTextModel"; +import route54 from "./routes/setting/loginConfig/getUser"; +import route55 from "./routes/setting/loginConfig/updateUserPwd"; +import route56 from "./routes/setting/memoryConfig/getMemory"; +import route57 from "./routes/setting/memoryConfig/sureMemory"; +import route58 from "./routes/setting/vendorConfig/addVendor"; +import route59 from "./routes/setting/vendorConfig/deleteVendor"; +import route60 from "./routes/setting/vendorConfig/getVendorList"; +import route61 from "./routes/setting/vendorConfig/modelTest"; +import route62 from "./routes/setting/vendorConfig/updateVendor"; +import route63 from "./routes/task/getMyTaskApi"; +import route64 from "./routes/task/getTaskCategories"; +import route65 from "./routes/task/taskDetails"; +import route66 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -98,33 +102,37 @@ export default async (app: Express) => { app.use("/api/novel/updateNovel", route31); app.use("/api/other/deleteAllData", route32); app.use("/api/other/getCaptcha", route33); - app.use("/api/production/getProductionData", route34); - app.use("/api/production/workbench/generateVideo", route35); - app.use("/api/production/workbench/getVideoModelDetail", route36); - app.use("/api/project/addProject", route37); - app.use("/api/project/delProject", route38); - app.use("/api/project/editProject", route39); - app.use("/api/project/getProject", route40); - app.use("/api/script/addScript", route41); - app.use("/api/script/delScript", route42); - app.use("/api/script/getScrptApi", route43); - app.use("/api/script/updateScript", route44); - app.use("/api/setting/agentDeploy/deployAgentModel", route45); - app.use("/api/setting/agentDeploy/getAgentDeploy", route46); - app.use("/api/setting/agentDeploy/updateKey", route47); - app.use("/api/setting/dbConfig/clearData", route48); - app.use("/api/setting/getTextModel", route49); - app.use("/api/setting/loginConfig/getUser", route50); - app.use("/api/setting/loginConfig/updateUserPwd", route51); - app.use("/api/setting/memoryConfig/getMemory", route52); - app.use("/api/setting/memoryConfig/sureMemory", route53); - app.use("/api/setting/vendorConfig/addVendor", route54); - app.use("/api/setting/vendorConfig/deleteVendor", route55); - app.use("/api/setting/vendorConfig/getVendorList", route56); - app.use("/api/setting/vendorConfig/modelTest", route57); - app.use("/api/setting/vendorConfig/updateVendor", route58); - app.use("/api/task/getMyTaskApi", route59); - app.use("/api/task/getTaskCategories", route60); - app.use("/api/task/taskDetails", route61); - app.use("/api/test/test", route62); + 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/workbench/generateVideo", route39); + app.use("/api/production/workbench/getVideoModelDetail", route40); + app.use("/api/project/addProject", route41); + app.use("/api/project/delProject", route42); + app.use("/api/project/editProject", route43); + app.use("/api/project/getProject", route44); + app.use("/api/script/addScript", route45); + app.use("/api/script/delScript", route46); + app.use("/api/script/getScrptApi", route47); + app.use("/api/script/updateScript", route48); + app.use("/api/setting/agentDeploy/deployAgentModel", route49); + app.use("/api/setting/agentDeploy/getAgentDeploy", route50); + app.use("/api/setting/agentDeploy/updateKey", route51); + app.use("/api/setting/dbConfig/clearData", route52); + app.use("/api/setting/getTextModel", route53); + app.use("/api/setting/loginConfig/getUser", route54); + app.use("/api/setting/loginConfig/updateUserPwd", route55); + app.use("/api/setting/memoryConfig/getMemory", route56); + app.use("/api/setting/memoryConfig/sureMemory", route57); + app.use("/api/setting/vendorConfig/addVendor", route58); + app.use("/api/setting/vendorConfig/deleteVendor", route59); + app.use("/api/setting/vendorConfig/getVendorList", route60); + app.use("/api/setting/vendorConfig/modelTest", route61); + app.use("/api/setting/vendorConfig/updateVendor", route62); + app.use("/api/task/getMyTaskApi", route63); + app.use("/api/task/getTaskCategories", route64); + app.use("/api/task/taskDetails", route65); + app.use("/api/test/test", route66); } diff --git a/src/routes/production/getProductionData.ts b/src/routes/production/getProductionData.ts index de7e078..4c71293 100644 --- a/src/routes/production/getProductionData.ts +++ b/src/routes/production/getProductionData.ts @@ -4,15 +4,82 @@ 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; - res.status(200).send(success("123")); + "/", + validateFields({ + scriptId: z.number(), + }), + async (req, res) => { + const { scriptId } = req.body; + + // 1. 查出该剧本下所有分镜 + const storyboards = await u + .db("o_storyboard") + .where("o_storyboard.scriptId", scriptId) + .select( + "o_storyboard.id", + "o_storyboard.name", + "o_storyboard.detail", + "o_storyboard.prompt", + "o_storyboard.seconds", + "o_storyboard.filePath", + "o_storyboard.frameType", + "o_storyboard.scriptId", + ) + .orderBy("o_storyboard.createTime", "asc"); + + if (storyboards.length === 0) { + return res.status(200).send(success([])); } + + const storyboardIds = storyboards.map((s) => s.id as number); + + // 2. 批量查出所有相关视频 + const videos = await u + .db("o_video") + .whereIn("o_video.storyboardId", storyboardIds) + .select("o_video.id", "o_video.storyboardId", "o_video.filePath", "o_video.state", "o_video.errorReason") + .orderBy("o_video.time", "desc"); + + // 3. 批量查出所有相关配置 + const configs = await u + .db("o_videoConfig") + .whereIn("o_videoConfig.storyboardId", storyboardIds) + .select( + "o_videoConfig.id", + "o_videoConfig.storyboardId", + "o_videoConfig.videoId", + "o_videoConfig.prompt", + "o_videoConfig.model", + "o_videoConfig.mode", + "o_videoConfig.resolution", + "o_videoConfig.duration", + "o_videoConfig.audio", + "o_videoConfig.data", + ); + + // 4. 按 storyboardId 建立 Map 方便聚合 + const videoMap = new Map(); + for (const video of videos) { + const sid = video.storyboardId as number; + if (!videoMap.has(sid)) videoMap.set(sid, []); + videoMap.get(sid)!.push(video); + } + const configMap = new Map(configs.map((c) => [c.storyboardId as number, c])); + + // 5. 组装结果：分镜平铺 + config 对象 + videos 数组 + const data = await Promise.all( + storyboards.map(async (storyboard) => { + const sid = storyboard.id as number; + return { + ...storyboard, + filePath: storyboard.filePath && (await u.oss.getFileUrl(storyboard.filePath!)), + config: configMap.get(sid) ?? null, + videos: videoMap.get(sid) ?? [], + }; + }), + ); + + return res.status(200).send(success(data)); + }, ); diff --git a/src/routes/production/workbench/generateVideo.ts b/src/routes/production/workbench/generateVideo.ts index 7ad90d4..9777435 100644 --- a/src/routes/production/workbench/generateVideo.ts +++ b/src/routes/production/workbench/generateVideo.ts @@ -13,15 +13,79 @@ export default router.post( projectId: z.number(), storyboardId: z.number(), prompt: z.string(), - data: z.array(z.string()).optional(), + data: z + .array( + z.object({ + id: z.number(), + type: z.string(), + }), + ) + .optional(), model: z.string(), - duration: z.number(), + duration: z.string(), resolution: z.string(), audio: z.boolean().optional(), - modeData: z.string(), + mode: z.string(), }), async (req, res) => { - const { scriptId, projectId, storyboardId, prompt, data, model, duration, resolution, audio, modeData } = req.body; + const { scriptId, projectId, storyboardId, prompt, data, model, duration, resolution, audio, mode } = req.body; + const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径 + //新增 + const [videoId] = await u.db("o_video").insert({ + filePath: videoPath, + time: Date.now(), + state: "生成中", + scriptId, + storyboardId, + }); + //查询分镜是否已有配置 + const config = await u.db("o_videoConfig").where({ storyboardId }).first(); + //保存配置 + if (config) { + await u + .db("o_videoConfig") + .update({ audio, model, mode, data: JSON.stringify(data), resolution, duration, prompt, updateTime: Date.now() }) + .where({ id: config.id }); + } else { + await u.db("o_videoConfig").insert({ + storyboardId, + audio, + model, + mode, + data: JSON.stringify(data), + resolution, + duration, + prompt, + createTime: Date.now(), + updateTime: Date.now(), + }); + } + //查询出图片数据 + const images = await Promise.all( + data.map(async (item: { id: number; type: string }) => { + if (item.type === "storyboard") { + const filePath = await u.db("o_storyboard").where("id", item.id).select("filePath").first(); + return filePath?.filePath; + } + if (item.type === "assets") { + const filePath = await u + .db("o_assets") + .where("o_assets.id", item.id) + .leftJoin("o_image", "o_assets.imageId", "o_image.id") + .select("o_image.filePath") + .first(); + return filePath?.filePath; + } + }), + ); + //把images里面的图片转成base64格式 + const base64 = await Promise.all( + images.map(async (item) => { + if (!item) return null; + return await u.oss.getImageBase64(item); + }), + ); + //开始生成 try { const relatedObjects = { id: storyboardId, @@ -34,44 +98,33 @@ export default router.post( 3. 视频风格应与用户指定的模式数据相匹配，包括色彩、音乐、特效等元素。 4. 视频中应包含用户提供的图片，并在视频中适当展示，以增强视频的视觉效果。 5. 如果用户指定了音频，请确保视频中的音频与视频内容相匹配，符合用户的创意意图。`; - const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; + const aiVideo = u.Ai.Video(model); await aiVideo.run({ - systemPrompt, // 系统提示词 - projectId: projectId, - storyboardId: storyboardId, - prompt: prompt, - data: data, - modeData: modeData, - duration: duration, - resolution: resolution, - audio: audio, + systemPrompt, + projectId, + storyboardId, + prompt, + imageBase64: base64.filter((item) => item !== null) as string[], + mode, + duration, + resolution, + audio, taskClass: "视频生成", describe: "根据提示词生成视频", relatedObjects: JSON.stringify(relatedObjects), }); - await aiVideo.save(videoPath); // 保存视频 - //保存视频信息到数据库 - // await u.db("o_video").insert({ - // resolution, - // prompt, - // filePath: videoPath, - // model, - // time: Date.now(), - // state: "生成成功", - // scriptId: scriptId, - // }); - res.status(200).send(success("视频生成成功")); - } catch (error) { - // await u.db("o_video").insert({ - // resolution, - // prompt, - // model, - // time: Date.now(), - // state: "生成失败", - // scriptId: scriptId, - // errorReason: error instanceof Error ? error.message : "未知错误", - // }); + await aiVideo.save(videoPath); + await u.db("o_video").where("id", videoId).update({ state: "生成成功" }); + res.status(200).send(success({ videoId, message: "视频生成成功" })); + } catch (error: any) { + await u + .db("o_video") + .where("id", videoId) + .update({ + state: "生成失败", + errorReason: error instanceof Error ? error.message : "未知错误", + }); res.status(500).send({ error: "视频生成失败" }); } }, diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 4d13935..65f1bec 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash f67609654b5467393c4809a3921d8fa4 +// @db-hash f8ab3a7aee659c729c770f3555728f1b //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -110,8 +110,19 @@ export interface o_setting { } export interface o_storyboard { 'createTime'?: number | null; + 'detail'?: string | null; + 'filePath'?: string | null; + 'frameType'?: string | null; 'id'?: number; 'name'?: string | null; + 'prompt'?: string | null; + 'scriptId'?: number | null; + 'seconds'?: string | null; +} +export interface o_storyboardFlow { + 'flowData': string; + 'id'?: number; + 'stroryboardId': number; } export interface o_tasks { 'describe'?: string | null; @@ -144,10 +155,6 @@ export interface o_video { 'errorReason'?: string | null; 'filePath'?: string | null; 'id'?: number; - 'mode'?: string | null; - 'model'?: string | null; - 'prompt'?: string | null; - 'resolution'?: string | null; 'scriptId'?: number | null; 'state'?: string | null; 'storyboardId'?: number | null; @@ -163,6 +170,7 @@ export interface o_videoConfig { 'model'?: string | null; 'prompt'?: string | null; 'resolution'?: string | null; + 'storyboardId'?: number | null; 'updateTime'?: number | null; 'videoId'?: number | null; } @@ -183,6 +191,7 @@ export interface DB { "o_script": o_script; "o_setting": o_setting; "o_storyboard": o_storyboard; + "o_storyboardFlow": o_storyboardFlow; "o_tasks": o_tasks; "o_user": o_user; "o_vendorConfig": o_vendorConfig; diff --git a/src/utils/ai.ts b/src/utils/ai.ts index f0933f5..bde273c 100644 --- a/src/utils/ai.ts +++ b/src/utils/ai.ts @@ -117,8 +117,8 @@ interface VideoConfig { storyboardId: number; // 关联的分镜ID systemPrompt?: string; // 系统提示词 prompt: string; //视频提示词 - data: string[]; //输入的图片提示词 - modeData: string; //模式 + imageBase64: string[]; //输入的图片提示词 + mode: string; //模式 duration: number; // 视频时长，单位秒 resolution: string; // 视频分辨率 audio: boolean; // 是否需要配音