zyc/video-flow-toon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '108' of https://github.com/HBAI-Ltd/Toonflow-app into 108

Browse Source 
# Conflicts:
#	src/router.ts
#	src/types/database.d.ts
This commit is contained in:
zhishi 2026-03-21 14:46:08 +08:00
commit fa7cfd44e5
5 changed files with 91 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/initDB.ts
View File

@ -337,14 +337,13 @@ export default async (knex: Knex, forceInit: boolean = false): Promise<void> =>
table.text("resolution"); table.text("resolution");
table.text("prompt"); table.text("prompt");
table.text("filePath"); table.text("filePath");
table.text("firstFrame");
table.text("storyboardImgs");
table.text("model"); table.text("model");
table.text("mode");
table.text("errorReason"); table.text("errorReason");
table.integer("time"); table.integer("time");
table.integer("state"); table.text("state");
table.integer("scriptId"); table.integer("scriptId");
table.integer("configId"); // 关联的视频配置ID table.integer("storyboardId");
table.primary(["id"]); table.primary(["id"]);
table.unique(["id"]); table.unique(["id"]);
}, },
@ -354,19 +353,14 @@ export default async (knex: Knex, forceInit: boolean = false): Promise<void> =>
name: "o_videoConfig", name: "o_videoConfig",
builder: (table) => { builder: (table) => {
table.integer("id").notNullable(); table.integer("id").notNullable();
table.integer("scriptId"); // 关联的脚本ID table.integer("videoId"); //视频Id
table.integer("projectId"); // 关联的项目ID table.integer("audio"); //声音
table.integer("aiConfigId"); //ai配置ID table.text("model"); //模型
table.integer("audioEnabled"); //声音
table.text("manufacturer"); // 厂商：volcengine/runninghub/openAi
table.text("mode"); // 模式：startEnd/multi/single table.text("mode"); // 模式：startEnd/multi/single
table.text("startFrame"); // 首帧图片信息 JSON table.text("data"); // 所选数据集图片 JSON
table.text("endFrame"); // 尾帧图片信息 JSON
table.text("images"); // 多图模式的图片列表 JSON
table.text("resolution"); // 分辨率 table.text("resolution"); // 分辨率
table.integer("duration"); // 时长 table.integer("duration"); // 时长
table.text("prompt"); // 提示词 table.text("prompt"); // 提示词
table.integer("selectedResultId"); // 选中的生成结果ID
table.integer("createTime"); // 创建时间 table.integer("createTime"); // 创建时间
table.integer("updateTime"); // 更新时间 table.integer("updateTime"); // 更新时间
table.primary(["id"]); table.primary(["id"]);

128
src/router.ts
View File

@ -1,4 +1,4 @@
// @routes-hash 3d0673061005074e704638efccc539d1 // @routes-hash beeb358ee056d0414c7a2ca88bc9b566
import { Express } from "express"; import { Express } from "express";
import route1 from "./routes/agents/clearMemory"; import route1 from "./routes/agents/clearMemory";
@ -34,40 +34,35 @@ import route30 from "./routes/novel/getNovel";
import route31 from "./routes/novel/updateNovel"; import route31 from "./routes/novel/updateNovel";
import route32 from "./routes/other/deleteAllData"; import route32 from "./routes/other/deleteAllData";
import route33 from "./routes/other/getCaptcha"; import route33 from "./routes/other/getCaptcha";
import route34 from "./routes/production/editStoryboard/generateStoryboardImage"; import route34 from "./routes/production/getProductionData";
import route35 from "./routes/production/editStoryboard/getStoryboardFlow"; import route35 from "./routes/production/workbench/generateVideo";
import route36 from "./routes/production/editStoryboard/saveStoryboardFlow"; import route36 from "./routes/production/workbench/getVideoModelDetail";
import route37 from "./routes/production/editStoryboard/updateStoryboardFlow"; import route37 from "./routes/project/addProject";
import route38 from "./routes/production/getProductionData"; import route38 from "./routes/project/delProject";
import route39 from "./routes/production/getStoryboardData"; import route39 from "./routes/project/editProject";
import route40 from "./routes/production/workbench/generateVideo"; import route40 from "./routes/project/getProject";
import route41 from "./routes/production/workbench/getVideoModelDetail"; import route41 from "./routes/script/addScript";
import route42 from "./routes/project/addProject"; import route42 from "./routes/script/delScript";
import route43 from "./routes/project/delProject"; import route43 from "./routes/script/getScrptApi";
import route44 from "./routes/project/editProject"; import route44 from "./routes/script/updateScript";
import route45 from "./routes/project/getProject"; import route45 from "./routes/setting/agentDeploy/deployAgentModel";
import route46 from "./routes/script/addScript"; import route46 from "./routes/setting/agentDeploy/getAgentDeploy";
import route47 from "./routes/script/delScript"; import route47 from "./routes/setting/agentDeploy/updateKey";
import route48 from "./routes/script/getScrptApi"; import route48 from "./routes/setting/dbConfig/clearData";
import route49 from "./routes/script/updateScript"; import route49 from "./routes/setting/getTextModel";
import route50 from "./routes/setting/agentDeploy/deployAgentModel"; import route50 from "./routes/setting/loginConfig/getUser";
import route51 from "./routes/setting/agentDeploy/getAgentDeploy"; import route51 from "./routes/setting/loginConfig/updateUserPwd";
import route52 from "./routes/setting/agentDeploy/updateKey"; import route52 from "./routes/setting/memoryConfig/getMemory";
import route53 from "./routes/setting/dbConfig/clearData"; import route53 from "./routes/setting/memoryConfig/sureMemory";
import route54 from "./routes/setting/getTextModel"; import route54 from "./routes/setting/vendorConfig/addVendor";
import route55 from "./routes/setting/loginConfig/getUser"; import route55 from "./routes/setting/vendorConfig/deleteVendor";
import route56 from "./routes/setting/loginConfig/updateUserPwd"; import route56 from "./routes/setting/vendorConfig/getVendorList";
import route57 from "./routes/setting/memoryConfig/getMemory"; import route57 from "./routes/setting/vendorConfig/modelTest";
import route58 from "./routes/setting/memoryConfig/sureMemory"; import route58 from "./routes/setting/vendorConfig/updateVendor";
import route59 from "./routes/setting/vendorConfig/addVendor"; import route59 from "./routes/task/getMyTaskApi";
import route60 from "./routes/setting/vendorConfig/deleteVendor"; import route60 from "./routes/task/getTaskCategories";
import route61 from "./routes/setting/vendorConfig/getVendorList"; import route61 from "./routes/task/taskDetails";
import route62 from "./routes/setting/vendorConfig/modelTest"; import route62 from "./routes/test/test";
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) => { export default async (app: Express) => {
app.use("/api/agents/clearMemory", route1); app.use("/api/agents/clearMemory", route1);
@ -103,38 +98,33 @@ export default async (app: Express) => {
app.use("/api/novel/updateNovel", route31); app.use("/api/novel/updateNovel", route31);
app.use("/api/other/deleteAllData", route32); app.use("/api/other/deleteAllData", route32);
app.use("/api/other/getCaptcha", route33); app.use("/api/other/getCaptcha", route33);
app.use("/api/production/editStoryboard/generateStoryboardImage", route34); app.use("/api/production/getProductionData", route34);
app.use("/api/production/editStoryboard/getStoryboardFlow", route35); app.use("/api/production/workbench/generateVideo", route35);
app.use("/api/production/editStoryboard/saveStoryboardFlow", route36); app.use("/api/production/workbench/getVideoModelDetail", route36);
app.use("/api/production/editStoryboard/updateStoryboardFlow", route37); app.use("/api/project/addProject", route37);
app.use("/api/production/getProductionData", route38); app.use("/api/project/delProject", route38);
app.use("/api/production/getStoryboardData", route39); app.use("/api/project/editProject", route39);
app.use("/api/production/workbench/generateVideo", route40); app.use("/api/project/getProject", route40);
app.use("/api/production/workbench/getVideoModelDetail", route41); app.use("/api/script/addScript", route41);
app.use("/api/project/addProject", route42); app.use("/api/script/delScript", route42);
app.use("/api/project/delProject", route43); app.use("/api/script/getScrptApi", route43);
app.use("/api/project/editProject", route44); app.use("/api/script/updateScript", route44);
app.use("/api/project/getProject", route45); app.use("/api/setting/agentDeploy/deployAgentModel", route45);
app.use("/api/script/addScript", route46); app.use("/api/setting/agentDeploy/getAgentDeploy", route46);
app.use("/api/script/delScript", route47); app.use("/api/setting/agentDeploy/updateKey", route47);
app.use("/api/script/getScrptApi", route48); app.use("/api/setting/dbConfig/clearData", route48);
app.use("/api/script/updateScript", route49); app.use("/api/setting/getTextModel", route49);
app.use("/api/setting/agentDeploy/deployAgentModel", route50); app.use("/api/setting/loginConfig/getUser", route50);
app.use("/api/setting/agentDeploy/getAgentDeploy", route51); app.use("/api/setting/loginConfig/updateUserPwd", route51);
app.use("/api/setting/agentDeploy/updateKey", route52); app.use("/api/setting/memoryConfig/getMemory", route52);
app.use("/api/setting/dbConfig/clearData", route53); app.use("/api/setting/memoryConfig/sureMemory", route53);
app.use("/api/setting/getTextModel", route54); app.use("/api/setting/vendorConfig/addVendor", route54);
app.use("/api/setting/loginConfig/getUser", route55); app.use("/api/setting/vendorConfig/deleteVendor", route55);
app.use("/api/setting/loginConfig/updateUserPwd", route56); app.use("/api/setting/vendorConfig/getVendorList", route56);
app.use("/api/setting/memoryConfig/getMemory", route57); app.use("/api/setting/vendorConfig/modelTest", route57);
app.use("/api/setting/memoryConfig/sureMemory", route58); app.use("/api/setting/vendorConfig/updateVendor", route58);
app.use("/api/setting/vendorConfig/addVendor", route59); app.use("/api/task/getMyTaskApi", route59);
app.use("/api/setting/vendorConfig/deleteVendor", route60); app.use("/api/task/getTaskCategories", route60);
app.use("/api/setting/vendorConfig/getVendorList", route61); app.use("/api/task/taskDetails", route61);
app.use("/api/setting/vendorConfig/modelTest", route62); app.use("/api/test/test", 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);
} }

18
src/routes/production/workbench/generateVideo.ts
View File

@ -13,7 +13,7 @@ export default router.post(
projectId: z.number(), projectId: z.number(),
storyboardId: z.number(), storyboardId: z.number(),
prompt: z.string(), prompt: z.string(),
imageData: z.array(z.string()).optional(), data: z.array(z.string()).optional(),
model: z.string(), model: z.string(),
duration: z.number(), duration: z.number(),
resolution: z.string(), resolution: z.string(),
@ -21,8 +21,7 @@ export default router.post(
modeData: z.string(), modeData: z.string(),
}), }),
async (req, res) => { async (req, res) => {
const { scriptId, projectId, storyboardId, prompt, imageData, model, duration, resolution, audio, modeData } = req.body; const { scriptId, projectId, storyboardId, prompt, data, model, duration, resolution, audio, modeData } = req.body;
console.log("%c Line:24 🍡 req.body", "background:#b03734", req.body);
try { try {
const relatedObjects = { const relatedObjects = {
id: storyboardId, id: storyboardId,
@ -42,7 +41,7 @@ export default router.post(
projectId: projectId, projectId: projectId,
storyboardId: storyboardId, storyboardId: storyboardId,
prompt: prompt, prompt: prompt,
imageData: imageData, data: data,
modeData: modeData, modeData: modeData,
duration: duration, duration: duration,
resolution: resolution, resolution: resolution,
@ -58,12 +57,21 @@ export default router.post(
// prompt, // prompt,
// filePath: videoPath, // filePath: videoPath,
// model, // model,
// time: new Date(), // time: Date.now(),
// state: "生成成功", // state: "生成成功",
// scriptId: scriptId, // scriptId: scriptId,
// }); // });
res.status(200).send(success("视频生成成功")); res.status(200).send(success("视频生成成功"));
} catch (error) { } 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: "视频生成失败" }); res.status(500).send({ error: "视频生成失败" });
} }
}, },

105
src/types/database.d.ts vendored
View File

@ -1,4 +1,4 @@
// @db-hash 8af8e41e3ca0cb5ee554944515d72ba8 // @db-hash f67609654b5467393c4809a3921d8fa4
//该文件由脚本自动生成，请勿手动修改 //该文件由脚本自动生成，请勿手动修改
export interface memories { export interface memories {
@ -35,18 +35,12 @@ export interface o_assets {
'projectId'?: number | null; 'projectId'?: number | null;
'prompt'?: string | null; 'prompt'?: string | null;
'remark'?: string | null; 'remark'?: string | null;
'scriptId'?: number | null;
'sonId'?: number | null; 'sonId'?: number | null;
'startTime'?: number | null; 'startTime'?: number | null;
'state'?: string | null; 'state'?: string | null;
'type'?: 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 { export interface o_event {
'createTime'?: number | null; 'createTime'?: number | null;
'detail'?: string | null; 'detail'?: string | null;
@ -67,33 +61,10 @@ export interface o_image {
'assetsId'?: number | null; 'assetsId'?: number | null;
'filePath'?: string | null; 'filePath'?: string | null;
'id'?: number; 'id'?: number;
'projectId'?: number | null; 'model'?: string | null;
'scriptId'?: number | null; 'resolution'?: string | null;
'state'?: string | null; 'state'?: string | null;
'type'?: 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 { export interface o_novel {
'chapter'?: string | null; 'chapter'?: string | null;
@ -126,15 +97,6 @@ export interface o_project {
'userId'?: number | null; 'userId'?: number | null;
'videoRatio'?: string | 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 { export interface o_script {
'content'?: string | null; 'content'?: string | null;
'createTime'?: number | null; 'createTime'?: number | null;
@ -142,44 +104,14 @@ export interface o_script {
'name'?: string | null; 'name'?: string | null;
'projectId'?: number | 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 { export interface o_setting {
'key'?: string | null; 'key'?: string | null;
'value'?: string | null; 'value'?: string | null;
} }
export interface o_skills {
'id'?: number;
'name'?: string | null;
'startTime'?: number | null;
}
export interface o_storyboard { export interface o_storyboard {
'createTime'?: number | null; 'createTime'?: number | null;
'detail'?: string | null;
'filePath'?: string | null;
'frameType'?: string | null;
'id'?: number; 'id'?: number;
'name'?: string | null; '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 { export interface o_tasks {
'describe'?: string | null; 'describe'?: string | null;
@ -209,36 +141,30 @@ export interface o_vendorConfig {
'version'?: string | null; 'version'?: string | null;
} }
export interface o_video { export interface o_video {
'configId'?: number | null;
'errorReason'?: string | null; 'errorReason'?: string | null;
'filePath'?: string | null; 'filePath'?: string | null;
'firstFrame'?: string | null;
'id'?: number; 'id'?: number;
'mode'?: string | null;
'model'?: string | null; 'model'?: string | null;
'prompt'?: string | null; 'prompt'?: string | null;
'resolution'?: string | null; 'resolution'?: string | null;
'scriptId'?: number | null; 'scriptId'?: number | null;
'state'?: number | null; 'state'?: string | null;
'storyboardImgs'?: string | null; 'storyboardId'?: number | null;
'time'?: number | null; 'time'?: number | null;
} }
export interface o_videoConfig { export interface o_videoConfig {
'aiConfigId'?: number | null; 'audio'?: number | null;
'audioEnabled'?: number | null;
'createTime'?: number | null; 'createTime'?: number | null;
'data'?: string | null;
'duration'?: number | null; 'duration'?: number | null;
'endFrame'?: string | null;
'id'?: number; 'id'?: number;
'images'?: string | null;
'manufacturer'?: string | null;
'mode'?: string | null; 'mode'?: string | null;
'projectId'?: number | null; 'model'?: string | null;
'prompt'?: string | null; 'prompt'?: string | null;
'resolution'?: string | null; 'resolution'?: string | null;
'scriptId'?: number | null;
'selectedResultId'?: number | null;
'startFrame'?: string | null;
'updateTime'?: number | null; 'updateTime'?: number | null;
'videoId'?: number | null;
} }
export interface DB { export interface DB {
@ -246,26 +172,17 @@ export interface DB {
"o_agentDeploy": o_agentDeploy; "o_agentDeploy": o_agentDeploy;
"o_artStyle": o_artStyle; "o_artStyle": o_artStyle;
"o_assets": o_assets; "o_assets": o_assets;
"o_chatHistory": o_chatHistory;
"o_event": o_event; "o_event": o_event;
"o_eventChapter": o_eventChapter; "o_eventChapter": o_eventChapter;
"o_flowData": o_flowData; "o_flowData": o_flowData;
"o_image": o_image; "o_image": o_image;
"o_model": o_model;
"o_myTasks": o_myTasks;
"o_novel": o_novel; "o_novel": o_novel;
"o_outline": o_outline; "o_outline": o_outline;
"o_outlineNovel": o_outlineNovel; "o_outlineNovel": o_outlineNovel;
"o_project": o_project; "o_project": o_project;
"o_prompts": o_prompts;
"o_script": o_script; "o_script": o_script;
"o_scriptAssets": o_scriptAssets;
"o_scriptOutline": o_scriptOutline;
"o_setting": o_setting; "o_setting": o_setting;
"o_skills": o_skills;
"o_storyboard": o_storyboard; "o_storyboard": o_storyboard;
"o_storyboardFlow": o_storyboardFlow;
"o_storyboardScript": o_storyboardScript;
"o_tasks": o_tasks; "o_tasks": o_tasks;
"o_user": o_user; "o_user": o_user;
"o_vendorConfig": o_vendorConfig; "o_vendorConfig": o_vendorConfig;

2
src/utils/ai.ts
View File

@ -117,7 +117,7 @@ interface VideoConfig {
storyboardId: number; // 关联的分镜ID storyboardId: number; // 关联的分镜ID
systemPrompt?: string; // 系统提示词 systemPrompt?: string; // 系统提示词
prompt: string; //视频提示词 prompt: string; //视频提示词
imageData: string[]; //输入的图片提示词 data: string[]; //输入的图片提示词
modeData: string; //模式 modeData: string; //模式
duration: number; // 视频时长，单位秒 duration: number; // 视频时长，单位秒
resolution: string; // 视频分辨率 resolution: string; // 视频分辨率