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) => {