diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index b5b6df6..6ca5250 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -423,9 +423,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 7e13e7c..685a3a3 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 4149c7e96379bfdba20853678db5c921 +// @routes-hash 13d20fd71e6cad1db42d944ca8d96ebe import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -14,52 +14,54 @@ 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/generateAssets"; -import route15 from "./routes/assetsGenerate/polishAssetsPrompt"; -import route16 from "./routes/general/generalStatistics"; -import route17 from "./routes/general/getSingleProject"; -import route18 from "./routes/general/updateProject"; -import route19 from "./routes/login/login"; -import route20 from "./routes/migrate/migrateData"; -import route21 from "./routes/modelSelect/getModelList"; -import route22 from "./routes/novel/addNovel"; -import route23 from "./routes/novel/batchDeleteNovel"; -import route24 from "./routes/novel/delNovel"; -import route25 from "./routes/novel/event/batchDeleteEvent"; -import route26 from "./routes/novel/event/deletEvent"; -import route27 from "./routes/novel/event/generateEvents"; -import route28 from "./routes/novel/event/getEvent"; -import route29 from "./routes/novel/getNovel"; -import route30 from "./routes/novel/updateNovel"; -import route31 from "./routes/other/deleteAllData"; -import route32 from "./routes/other/getCaptcha"; -import route33 from "./routes/production/getProductionData"; -import route34 from "./routes/project/addProject"; -import route35 from "./routes/project/delProject"; -import route36 from "./routes/project/editProject"; -import route37 from "./routes/project/getProject"; -import route38 from "./routes/script/addScript"; -import route39 from "./routes/script/delScript"; -import route40 from "./routes/script/getScrptApi"; -import route41 from "./routes/script/updateScript"; -import route42 from "./routes/setting/agentDeploy/deployAgentModel"; -import route43 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route44 from "./routes/setting/agentDeploy/updateKey"; -import route45 from "./routes/setting/dbConfig/clearData"; -import route46 from "./routes/setting/getTextModel"; -import route47 from "./routes/setting/loginConfig/getUser"; -import route48 from "./routes/setting/loginConfig/updateUserPwd"; -import route49 from "./routes/setting/memoryConfig/getMemory"; -import route50 from "./routes/setting/memoryConfig/sureMemory"; -import route51 from "./routes/setting/vendorConfig/addVendor"; -import route52 from "./routes/setting/vendorConfig/deleteVendor"; -import route53 from "./routes/setting/vendorConfig/getVendorList"; -import route54 from "./routes/setting/vendorConfig/modelTest"; -import route55 from "./routes/setting/vendorConfig/updateVendor"; -import route56 from "./routes/task/getMyTaskApi"; -import route57 from "./routes/task/getTaskCategories"; -import route58 from "./routes/task/taskDetails"; -import route59 from "./routes/test/test"; +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/getModelList"; +import route24 from "./routes/novel/addNovel"; +import route25 from "./routes/novel/batchDeleteNovel"; +import route26 from "./routes/novel/delNovel"; +import route27 from "./routes/novel/event/batchDeleteEvent"; +import route28 from "./routes/novel/event/deletEvent"; +import route29 from "./routes/novel/event/generateEvents"; +import route30 from "./routes/novel/event/getEvent"; +import route31 from "./routes/novel/getNovel"; +import route32 from "./routes/novel/updateNovel"; +import route33 from "./routes/other/deleteAllData"; +import route34 from "./routes/other/getCaptcha"; +import route35 from "./routes/production/getProductionData"; +import route36 from "./routes/project/addProject"; +import route37 from "./routes/project/delProject"; +import route38 from "./routes/project/editProject"; +import route39 from "./routes/project/getProject"; +import route40 from "./routes/script/addScript"; +import route41 from "./routes/script/delScript"; +import route42 from "./routes/script/getScrptApi"; +import route43 from "./routes/script/updateScript"; +import route44 from "./routes/setting/agentDeploy/deployAgentModel"; +import route45 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route46 from "./routes/setting/agentDeploy/updateKey"; +import route47 from "./routes/setting/dbConfig/clearData"; +import route48 from "./routes/setting/getTextModel"; +import route49 from "./routes/setting/loginConfig/getUser"; +import route50 from "./routes/setting/loginConfig/updateUserPwd"; +import route51 from "./routes/setting/memoryConfig/getMemory"; +import route52 from "./routes/setting/memoryConfig/sureMemory"; +import route53 from "./routes/setting/vendorConfig/addVendor"; +import route54 from "./routes/setting/vendorConfig/deleteVendor"; +import route55 from "./routes/setting/vendorConfig/getVendorList"; +import route56 from "./routes/setting/vendorConfig/modelTest"; +import route57 from "./routes/setting/vendorConfig/updateVendor"; +import route58 from "./routes/task/getMyTaskApi"; +import route59 from "./routes/task/getTaskCategories"; +import route60 from "./routes/task/taskDetails"; +import route61 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -75,50 +77,52 @@ 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/generateAssets", route14); - app.use("/api/assetsGenerate/polishAssetsPrompt", route15); - app.use("/api/general/generalStatistics", route16); - app.use("/api/general/getSingleProject", route17); - app.use("/api/general/updateProject", route18); - app.use("/api/login/login", route19); - app.use("/api/migrate/migrateData", route20); - app.use("/api/modelSelect/getModelList", route21); - app.use("/api/novel/addNovel", route22); - app.use("/api/novel/batchDeleteNovel", route23); - app.use("/api/novel/delNovel", route24); - app.use("/api/novel/event/batchDeleteEvent", route25); - app.use("/api/novel/event/deletEvent", route26); - app.use("/api/novel/event/generateEvents", route27); - app.use("/api/novel/event/getEvent", route28); - app.use("/api/novel/getNovel", route29); - app.use("/api/novel/updateNovel", route30); - app.use("/api/other/deleteAllData", route31); - app.use("/api/other/getCaptcha", route32); - app.use("/api/production/getProductionData", route33); - app.use("/api/project/addProject", route34); - app.use("/api/project/delProject", route35); - app.use("/api/project/editProject", route36); - app.use("/api/project/getProject", route37); - app.use("/api/script/addScript", route38); - app.use("/api/script/delScript", route39); - app.use("/api/script/getScrptApi", route40); - app.use("/api/script/updateScript", route41); - app.use("/api/setting/agentDeploy/deployAgentModel", route42); - app.use("/api/setting/agentDeploy/getAgentDeploy", route43); - app.use("/api/setting/agentDeploy/updateKey", route44); - app.use("/api/setting/dbConfig/clearData", route45); - app.use("/api/setting/getTextModel", route46); - app.use("/api/setting/loginConfig/getUser", route47); - app.use("/api/setting/loginConfig/updateUserPwd", route48); - app.use("/api/setting/memoryConfig/getMemory", route49); - app.use("/api/setting/memoryConfig/sureMemory", route50); - app.use("/api/setting/vendorConfig/addVendor", route51); - app.use("/api/setting/vendorConfig/deleteVendor", route52); - app.use("/api/setting/vendorConfig/getVendorList", route53); - app.use("/api/setting/vendorConfig/modelTest", route54); - app.use("/api/setting/vendorConfig/updateVendor", route55); - app.use("/api/task/getMyTaskApi", route56); - app.use("/api/task/getTaskCategories", route57); - app.use("/api/task/taskDetails", route58); - app.use("/api/test/test", route59); + 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/getModelList", route23); + app.use("/api/novel/addNovel", route24); + app.use("/api/novel/batchDeleteNovel", route25); + app.use("/api/novel/delNovel", route26); + app.use("/api/novel/event/batchDeleteEvent", route27); + app.use("/api/novel/event/deletEvent", route28); + app.use("/api/novel/event/generateEvents", route29); + app.use("/api/novel/event/getEvent", route30); + app.use("/api/novel/getNovel", route31); + app.use("/api/novel/updateNovel", route32); + app.use("/api/other/deleteAllData", route33); + app.use("/api/other/getCaptcha", route34); + app.use("/api/production/getProductionData", route35); + app.use("/api/project/addProject", route36); + app.use("/api/project/delProject", route37); + app.use("/api/project/editProject", route38); + app.use("/api/project/getProject", route39); + app.use("/api/script/addScript", route40); + app.use("/api/script/delScript", route41); + app.use("/api/script/getScrptApi", route42); + app.use("/api/script/updateScript", route43); + app.use("/api/setting/agentDeploy/deployAgentModel", route44); + app.use("/api/setting/agentDeploy/getAgentDeploy", route45); + app.use("/api/setting/agentDeploy/updateKey", route46); + app.use("/api/setting/dbConfig/clearData", route47); + app.use("/api/setting/getTextModel", route48); + app.use("/api/setting/loginConfig/getUser", route49); + app.use("/api/setting/loginConfig/updateUserPwd", route50); + app.use("/api/setting/memoryConfig/getMemory", route51); + app.use("/api/setting/memoryConfig/sureMemory", route52); + app.use("/api/setting/vendorConfig/addVendor", route53); + app.use("/api/setting/vendorConfig/deleteVendor", route54); + app.use("/api/setting/vendorConfig/getVendorList", route55); + app.use("/api/setting/vendorConfig/modelTest", route56); + app.use("/api/setting/vendorConfig/updateVendor", route57); + app.use("/api/task/getMyTaskApi", route58); + app.use("/api/task/getTaskCategories", route59); + app.use("/api/task/taskDetails", route60); + app.use("/api/test/test", route61); } diff --git a/src/routes/assetsGenerate/batchGenerationAssets.ts b/src/routes/assetsGenerate/batchGenerationAssets.ts new file mode 100644 index 0000000..4c30cab --- /dev/null +++ b/src/routes/assetsGenerate/batchGenerationAssets.ts @@ -0,0 +1,173 @@ +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 6256880..594de6e 100644 --- a/src/routes/assetsGenerate/generateAssets.ts +++ b/src/routes/assetsGenerate/generateAssets.ts @@ -111,11 +111,14 @@ export default router.post( }); aiImage.save(imagePath!); const imageData = await u.db("o_image").where("id", imageId).select("*").first(); + const modelData = model.split(":")[1]; if (imageData) { await u.db("o_image").where("id", imageId).update({ state: "生成成功", filePath: imagePath, type: insertType, + model: modelData, + resolution: resolution, }); const path = await u.oss.getFileUrl(imagePath!); await u.db("o_assets").where("id", id).update({ diff --git a/src/routes/cornerScape/getAllAssets.ts b/src/routes/cornerScape/getAllAssets.ts new file mode 100644 index 0000000..8db8713 --- /dev/null +++ b/src/routes/cornerScape/getAllAssets.ts @@ -0,0 +1,33 @@ +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({ + projectId: z.number(), + type: z.array(z.string()).optional(), + }), + async (req, res) => { + const { projectId, type, } = req.body; + const data = await u + .db("o_assets") + .leftJoin("o_image", "o_assets.imageId", "o_image.id") + .select("o_assets.*", "o_image.filePath", "o_image.state", "o_image.model", "o_image.resolution") + .where("o_assets.projectId", projectId) + .andWhere("o_assets.type", "<>", "clip") + .modify((qb) => { + if (type && type.length > 0) qb.whereIn("o_assets.type", type); + }); + const result = await Promise.all( + data.map(async (parent: any) => ({ + ...parent, + filePath: parent.filePath && (await u.oss.getFileUrl(parent.filePath!)), + })), + ); + res.status(200).send(success(result)); + }, +); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index ddd1ec9..33b529c 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash ad26ece2cf8002d48518ba2b8cd908f8 +// @db-hash 381c57f959d9ba09321e35a1c20674fa //该文件由脚本自动生成,请勿手动修改 export interface memories { @@ -62,11 +62,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;