diff --git a/src/router.ts b/src/router.ts index 6b6e7c3..d58b591 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 03f1781a722f0e9e08213aec7ac1c10c +// @routes-hash cc267cab29401f6ad9055dac01879652 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -75,77 +75,78 @@ import route71 from "./routes/production/storyboard/previewImage"; import route72 from "./routes/production/storyboard/removeFrame"; import route73 from "./routes/production/storyboard/updateStoryboardUrl"; import route74 from "./routes/production/workbench/addTrack"; -import route75 from "./routes/production/workbench/deleteTrack"; -import route76 from "./routes/production/workbench/delVideo"; -import route77 from "./routes/production/workbench/generateVideo"; -import route78 from "./routes/production/workbench/generateVideoPrompt"; -import route79 from "./routes/production/workbench/getGenerateData"; -import route80 from "./routes/production/workbench/getVideoList"; -import route81 from "./routes/production/workbench/selectVideo"; -import route82 from "./routes/production/workbench/updateVideoPrompt"; -import route83 from "./routes/project/addDirectorManual"; -import route84 from "./routes/project/addProject"; -import route85 from "./routes/project/addVisualManual"; -import route86 from "./routes/project/deleteDirectorManual"; -import route87 from "./routes/project/deleteVisualManual"; -import route88 from "./routes/project/delProject"; -import route89 from "./routes/project/editDirectorlManual"; -import route90 from "./routes/project/editProject"; -import route91 from "./routes/project/editVisualManual"; -import route92 from "./routes/project/getModelDetails"; -import route93 from "./routes/project/getProject"; -import route94 from "./routes/project/getVisualManual"; -import route95 from "./routes/project/queryDirectorManual"; -import route96 from "./routes/project/visualManual"; -import route97 from "./routes/script/addScript"; -import route98 from "./routes/script/batchAddScript"; -import route99 from "./routes/script/delScript"; -import route100 from "./routes/script/exportScript"; -import route101 from "./routes/script/extractAssets"; -import route102 from "./routes/script/getScrptApi"; -import route103 from "./routes/script/pollScriptAssets"; -import route104 from "./routes/script/updateScript"; -import route105 from "./routes/scriptAgent/getPlanData"; -import route106 from "./routes/scriptAgent/setPlanData"; -import route107 from "./routes/scriptAgent/updateData"; -import route108 from "./routes/setting/about/checkUpdate"; -import route109 from "./routes/setting/about/downloadApp"; -import route110 from "./routes/setting/agentDeploy/agentSetKey"; -import route111 from "./routes/setting/agentDeploy/deployAgentModel"; -import route112 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route113 from "./routes/setting/dbConfig/clearData"; -import route114 from "./routes/setting/dev/getSwitchAiDevTool"; -import route115 from "./routes/setting/dev/updateSwitchAiDevTool"; -import route116 from "./routes/setting/fileManagement/openFolder"; -import route117 from "./routes/setting/getTextModel"; -import route118 from "./routes/setting/loginConfig/getUser"; -import route119 from "./routes/setting/loginConfig/updateUserPwd"; -import route120 from "./routes/setting/memoryConfig/delAllMemory"; -import route121 from "./routes/setting/memoryConfig/getMemory"; -import route122 from "./routes/setting/memoryConfig/sureMemory"; -import route123 from "./routes/setting/modelMap/bindingPrompt"; -import route124 from "./routes/setting/modelMap/getImageAndVideoModel"; -import route125 from "./routes/setting/promptManage/getPrompt"; -import route126 from "./routes/setting/promptManage/updatePrompt"; -import route127 from "./routes/setting/skillManagement/getSkillContent"; -import route128 from "./routes/setting/skillManagement/getSkillList"; -import route129 from "./routes/setting/skillManagement/saveSkillContent"; -import route130 from "./routes/setting/vendorConfig/addVendor"; -import route131 from "./routes/setting/vendorConfig/addVendorModel"; -import route132 from "./routes/setting/vendorConfig/deleteVendor"; -import route133 from "./routes/setting/vendorConfig/delVendorModel"; -import route134 from "./routes/setting/vendorConfig/enableVendor"; -import route135 from "./routes/setting/vendorConfig/getCodeByLink"; -import route136 from "./routes/setting/vendorConfig/getVendorList"; -import route137 from "./routes/setting/vendorConfig/modelTest"; -import route138 from "./routes/setting/vendorConfig/updateCode"; -import route139 from "./routes/setting/vendorConfig/updateVendorInputs"; -import route140 from "./routes/setting/vendorConfig/upVendorModel"; -import route141 from "./routes/task/getProject"; -import route142 from "./routes/task/getTaskApi"; -import route143 from "./routes/task/getTaskCategories"; -import route144 from "./routes/task/taskDetails"; -import route145 from "./routes/test/test"; +import route75 from "./routes/production/workbench/checkVideoStateList"; +import route76 from "./routes/production/workbench/deleteTrack"; +import route77 from "./routes/production/workbench/delVideo"; +import route78 from "./routes/production/workbench/generateVideo"; +import route79 from "./routes/production/workbench/generateVideoPrompt"; +import route80 from "./routes/production/workbench/getGenerateData"; +import route81 from "./routes/production/workbench/getVideoList"; +import route82 from "./routes/production/workbench/selectVideo"; +import route83 from "./routes/production/workbench/updateVideoPrompt"; +import route84 from "./routes/project/addDirectorManual"; +import route85 from "./routes/project/addProject"; +import route86 from "./routes/project/addVisualManual"; +import route87 from "./routes/project/deleteDirectorManual"; +import route88 from "./routes/project/deleteVisualManual"; +import route89 from "./routes/project/delProject"; +import route90 from "./routes/project/editDirectorlManual"; +import route91 from "./routes/project/editProject"; +import route92 from "./routes/project/editVisualManual"; +import route93 from "./routes/project/getModelDetails"; +import route94 from "./routes/project/getProject"; +import route95 from "./routes/project/getVisualManual"; +import route96 from "./routes/project/queryDirectorManual"; +import route97 from "./routes/project/visualManual"; +import route98 from "./routes/script/addScript"; +import route99 from "./routes/script/batchAddScript"; +import route100 from "./routes/script/delScript"; +import route101 from "./routes/script/exportScript"; +import route102 from "./routes/script/extractAssets"; +import route103 from "./routes/script/getScrptApi"; +import route104 from "./routes/script/pollScriptAssets"; +import route105 from "./routes/script/updateScript"; +import route106 from "./routes/scriptAgent/getPlanData"; +import route107 from "./routes/scriptAgent/setPlanData"; +import route108 from "./routes/scriptAgent/updateData"; +import route109 from "./routes/setting/about/checkUpdate"; +import route110 from "./routes/setting/about/downloadApp"; +import route111 from "./routes/setting/agentDeploy/agentSetKey"; +import route112 from "./routes/setting/agentDeploy/deployAgentModel"; +import route113 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route114 from "./routes/setting/dbConfig/clearData"; +import route115 from "./routes/setting/dev/getSwitchAiDevTool"; +import route116 from "./routes/setting/dev/updateSwitchAiDevTool"; +import route117 from "./routes/setting/fileManagement/openFolder"; +import route118 from "./routes/setting/getTextModel"; +import route119 from "./routes/setting/loginConfig/getUser"; +import route120 from "./routes/setting/loginConfig/updateUserPwd"; +import route121 from "./routes/setting/memoryConfig/delAllMemory"; +import route122 from "./routes/setting/memoryConfig/getMemory"; +import route123 from "./routes/setting/memoryConfig/sureMemory"; +import route124 from "./routes/setting/modelMap/bindingPrompt"; +import route125 from "./routes/setting/modelMap/getImageAndVideoModel"; +import route126 from "./routes/setting/promptManage/getPrompt"; +import route127 from "./routes/setting/promptManage/updatePrompt"; +import route128 from "./routes/setting/skillManagement/getSkillContent"; +import route129 from "./routes/setting/skillManagement/getSkillList"; +import route130 from "./routes/setting/skillManagement/saveSkillContent"; +import route131 from "./routes/setting/vendorConfig/addVendor"; +import route132 from "./routes/setting/vendorConfig/addVendorModel"; +import route133 from "./routes/setting/vendorConfig/deleteVendor"; +import route134 from "./routes/setting/vendorConfig/delVendorModel"; +import route135 from "./routes/setting/vendorConfig/enableVendor"; +import route136 from "./routes/setting/vendorConfig/getCodeByLink"; +import route137 from "./routes/setting/vendorConfig/getVendorList"; +import route138 from "./routes/setting/vendorConfig/modelTest"; +import route139 from "./routes/setting/vendorConfig/updateCode"; +import route140 from "./routes/setting/vendorConfig/updateVendorInputs"; +import route141 from "./routes/setting/vendorConfig/upVendorModel"; +import route142 from "./routes/task/getProject"; +import route143 from "./routes/task/getTaskApi"; +import route144 from "./routes/task/getTaskCategories"; +import route145 from "./routes/task/taskDetails"; +import route146 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -222,75 +223,76 @@ export default async (app: Express) => { app.use("/api/production/storyboard/removeFrame", route72); app.use("/api/production/storyboard/updateStoryboardUrl", route73); app.use("/api/production/workbench/addTrack", route74); - app.use("/api/production/workbench/deleteTrack", route75); - app.use("/api/production/workbench/delVideo", route76); - app.use("/api/production/workbench/generateVideo", route77); - app.use("/api/production/workbench/generateVideoPrompt", route78); - app.use("/api/production/workbench/getGenerateData", route79); - app.use("/api/production/workbench/getVideoList", route80); - app.use("/api/production/workbench/selectVideo", route81); - app.use("/api/production/workbench/updateVideoPrompt", route82); - app.use("/api/project/addDirectorManual", route83); - app.use("/api/project/addProject", route84); - app.use("/api/project/addVisualManual", route85); - app.use("/api/project/deleteDirectorManual", route86); - app.use("/api/project/deleteVisualManual", route87); - app.use("/api/project/delProject", route88); - app.use("/api/project/editDirectorlManual", route89); - app.use("/api/project/editProject", route90); - app.use("/api/project/editVisualManual", route91); - app.use("/api/project/getModelDetails", route92); - app.use("/api/project/getProject", route93); - app.use("/api/project/getVisualManual", route94); - app.use("/api/project/queryDirectorManual", route95); - app.use("/api/project/visualManual", route96); - app.use("/api/script/addScript", route97); - app.use("/api/script/batchAddScript", route98); - app.use("/api/script/delScript", route99); - app.use("/api/script/exportScript", route100); - app.use("/api/script/extractAssets", route101); - app.use("/api/script/getScrptApi", route102); - app.use("/api/script/pollScriptAssets", route103); - app.use("/api/script/updateScript", route104); - app.use("/api/scriptAgent/getPlanData", route105); - app.use("/api/scriptAgent/setPlanData", route106); - app.use("/api/scriptAgent/updateData", route107); - app.use("/api/setting/about/checkUpdate", route108); - app.use("/api/setting/about/downloadApp", route109); - app.use("/api/setting/agentDeploy/agentSetKey", route110); - app.use("/api/setting/agentDeploy/deployAgentModel", route111); - app.use("/api/setting/agentDeploy/getAgentDeploy", route112); - app.use("/api/setting/dbConfig/clearData", route113); - app.use("/api/setting/dev/getSwitchAiDevTool", route114); - app.use("/api/setting/dev/updateSwitchAiDevTool", route115); - app.use("/api/setting/fileManagement/openFolder", route116); - app.use("/api/setting/getTextModel", route117); - app.use("/api/setting/loginConfig/getUser", route118); - app.use("/api/setting/loginConfig/updateUserPwd", route119); - app.use("/api/setting/memoryConfig/delAllMemory", route120); - app.use("/api/setting/memoryConfig/getMemory", route121); - app.use("/api/setting/memoryConfig/sureMemory", route122); - app.use("/api/setting/modelMap/bindingPrompt", route123); - app.use("/api/setting/modelMap/getImageAndVideoModel", route124); - app.use("/api/setting/promptManage/getPrompt", route125); - app.use("/api/setting/promptManage/updatePrompt", route126); - app.use("/api/setting/skillManagement/getSkillContent", route127); - app.use("/api/setting/skillManagement/getSkillList", route128); - app.use("/api/setting/skillManagement/saveSkillContent", route129); - app.use("/api/setting/vendorConfig/addVendor", route130); - app.use("/api/setting/vendorConfig/addVendorModel", route131); - app.use("/api/setting/vendorConfig/deleteVendor", route132); - app.use("/api/setting/vendorConfig/delVendorModel", route133); - app.use("/api/setting/vendorConfig/enableVendor", route134); - app.use("/api/setting/vendorConfig/getCodeByLink", route135); - app.use("/api/setting/vendorConfig/getVendorList", route136); - app.use("/api/setting/vendorConfig/modelTest", route137); - app.use("/api/setting/vendorConfig/updateCode", route138); - app.use("/api/setting/vendorConfig/updateVendorInputs", route139); - app.use("/api/setting/vendorConfig/upVendorModel", route140); - app.use("/api/task/getProject", route141); - app.use("/api/task/getTaskApi", route142); - app.use("/api/task/getTaskCategories", route143); - app.use("/api/task/taskDetails", route144); - app.use("/api/test/test", route145); + app.use("/api/production/workbench/checkVideoStateList", route75); + app.use("/api/production/workbench/deleteTrack", route76); + app.use("/api/production/workbench/delVideo", route77); + app.use("/api/production/workbench/generateVideo", route78); + app.use("/api/production/workbench/generateVideoPrompt", route79); + app.use("/api/production/workbench/getGenerateData", route80); + app.use("/api/production/workbench/getVideoList", route81); + app.use("/api/production/workbench/selectVideo", route82); + app.use("/api/production/workbench/updateVideoPrompt", route83); + app.use("/api/project/addDirectorManual", route84); + app.use("/api/project/addProject", route85); + app.use("/api/project/addVisualManual", route86); + app.use("/api/project/deleteDirectorManual", route87); + app.use("/api/project/deleteVisualManual", route88); + app.use("/api/project/delProject", route89); + app.use("/api/project/editDirectorlManual", route90); + app.use("/api/project/editProject", route91); + app.use("/api/project/editVisualManual", route92); + app.use("/api/project/getModelDetails", route93); + app.use("/api/project/getProject", route94); + app.use("/api/project/getVisualManual", route95); + app.use("/api/project/queryDirectorManual", route96); + app.use("/api/project/visualManual", route97); + app.use("/api/script/addScript", route98); + app.use("/api/script/batchAddScript", route99); + app.use("/api/script/delScript", route100); + app.use("/api/script/exportScript", route101); + app.use("/api/script/extractAssets", route102); + app.use("/api/script/getScrptApi", route103); + app.use("/api/script/pollScriptAssets", route104); + app.use("/api/script/updateScript", route105); + app.use("/api/scriptAgent/getPlanData", route106); + app.use("/api/scriptAgent/setPlanData", route107); + app.use("/api/scriptAgent/updateData", route108); + app.use("/api/setting/about/checkUpdate", route109); + app.use("/api/setting/about/downloadApp", route110); + app.use("/api/setting/agentDeploy/agentSetKey", route111); + app.use("/api/setting/agentDeploy/deployAgentModel", route112); + app.use("/api/setting/agentDeploy/getAgentDeploy", route113); + app.use("/api/setting/dbConfig/clearData", route114); + app.use("/api/setting/dev/getSwitchAiDevTool", route115); + app.use("/api/setting/dev/updateSwitchAiDevTool", route116); + app.use("/api/setting/fileManagement/openFolder", route117); + app.use("/api/setting/getTextModel", route118); + app.use("/api/setting/loginConfig/getUser", route119); + app.use("/api/setting/loginConfig/updateUserPwd", route120); + app.use("/api/setting/memoryConfig/delAllMemory", route121); + app.use("/api/setting/memoryConfig/getMemory", route122); + app.use("/api/setting/memoryConfig/sureMemory", route123); + app.use("/api/setting/modelMap/bindingPrompt", route124); + app.use("/api/setting/modelMap/getImageAndVideoModel", route125); + app.use("/api/setting/promptManage/getPrompt", route126); + app.use("/api/setting/promptManage/updatePrompt", route127); + app.use("/api/setting/skillManagement/getSkillContent", route128); + app.use("/api/setting/skillManagement/getSkillList", route129); + app.use("/api/setting/skillManagement/saveSkillContent", route130); + app.use("/api/setting/vendorConfig/addVendor", route131); + app.use("/api/setting/vendorConfig/addVendorModel", route132); + app.use("/api/setting/vendorConfig/deleteVendor", route133); + app.use("/api/setting/vendorConfig/delVendorModel", route134); + app.use("/api/setting/vendorConfig/enableVendor", route135); + app.use("/api/setting/vendorConfig/getCodeByLink", route136); + app.use("/api/setting/vendorConfig/getVendorList", route137); + app.use("/api/setting/vendorConfig/modelTest", route138); + app.use("/api/setting/vendorConfig/updateCode", route139); + app.use("/api/setting/vendorConfig/updateVendorInputs", route140); + app.use("/api/setting/vendorConfig/upVendorModel", route141); + app.use("/api/task/getProject", route142); + app.use("/api/task/getTaskApi", route143); + app.use("/api/task/getTaskCategories", route144); + app.use("/api/task/taskDetails", route145); + app.use("/api/test/test", route146); } diff --git a/src/routes/production/workbench/generateVideoPrompt.ts b/src/routes/production/workbench/generateVideoPrompt.ts index 5306e81..807a619 100644 --- a/src/routes/production/workbench/generateVideoPrompt.ts +++ b/src/routes/production/workbench/generateVideoPrompt.ts @@ -1,7 +1,7 @@ import express from "express"; import u from "@/utils"; import { z } from "zod"; -import { success } from "@/lib/responseFormat"; +import { success, error } from "@/lib/responseFormat"; import { validateFields } from "@/middleware/middleware"; import { info } from "node:console"; const router = express.Router(); @@ -42,7 +42,12 @@ export default router.post( } if (item.sources === "assets") { // 查询素材 - const assetsData = await u.db("o_assets").leftJoin("o_image","o_image.id","o_assets.imageId").where("o_assets.id", item.id).select("o_assets.id", "o_assets.type", "o_assets.name","o_image.filePath").first(); + const assetsData = await u + .db("o_assets") + .leftJoin("o_image", "o_image.id", "o_assets.imageId") + .where("o_assets.id", item.id) + .select("o_assets.id", "o_assets.type", "o_assets.name", "o_image.filePath") + .first(); return { ...assetsData, _type: "assets", // 标记类型 @@ -61,7 +66,7 @@ export default router.post( id: item.id, type: item.type, name: item.name, - filePath:item.filePath + filePath: item.filePath, }); if (item._type === "storyboard") storyboard.push({ @@ -86,7 +91,10 @@ export default router.post( const visualManual = u.getArtPrompt(artStyle, "art_skills", "art_storyboard_video"); const content = ` **模型名称**：${modelData}, - **资产信息**（角色、场景、道具):${assets.filter(i => i.filePath).map((i) => `[${i.id},${i.type},${i.name}]`).join("，")}, + **资产信息**（角色、场景、道具):${assets + .filter((i) => i.filePath) + .map((i) => `[${i.id},${i.type},${i.name}]`) + .join("，")}, **分镜信息**：${storyboard.map( (i) => ``, )}, `; + console.log("%c Line:93 🥥 content", "background:#e41a6a", content); + try { const { text } = await u.Ai.Text("universalAi").invoke({ system: videoPromptGeneration, @@ -113,8 +123,8 @@ export default router.post( prompt: text, }); res.status(200).send(success(text)); - } catch (error) { - res.status(500).send(error); + } catch (e) { + res.status(400).send(error(u.error(e).message)); } }, ); diff --git a/src/routes/production/workbench/getGenerateData.ts b/src/routes/production/workbench/getGenerateData.ts index f8ed952..fe463b9 100644 --- a/src/routes/production/workbench/getGenerateData.ts +++ b/src/routes/production/workbench/getGenerateData.ts @@ -37,16 +37,16 @@ export default router.post( }), async (req, res) => { const { projectId, scriptId } = req.body; - const projectData = await u.db("o_project").where("id", projectId).select("id", "videoModel","mode").first(); + const projectData = await u.db("o_project").where("id", projectId).select("id", "videoModel", "mode").first(); if (!projectData?.videoModel) { return res.status(400).json(success("项目未配置视频模型")); } - let videoMode = "" - try{ - videoMode = JSON.parse(projectData?.mode ?? "") - }catch(e){ - videoMode = projectData?.mode ?? "" + let videoMode = ""; + try { + videoMode = JSON.parse(projectData?.mode ?? ""); + } catch (e) { + videoMode = projectData?.mode ?? ""; } const isRef = Array.isArray(videoMode) ? true : false; @@ -134,8 +134,8 @@ export default router.post( seenAssetIds.add(a.id); return true; }); - const hasImageAssetData = uniqueAssets.filter(i => i.src) - const notHasImageAssetData = uniqueAssets.filter(i => !i.src) + const hasImageAssetData = uniqueAssets.filter((i) => i.src); + const notHasImageAssetData = uniqueAssets.filter((i) => !i.src); return [...hasImageAssetData, ...storyboardMedias, ...notHasImageAssetData]; })(), @@ -146,6 +146,7 @@ export default router.post( id: v.id!, src: v.filePath ? await u.oss.getFileUrl(v.filePath) : "", state: v.state === "已完成" ? "已完成" : v.state === "生成中" ? "生成中" : v.state === "生成失败" ? "生成失败" : "未生成", + errorReason: v?.errorReason ?? "", })), ), }); diff --git a/src/utils/ai.ts b/src/utils/ai.ts index f2ca25c..3a5c2fc 100644 --- a/src/utils/ai.ts +++ b/src/utils/ai.ts @@ -200,6 +200,8 @@ class AiVideo { const exec = async (mn: `${string}:${string}`) => { const fn = await getVendorTemplateFn("videoRequest", mn); await referenceList2imageBase642(mn.split(/:(.+)/)[0], input); + console.log("%c Line:204 🍡 input", "background:#465975", input); + this.result = await fn(input); if (this.result.startsWith("http")) this.result = await urlToBase64(this.result); return this; diff --git a/src/utils/vm.ts b/src/utils/vm.ts index f71706b..e55add6 100644 --- a/src/utils/vm.ts +++ b/src/utils/vm.ts @@ -54,8 +54,8 @@ export default function runCode(code: string, vendor?: Record) { return exports as Record; } -export function logger(logstring: string) { - console.log("【VM】" + logstring); +export function logger(logstring: any) { + console.log("【VM】" + JSON.stringify(logstring)); } /** * 压缩图片，目标字节数不高于 size