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/types/database.d.ts
This commit is contained in:
ACT丶流星雨 2026-03-30 13:09:04 +08:00
commit 59b28459b3
6 changed files with 252 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/initDB.ts
View File

@ -481,6 +481,7 @@ export default async (knex: Knex, forceInit: boolean = false): Promise<void> =>
table.integer("scriptId");
table.text("title");
table.text("prompt");
table.text("videoPrompt");
table.text("description");
table.text("filePath");
table.text("model");

242
src/router.ts
View File

@ -1,4 +1,4 @@
// @routes-hash 48f3cafa7563a8ec5d646e1f88ef8bfd
// @routes-hash c1392b39a921d712296ccb6b4aea3507
import { Express } from "express";
import route1 from "./routes/agents/clearMemory";
@ -55,65 +55,67 @@ import route51 from "./routes/production/getFlowData";
import route52 from "./routes/production/getProductionData";
import route53 from "./routes/production/getStoryboardData";
import route54 from "./routes/production/saveFlowData";
import route55 from "./routes/production/storyboard/downPreviewImage";
import route56 from "./routes/production/storyboard/getStoryboardData";
import route57 from "./routes/production/storyboard/previewImage";
import route58 from "./routes/production/workbench/confirmSelection";
import route59 from "./routes/production/workbench/delVideo";
import route60 from "./routes/production/workbench/generateVideo";
import route61 from "./routes/production/workbench/getChatLines";
import route62 from "./routes/production/workbench/getVideoModelDetail";
import route63 from "./routes/production/workbench/videoPolling";
import route64 from "./routes/project/addProject";
import route65 from "./routes/project/addVisual";
import route66 from "./routes/project/addVisualManual";
import route67 from "./routes/project/deleteVisualManual";
import route68 from "./routes/project/delProject";
import route69 from "./routes/project/editProject";
import route70 from "./routes/project/editVisualManual";
import route71 from "./routes/project/getProject";
import route72 from "./routes/project/getVisualManual";
import route73 from "./routes/project/visualManual";
import route74 from "./routes/script/addScript";
import route75 from "./routes/script/delScript";
import route76 from "./routes/script/exportScript";
import route77 from "./routes/script/extractAssets";
import route78 from "./routes/script/getScrptApi";
import route79 from "./routes/script/pollScriptAssets";
import route80 from "./routes/script/updateScript";
import route81 from "./routes/scriptAgent/getPlanData";
import route82 from "./routes/scriptAgent/setPlanData";
import route83 from "./routes/setting/about/checkUpdate";
import route84 from "./routes/setting/about/downloadApp";
import route85 from "./routes/setting/agentDeploy/agentSetKey";
import route86 from "./routes/setting/agentDeploy/deployAgentModel";
import route87 from "./routes/setting/agentDeploy/getAgentDeploy";
import route88 from "./routes/setting/dbConfig/clearData";
import route89 from "./routes/setting/dev/getSwitchAiDevTool";
import route90 from "./routes/setting/dev/updateSwitchAiDevTool";
import route91 from "./routes/setting/fileManagement/openFolder";
import route92 from "./routes/setting/getTextModel";
import route93 from "./routes/setting/loginConfig/getUser";
import route94 from "./routes/setting/loginConfig/updateUserPwd";
import route95 from "./routes/setting/memoryConfig/delAllMemory";
import route96 from "./routes/setting/memoryConfig/getMemory";
import route97 from "./routes/setting/memoryConfig/sureMemory";
import route98 from "./routes/setting/promptManage/getPrompt";
import route99 from "./routes/setting/promptManage/updatePrompt";
import route100 from "./routes/setting/skillManagement/getSkillContent";
import route101 from "./routes/setting/skillManagement/getSkillList";
import route102 from "./routes/setting/skillManagement/saveSkillContent";
import route103 from "./routes/setting/vendorConfig/addVendor";
import route104 from "./routes/setting/vendorConfig/deleteVendor";
import route105 from "./routes/setting/vendorConfig/getVendorList";
import route106 from "./routes/setting/vendorConfig/modelTest";
import route107 from "./routes/setting/vendorConfig/updateCode";
import route108 from "./routes/setting/vendorConfig/updateVendor";
import route109 from "./routes/task/getProject";
import route110 from "./routes/task/getTaskApi";
import route111 from "./routes/task/getTaskCategories";
import route112 from "./routes/task/taskDetails";
import route113 from "./routes/test/test";
import route55 from "./routes/production/storyboard/batchGenerateImage";
import route56 from "./routes/production/storyboard/downPreviewImage";
import route57 from "./routes/production/storyboard/getStoryboardData";
import route58 from "./routes/production/storyboard/previewImage";
import route59 from "./routes/production/workbench/confirmSelection";
import route60 from "./routes/production/workbench/delVideo";
import route61 from "./routes/production/workbench/generateVideo";
import route62 from "./routes/production/workbench/generateVideoPrompt";
import route63 from "./routes/production/workbench/getChatLines";
import route64 from "./routes/production/workbench/getVideoModelDetail";
import route65 from "./routes/production/workbench/videoPolling";
import route66 from "./routes/project/addProject";
import route67 from "./routes/project/addVisual";
import route68 from "./routes/project/addVisualManual";
import route69 from "./routes/project/deleteVisualManual";
import route70 from "./routes/project/delProject";
import route71 from "./routes/project/editProject";
import route72 from "./routes/project/editVisualManual";
import route73 from "./routes/project/getProject";
import route74 from "./routes/project/getVisualManual";
import route75 from "./routes/project/visualManual";
import route76 from "./routes/script/addScript";
import route77 from "./routes/script/delScript";
import route78 from "./routes/script/exportScript";
import route79 from "./routes/script/extractAssets";
import route80 from "./routes/script/getScrptApi";
import route81 from "./routes/script/pollScriptAssets";
import route82 from "./routes/script/updateScript";
import route83 from "./routes/scriptAgent/getPlanData";
import route84 from "./routes/scriptAgent/setPlanData";
import route85 from "./routes/setting/about/checkUpdate";
import route86 from "./routes/setting/about/downloadApp";
import route87 from "./routes/setting/agentDeploy/agentSetKey";
import route88 from "./routes/setting/agentDeploy/deployAgentModel";
import route89 from "./routes/setting/agentDeploy/getAgentDeploy";
import route90 from "./routes/setting/dbConfig/clearData";
import route91 from "./routes/setting/dev/getSwitchAiDevTool";
import route92 from "./routes/setting/dev/updateSwitchAiDevTool";
import route93 from "./routes/setting/fileManagement/openFolder";
import route94 from "./routes/setting/getTextModel";
import route95 from "./routes/setting/loginConfig/getUser";
import route96 from "./routes/setting/loginConfig/updateUserPwd";
import route97 from "./routes/setting/memoryConfig/delAllMemory";
import route98 from "./routes/setting/memoryConfig/getMemory";
import route99 from "./routes/setting/memoryConfig/sureMemory";
import route100 from "./routes/setting/promptManage/getPrompt";
import route101 from "./routes/setting/promptManage/updatePrompt";
import route102 from "./routes/setting/skillManagement/getSkillContent";
import route103 from "./routes/setting/skillManagement/getSkillList";
import route104 from "./routes/setting/skillManagement/saveSkillContent";
import route105 from "./routes/setting/vendorConfig/addVendor";
import route106 from "./routes/setting/vendorConfig/deleteVendor";
import route107 from "./routes/setting/vendorConfig/getVendorList";
import route108 from "./routes/setting/vendorConfig/modelTest";
import route109 from "./routes/setting/vendorConfig/updateCode";
import route110 from "./routes/setting/vendorConfig/updateVendor";
import route111 from "./routes/task/getProject";
import route112 from "./routes/task/getTaskApi";
import route113 from "./routes/task/getTaskCategories";
import route114 from "./routes/task/taskDetails";
import route115 from "./routes/test/test";
export default async (app: Express) => {
app.use("/api/agents/clearMemory", route1);
@ -170,63 +172,65 @@ export default async (app: Express) => {
app.use("/api/production/getProductionData", route52);
app.use("/api/production/getStoryboardData", route53);
app.use("/api/production/saveFlowData", route54);
app.use("/api/production/storyboard/downPreviewImage", route55);
app.use("/api/production/storyboard/getStoryboardData", route56);
app.use("/api/production/storyboard/previewImage", route57);
app.use("/api/production/workbench/confirmSelection", route58);
app.use("/api/production/workbench/delVideo", route59);
app.use("/api/production/workbench/generateVideo", route60);
app.use("/api/production/workbench/getChatLines", route61);
app.use("/api/production/workbench/getVideoModelDetail", route62);
app.use("/api/production/workbench/videoPolling", route63);
app.use("/api/project/addProject", route64);
app.use("/api/project/addVisual", route65);
app.use("/api/project/addVisualManual", route66);
app.use("/api/project/deleteVisualManual", route67);
app.use("/api/project/delProject", route68);
app.use("/api/project/editProject", route69);
app.use("/api/project/editVisualManual", route70);
app.use("/api/project/getProject", route71);
app.use("/api/project/getVisualManual", route72);
app.use("/api/project/visualManual", route73);
app.use("/api/script/addScript", route74);
app.use("/api/script/delScript", route75);
app.use("/api/script/exportScript", route76);
app.use("/api/script/extractAssets", route77);
app.use("/api/script/getScrptApi", route78);
app.use("/api/script/pollScriptAssets", route79);
app.use("/api/script/updateScript", route80);
app.use("/api/scriptAgent/getPlanData", route81);
app.use("/api/scriptAgent/setPlanData", route82);
app.use("/api/setting/about/checkUpdate", route83);
app.use("/api/setting/about/downloadApp", route84);
app.use("/api/setting/agentDeploy/agentSetKey", route85);
app.use("/api/setting/agentDeploy/deployAgentModel", route86);
app.use("/api/setting/agentDeploy/getAgentDeploy", route87);
app.use("/api/setting/dbConfig/clearData", route88);
app.use("/api/setting/dev/getSwitchAiDevTool", route89);
app.use("/api/setting/dev/updateSwitchAiDevTool", route90);
app.use("/api/setting/fileManagement/openFolder", route91);
app.use("/api/setting/getTextModel", route92);
app.use("/api/setting/loginConfig/getUser", route93);
app.use("/api/setting/loginConfig/updateUserPwd", route94);
app.use("/api/setting/memoryConfig/delAllMemory", route95);
app.use("/api/setting/memoryConfig/getMemory", route96);
app.use("/api/setting/memoryConfig/sureMemory", route97);
app.use("/api/setting/promptManage/getPrompt", route98);
app.use("/api/setting/promptManage/updatePrompt", route99);
app.use("/api/setting/skillManagement/getSkillContent", route100);
app.use("/api/setting/skillManagement/getSkillList", route101);
app.use("/api/setting/skillManagement/saveSkillContent", route102);
app.use("/api/setting/vendorConfig/addVendor", route103);
app.use("/api/setting/vendorConfig/deleteVendor", route104);
app.use("/api/setting/vendorConfig/getVendorList", route105);
app.use("/api/setting/vendorConfig/modelTest", route106);
app.use("/api/setting/vendorConfig/updateCode", route107);
app.use("/api/setting/vendorConfig/updateVendor", route108);
app.use("/api/task/getProject", route109);
app.use("/api/task/getTaskApi", route110);
app.use("/api/task/getTaskCategories", route111);
app.use("/api/task/taskDetails", route112);
app.use("/api/test/test", route113);
app.use("/api/production/storyboard/batchGenerateImage", route55);
app.use("/api/production/storyboard/downPreviewImage", route56);
app.use("/api/production/storyboard/getStoryboardData", route57);
app.use("/api/production/storyboard/previewImage", route58);
app.use("/api/production/workbench/confirmSelection", route59);
app.use("/api/production/workbench/delVideo", route60);
app.use("/api/production/workbench/generateVideo", route61);
app.use("/api/production/workbench/generateVideoPrompt", route62);
app.use("/api/production/workbench/getChatLines", route63);
app.use("/api/production/workbench/getVideoModelDetail", route64);
app.use("/api/production/workbench/videoPolling", route65);
app.use("/api/project/addProject", route66);
app.use("/api/project/addVisual", route67);
app.use("/api/project/addVisualManual", route68);
app.use("/api/project/deleteVisualManual", route69);
app.use("/api/project/delProject", route70);
app.use("/api/project/editProject", route71);
app.use("/api/project/editVisualManual", route72);
app.use("/api/project/getProject", route73);
app.use("/api/project/getVisualManual", route74);
app.use("/api/project/visualManual", route75);
app.use("/api/script/addScript", route76);
app.use("/api/script/delScript", route77);
app.use("/api/script/exportScript", route78);
app.use("/api/script/extractAssets", route79);
app.use("/api/script/getScrptApi", route80);
app.use("/api/script/pollScriptAssets", route81);
app.use("/api/script/updateScript", route82);
app.use("/api/scriptAgent/getPlanData", route83);
app.use("/api/scriptAgent/setPlanData", route84);
app.use("/api/setting/about/checkUpdate", route85);
app.use("/api/setting/about/downloadApp", route86);
app.use("/api/setting/agentDeploy/agentSetKey", route87);
app.use("/api/setting/agentDeploy/deployAgentModel", route88);
app.use("/api/setting/agentDeploy/getAgentDeploy", route89);
app.use("/api/setting/dbConfig/clearData", route90);
app.use("/api/setting/dev/getSwitchAiDevTool", route91);
app.use("/api/setting/dev/updateSwitchAiDevTool", route92);
app.use("/api/setting/fileManagement/openFolder", route93);
app.use("/api/setting/getTextModel", route94);
app.use("/api/setting/loginConfig/getUser", route95);
app.use("/api/setting/loginConfig/updateUserPwd", route96);
app.use("/api/setting/memoryConfig/delAllMemory", route97);
app.use("/api/setting/memoryConfig/getMemory", route98);
app.use("/api/setting/memoryConfig/sureMemory", route99);
app.use("/api/setting/promptManage/getPrompt", route100);
app.use("/api/setting/promptManage/updatePrompt", route101);
app.use("/api/setting/skillManagement/getSkillContent", route102);
app.use("/api/setting/skillManagement/getSkillList", route103);
app.use("/api/setting/skillManagement/saveSkillContent", route104);
app.use("/api/setting/vendorConfig/addVendor", route105);
app.use("/api/setting/vendorConfig/deleteVendor", route106);
app.use("/api/setting/vendorConfig/getVendorList", route107);
app.use("/api/setting/vendorConfig/modelTest", route108);
app.use("/api/setting/vendorConfig/updateCode", route109);
app.use("/api/setting/vendorConfig/updateVendor", route110);
app.use("/api/task/getProject", route111);
app.use("/api/task/getTaskApi", route112);
app.use("/api/task/getTaskCategories", route113);
app.use("/api/task/taskDetails", route114);
app.use("/api/test/test", route115);
}

7
src/routes/production/getProductionData.ts
View File

@ -8,17 +8,22 @@ export default router.post(
"/",
validateFields({
scriptId: z.number(),
projectId: z.number(),
}),
async (req, res) => {
const { scriptId } = req.body;
const { scriptId, projectId } = req.body;
//查询分镜数据
const storyboards = await u.db("o_storyboard").where("o_storyboard.scriptId", scriptId).select("*").orderBy("index", "asc");
//查询项目默认的视频模型
const project = await u.db("o_project").where("id", projectId).first();
const storyboardsList = await Promise.all(
storyboards.map(async (item) => {
return {
...item,
model: project?.videoModel || null,
filePath: item.filePath ? await u.oss.getFileUrl(item.filePath) : null,
};
}),

74
src/routes/production/storyboard/batchGenerateImage.ts Normal file
View File

@ -0,0 +1,74 @@
import express from "express";
import u from "@/utils";
import { z } from "zod";
import sharp from "sharp";
import { success } from "@/lib/responseFormat";
import { validateFields } from "@/middleware/middleware";
import { Output } from "ai";
const router = express.Router();
export default router.post(
"/",
validateFields({
storyboardIds: z.array(z.number()),
projectId: z.number(),
}),
async (req, res) => {
const { storyboardIds, projectId } = req.body;
const projectSettingData = await u.db("o_project").where("id", projectId).select("imageModel", "imageQuality", "artStyle").first();
const sceneArkPrompt = u.getArtPrompt(projectSettingData?.artStyle || "", "art_storyboard");
const storyboardData = await u.db("o_storyboard").whereIn("id", storyboardIds).select("id", "description", "title");
const { text } = await u.Ai.Text("universalAi").invoke({
system: `
你需要根据用户提供的分镜的标题与描述，结合当前项目的美术风格，为我优化提示词以便生成更符合项目美术风格的分镜图片。请你只优化提示词，不要添加任何额外的描述性文字，请以JSON格式输出: [{id:"对应分镜ID",prompt:"分镜提示词"}]。
美术风格：${sceneArkPrompt}`,
messages: [
{
role: "user",
content: `一下是我的分镜内容\n ${storyboardData.map((s) => `分镜ID:${s.id},分镜描述:${s.description},分镜标题:${s.title}`).join("\n")}`,
},
],
output: Output.object({
schema: z.array(
z.object({
prompt: z.string().describe("优化后的提示词"),
}),
),
}),
});
for (const item of storyboardData) {
const repeloadObj = {
prompt: text,
size: projectSettingData?.imageQuality as "1K" | "2K" | "4K",
aspectRatio: "16:9",
};
u.Ai.Image(projectSettingData?.imageModel as `${string}:${string}`).run({
prompt: text,
imageBase64: [],
size: projectSettingData?.imageQuality as "1K" | "2K" | "4K",
aspectRatio: "16:9",
taskClass: "生成图片",
describe: "资产图片生成",
relatedObjects: JSON.stringify(repeloadObj),
projectId: projectId,
});
// .then(async (imageCls) => {
// const savePath = `/${resTool.data.projectId}/assets/${resTool.data.scriptId}/${u.uuid()}.jpg`;
// await imageCls.save(savePath);
// const obj = {
// ...item,
// id: item.assetId,
// src: await u.oss.getFileUrl(savePath),
// state: "已完成",
// };
//更新对应数据库
// await u.db("o_assets").where("id", item.assetId).update({ imageId: imageId });
// await u.db("o_image").where({ id: imageId }).update({ state: "已完成", filePath: savePath });
// });
}
return res.status(200).send(success());
},
);

30
src/routes/production/workbench/generateVideoPrompt.ts Normal file
View File

@ -0,0 +1,30 @@
import express from "express";
import u from "@/utils";
import { z } from "zod";
import getPath from "@/utils/getPath";
import { success } from "@/lib/responseFormat";
import { validateFields } from "@/middleware/middleware";
import fs from "fs";
import path from "path";
const router = express.Router();
export default router.post(
"/",
validateFields({
model: z.string(),
storyboardId: z.number(),
}),
async (req, res) => {
const { model, storyboardId } = req.body;
//测试数据
//拿到分镜以及对应的资产信息
const data = await u
.db("o_storyboard")
.leftJoin("o_assets2Storyboard", "storyboardId.id", "o_assets2Storyboard.storyboardId")
.leftJoin("o_assets", "o_assets2Storyboard.assetId", "o_assets.id")
.where("o_storyboard.id", storyboardId)
.select("o_storyboard.*", "o_assets.name as assetName", "o_assets.type as assetType", "o_assets.prompt as assetPrompt");
res.status(200).send(success({ message: "" }));
},
);

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

@ -1,6 +1,19 @@
<<<<<<< HEAD
// @db-hash 93b2462070c45c2b449e9a18c4e88763
//该文件由脚本自动生成，请勿手动修改
=======
// @db-hash f7bc2fdb80756d5536929eb47155578b
//该文件由脚本自动生成，请勿手动修改
export interface _o_script_old_20260327 {
'content'?: string | null;
'createTime'?: number | null;
'id'?: number;
'name'?: string | null;
'projectId'?: number | null;
}
>>>>>>> 9da2610cdedc1e293b351ed3ab67fbc6fcd989f1
export interface memories {
'content': string;
'createTime': number;
@ -47,7 +60,6 @@ export interface o_assets {
'name'?: string | null;
'projectId'?: number | null;
'prompt'?: string | null;
'promptState'?: string | null;
'remark'?: string | null;
'scriptId'?: number | null;
'startTime'?: number | null;
@ -167,7 +179,7 @@ export interface o_storyboard {
'filePath'?: string | null;
'frameMode'?: string | null;
'id'?: number;
'index'?: number | null;
'index'?: string | null;
'lines'?: string | null;
'mode'?: string | null;
'model'?: string | null;
@ -232,6 +244,10 @@ export interface o_videoConfig {
}
export interface DB {
<<<<<<< HEAD
=======
"_o_script_old_20260327": _o_script_old_20260327;
>>>>>>> 9da2610cdedc1e293b351ed3ab67fbc6fcd989f1
"memories": memories;
"o_agentDeploy": o_agentDeploy;
"o_agentWorkData": o_agentWorkData;