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:
zhishi 2026-04-01 18:23:35 +08:00
commit bd585b25a4
9 changed files with 170 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/initDB.ts
View File

@ -539,6 +539,7 @@ description: 专注于从剧本内容中提取所使用的资产（角色、场
table.text("state"); table.text("state");
table.text("reason"); table.text("reason");
table.text("prompt"); table.text("prompt");
table.integer("selectVideoId");
table.primary(["id"]); table.primary(["id"]);
table.unique(["id"]); table.unique(["id"]);
}, },

212
src/router.ts
View File

@ -1,4 +1,4 @@
// @routes-hash 74dea22f03cd475b3b00fd48e38fd9df // @routes-hash 44a93adb5c8e47f025e5e1ed15f8645d
import { Express } from "express"; import { Express } from "express";
import route1 from "./routes/agents/clearMemory"; import route1 from "./routes/agents/clearMemory";
@ -76,58 +76,59 @@ import route72 from "./routes/production/workbench/generateVideoPrompt";
import route73 from "./routes/production/workbench/getGenerateData"; import route73 from "./routes/production/workbench/getGenerateData";
import route74 from "./routes/production/workbench/getVideoList"; import route74 from "./routes/production/workbench/getVideoList";
import route75 from "./routes/production/workbench/getVideoModelDetail"; import route75 from "./routes/production/workbench/getVideoModelDetail";
import route76 from "./routes/project/addProject"; import route76 from "./routes/production/workbench/selectVideo";
import route77 from "./routes/project/addVisual"; import route77 from "./routes/project/addProject";
import route78 from "./routes/project/addVisualManual"; import route78 from "./routes/project/addVisual";
import route79 from "./routes/project/deleteVisualManual"; import route79 from "./routes/project/addVisualManual";
import route80 from "./routes/project/delProject"; import route80 from "./routes/project/deleteVisualManual";
import route81 from "./routes/project/editProject"; import route81 from "./routes/project/delProject";
import route82 from "./routes/project/editVisualManual"; import route82 from "./routes/project/editProject";
import route83 from "./routes/project/getProject"; import route83 from "./routes/project/editVisualManual";
import route84 from "./routes/project/getVisualManual"; import route84 from "./routes/project/getProject";
import route85 from "./routes/project/visualManual"; import route85 from "./routes/project/getVisualManual";
import route86 from "./routes/script/addScript"; import route86 from "./routes/project/visualManual";
import route87 from "./routes/script/delScript"; import route87 from "./routes/script/addScript";
import route88 from "./routes/script/exportScript"; import route88 from "./routes/script/delScript";
import route89 from "./routes/script/extractAssets"; import route89 from "./routes/script/exportScript";
import route90 from "./routes/script/getScrptApi"; import route90 from "./routes/script/extractAssets";
import route91 from "./routes/script/pollScriptAssets"; import route91 from "./routes/script/getScrptApi";
import route92 from "./routes/script/updateScript"; import route92 from "./routes/script/pollScriptAssets";
import route93 from "./routes/scriptAgent/getPlanData"; import route93 from "./routes/script/updateScript";
import route94 from "./routes/scriptAgent/setPlanData"; import route94 from "./routes/scriptAgent/getPlanData";
import route95 from "./routes/scriptAgent/updateData"; import route95 from "./routes/scriptAgent/setPlanData";
import route96 from "./routes/setting/about/checkUpdate"; import route96 from "./routes/scriptAgent/updateData";
import route97 from "./routes/setting/about/downloadApp"; import route97 from "./routes/setting/about/checkUpdate";
import route98 from "./routes/setting/agentDeploy/agentSetKey"; import route98 from "./routes/setting/about/downloadApp";
import route99 from "./routes/setting/agentDeploy/deployAgentModel"; import route99 from "./routes/setting/agentDeploy/agentSetKey";
import route100 from "./routes/setting/agentDeploy/getAgentDeploy"; import route100 from "./routes/setting/agentDeploy/deployAgentModel";
import route101 from "./routes/setting/dbConfig/clearData"; import route101 from "./routes/setting/agentDeploy/getAgentDeploy";
import route102 from "./routes/setting/dev/getSwitchAiDevTool"; import route102 from "./routes/setting/dbConfig/clearData";
import route103 from "./routes/setting/dev/updateSwitchAiDevTool"; import route103 from "./routes/setting/dev/getSwitchAiDevTool";
import route104 from "./routes/setting/fileManagement/openFolder"; import route104 from "./routes/setting/dev/updateSwitchAiDevTool";
import route105 from "./routes/setting/getTextModel"; import route105 from "./routes/setting/fileManagement/openFolder";
import route106 from "./routes/setting/loginConfig/getUser"; import route106 from "./routes/setting/getTextModel";
import route107 from "./routes/setting/loginConfig/updateUserPwd"; import route107 from "./routes/setting/loginConfig/getUser";
import route108 from "./routes/setting/memoryConfig/delAllMemory"; import route108 from "./routes/setting/loginConfig/updateUserPwd";
import route109 from "./routes/setting/memoryConfig/getMemory"; import route109 from "./routes/setting/memoryConfig/delAllMemory";
import route110 from "./routes/setting/memoryConfig/sureMemory"; import route110 from "./routes/setting/memoryConfig/getMemory";
import route111 from "./routes/setting/promptManage/getPrompt"; import route111 from "./routes/setting/memoryConfig/sureMemory";
import route112 from "./routes/setting/promptManage/updatePrompt"; import route112 from "./routes/setting/promptManage/getPrompt";
import route113 from "./routes/setting/skillManagement/getSkillContent"; import route113 from "./routes/setting/promptManage/updatePrompt";
import route114 from "./routes/setting/skillManagement/getSkillList"; import route114 from "./routes/setting/skillManagement/getSkillContent";
import route115 from "./routes/setting/skillManagement/saveSkillContent"; import route115 from "./routes/setting/skillManagement/getSkillList";
import route116 from "./routes/setting/vendorConfig/addVendor"; import route116 from "./routes/setting/skillManagement/saveSkillContent";
import route117 from "./routes/setting/vendorConfig/deleteVendor"; import route117 from "./routes/setting/vendorConfig/addVendor";
import route118 from "./routes/setting/vendorConfig/enableEnglishVendor"; import route118 from "./routes/setting/vendorConfig/deleteVendor";
import route119 from "./routes/setting/vendorConfig/getVendorList"; import route119 from "./routes/setting/vendorConfig/enableEnglishVendor";
import route120 from "./routes/setting/vendorConfig/modelTest"; import route120 from "./routes/setting/vendorConfig/getVendorList";
import route121 from "./routes/setting/vendorConfig/updateCode"; import route121 from "./routes/setting/vendorConfig/modelTest";
import route122 from "./routes/setting/vendorConfig/updateVendor"; import route122 from "./routes/setting/vendorConfig/updateCode";
import route123 from "./routes/task/getProject"; import route123 from "./routes/setting/vendorConfig/updateVendor";
import route124 from "./routes/task/getTaskApi"; import route124 from "./routes/task/getProject";
import route125 from "./routes/task/getTaskCategories"; import route125 from "./routes/task/getTaskApi";
import route126 from "./routes/task/taskDetails"; import route126 from "./routes/task/getTaskCategories";
import route127 from "./routes/test/test"; import route127 from "./routes/task/taskDetails";
import route128 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);
@ -205,56 +206,57 @@ export default async (app: Express) => {
app.use("/api/production/workbench/getGenerateData", route73); app.use("/api/production/workbench/getGenerateData", route73);
app.use("/api/production/workbench/getVideoList", route74); app.use("/api/production/workbench/getVideoList", route74);
app.use("/api/production/workbench/getVideoModelDetail", route75); app.use("/api/production/workbench/getVideoModelDetail", route75);
app.use("/api/project/addProject", route76); app.use("/api/production/workbench/selectVideo", route76);
app.use("/api/project/addVisual", route77); app.use("/api/project/addProject", route77);
app.use("/api/project/addVisualManual", route78); app.use("/api/project/addVisual", route78);
app.use("/api/project/deleteVisualManual", route79); app.use("/api/project/addVisualManual", route79);
app.use("/api/project/delProject", route80); app.use("/api/project/deleteVisualManual", route80);
app.use("/api/project/editProject", route81); app.use("/api/project/delProject", route81);
app.use("/api/project/editVisualManual", route82); app.use("/api/project/editProject", route82);
app.use("/api/project/getProject", route83); app.use("/api/project/editVisualManual", route83);
app.use("/api/project/getVisualManual", route84); app.use("/api/project/getProject", route84);
app.use("/api/project/visualManual", route85); app.use("/api/project/getVisualManual", route85);
app.use("/api/script/addScript", route86); app.use("/api/project/visualManual", route86);
app.use("/api/script/delScript", route87); app.use("/api/script/addScript", route87);
app.use("/api/script/exportScript", route88); app.use("/api/script/delScript", route88);
app.use("/api/script/extractAssets", route89); app.use("/api/script/exportScript", route89);
app.use("/api/script/getScrptApi", route90); app.use("/api/script/extractAssets", route90);
app.use("/api/script/pollScriptAssets", route91); app.use("/api/script/getScrptApi", route91);
app.use("/api/script/updateScript", route92); app.use("/api/script/pollScriptAssets", route92);
app.use("/api/scriptAgent/getPlanData", route93); app.use("/api/script/updateScript", route93);
app.use("/api/scriptAgent/setPlanData", route94); app.use("/api/scriptAgent/getPlanData", route94);
app.use("/api/scriptAgent/updateData", route95); app.use("/api/scriptAgent/setPlanData", route95);
app.use("/api/setting/about/checkUpdate", route96); app.use("/api/scriptAgent/updateData", route96);
app.use("/api/setting/about/downloadApp", route97); app.use("/api/setting/about/checkUpdate", route97);
app.use("/api/setting/agentDeploy/agentSetKey", route98); app.use("/api/setting/about/downloadApp", route98);
app.use("/api/setting/agentDeploy/deployAgentModel", route99); app.use("/api/setting/agentDeploy/agentSetKey", route99);
app.use("/api/setting/agentDeploy/getAgentDeploy", route100); app.use("/api/setting/agentDeploy/deployAgentModel", route100);
app.use("/api/setting/dbConfig/clearData", route101); app.use("/api/setting/agentDeploy/getAgentDeploy", route101);
app.use("/api/setting/dev/getSwitchAiDevTool", route102); app.use("/api/setting/dbConfig/clearData", route102);
app.use("/api/setting/dev/updateSwitchAiDevTool", route103); app.use("/api/setting/dev/getSwitchAiDevTool", route103);
app.use("/api/setting/fileManagement/openFolder", route104); app.use("/api/setting/dev/updateSwitchAiDevTool", route104);
app.use("/api/setting/getTextModel", route105); app.use("/api/setting/fileManagement/openFolder", route105);
app.use("/api/setting/loginConfig/getUser", route106); app.use("/api/setting/getTextModel", route106);
app.use("/api/setting/loginConfig/updateUserPwd", route107); app.use("/api/setting/loginConfig/getUser", route107);
app.use("/api/setting/memoryConfig/delAllMemory", route108); app.use("/api/setting/loginConfig/updateUserPwd", route108);
app.use("/api/setting/memoryConfig/getMemory", route109); app.use("/api/setting/memoryConfig/delAllMemory", route109);
app.use("/api/setting/memoryConfig/sureMemory", route110); app.use("/api/setting/memoryConfig/getMemory", route110);
app.use("/api/setting/promptManage/getPrompt", route111); app.use("/api/setting/memoryConfig/sureMemory", route111);
app.use("/api/setting/promptManage/updatePrompt", route112); app.use("/api/setting/promptManage/getPrompt", route112);
app.use("/api/setting/skillManagement/getSkillContent", route113); app.use("/api/setting/promptManage/updatePrompt", route113);
app.use("/api/setting/skillManagement/getSkillList", route114); app.use("/api/setting/skillManagement/getSkillContent", route114);
app.use("/api/setting/skillManagement/saveSkillContent", route115); app.use("/api/setting/skillManagement/getSkillList", route115);
app.use("/api/setting/vendorConfig/addVendor", route116); app.use("/api/setting/skillManagement/saveSkillContent", route116);
app.use("/api/setting/vendorConfig/deleteVendor", route117); app.use("/api/setting/vendorConfig/addVendor", route117);
app.use("/api/setting/vendorConfig/enableEnglishVendor", route118); app.use("/api/setting/vendorConfig/deleteVendor", route118);
app.use("/api/setting/vendorConfig/getVendorList", route119); app.use("/api/setting/vendorConfig/enableEnglishVendor", route119);
app.use("/api/setting/vendorConfig/modelTest", route120); app.use("/api/setting/vendorConfig/getVendorList", route120);
app.use("/api/setting/vendorConfig/updateCode", route121); app.use("/api/setting/vendorConfig/modelTest", route121);
app.use("/api/setting/vendorConfig/updateVendor", route122); app.use("/api/setting/vendorConfig/updateCode", route122);
app.use("/api/task/getProject", route123); app.use("/api/setting/vendorConfig/updateVendor", route123);
app.use("/api/task/getTaskApi", route124); app.use("/api/task/getProject", route124);
app.use("/api/task/getTaskCategories", route125); app.use("/api/task/getTaskApi", route125);
app.use("/api/task/taskDetails", route126); app.use("/api/task/getTaskCategories", route126);
app.use("/api/test/test", route127); app.use("/api/task/taskDetails", route127);
app.use("/api/test/test", route128);
} }

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

@ -5,6 +5,18 @@ import { v4 as uuidv4 } from "uuid";
import { success } from "@/lib/responseFormat"; import { success } from "@/lib/responseFormat";
import { validateFields } from "@/middleware/middleware"; import { validateFields } from "@/middleware/middleware";
const router = express.Router(); const router = express.Router();
type Type = "imageReference" | "startImage" | "endImage" | "videoReference" | "audioReference";
interface UploadItem {
fileType: "image" | "video" | "audio";
type: Type;
sources?: "assets" | "storyboard";
id?: number;
src?: string;
label?: string;
prompt?: string;
}
export default router.post( export default router.post(
"/", "/",
validateFields({ validateFields({
@ -29,23 +41,14 @@ export default router.post(
//获取生成视频比例 //获取生成视频比例
const ratio = await u.db("o_project").select("videoRatio").where("id", projectId).first(); const ratio = await u.db("o_project").select("videoRatio").where("id", projectId).first();
const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径 const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径
//新增
const [videoId] = await u.db("o_video").insert({
filePath: videoPath,
time: Date.now(),
state: "生成中",
scriptId,
projectId,
videoTrackId: trackId,
});
//查询出图片数据 //查询出图片数据
const images = await Promise.all( const images = await Promise.all(
uploadData.map(async (item: { id: number; type: string }) => { uploadData.map(async (item: UploadItem) => {
if (item.type === "storyboard") { if (item.sources === "storyboard") {
const filePath = await u.db("o_storyboard").where("id", item.id).select("filePath").first(); const filePath = await u.db("o_storyboard").where("id", item.id).select("filePath").first();
return filePath?.filePath; return filePath?.filePath;
} }
if (item.type === "assets") { if (item.sources === "assets") {
const filePath = await u const filePath = await u
.db("o_assets") .db("o_assets")
.where("o_assets.id", item.id) .where("o_assets.id", item.id)
@ -63,6 +66,15 @@ export default router.post(
return await u.oss.getImageBase64(item); return await u.oss.getImageBase64(item);
}), }),
); );
//新增
const [videoId] = await u.db("o_video").insert({
filePath: videoPath,
time: Date.now(),
state: "生成中",
scriptId,
projectId,
videoTrackId: trackId,
});
res.status(200).send(success(videoId)); res.status(200).send(success(videoId));
(async () => { (async () => {
try { try {

17
src/routes/production/workbench/getGenerateData.ts
View File

@ -23,6 +23,7 @@ interface TrackItem {
prompt: string; prompt: string;
state: "未生成" | "生成中" | "已完成" | "生成失败"; state: "未生成" | "生成中" | "已完成" | "生成失败";
reason?: string; reason?: string;
selectVideoId?: number;
medias: TrackMedia[]; medias: TrackMedia[];
videoList: VideoItem[]; videoList: VideoItem[];
} }
@ -40,7 +41,6 @@ export default router.post(
"videoTrackId", "videoTrackId",
storyboardList.map((s) => s.trackId), storyboardList.map((s) => s.trackId),
); );
console.log("%c Line:40 🌽 videoList", "background:#ffdd4d", videoList);
const trackData = await u.db("o_videoTrack").whereIn( const trackData = await u.db("o_videoTrack").whereIn(
//@ts-ignore //@ts-ignore
"id", "id",
@ -56,15 +56,18 @@ export default router.post(
prompt: item?.prompt || "", prompt: item?.prompt || "",
state: (item?.state as "未生成" | "生成中" | "已完成" | "生成失败") ?? "未生成", state: (item?.state as "未生成" | "生成中" | "已完成" | "生成失败") ?? "未生成",
reason: item?.reason ?? "", reason: item?.reason ?? "",
selectVideoId: Number(item?.selectVideoId)!,
medias: await Promise.all( medias: await Promise.all(
storyboardList storyboardList
.filter((s) => s.trackId === trackId) .filter((s) => s.trackId === trackId)
.map(async (s): Promise<TrackMedia> => ({ .map(
src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "", async (s): Promise<TrackMedia> => ({
fileType: "image", src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "",
...(s.prompt != null ? { prompt: s.prompt } : {}), fileType: "image",
...(s.id != null ? { id: s.id } : {}), ...(s.prompt != null ? { prompt: s.prompt } : {}),
})), ...(s.id != null ? { id: s.id } : {}),
}),
),
), ),
videoList: await Promise.all( videoList: await Promise.all(
videoList videoList

21
src/routes/production/workbench/selectVideo.ts Normal file
View File

@ -0,0 +1,21 @@
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({
trackId: z.number(),
videoId: z.number(),
}),
async (req, res) => {
const { trackId, videoId } = req.body;
await u.db("o_videoTrack").where("id", trackId).update({
selectVideoId: videoId,
});
res.status(200).send(success({ message: "视频选择成功" }));
},
);

13
src/routes/setting/vendorConfig/addVendor.ts
View File

@ -35,7 +35,7 @@ const vendorConfigSchema = z.object({
modelName: z.string(), modelName: z.string(),
type: z.literal("image"), type: z.literal("image"),
mode: z.array(z.enum(["text", "singleImage", "multiReference"])), mode: z.array(z.enum(["text", "singleImage", "multiReference"])),
associationSkills:z.string().optional(), associationSkills: z.string().optional(),
}), }),
z.object({ z.object({
name: z.string(), name: z.string(),
@ -43,15 +43,7 @@ const vendorConfigSchema = z.object({
type: z.literal("video"), type: z.literal("video"),
mode: z.array( mode: z.array(
z.union([ z.union([
z.enum([ z.enum(["singleImage", "startEndRequired", "endFrameOptional", "startFrameOptional", "text", "audioReference", "videoReference"]),
"singleImage",
"startEndRequired",
"endFrameOptional",
"startFrameOptional",
"text",
"audioReference",
"videoReference",
]),
z.array(z.enum(["videoReference", "imageReference", "audioReference", "textReference"])), z.array(z.enum(["videoReference", "imageReference", "audioReference", "textReference"])),
]), ]),
), ),
@ -100,6 +92,7 @@ export default router.post(
models: JSON.stringify(vendor.models ?? []), models: JSON.stringify(vendor.models ?? []),
code: tsCode, code: tsCode,
createTime: Date.now(), createTime: Date.now(),
enableEnglish: 0,
}); });
res.status(200).send(success(result.data)); res.status(200).send(success(result.data));
}, },

1
src/routes/setting/vendorConfig/updateCode.ts
View File

@ -103,6 +103,7 @@ export default router.post(
inputValues: JSON.stringify(vendor.inputValues ?? {}), inputValues: JSON.stringify(vendor.inputValues ?? {}),
models: JSON.stringify(vendor.models ?? []), models: JSON.stringify(vendor.models ?? []),
code: tsCode, code: tsCode,
enableEnglish: 0,
createTime: Date.now(), createTime: Date.now(),
}); });
res.status(200).send(success(result.data)); res.status(200).send(success(result.data));

1
src/routes/setting/vendorConfig/updateVendor.ts
View File

@ -67,6 +67,7 @@ export default router.post(
inputs: JSON.stringify(inputs), inputs: JSON.stringify(inputs),
inputValues: JSON.stringify(inputValues), inputValues: JSON.stringify(inputValues),
models: JSON.stringify(models), models: JSON.stringify(models),
enableEnglish: 0,
}); });
res.status(200).send(success("更新成功")); res.status(200).send(success("更新成功"));
}, },

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

@ -1,12 +1,6 @@
// @db-hash f82eb99171699f051830710c1f816b59 // @db-hash 6b1f47596dc417ed5691fe156dc2928f
//该文件由脚本自动生成，请勿手动修改 //该文件由脚本自动生成，请勿手动修改
export interface _o_videoTrack_old_20260401 {
'id'?: number;
'projectId'?: number | null;
'scriptId'?: number | null;
'videoId'?: number | null;
}
export interface memories { export interface memories {
'content': string; 'content': string;
'createTime': number; 'createTime': number;
@ -226,12 +220,12 @@ export interface o_videoTrack {
'prompt'?: string | null; 'prompt'?: string | null;
'reason'?: string | null; 'reason'?: string | null;
'scriptId'?: number | null; 'scriptId'?: number | null;
'selectVideoId'?: string | null;
'state'?: string | null; 'state'?: string | null;
'videoId'?: number | null; 'videoId'?: number | null;
} }
export interface DB { export interface DB {
"_o_videoTrack_old_20260401": _o_videoTrack_old_20260401;
"memories": memories; "memories": memories;
"o_agentDeploy": o_agentDeploy; "o_agentDeploy": o_agentDeploy;
"o_agentWorkData": o_agentWorkData; "o_agentWorkData": o_agentWorkData;