From 7d584cf64fa333898ac87cc47a11b86351ba5052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Thu, 19 Mar 2026 20:25:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/initDB.ts | 5 +- src/router.ts | 190 +++++++++--------- .../assetsGenerate/batchGenerationAssets.ts | 173 ++++++++++++++++ src/routes/assetsGenerate/generateAssets.ts | 3 + src/routes/cornerScape/getAllAssets.ts | 33 +++ src/types/database.d.ts | 7 +- 6 files changed, 311 insertions(+), 100 deletions(-) create mode 100644 src/routes/assetsGenerate/batchGenerationAssets.ts create mode 100644 src/routes/cornerScape/getAllAssets.ts 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; From a80ef39f66b01f0f0aa5dae19d9c4d6e0d5ca245 Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Thu, 19 Mar 2026 20:30:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?memory=E6=8E=A5=E5=85=A5setting=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/agent/memory.ts | 84 ++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 24 deletions(-) diff --git a/src/utils/agent/memory.ts b/src/utils/agent/memory.ts index e0b6458..94a8081 100644 --- a/src/utils/agent/memory.ts +++ b/src/utils/agent/memory.ts @@ -5,13 +5,22 @@ import type { memories as MemoryRow } from "@/types/database"; import { tool } from "ai"; import { z } from "zod"; -// ── 可调配置 ── -const messagesPerSummary = 3; // 每累积多少条message触发一次summary生成 -const summaryMaxLength = 500; // summary最大字符长度 -const shortTermLimit = 5; // get()返回的近期未总结message条数 -const summaryLimit = 10; // get()返回的summary条数 -const ragLimit = 3; // get()向量相似搜索返回的message条数 -const deepRetrieveSummaryLimit = 5; // deepRetrieve()向量召回summary的条数 +// ── 可调配置默认值 ── +const DEFAULTS: { + messagesPerSummary: number; + summaryMaxLength: number; + shortTermLimit: number; + summaryLimit: number; + ragLimit: number; + deepRetrieveSummaryLimit: number; +} = { + messagesPerSummary: 3, // 每累积多少条message触发一次summary生成 + summaryMaxLength: 500, // summary最大字符长度 + shortTermLimit: 5, // get()返回的近期未总结message条数 + summaryLimit: 10, // get()返回的summary条数 + ragLimit: 3, // get()向量相似搜索返回的message条数 + deepRetrieveSummaryLimit: 5, // deepRetrieve()向量召回summary的条数 +}; // ── 向量搜索辅助 ── function vectorSearch(rows: MemoryRow[], queryEmbedding: number[], limit: number) { @@ -34,11 +43,12 @@ class Memory { } private async generateSummary(contents: string[]): Promise { + const { summaryMaxLength } = await this.getConfigData({ summaryMaxLength: DEFAULTS.summaryMaxLength }); const { text } = await u.Ai.Text(this.agentType as any).invoke({ system: `你是一个记忆压缩助手。请将以下多条记忆内容压缩为一段简洁的摘要，不超过${summaryMaxLength}个字符。只输出摘要内容，不要加任何前缀或解释。`, messages: [{ role: "user", content: contents.map((c, i) => `${i + 1}. ${c}`).join("\n") }], }); - return text.slice(0, summaryMaxLength); + return text.slice(0, Number(summaryMaxLength)); } private async judgeSummaryRelevance(keyword: string, summaries: { id: string; content: string }[]): Promise { @@ -54,8 +64,26 @@ class Memory { } catch {} return []; } + private async getConfigData>(defaults: T): Promise { + const keys = Object.keys(defaults) as (keyof T & string)[]; + const rows = await u.db("o_setting").whereIn("key", keys); - async add( role: string = "user",content: string) { + const dbMap: Record = {}; + for (const row of rows) { + if (row.key != null) dbMap[row.key] = row.value ?? null; + } + + const result = { ...defaults }; + for (const key of keys) { + const raw = dbMap[key]; + if (raw == null) continue; // null / undefined 使用默认值 + const num = Number(raw); + (result as Record)[key] = Number.isNaN(num) ? raw : num; + } + return result; + } + async add(role: string = "user", content: string) { + const { messagesPerSummary } = await this.getConfigData({ messagesPerSummary: DEFAULTS.messagesPerSummary }); const id = uuidv4(); const embedding = await getEmbedding(content); const isolationKey = this.isolationKey; @@ -69,14 +97,14 @@ class Memory { embedding: JSON.stringify(embedding), relatedMessageIds: null, summarized: 0, - createTime: Date.now(), + createdAt: Date.now(), } as any); // 检查未总结消息数量 - const unsummarized = await u.db("memories").where({ isolationKey, type: "message", summarized: 0 }).orderBy("createTime", "asc"); + const unsummarized = await u.db("memories").where({ isolationKey, type: "message", summarized: 0 }).orderBy("createdAt", "asc"); - if (unsummarized.length >= messagesPerSummary) { - const batch = unsummarized.slice(0, messagesPerSummary); + if (unsummarized.length >= Number(messagesPerSummary)) { + const batch = unsummarized.slice(0, Number(messagesPerSummary)); const batchIds = batch.map((m) => m.id); const batchContents = batch.map((m) => m.content); @@ -92,8 +120,8 @@ class Memory { embedding: JSON.stringify(summaryEmbedding), relatedMessageIds: JSON.stringify(batchIds), summarized: 0, - createTime: Date.now(), - }); + createdAt: Date.now(), + } as any); // 标记已总结 await u.db("memories").whereIn("id", batchIds).update({ summarized: 1 }); @@ -101,42 +129,50 @@ class Memory { } async get(text: string) { + const { shortTermLimit, summaryLimit, ragLimit } = await this.getConfigData({ + shortTermLimit: DEFAULTS.shortTermLimit, + summaryLimit: DEFAULTS.summaryLimit, + ragLimit: DEFAULTS.ragLimit, + }); + const isolationKey = this.isolationKey; // shortTerm: 最近未被总结的 messages const shortTerm = await u .db("memories") .where({ isolationKey, type: "message", summarized: 0 }) - .orderBy("createTime", "desc") - .limit(shortTermLimit); + .orderBy("createdAt", "desc") + .limit(Number(shortTermLimit)); shortTerm.reverse(); // 最旧在前 // summaries: 最近的 summary - const summaries = await u.db("memories").where({ isolationKey, type: "summary" }).orderBy("createTime", "desc").limit(summaryLimit); + const summaries = await u.db("memories").where({ isolationKey, type: "summary" }).orderBy("createdAt", "desc").limit(Number(summaryLimit)); summaries.reverse(); // rag: 向量搜索所有 messages const queryEmbedding = await getEmbedding(text); const allMessages = await u.db("memories").where({ isolationKey, type: "message" }); - const ragResults = vectorSearch(allMessages, queryEmbedding, ragLimit); + const ragResults = vectorSearch(allMessages, queryEmbedding, Number(ragLimit)); return { - shortTerm: shortTerm.map((m: any) => ({ id: m.id, role: m.role, content: m.content, createTime: m.createTime })), + shortTerm: shortTerm.map((m: any) => ({ id: m.id, role: m.role, content: m.content, createdAt: m.createdAt })), summaries: summaries.map((s) => ({ id: s.id, content: s.content, relatedMessageIds: JSON.parse(s.relatedMessageIds || "[]"), - createTime: s.createTime, + createdAt: (s as any).createdAt, })), rag: ragResults.map((r) => ({ id: r.id, content: r.content, similarity: r.similarity })), }; } async deepRetrieve(keyword: string) { + const { deepRetrieveSummaryLimit } = await this.getConfigData({ deepRetrieveSummaryLimit: DEFAULTS.deepRetrieveSummaryLimit }); + const isolationKey = this.isolationKey; // 步骤1: 向量搜索 summary const queryEmbedding = await getEmbedding(keyword); const allSummaries = await u.db("memories").where({ isolationKey, type: "summary" }); - const topSummaries = vectorSearch(allSummaries, queryEmbedding, deepRetrieveSummaryLimit); + const topSummaries = vectorSearch(allSummaries, queryEmbedding, Number(deepRetrieveSummaryLimit)); if (topSummaries.length === 0) return []; @@ -154,9 +190,9 @@ class Memory { if (messageIds.length === 0) return []; - const messages = await u.db("memories").whereIn("id", messageIds).orderBy("createTime", "asc"); + const messages = await u.db("memories").whereIn("id", messageIds).orderBy("createdAt", "asc"); - return messages.map((m) => ({ id: m.id, content: m.content, createTime: m.createTime })); + return messages.map((m) => ({ id: m.id, content: m.content, createdAt: m.createdAt })); } getTools() { From 5bfe3d48ed30381891105b186b1057cbdf8e8d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Thu, 19 Mar 2026 21:25:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=B9=E4=BA=8Eapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router.ts | 192 +++++++++--------- .../assetsGenerate/batchGenerationAssets.ts | 173 ---------------- src/types/database.d.ts | 9 +- 3 files changed, 99 insertions(+), 275 deletions(-) delete mode 100644 src/routes/assetsGenerate/batchGenerationAssets.ts diff --git a/src/router.ts b/src/router.ts index 685a3a3..9b771c2 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 13d20fd71e6cad1db42d944ca8d96ebe +// @routes-hash 3aef51df31467bb6ff0ed05b9520c86e import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -14,54 +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/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"; +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); @@ -77,52 +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/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); + 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/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/types/database.d.ts b/src/types/database.d.ts index 4c3b490..bb4b83a 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,9 +1,9 @@ -// @db-hash feca77a2c2ec5b6a2989347f982558d5 +// @db-hash 3375b001172e37262e06bf0b798aa4ce //该文件由脚本自动生成，请勿手动修改 export interface memories { 'content': string; - 'createTime': number; + 'createdAt': number; 'embedding'?: string | null; 'id'?: string; 'isolationKey': string; @@ -67,11 +67,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; From 12c51dee92558eae991f4d46f277192b387be676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Thu, 19 Mar 2026 22:24:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/initDB.ts | 6 +- src/routes/assets/delAssets.ts | 1 + src/routes/assets/uploadClip.ts | 1 - src/routes/assetsGenerate/generateAssets.ts | 6 +- src/types/database.d.ts | 71 +-------------------- 5 files changed, 10 insertions(+), 75 deletions(-) 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/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/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 bb4b83a..e3a7e5f 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,9 +1,9 @@ -// @db-hash 3375b001172e37262e06bf0b798aa4ce +// @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; @@ -72,28 +66,6 @@ export interface o_image { 'state'?: string | null; 'type'?: string | 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; 'chapterData'?: string | null; @@ -125,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; @@ -141,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; @@ -235,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; From e25e4b71d4989f3d1474513c383717fec5c5c80d Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Thu, 19 Mar 2026 22:58:08 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router.ts | 160 ++++++++++++----------- src/routes/modelSelect/getModelDetail.ts | 24 ++++ src/types/database.d.ts | 4 +- src/utils/cleanNovel.ts | 53 ++++---- 4 files changed, 132 insertions(+), 109 deletions(-) create mode 100644 src/routes/modelSelect/getModelDetail.ts diff --git a/src/router.ts b/src/router.ts index 685a3a3..ed29566 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 13d20fd71e6cad1db42d944ca8d96ebe +// @routes-hash 85e994f12e3bd2fce88b44ea41bf191f import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -23,45 +23,46 @@ 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"; +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"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -86,43 +87,44 @@ export default async (app: Express) => { 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); + 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); } diff --git a/src/routes/modelSelect/getModelDetail.ts b/src/routes/modelSelect/getModelDetail.ts new file mode 100644 index 0000000..588dfe7 --- /dev/null +++ b/src/routes/modelSelect/getModelDetail.ts @@ -0,0 +1,24 @@ +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({ + modelId: z.string(), + }), + async (req, res) => { + const { modelId, type = "video" } = req.body; + const [id, name] = modelId.split(":"); + const data = await u.db("o_vendorConfig").where("id", id).select("models").first(); + if (!data) { + return res.status(404).send({ error: "模型未找到" }); + } + const models = JSON.parse(data.models!); + const findData = models.find((i) => i.modelName == name); + res.status(200).send(success(findData)); + }, +); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 4c3b490..ffaa589 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,9 +1,9 @@ -// @db-hash feca77a2c2ec5b6a2989347f982558d5 +// @db-hash 2f9e6a9e9145cead00652858cafb9159 //该文件由脚本自动生成，请勿手动修改 export interface memories { 'content': string; - 'createTime': number; + 'createdAt': number; 'embedding'?: string | null; 'id'?: string; 'isolationKey': string; diff --git a/src/utils/cleanNovel.ts b/src/utils/cleanNovel.ts index 3d0351e..32183fe 100644 --- a/src/utils/cleanNovel.ts +++ b/src/utils/cleanNovel.ts @@ -56,7 +56,7 @@ class CleanNovel { let preData: Novel | null = null; //所有事件 let totalEvent: EventType[] = []; - const intansce = await ai.create(1); + const intansce = u.Ai.Text("eventExtractAi"); try { for (let gi = 0; gi < groups.length; gi++) { @@ -82,12 +82,11 @@ class CleanNovel { }); let resData; try { - resData = await intansce.text.invoke( - { - messages: [ - { - role: "system", - content: ` + resData = await intansce.invoke({ + messages: [ + { + role: "system", + content: ` 你是专业剧本结构分析师，负责将用户提供的章节文本拆分为标准情节单元。请严格遵循以下规则执行。 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━ @@ -116,34 +115,32 @@ class CleanNovel { - 单个章节拆分为多个情节单元； - 遗漏任何章节。 `, - }, - ...cleanText, - ], - output: { - event: z.array( - z - .object({ - chapter: z - .string() - .describe( - "事件覆盖的章节（如1-3章、4-6章），章节划分必须连续，每个章节范围只能属于一个事件。事件分割不可过细——避免只描述琐碎、日常细节的微小事件。", - ), - name: z.string().describe("事件名称"), - detail: z.string().describe("事件过程详情（包括起因、经过、结果、场景、人物等）"), - }) - .describe("事件必须在100-200字说明起因经过结果，不可将单一章节或细小场景独立成事件，"), - ), }, - }, - { modelName: "gpt-4.1" }, - ); + ...cleanText, + ], + // output: { + // event: z.array( + // z + // .object({ + // chapter: z + // .string() + // .describe( + // "事件覆盖的章节（如1-3章、4-6章），章节划分必须连续，每个章节范围只能属于一个事件。事件分割不可过细——避免只描述琐碎、日常细节的微小事件。", + // ), + // name: z.string().describe("事件名称"), + // detail: z.string().describe("事件过程详情（包括起因、经过、结果、场景、人物等）"), + // }) + // .describe("事件必须在100-200字说明起因经过结果，不可将单一章节或细小场景独立成事件，"), + // ), + // }, + }); } catch (e) { taskRecord(-1, u.error(e).message); throw e; } taskRecord(1); - preData = resData as Novel; + preData = resData.text as Novel; const newEvents = preData?.event || []; newEvents.forEach((newItem) => { From 935abf189aa35a06aa661f53934500a1809febb7 Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Thu, 19 Mar 2026 23:08:52 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0scema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router.ts | 160 ++++++++++++++++++++-------------------- src/types/database.d.ts | 76 +++++++++++++++++-- src/utils/ai.ts | 4 +- src/utils/cleanNovel.ts | 37 +++++----- 4 files changed, 174 insertions(+), 103 deletions(-) diff --git a/src/router.ts b/src/router.ts index 9b771c2..7fe2681 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 3aef51df31467bb6ff0ed05b9520c86e +// @routes-hash dbac61c96fe5d9d9a361d24721d77197 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -22,45 +22,46 @@ 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"; +import route22 from "./routes/modelSelect/getModelDetail"; +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); @@ -84,43 +85,44 @@ export default async (app: Express) => { 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); + app.use("/api/modelSelect/getModelDetail", 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/types/database.d.ts b/src/types/database.d.ts index e3a7e5f..ffaa589 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,9 +1,9 @@ -// @db-hash 04e1150a9773602183de5f660a52b092 +// @db-hash 2f9e6a9e9145cead00652858cafb9159 //该文件由脚本自动生成，请勿手动修改 export interface memories { 'content': string; - 'createTime': number; + 'createdAt': number; 'embedding'?: string | null; 'id'?: string; 'isolationKey': string; @@ -35,12 +35,18 @@ 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; @@ -61,10 +67,33 @@ export interface o_image { 'assetsId'?: number | null; 'filePath'?: string | null; 'id'?: number; - 'model'?: string | null; - 'resolution'?: string | null; + 'projectId'?: number | null; + 'scriptId'?: number | 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; @@ -97,6 +126,15 @@ 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; @@ -104,15 +142,35 @@ 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; @@ -178,17 +236,25 @@ 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; diff --git a/src/utils/ai.ts b/src/utils/ai.ts index 818d4aa..87db692 100644 --- a/src/utils/ai.ts +++ b/src/utils/ai.ts @@ -4,10 +4,10 @@ import axios from "axios"; import { transform } from "sucrase"; import u from "@/utils"; -type AiType = "scriptAgent" | "productionAgent" | "assetsAi" | "polishingAi" | "ttsDubbing" | "test"; +type AiType = "scriptAgent" | "productionAgent" | "assetsAi" | "polishingAi" | "ttsDubbing" | "eventExtractAi"; type FnName = "textRequest" | "imageRequest" | "videoRequest" | "ttsRequest"; -const AiTypeValues: AiType[] = ["scriptAgent", "productionAgent", "assetsAi", "polishingAi", "ttsDubbing"]; +const AiTypeValues: AiType[] = ["scriptAgent", "productionAgent", "assetsAi", "polishingAi", "ttsDubbing", "eventExtractAi"]; async function getVendorTemplateFn(fnName: FnName, value: AiType | `${number}:${string}`) { let id, modelName; const isAgent = AiTypeValues.includes(value as AiType); diff --git a/src/utils/cleanNovel.ts b/src/utils/cleanNovel.ts index 32183fe..64080d2 100644 --- a/src/utils/cleanNovel.ts +++ b/src/utils/cleanNovel.ts @@ -1,5 +1,6 @@ import * as z from "zod"; -import { ModelMessage } from "ai"; +import { ModelMessage, Output } from "ai"; + import { o_novel } from "@/types/database"; import ai from "@/utils/ai"; import u from "@/utils"; @@ -118,21 +119,23 @@ class CleanNovel { }, ...cleanText, ], - // output: { - // event: z.array( - // z - // .object({ - // chapter: z - // .string() - // .describe( - // "事件覆盖的章节（如1-3章、4-6章），章节划分必须连续，每个章节范围只能属于一个事件。事件分割不可过细——避免只描述琐碎、日常细节的微小事件。", - // ), - // name: z.string().describe("事件名称"), - // detail: z.string().describe("事件过程详情（包括起因、经过、结果、场景、人物等）"), - // }) - // .describe("事件必须在100-200字说明起因经过结果，不可将单一章节或细小场景独立成事件，"), - // ), - // }, + output: Output.object({ + schema: z.object({ + event: z.array( + z + .object({ + chapter: z + .string() + .describe( + "事件覆盖的章节（如1-3章、4-6章），章节划分必须连续，每个章节范围只能属于一个事件。事件分割不可过细——避免只描述琐碎、日常细节的微小事件。", + ), + name: z.string().describe("事件名称"), + detail: z.string().describe("事件过程详情（包括起因、经过、结果、场景、人物等）"), + }) + .describe("事件必须在100-200字说明起因经过结果，不可将单一章节或细小场景独立成事件，"), + ), + }), + }), }); } catch (e) { taskRecord(-1, u.error(e).message); @@ -140,7 +143,7 @@ class CleanNovel { } taskRecord(1); - preData = resData.text as Novel; + preData = JSON.parse(resData.text); const newEvents = preData?.event || []; newEvents.forEach((newItem) => {