diff --git a/data/skills/art_prompts/chinese_sweet_romance/README.md b/data/skills/art_prompts/chinese_sweet_romance/README.md index 7c3c2c7..32ec9f7 100644 --- a/data/skills/art_prompts/chinese_sweet_romance/README.md +++ b/data/skills/art_prompts/chinese_sweet_romance/README.md @@ -1,3 +1,5 @@ +# 全局美学基础 · 古风甜宠写实超现实主义 +123 123 1212121212的王师傅水电费第三方水电费 1212121212 diff --git a/data/skills/art_prompts/chinese_sweet_romance/images/f0f89ce4-b197-4bd6-9794-3d14d1c3ab1e.jpg b/data/skills/art_prompts/chinese_sweet_romance/images/f0f89ce4-b197-4bd6-9794-3d14d1c3ab1e.jpg deleted file mode 100644 index 9ec69a9..0000000 Binary files a/data/skills/art_prompts/chinese_sweet_romance/images/f0f89ce4-b197-4bd6-9794-3d14d1c3ab1e.jpg and /dev/null differ diff --git a/data/skills/production_agent_execution.md b/data/skills/production_agent_execution.md index 06b78de..47f90bf 100644 --- a/data/skills/production_agent_execution.md +++ b/data/skills/production_agent_execution.md @@ -664,7 +664,7 @@ Image [2]: @图2 — [外貌关键描述] ### 约束 - 前置条件：分镜表已构建完成且用户已确认 -- 你必须使用XML格式写入工作区分镜面板： +- 你必须使用XML格式写入工作区分镜面板： - 分组总时长约束：每个 `group` 的累计时长不得超过 15 秒 - 行数一致性约束：分镜面板 `items` 数量必须与 `stoaryTable` 的分镜数据行数量完全一致（不包含表头与分隔行） - 时长一致性约束：分镜面板 `duration` 必须与 `stoaryTable` 对应行时长完全一致 diff --git a/src/agents/productionAgent/index.ts b/src/agents/productionAgent/index.ts index 885f600..37665b1 100644 --- a/src/agents/productionAgent/index.ts +++ b/src/agents/productionAgent/index.ts @@ -135,7 +135,7 @@ function createSubAgent(parentCtx: AgentContext) { "你必须使用如下XML格式写入工作区：\n```", "拍摄计划：内容", "分镜表：内容", - "分镜面板：", + "分镜面板：", "```", ].join("\n"); const projectData = await u.db("o_project").where("id", resTool.data.projectId).first(); diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index 7bd081c..235a9b1 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -488,7 +488,7 @@ description: 专注于从剧本内容中提取所使用的资产（角色、场 table.text("state"); table.integer("trackId"); table.text("reason"); - table.text("videoPrompt"); + table.text("videoDesc"); table.integer("shouldGenerateImage"); // 0 否 1 是 table.integer("projectId"); table.integer("flowId"); //工作流id diff --git a/src/routes/production/getFlowData.ts b/src/routes/production/getFlowData.ts index c6d1a70..309e904 100644 --- a/src/routes/production/getFlowData.ts +++ b/src/routes/production/getFlowData.ts @@ -127,6 +127,7 @@ export default router.post( desc: child.describe ?? "", src: child.filePath && (await u.oss.getFileUrl(child.filePath!)), state: child.state ?? "未生成", + errorReason: child?.errorReason ?? "", })), ), })), @@ -140,6 +141,7 @@ export default router.post( associateAssetsIds: assets2StoryboardMap[i.id!] ?? [], src: i.filePath, state: i.state, + reason: i?.reason ?? "", })) .sort((a, b) => (a.index ?? 0) - (b.index ?? 0)); res.status(200).send(success(flowData)); diff --git a/src/routes/production/storyboard/addStoryboard.ts b/src/routes/production/storyboard/addStoryboard.ts index cf707ff..0aa9e7a 100644 --- a/src/routes/production/storyboard/addStoryboard.ts +++ b/src/routes/production/storyboard/addStoryboard.ts @@ -18,14 +18,14 @@ export default router.post( prompt: z.string(), duration: z.number(), state: z.string(), - videoPrompt: z.string(), + videoDesc: z.string(), shouldGenerateImage: z.number(), src: z.string().nullable(), scriptId: z.number(), projectId: z.number(), }), async (req, res) => { - const { prompt, duration, state, src, scriptId, projectId, videoPrompt, shouldGenerateImage } = req.body; + const { prompt, duration, state, src, scriptId, projectId, videoDesc, shouldGenerateImage } = req.body; const [trackId] = await u.db("o_videoTrack").insert({ scriptId: scriptId, @@ -37,7 +37,7 @@ export default router.post( state, filePath: new URL(src).pathname, trackId, - videoPrompt, + videoDesc, shouldGenerateImage, scriptId: scriptId, projectId: projectId, diff --git a/src/routes/production/storyboard/batchAddStoryboardInfo.ts b/src/routes/production/storyboard/batchAddStoryboardInfo.ts index 32aa8e6..6222355 100644 --- a/src/routes/production/storyboard/batchAddStoryboardInfo.ts +++ b/src/routes/production/storyboard/batchAddStoryboardInfo.ts @@ -14,7 +14,7 @@ export default router.post( track: z.string(), state: z.string(), src: z.string().nullable(), - videoPrompt: z.string(), + videoDesc: z.string(), shouldGenerateImage: z.number(), associateAssetsIds: z.array(z.number()), }), @@ -33,7 +33,7 @@ export default router.post( scriptId, projectId, track:item.track, - videoPrompt:item.videoPrompt, + videoDesc:item.videoDesc, shouldGenerateImage:item.shouldGenerateImage, createTime: Date.now(), }); diff --git a/src/routes/production/storyboard/editStoryboardInfo.ts b/src/routes/production/storyboard/editStoryboardInfo.ts index 4640c62..b62449c 100644 --- a/src/routes/production/storyboard/editStoryboardInfo.ts +++ b/src/routes/production/storyboard/editStoryboardInfo.ts @@ -11,11 +11,13 @@ export default router.post( validateFields({ id: z.number(), prompt: z.string(), + videoDesc: z.string(), }), async (req, res) => { const { id, prompt } = req.body; await u.db("o_storyboard").where({ id }).update({ prompt, + videoDesc, }); res.status(200).send(success({ message: "更新提示词成功" })); }, diff --git a/src/routes/production/workbench/getGenerateData.ts b/src/routes/production/workbench/getGenerateData.ts index 0a18465..2139de2 100644 --- a/src/routes/production/workbench/getGenerateData.ts +++ b/src/routes/production/workbench/getGenerateData.ts @@ -15,7 +15,7 @@ interface TrackMedia { src: string; id?: number; fileType: "image" | "video" | "audio"; - prompt?: string; + videoDesc?: string; } interface TrackItem { @@ -66,7 +66,7 @@ export default router.post( async (s): Promise => ({ src: s.filePath ? await u.oss.getFileUrl(s.filePath) : "", fileType: "image", - ...(s.prompt != null ? { prompt: s.prompt } : {}), + ...(s.prompt != null ? { prompt: s.videoDesc } : {}), ...(s.id != null ? { id: s.id } : {}), }), ), diff --git a/src/types/database.d.ts b/src/types/database.d.ts index dc02a15..c9e9f75 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,6 +1,50 @@ -// @db-hash 6aa15a584eba838157eddf2458c0e260 +// @db-hash ea4ad047f16c826806ff76f388882a9c //该文件由脚本自动生成，请勿手动修改 +export interface _o_storyboard_old_20260402 { + 'createTime'?: number | null; + 'duration'?: string | null; + 'filePath'?: string | null; + 'flowId'?: number | null; + 'id'?: number; + 'index'?: number | null; + 'projectId'?: number | null; + 'prompt'?: string | null; + 'reason'?: string | null; + 'scriptId'?: number | null; + 'shouldGenerateImage'?: number | null; + 'state'?: string | null; + 'trackId'?: number | null; + 'videoPrompt'?: string | null; +} +export interface _o_vendorConfig_old_20260401 { + 'author'?: string | null; + 'code'?: string | null; + 'createTime'?: number | null; + 'description'?: string | null; + 'icon'?: string | null; + 'id'?: string; + 'inputs'?: string | null; + 'inputValues'?: string | null; + 'models'?: string | null; + 'name'?: string | null; +} +export interface _o_videoTrack_old_20260401 { + 'id'?: number; + 'projectId'?: number | null; + 'scriptId'?: number | null; + 'videoId'?: number | null; +} +export interface _o_videoTrack_old_20260401_1 { + 'id'?: number; + 'projectId'?: number | null; + 'prompt'?: string | null; + 'reason'?: string | null; + 'scriptId'?: number | null; + 'selectVideoId'?: number | null; + 'state'?: string | null; + 'videoId'?: number | null; +} export interface memories { 'content': string; 'createTime': number; @@ -173,8 +217,10 @@ export interface o_storyboard { 'prompt'?: string | null; 'reason'?: string | null; 'scriptId'?: number | null; + 'shouldGenerateImage'?: number | null; 'state'?: string | null; 'trackId'?: number | null; + 'videoDesc'?: string | null; } export interface o_tasks { 'describe'?: string | null; @@ -197,7 +243,7 @@ export interface o_vendorConfig { 'code'?: string | null; 'createTime'?: number | null; 'description'?: string | null; - 'enable'?: number | null; + 'enableEnglish'?: number | null; 'icon'?: string | null; 'id'?: string; 'inputs'?: string | null; @@ -216,6 +262,7 @@ export interface o_video { 'videoTrackId'?: number | null; } export interface o_videoTrack { + 'duration'?: number | null; 'id'?: number; 'projectId'?: number | null; 'prompt'?: string | null; @@ -227,6 +274,10 @@ export interface o_videoTrack { } export interface DB { + "_o_storyboard_old_20260402": _o_storyboard_old_20260402; + "_o_vendorConfig_old_20260401": _o_vendorConfig_old_20260401; + "_o_videoTrack_old_20260401": _o_videoTrack_old_20260401; + "_o_videoTrack_old_20260401_1": _o_videoTrack_old_20260401_1; "memories": memories; "o_agentDeploy": o_agentDeploy; "o_agentWorkData": o_agentWorkData;