diff --git a/src/router.ts b/src/router.ts index e3ac704..dbeb71d 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash d254ffb72233b383eb55b33a4cf5bb22 +// @routes-hash 28255c1abae49ce4dc3f08e502620972 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -76,76 +76,77 @@ import route72 from "./routes/production/storyboard/previewImage"; import route73 from "./routes/production/storyboard/removeFrame"; import route74 from "./routes/production/storyboard/updateStoryboardUrl"; import route75 from "./routes/production/workbench/addTrack"; -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/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 route76 from "./routes/production/workbench/checkVideoStateList"; +import route77 from "./routes/production/workbench/deleteTrack"; +import route78 from "./routes/production/workbench/delVideo"; +import route79 from "./routes/production/workbench/generateVideo"; +import route80 from "./routes/production/workbench/generateVideoPrompt"; +import route81 from "./routes/production/workbench/getGenerateData"; +import route82 from "./routes/production/workbench/getVideoList"; +import route83 from "./routes/production/workbench/selectVideo"; +import route84 from "./routes/production/workbench/updateVideoPrompt"; +import route85 from "./routes/project/addDirectorManual"; +import route86 from "./routes/project/addProject"; +import route87 from "./routes/project/addVisualManual"; +import route88 from "./routes/project/deleteDirectorManual"; +import route89 from "./routes/project/deleteVisualManual"; +import route90 from "./routes/project/delProject"; +import route91 from "./routes/project/editDirectorlManual"; +import route92 from "./routes/project/editProject"; +import route93 from "./routes/project/editVisualManual"; +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); @@ -223,74 +224,75 @@ export default async (app: Express) => { app.use("/api/production/storyboard/removeFrame", route73); app.use("/api/production/storyboard/updateStoryboardUrl", route74); app.use("/api/production/workbench/addTrack", 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/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", route76); + app.use("/api/production/workbench/deleteTrack", route77); + app.use("/api/production/workbench/delVideo", route78); + app.use("/api/production/workbench/generateVideo", route79); + app.use("/api/production/workbench/generateVideoPrompt", route80); + app.use("/api/production/workbench/getGenerateData", route81); + app.use("/api/production/workbench/getVideoList", route82); + app.use("/api/production/workbench/selectVideo", route83); + app.use("/api/production/workbench/updateVideoPrompt", route84); + app.use("/api/project/addDirectorManual", route85); + app.use("/api/project/addProject", route86); + app.use("/api/project/addVisualManual", route87); + app.use("/api/project/deleteDirectorManual", route88); + app.use("/api/project/deleteVisualManual", route89); + app.use("/api/project/delProject", route90); + app.use("/api/project/editDirectorlManual", route91); + app.use("/api/project/editProject", route92); + app.use("/api/project/editVisualManual", 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/addTrack.ts b/src/routes/production/workbench/addTrack.ts index 17e346e..cf3ed1f 100644 --- a/src/routes/production/workbench/addTrack.ts +++ b/src/routes/production/workbench/addTrack.ts @@ -13,6 +13,9 @@ export default router.post( }), async (req, res) => { const { projectId, scriptId, duration } = req.body; + const data = await u.db("o_project").where("id", projectId).first(); + const video = data?.videoModel?.split(":"); + const vemdor = await u.vendor.getModelList(video?.[0]!); const [id] = await u.db("o_videoTrack").insert({ projectId, scriptId, diff --git a/src/routes/production/workbench/checkVideoStateList.ts b/src/routes/production/workbench/checkVideoStateList.ts new file mode 100644 index 0000000..8d0842d --- /dev/null +++ b/src/routes/production/workbench/checkVideoStateList.ts @@ -0,0 +1,33 @@ +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(), + videoIds: z.array(z.number()), + }), + async (req, res) => { + const { projectId, scriptId, videoIds } = req.body; + const videoList = await u + .db("o_video") + .whereIn("id", videoIds) + .whereIn("state", ["生成成功", "生成失败"]) + .select("id", "state", "errorReason", "filePath"); + res.status(200).send( + success( + await Promise.all( + videoList.map(async (s) => ({ + ...s, + src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "", + })), + ), + ), + ); + }, +); diff --git a/src/routes/production/workbench/deleteTrack.ts b/src/routes/production/workbench/deleteTrack.ts index e309525..3077142 100644 --- a/src/routes/production/workbench/deleteTrack.ts +++ b/src/routes/production/workbench/deleteTrack.ts @@ -13,6 +13,9 @@ export default router.post( async (req, res) => { const { id } = req.body; await u.db("o_videoTrack").where("id", id).delete(); + await u.db("o_storyboard").where("trackId", id).update({ + trackId: null, + }); res.status(200).send(success({ message: "视频段删除成功" })); }, ); diff --git a/src/routes/production/workbench/generateVideoPrompt.ts b/src/routes/production/workbench/generateVideoPrompt.ts index 643cc23..5306e81 100644 --- a/src/routes/production/workbench/generateVideoPrompt.ts +++ b/src/routes/production/workbench/generateVideoPrompt.ts @@ -95,8 +95,6 @@ export default router.post( >`, )}, `; - console.log("%c Line:87 🌮 content", "background:#2eafb0", content); - try { const { text } = await u.Ai.Text("universalAi").invoke({ system: videoPromptGeneration,