diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index 821e853..d8a70f6 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -276,6 +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("imageId").unsigned().references("id").inTable("o_image"); table.integer("sonId"); table.integer("projectId"); @@ -294,9 +295,8 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.text("filePath"); table.text("type"); table.integer("assetsId"); - table.integer("scriptId"); - table.integer("projectId"); - table.integer("videoId"); + table.text("model"); + table.text("resolution"); table.text("state"); table.primary(["id"]); table.unique(["id"]); diff --git a/src/router.ts b/src/router.ts index ed29566..9b771c2 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 85e994f12e3bd2fce88b44ea41bf191f +// @routes-hash 3aef51df31467bb6ff0ed05b9520c86e import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -14,55 +14,53 @@ 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/batchGenerationAssets"; -import route15 from "./routes/assetsGenerate/generateAssets"; -import route16 from "./routes/assetsGenerate/polishAssetsPrompt"; -import route17 from "./routes/cornerScape/getAllAssets"; -import route18 from "./routes/general/generalStatistics"; -import route19 from "./routes/general/getSingleProject"; -import route20 from "./routes/general/updateProject"; -import route21 from "./routes/login/login"; -import route22 from "./routes/migrate/migrateData"; -import route23 from "./routes/modelSelect/getModelDetail"; -import route24 from "./routes/modelSelect/getModelList"; -import route25 from "./routes/novel/addNovel"; -import route26 from "./routes/novel/batchDeleteNovel"; -import route27 from "./routes/novel/delNovel"; -import route28 from "./routes/novel/event/batchDeleteEvent"; -import route29 from "./routes/novel/event/deletEvent"; -import route30 from "./routes/novel/event/generateEvents"; -import route31 from "./routes/novel/event/getEvent"; -import route32 from "./routes/novel/getNovel"; -import route33 from "./routes/novel/updateNovel"; -import route34 from "./routes/other/deleteAllData"; -import route35 from "./routes/other/getCaptcha"; -import route36 from "./routes/production/getProductionData"; -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"; +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/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/project/addProject"; +import route36 from "./routes/project/delProject"; +import route37 from "./routes/project/editProject"; +import route38 from "./routes/project/getProject"; +import route39 from "./routes/script/addScript"; +import route40 from "./routes/script/delScript"; +import route41 from "./routes/script/getScrptApi"; +import route42 from "./routes/script/updateScript"; +import route43 from "./routes/setting/agentDeploy/deployAgentModel"; +import route44 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route45 from "./routes/setting/agentDeploy/updateKey"; +import route46 from "./routes/setting/dbConfig/clearData"; +import route47 from "./routes/setting/getTextModel"; +import route48 from "./routes/setting/loginConfig/getUser"; +import route49 from "./routes/setting/loginConfig/updateUserPwd"; +import route50 from "./routes/setting/memoryConfig/getMemory"; +import route51 from "./routes/setting/memoryConfig/sureMemory"; +import route52 from "./routes/setting/vendorConfig/addVendor"; +import route53 from "./routes/setting/vendorConfig/deleteVendor"; +import route54 from "./routes/setting/vendorConfig/getVendorList"; +import route55 from "./routes/setting/vendorConfig/modelTest"; +import route56 from "./routes/setting/vendorConfig/updateVendor"; +import route57 from "./routes/task/getMyTaskApi"; +import route58 from "./routes/task/getTaskCategories"; +import route59 from "./routes/task/taskDetails"; +import route60 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -78,53 +76,51 @@ export default async (app: Express) => { app.use("/api/assets/saveAssets", route11); app.use("/api/assets/updateAssets", route12); app.use("/api/assets/uploadClip", route13); - app.use("/api/assetsGenerate/batchGenerationAssets", route14); - app.use("/api/assetsGenerate/generateAssets", route15); - app.use("/api/assetsGenerate/polishAssetsPrompt", route16); - app.use("/api/cornerScape/getAllAssets", route17); - app.use("/api/general/generalStatistics", route18); - app.use("/api/general/getSingleProject", route19); - app.use("/api/general/updateProject", route20); - app.use("/api/login/login", route21); - app.use("/api/migrate/migrateData", route22); - app.use("/api/modelSelect/getModelDetail", route23); - app.use("/api/modelSelect/getModelList", route24); - app.use("/api/novel/addNovel", route25); - app.use("/api/novel/batchDeleteNovel", route26); - app.use("/api/novel/delNovel", route27); - app.use("/api/novel/event/batchDeleteEvent", route28); - app.use("/api/novel/event/deletEvent", route29); - app.use("/api/novel/event/generateEvents", route30); - app.use("/api/novel/event/getEvent", route31); - app.use("/api/novel/getNovel", route32); - app.use("/api/novel/updateNovel", route33); - app.use("/api/other/deleteAllData", route34); - app.use("/api/other/getCaptcha", route35); - app.use("/api/production/getProductionData", 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); + 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/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/project/addProject", route35); + app.use("/api/project/delProject", route36); + app.use("/api/project/editProject", route37); + app.use("/api/project/getProject", route38); + app.use("/api/script/addScript", route39); + app.use("/api/script/delScript", route40); + app.use("/api/script/getScrptApi", route41); + app.use("/api/script/updateScript", route42); + app.use("/api/setting/agentDeploy/deployAgentModel", route43); + app.use("/api/setting/agentDeploy/getAgentDeploy", route44); + app.use("/api/setting/agentDeploy/updateKey", route45); + app.use("/api/setting/dbConfig/clearData", route46); + app.use("/api/setting/getTextModel", route47); + app.use("/api/setting/loginConfig/getUser", route48); + app.use("/api/setting/loginConfig/updateUserPwd", route49); + app.use("/api/setting/memoryConfig/getMemory", route50); + app.use("/api/setting/memoryConfig/sureMemory", route51); + app.use("/api/setting/vendorConfig/addVendor", route52); + app.use("/api/setting/vendorConfig/deleteVendor", route53); + app.use("/api/setting/vendorConfig/getVendorList", route54); + app.use("/api/setting/vendorConfig/modelTest", route55); + app.use("/api/setting/vendorConfig/updateVendor", route56); + app.use("/api/task/getMyTaskApi", route57); + app.use("/api/task/getTaskCategories", route58); + app.use("/api/task/taskDetails", route59); + app.use("/api/test/test", route60); } diff --git a/src/routes/assets/delAssets.ts b/src/routes/assets/delAssets.ts index 162e55b..38addd0 100644 --- a/src/routes/assets/delAssets.ts +++ b/src/routes/assets/delAssets.ts @@ -12,6 +12,7 @@ export default router.post( }), async (req, res) => { const { id } = req.body; + console.log("%c Line:15 🍑 id", "background:#465975", id); const assetsData = await u.db("o_image").where("assetsId", id); await Promise.all(assetsData.map((i) => i.filePath && u.oss.deleteFile(i.filePath))); await u.db("o_assets").where({ id }).delete(); diff --git a/src/routes/assets/uploadClip.ts b/src/routes/assets/uploadClip.ts index 77b74e7..cdffe3b 100644 --- a/src/routes/assets/uploadClip.ts +++ b/src/routes/assets/uploadClip.ts @@ -50,7 +50,6 @@ export default router.post( filePath: savePath, type, assetsId: id, - projectId, state: "1", }); await u.db("o_assets").where("id", id).update({ diff --git a/src/routes/assetsGenerate/batchGenerationAssets.ts b/src/routes/assetsGenerate/batchGenerationAssets.ts deleted file mode 100644 index 4c30cab..0000000 --- a/src/routes/assetsGenerate/batchGenerationAssets.ts +++ /dev/null @@ -1,173 +0,0 @@ -import express from "express"; -import u from "@/utils"; -import { z } from "zod"; -import { v4 as uuidv4 } from "uuid"; -import { error, success } from "@/lib/responseFormat"; -const router = express.Router(); - -const assetItemSchema = z.object({ - id: z.number(), - type: z.enum(["role", "scene", "tool", "storyboard"]), - projectId: z.number(), - name: z.string(), - base64: z.string().optional().nullable(), - prompt: z.string(), - model: z.custom<`${number}:${string}`>( - (val) => typeof val === "string" && /^\d+:.+$/.test(val), - { message: "model 格式应为 {vendorId}:{modelName}，例如 1:modelName" }, - ), - resolution: z.enum(["1K", "2K", "4K"]), -}); - -type AssetItem = z.infer; - -// 处理单个资产图片生成 -async function generateSingleAsset(item: AssetItem) { - const { id, type, projectId, base64, prompt, name, model, resolution } = item; - - const project = await u.db("o_project").where("id", projectId).select("artStyle", "type", "intro").first(); - if (!project) throw new Error(`项目 ${projectId} 不存在`); - - const role = (await u.getPrompts("role-generateImage")) ?? ""; - const scene = (await u.getPrompts("scene-generateImage")) ?? ""; - const tool = (await u.getPrompts("tool-generateImage")) ?? ""; - - let systemPrompt = ""; - let userPrompt = ""; - - if (type === "role") { - systemPrompt = role; - userPrompt = ` - 请根据以下参数生成角色标准四视图： - - **基础参数：** - - 画风风格: ${project?.artStyle || "未指定"} - - **角色设定：** - - 名称:${name}, - - 提示词:${prompt}, - - 请严格按照系统规范生成人物角色四视图。 - `; - } else if (type === "scene") { - systemPrompt = scene; - userPrompt = ` - 请根据以下参数生成标准场景图： - - **基础参数：** - - 画风风格: ${project?.artStyle || "未指定"} - - **场景设定：** - - 名称:${name}, - - 提示词:${prompt}, - - 请严格按照系统规范生成标准场景图。 - `; - } else if (type === "tool") { - systemPrompt = tool; - userPrompt = ` - 请根据以下参数生成标准道具图： - - **基础参数：** - - 画风风格: ${project?.artStyle || "未指定"} - - **道具设定：** - - 名称:${name}, - - 提示词:${prompt}, - - 请严格按照系统规范生成标准道具图。 - `; - } - - const [imageId] = await u.db("o_image").insert({ - type, - state: "生成中", - assetsId: id, - }); - - try { - let imagePath: string; - let insertType: string; - - if (type === "role") { - insertType = "role"; - imagePath = `/${projectId}/role/${uuidv4()}.jpg`; - } else if (type === "scene") { - insertType = "scene"; - imagePath = `/${projectId}/scene/${uuidv4()}.jpg`; - } else { - insertType = "tool"; - imagePath = `/${projectId}/props/${uuidv4()}.jpg`; - } - - const aiImage = u.Ai.Image(model); - await aiImage.run({ - systemPrompt, - prompt: userPrompt, - imageBase64: base64 ? [base64] : [], - size: resolution, - aspectRatio: "16:9", - }); - aiImage.save(imagePath); - - const imageData = await u.db("o_image").where("id", imageId).select("*").first(); - const modelData = model.split(":")[1]; - - if (!imageData) { - throw new Error("资产已被删除"); - } - - await u.db("o_image").where("id", imageId).update({ - state: "生成成功", - filePath: imagePath, - type: insertType, - model: modelData, - resolution, - }); - - const path = await u.oss.getFileUrl(imagePath); - await u.db("o_assets").where("id", id).update({ imageId }); - - return { success: true, path, assetsId: id }; - } catch (e) { - await u.db("o_image").where("id", imageId).update({ state: "生成失败" }); - throw e; - } -} - -// 批量生成资产图片 -export default router.post("/", async (req, res) => { - // 校验请求体 - const bodySchema = z.object({ - concurrentCount: z.number().int().min(1).default(3), - items: z.array(assetItemSchema).min(1), - }); - - const parseResult = bodySchema.safeParse(req.body); - if (!parseResult.success) { - const errors = parseResult.error.issues.map((issue) => `字段 ${issue.path.join(".")} ${issue.message}`); - return res.status(400).json({ message: "参数错误", errors }); - } - - const { concurrentCount, items } = parseResult.data; - const results: { assetsId: number; success: boolean; path?: string; message?: string }[] = []; - - // 按并发数分批执行 - for (let i = 0; i < items.length; i += concurrentCount) { - const batch = items.slice(i, i + concurrentCount); - const batchResults = await Promise.allSettled(batch.map((item) => generateSingleAsset(item))); - - for (let j = 0; j < batchResults.length; j++) { - const result = batchResults[j]; - const item = batch[j]; - if (result.status === "fulfilled") { - results.push({ assetsId: item.id, success: true, path: result.value.path }); - } else { - const msg = u.error(result.reason).message || "图片生成失败"; - results.push({ assetsId: item.id, success: false, message: msg }); - } - } - } - - return res.status(200).send(success(results)); -}); diff --git a/src/routes/assetsGenerate/generateAssets.ts b/src/routes/assetsGenerate/generateAssets.ts index 594de6e..6283434 100644 --- a/src/routes/assetsGenerate/generateAssets.ts +++ b/src/routes/assetsGenerate/generateAssets.ts @@ -23,9 +23,9 @@ export default router.post( //获取风格 const project = await u.db("o_project").where("id", projectId).select("artStyle", "type", "intro").first(); if (!project) return res.status(500).send(success({ message: "项目为空" })); - const role = await u.getPrompts("role-generateImage") ?? ""; - const scene = await u.getPrompts("scene-generateImage") ?? ""; - const tool = await u.getPrompts("tool-generateImage") ?? ""; + const role = (await u.getPrompts("role-generateImage")) ?? ""; + const scene = (await u.getPrompts("scene-generateImage")) ?? ""; + const tool = (await u.getPrompts("tool-generateImage")) ?? ""; let systemPrompt = ""; let userPrompt = ""; diff --git a/src/types/database.d.ts b/src/types/database.d.ts index ffaa589..e3a7e5f 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,9 +1,9 @@ -// @db-hash 2f9e6a9e9145cead00652858cafb9159 +// @db-hash 04e1150a9773602183de5f660a52b092 //该文件由脚本自动生成，请勿手动修改 export interface memories { 'content': string; - 'createdAt': number; + 'createTime': number; 'embedding'?: string | null; 'id'?: string; 'isolationKey': string; @@ -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; @@ -236,25 +178,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;