diff --git a/src/router.ts b/src/router.ts index f65c868..9552da9 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash beeb358ee056d0414c7a2ca88bc9b566 +// @routes-hash 3d0673061005074e704638efccc539d1 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -34,35 +34,40 @@ 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/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); @@ -98,33 +103,38 @@ 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/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); } diff --git a/src/routes/production/editStoryboard/generateStoryboardImage.ts b/src/routes/production/editStoryboard/generateStoryboardImage.ts index 9c57f15..1f32384 100644 --- a/src/routes/production/editStoryboard/generateStoryboardImage.ts +++ b/src/routes/production/editStoryboard/generateStoryboardImage.ts @@ -96,11 +96,6 @@ export default router.post( await imageClass.save(savePath); const url = await u.oss.getFileUrl(savePath); - const [imageId] = await u.db("o_image").insert({ - filePath: savePath, - state: "1", - type: "storyFlow", - }); - return res.status(200).send(success({ imageId, url })); + return res.status(200).send(success({ url })); }, ); diff --git a/src/routes/production/editStoryboard/getStoryboardFlow.ts b/src/routes/production/editStoryboard/getStoryboardFlow.ts index 499aee7..682fbfa 100644 --- a/src/routes/production/editStoryboard/getStoryboardFlow.ts +++ b/src/routes/production/editStoryboard/getStoryboardFlow.ts @@ -15,13 +15,19 @@ export default router.post( console.log("%c Line:15 🥤 id", "background:#e41a6a", id); const storyboardFlowData = await u.db("o_storyboardFlow").where("stroryboardId", id).first(); if (storyboardFlowData?.flowData) { - return res.status(200).send(success(JSON.parse(storyboardFlowData?.flowData))); + const parseFlow = JSON.parse(storyboardFlowData.flowData); + await Promise.all( + parseFlow.nodes.map(async (node: any) => { + if (node.type === "upload") { + node.data.image = node.data.image ? await u.oss.getFileUrl(node.data.image) : ""; + } else if (node.type === "generated") { + node.data.generatedImage = node.data.generatedImage ? await u.oss.getFileUrl(node.data.generatedImage) : ""; + } + }), + ); + return res.status(200).send(success(parseFlow)); } - return res.status(200).send( - success({ - nodes: [], - edges: [], - }), - ); + + return res.status(200).send(success(null)); }, ); diff --git a/src/routes/production/editStoryboard/saveStoryboardFlow.ts b/src/routes/production/editStoryboard/saveStoryboardFlow.ts index ca7b610..74d1dfb 100644 --- a/src/routes/production/editStoryboard/saveStoryboardFlow.ts +++ b/src/routes/production/editStoryboard/saveStoryboardFlow.ts @@ -10,15 +10,22 @@ export default router.post( validateFields({ edges: z.any(), nodes: z.any(), - imageUrl: z.number(), + imageUrl: z.string(), }), async (req, res) => { 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({ + nodes.forEach((node: any) => { + if (node.type == "upload") { + node.data.image = node.data.image ? new URL(node.data.image).pathname : ""; + } + if (node.type == "generated") { + node.data.generatedImage = node.data.generatedImage ? new URL(node.data.generatedImage).pathname : ""; + } + }); + const [id] = await u.db("o_storyboard").insert({ filePath: new URL(imageUrl).pathname, }); await u.db("o_storyboardFlow").insert({ diff --git a/src/routes/production/editStoryboard/updateStoryboardFlow.ts b/src/routes/production/editStoryboard/updateStoryboardFlow.ts index b6d5812..626b377 100644 --- a/src/routes/production/editStoryboard/updateStoryboardFlow.ts +++ b/src/routes/production/editStoryboard/updateStoryboardFlow.ts @@ -11,14 +11,21 @@ export default router.post( edges: z.any(), nodes: z.any(), id: z.number(), - imageUrl: z.number(), + imageUrl: z.string(), }), async (req, res) => { const { edges, nodes, id, imageUrl } = req.body; if (!imageUrl.includes("http")) { return res.status(400).send({ message: "图片地址不合法" }); } - // if + nodes.forEach((node: any) => { + if (node.type == "upload") { + node.data.image = node.data.image ? new URL(node.data.image).pathname : ""; + } + if (node.type == "generated") { + node.data.generatedImage = node.data.generatedImage ? new URL(node.data.generatedImage).pathname : ""; + } + }); await u .db("o_storyboard") .where("id", id) diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 4d13935..775ad75 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash f67609654b5467393c4809a3921d8fa4 +// @db-hash 8af8e41e3ca0cb5ee554944515d72ba8 //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -35,12 +35,18 @@ export interface o_assets { 'projectId'?: number | null; 'prompt'?: string | null; 'remark'?: string | null; - 'scriptId'?: number | null; 'sonId'?: number | null; 'startTime'?: number | null; 'state'?: string | null; 'type'?: string | null; } +export interface o_chatHistory { + 'data'?: string | null; + 'id'?: number; + 'novel'?: string | null; + 'projectId'?: number | null; + 'type'?: string | null; +} export interface o_event { 'createTime'?: number | null; 'detail'?: string | null; @@ -61,10 +67,33 @@ export interface o_image { 'assetsId'?: number | null; 'filePath'?: string | null; 'id'?: number; - 'model'?: string | null; - 'resolution'?: string | null; + 'projectId'?: number | null; + 'scriptId'?: number | null; 'state'?: string | null; 'type'?: string | null; + 'videoId'?: number | null; +} +export interface o_model { + 'apiKey'?: string | null; + 'baseUrl'?: string | null; + 'createTime'?: number | null; + 'id'?: number; + 'index'?: number | null; + 'manufacturer'?: string | null; + 'model'?: string | null; + 'modelType'?: string | null; + 'type'?: string | null; +} +export interface o_myTasks { + 'describe'?: string | null; + 'id'?: number; + 'model'?: string | null; + 'projectId'?: number | null; + 'reason'?: string | null; + 'relatedObjects'?: string | null; + 'startTime'?: number | null; + 'state'?: string | null; + 'taskClass'?: string | null; } export interface o_novel { 'chapter'?: string | null; @@ -97,6 +126,15 @@ export interface o_project { 'userId'?: number | null; 'videoRatio'?: string | null; } +export interface o_prompts { + 'code'?: string | null; + 'customValue'?: string | null; + 'defaultValue'?: string | null; + 'id'?: number; + 'name'?: string | null; + 'parentCode'?: string | null; + 'type'?: string | null; +} export interface o_script { 'content'?: string | null; 'createTime'?: number | null; @@ -104,14 +142,44 @@ export interface o_script { 'name'?: string | null; 'projectId'?: number | null; } +export interface o_scriptAssets { + 'assetsId'?: number | null; + 'id'?: number; + 'scriptId'?: number | null; +} +export interface o_scriptOutline { + 'id'?: number; + 'outlineId'?: number | null; + 'scriptId'?: number | null; +} export interface o_setting { 'key'?: string | null; 'value'?: string | null; } -export interface o_storyboard { - 'createTime'?: number | null; +export interface o_skills { 'id'?: number; 'name'?: string | null; + 'startTime'?: number | null; +} +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; + 'scriptId'?: number | null; + 'storyboardId'?: number | null; } export interface o_tasks { 'describe'?: string | null; @@ -141,30 +209,36 @@ export interface o_vendorConfig { 'version'?: string | null; } export interface o_video { + 'configId'?: number | null; 'errorReason'?: string | null; 'filePath'?: string | null; + 'firstFrame'?: 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; + 'state'?: number | null; + 'storyboardImgs'?: string | null; 'time'?: number | null; } export interface o_videoConfig { - 'audio'?: number | null; + 'aiConfigId'?: number | null; + 'audioEnabled'?: number | null; 'createTime'?: number | null; - 'data'?: string | null; 'duration'?: number | null; + 'endFrame'?: string | null; 'id'?: number; + 'images'?: string | null; + 'manufacturer'?: string | null; 'mode'?: string | null; - 'model'?: string | null; + 'projectId'?: number | null; 'prompt'?: string | null; 'resolution'?: string | null; + 'scriptId'?: number | null; + 'selectedResultId'?: number | null; + 'startFrame'?: string | null; 'updateTime'?: number | null; - 'videoId'?: number | null; } export interface DB { @@ -172,17 +246,26 @@ export interface DB { "o_agentDeploy": o_agentDeploy; "o_artStyle": o_artStyle; "o_assets": o_assets; + "o_chatHistory": o_chatHistory; "o_event": o_event; "o_eventChapter": o_eventChapter; "o_flowData": o_flowData; "o_image": o_image; + "o_model": o_model; + "o_myTasks": o_myTasks; "o_novel": o_novel; "o_outline": o_outline; "o_outlineNovel": o_outlineNovel; "o_project": o_project; + "o_prompts": o_prompts; "o_script": o_script; + "o_scriptAssets": o_scriptAssets; + "o_scriptOutline": o_scriptOutline; "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; "o_vendorConfig": o_vendorConfig;