diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index ada4c87..bd43e3e 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -276,7 +276,7 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.text("remark"); table.text("type"); table.text("describe"); - table.integer("scriptId");//剧本id + table.integer("scriptId"); //剧本id table.integer("imageId").unsigned().references("id").inTable("o_image"); table.integer("sonId"); table.integer("projectId"); @@ -332,14 +332,13 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.text("resolution"); table.text("prompt"); table.text("filePath"); - table.text("firstFrame"); - table.text("storyboardImgs"); table.text("model"); + table.text("mode"); table.text("errorReason"); table.integer("time"); - table.integer("state"); + table.text("state"); table.integer("scriptId"); - table.integer("configId"); // 关联的视频配置ID + table.integer("storyboardId"); table.primary(["id"]); table.unique(["id"]); }, @@ -349,19 +348,14 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => name: "o_videoConfig", builder: (table) => { table.integer("id").notNullable(); - table.integer("scriptId"); // 关联的脚本ID - table.integer("projectId"); // 关联的项目ID - table.integer("aiConfigId"); //ai配置ID - table.integer("audioEnabled"); //声音 - table.text("manufacturer"); // 厂商：volcengine/runninghub/openAi + table.integer("videoId"); //视频Id + table.integer("audio"); //声音 + table.text("model"); //模型 table.text("mode"); // 模式：startEnd/multi/single - table.text("startFrame"); // 首帧图片信息 JSON - table.text("endFrame"); // 尾帧图片信息 JSON - table.text("images"); // 多图模式的图片列表 JSON + table.text("data"); // 所选数据集图片 JSON table.text("resolution"); // 分辨率 table.integer("duration"); // 时长 table.text("prompt"); // 提示词 - table.integer("selectedResultId"); // 选中的生成结果ID table.integer("createTime"); // 创建时间 table.integer("updateTime"); // 更新时间 table.primary(["id"]); diff --git a/src/router.ts b/src/router.ts index ebc0e67..f65c868 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,132 +1,130 @@ -// @routes-hash ee45dd26b9149e6eabf834c1fb5cfbb6 +// @routes-hash beeb358ee056d0414c7a2ca88bc9b566 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; import route2 from "./routes/agents/getMemory"; -import route3 from "./routes/agents/productionAgent"; -import route4 from "./routes/artStyle/getArtStyle"; -import route5 from "./routes/assets/addAssets"; -import route6 from "./routes/assets/batchDelete"; -import route7 from "./routes/assets/batchGenerationData"; -import route8 from "./routes/assets/delAssets"; -import route9 from "./routes/assets/getAssetsApi"; -import route10 from "./routes/assets/getImage"; -import route11 from "./routes/assets/saveAssets"; -import route12 from "./routes/assets/updateAssets"; -import route13 from "./routes/assets/uploadClip"; -import route14 from "./routes/assetsGenerate/generateAssets"; -import route15 from "./routes/assetsGenerate/polishAssetsPrompt"; -import route16 from "./routes/cornerScape/getAllAssets"; -import route17 from "./routes/general/generalStatistics"; -import route18 from "./routes/general/getSingleProject"; -import route19 from "./routes/general/updateProject"; -import route20 from "./routes/login/login"; -import route21 from "./routes/migrate/migrateData"; -import route22 from "./routes/modelSelect/getModelDetail"; -import route23 from "./routes/modelSelect/getModelList"; -import route24 from "./routes/novel/addNovel"; -import route25 from "./routes/novel/batchDeleteNovel"; -import route26 from "./routes/novel/delNovel"; -import route27 from "./routes/novel/event/batchDeleteEvent"; -import route28 from "./routes/novel/event/deletEvent"; -import route29 from "./routes/novel/event/generateEvents"; -import route30 from "./routes/novel/event/getEvent"; -import route31 from "./routes/novel/getNovel"; -import route32 from "./routes/novel/updateNovel"; -import route33 from "./routes/other/deleteAllData"; -import route34 from "./routes/other/getCaptcha"; -import route35 from "./routes/production/getProductionData"; -import route36 from "./routes/production/workbench/generateVideo"; -import route37 from "./routes/production/workbench/getVideoModelDetail"; -import route38 from "./routes/project/addProject"; -import route39 from "./routes/project/delProject"; -import route40 from "./routes/project/editProject"; -import route41 from "./routes/project/getProject"; -import route42 from "./routes/script/addScript"; -import route43 from "./routes/script/delScript"; -import route44 from "./routes/script/getScrptApi"; -import route45 from "./routes/script/updateScript"; -import route46 from "./routes/setting/agentDeploy/deployAgentModel"; -import route47 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route48 from "./routes/setting/agentDeploy/updateKey"; -import route49 from "./routes/setting/dbConfig/clearData"; -import route50 from "./routes/setting/getTextModel"; -import route51 from "./routes/setting/loginConfig/getUser"; -import route52 from "./routes/setting/loginConfig/updateUserPwd"; -import route53 from "./routes/setting/memoryConfig/getMemory"; -import route54 from "./routes/setting/memoryConfig/sureMemory"; -import route55 from "./routes/setting/vendorConfig/addVendor"; -import route56 from "./routes/setting/vendorConfig/deleteVendor"; -import route57 from "./routes/setting/vendorConfig/getVendorList"; -import route58 from "./routes/setting/vendorConfig/modelTest"; -import route59 from "./routes/setting/vendorConfig/updateVendor"; -import route60 from "./routes/task/getMyTaskApi"; -import route61 from "./routes/task/getTaskCategories"; -import route62 from "./routes/task/taskDetails"; -import route63 from "./routes/test/test"; +import route3 from "./routes/artStyle/getArtStyle"; +import route4 from "./routes/assets/addAssets"; +import route5 from "./routes/assets/batchDelete"; +import route6 from "./routes/assets/batchGenerationData"; +import route7 from "./routes/assets/delAssets"; +import route8 from "./routes/assets/getAssetsApi"; +import route9 from "./routes/assets/getImage"; +import route10 from "./routes/assets/saveAssets"; +import route11 from "./routes/assets/updateAssets"; +import route12 from "./routes/assets/uploadClip"; +import route13 from "./routes/assetsGenerate/generateAssets"; +import route14 from "./routes/assetsGenerate/polishAssetsPrompt"; +import route15 from "./routes/cornerScape/getAllAssets"; +import route16 from "./routes/general/generalStatistics"; +import route17 from "./routes/general/getSingleProject"; +import route18 from "./routes/general/updateProject"; +import route19 from "./routes/login/login"; +import route20 from "./routes/migrate/migrateData"; +import route21 from "./routes/modelSelect/getModelDetail"; +import route22 from "./routes/modelSelect/getModelList"; +import route23 from "./routes/novel/addNovel"; +import route24 from "./routes/novel/batchDeleteNovel"; +import route25 from "./routes/novel/delNovel"; +import route26 from "./routes/novel/event/batchDeleteEvent"; +import route27 from "./routes/novel/event/deletEvent"; +import route28 from "./routes/novel/event/generateEvents"; +import route29 from "./routes/novel/event/getEvent"; +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"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); app.use("/api/agents/getMemory", route2); - app.use("/api/agents/productionAgent", route3); - app.use("/api/artStyle/getArtStyle", route4); - app.use("/api/assets/addAssets", route5); - app.use("/api/assets/batchDelete", route6); - app.use("/api/assets/batchGenerationData", route7); - app.use("/api/assets/delAssets", route8); - app.use("/api/assets/getAssetsApi", route9); - app.use("/api/assets/getImage", route10); - app.use("/api/assets/saveAssets", route11); - app.use("/api/assets/updateAssets", route12); - app.use("/api/assets/uploadClip", route13); - app.use("/api/assetsGenerate/generateAssets", route14); - app.use("/api/assetsGenerate/polishAssetsPrompt", route15); - app.use("/api/cornerScape/getAllAssets", route16); - app.use("/api/general/generalStatistics", route17); - app.use("/api/general/getSingleProject", route18); - app.use("/api/general/updateProject", route19); - app.use("/api/login/login", route20); - app.use("/api/migrate/migrateData", route21); - app.use("/api/modelSelect/getModelDetail", route22); - app.use("/api/modelSelect/getModelList", route23); - app.use("/api/novel/addNovel", route24); - app.use("/api/novel/batchDeleteNovel", route25); - app.use("/api/novel/delNovel", route26); - app.use("/api/novel/event/batchDeleteEvent", route27); - app.use("/api/novel/event/deletEvent", route28); - app.use("/api/novel/event/generateEvents", route29); - app.use("/api/novel/event/getEvent", route30); - app.use("/api/novel/getNovel", route31); - app.use("/api/novel/updateNovel", route32); - app.use("/api/other/deleteAllData", route33); - app.use("/api/other/getCaptcha", route34); - app.use("/api/production/getProductionData", route35); - app.use("/api/production/workbench/generateVideo", route36); - app.use("/api/production/workbench/getVideoModelDetail", route37); - app.use("/api/project/addProject", route38); - app.use("/api/project/delProject", route39); - app.use("/api/project/editProject", route40); - app.use("/api/project/getProject", route41); - app.use("/api/script/addScript", route42); - app.use("/api/script/delScript", route43); - app.use("/api/script/getScrptApi", route44); - app.use("/api/script/updateScript", route45); - app.use("/api/setting/agentDeploy/deployAgentModel", route46); - app.use("/api/setting/agentDeploy/getAgentDeploy", route47); - app.use("/api/setting/agentDeploy/updateKey", route48); - app.use("/api/setting/dbConfig/clearData", route49); - app.use("/api/setting/getTextModel", route50); - app.use("/api/setting/loginConfig/getUser", route51); - app.use("/api/setting/loginConfig/updateUserPwd", route52); - app.use("/api/setting/memoryConfig/getMemory", route53); - app.use("/api/setting/memoryConfig/sureMemory", route54); - app.use("/api/setting/vendorConfig/addVendor", route55); - app.use("/api/setting/vendorConfig/deleteVendor", route56); - app.use("/api/setting/vendorConfig/getVendorList", route57); - app.use("/api/setting/vendorConfig/modelTest", route58); - app.use("/api/setting/vendorConfig/updateVendor", route59); - app.use("/api/task/getMyTaskApi", route60); - app.use("/api/task/getTaskCategories", route61); - app.use("/api/task/taskDetails", route62); - app.use("/api/test/test", route63); + app.use("/api/artStyle/getArtStyle", route3); + app.use("/api/assets/addAssets", route4); + app.use("/api/assets/batchDelete", route5); + app.use("/api/assets/batchGenerationData", route6); + app.use("/api/assets/delAssets", route7); + app.use("/api/assets/getAssetsApi", route8); + app.use("/api/assets/getImage", route9); + app.use("/api/assets/saveAssets", route10); + app.use("/api/assets/updateAssets", route11); + app.use("/api/assets/uploadClip", route12); + app.use("/api/assetsGenerate/generateAssets", route13); + app.use("/api/assetsGenerate/polishAssetsPrompt", route14); + app.use("/api/cornerScape/getAllAssets", route15); + app.use("/api/general/generalStatistics", route16); + app.use("/api/general/getSingleProject", route17); + app.use("/api/general/updateProject", route18); + app.use("/api/login/login", route19); + app.use("/api/migrate/migrateData", route20); + app.use("/api/modelSelect/getModelDetail", route21); + app.use("/api/modelSelect/getModelList", route22); + app.use("/api/novel/addNovel", route23); + app.use("/api/novel/batchDeleteNovel", route24); + app.use("/api/novel/delNovel", route25); + app.use("/api/novel/event/batchDeleteEvent", route26); + app.use("/api/novel/event/deletEvent", route27); + app.use("/api/novel/event/generateEvents", route28); + app.use("/api/novel/event/getEvent", route29); + app.use("/api/novel/getNovel", route30); + 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); } diff --git a/src/routes/production/workbench/generateVideo.ts b/src/routes/production/workbench/generateVideo.ts index b0942de..7ad90d4 100644 --- a/src/routes/production/workbench/generateVideo.ts +++ b/src/routes/production/workbench/generateVideo.ts @@ -13,7 +13,7 @@ export default router.post( projectId: z.number(), storyboardId: z.number(), prompt: z.string(), - imageData: z.array(z.string()).optional(), + data: z.array(z.string()).optional(), model: z.string(), duration: z.number(), resolution: z.string(), @@ -21,8 +21,7 @@ export default router.post( modeData: z.string(), }), async (req, res) => { - const { scriptId, projectId, storyboardId, prompt, imageData, model, duration, resolution, audio, modeData } = req.body; - console.log("%c Line:24 🍡 req.body", "background:#b03734", req.body); + const { scriptId, projectId, storyboardId, prompt, data, model, duration, resolution, audio, modeData } = req.body; try { const relatedObjects = { id: storyboardId, @@ -42,7 +41,7 @@ export default router.post( projectId: projectId, storyboardId: storyboardId, prompt: prompt, - imageData: imageData, + data: data, modeData: modeData, duration: duration, resolution: resolution, @@ -58,12 +57,21 @@ export default router.post( // prompt, // filePath: videoPath, // model, - // time: new Date(), + // 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 : "未知错误", + // }); res.status(500).send({ error: "视频生成失败" }); } }, diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 4c3b490..4d13935 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash feca77a2c2ec5b6a2989347f982558d5 +// @db-hash f67609654b5467393c4809a3921d8fa4 //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -35,18 +35,12 @@ 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; @@ -67,33 +61,10 @@ export interface o_image { 'assetsId'?: number | null; 'filePath'?: string | null; 'id'?: number; - 'projectId'?: number | null; - 'scriptId'?: number | null; + 'model'?: string | null; + 'resolution'?: string | 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; @@ -126,15 +97,6 @@ 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; @@ -142,35 +104,15 @@ 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_skills { - 'id'?: number; - 'name'?: string | null; - 'startTime'?: number | null; -} export interface o_storyboard { 'createTime'?: number | null; 'id'?: number; 'name'?: string | null; } -export interface o_storyboardScript { - 'id'?: number; - 'scriptId'?: number | null; - 'storyboardId'?: number | null; -} export interface o_tasks { 'describe'?: string | null; 'id'?: number; @@ -199,36 +141,30 @@ 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'?: number | null; - 'storyboardImgs'?: string | null; + 'state'?: string | null; + 'storyboardId'?: number | null; 'time'?: number | null; } export interface o_videoConfig { - 'aiConfigId'?: number | null; - 'audioEnabled'?: number | null; + 'audio'?: 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; - 'projectId'?: number | null; + 'model'?: string | 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 { @@ -236,25 +172,17 @@ 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_storyboardScript": o_storyboardScript; "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 fa90e1f..f0933f5 100644 --- a/src/utils/ai.ts +++ b/src/utils/ai.ts @@ -117,7 +117,7 @@ interface VideoConfig { storyboardId: number; // 关联的分镜ID systemPrompt?: string; // 系统提示词 prompt: string; //视频提示词 - imageData: string[]; //输入的图片提示词 + data: string[]; //输入的图片提示词 modeData: string; //模式 duration: number; // 视频时长，单位秒 resolution: string; // 视频分辨率