diff --git a/src/agents/scriptAgent/index.ts b/src/agents/scriptAgent/index.ts index bc34c0b..4b4c196 100644 --- a/src/agents/scriptAgent/index.ts +++ b/src/agents/scriptAgent/index.ts @@ -40,7 +40,7 @@ export async function decisionAI(ctx: AgentContext) { resTool.systemMessage("决策层AI 接管聊天"); const memory = new Memory("scriptAgent", isolationKey); - + console.log("%c Line:43 🥟 isolationKey", "background:#4fff4B", isolationKey); await memory.add("user", text); const [skill, mem] = await Promise.all([useSkill("script-agent", "decision"), memory.get(text)]); @@ -58,10 +58,8 @@ export async function decisionAI(ctx: AgentContext) { `目标改编视频画幅:${projectData?.videoRatio ?? "16:9"}`, ].join("\n"); - // const prefixSystem = `${projectInfo}\n\n## 章节ID映射表\n${novelData.map((i: any) => `- ${i.id}: 第${i.index}章`).join("\n")}\n\n`; - const prefixSystem = `不管说什么直接调用 insert_script_to_sqlite 工具` + const prefixSystem = `${projectInfo}\n\n## 章节ID映射表\n${novelData.map((i: any) => `- ${i.id}: 第${i.index}章`).join("\n")}\n\n`; console.log("%c Line:57 🍧 prefixSystem", "background:#ea7e5c", prefixSystem); - const { textStream } = await u.Ai.Text("scriptAgent").stream({ system: prefixSystem + systemPrompt, diff --git a/src/agents/scriptAgent/tools.ts b/src/agents/scriptAgent/tools.ts index 342005f..16538e3 100644 --- a/src/agents/scriptAgent/tools.ts +++ b/src/agents/scriptAgent/tools.ts @@ -117,7 +117,6 @@ export default (resTool: ResTool, toolsNames?: string[]) => { type: i.type, describe: i.desc, projectId: resTool.data.projectId, - state: "未生成", }); assetId.push(id); } diff --git a/src/router.ts b/src/router.ts index 2382c1f..69cc791 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash a1ebcce277ce90155e2edf126144b986 +// @routes-hash 5a08bddffb3b0f7c62f76b6d862f1459 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -63,23 +63,24 @@ import route59 from "./routes/script/getScrptApi"; import route60 from "./routes/script/updateScript"; import route61 from "./routes/scriptAgent/getPlanData"; import route62 from "./routes/scriptAgent/setPlanData"; -import route63 from "./routes/setting/agentDeploy/deployAgentModel"; -import route64 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route65 from "./routes/setting/dbConfig/clearData"; -import route66 from "./routes/setting/getTextModel"; -import route67 from "./routes/setting/loginConfig/getUser"; -import route68 from "./routes/setting/loginConfig/updateUserPwd"; -import route69 from "./routes/setting/memoryConfig/getMemory"; -import route70 from "./routes/setting/memoryConfig/sureMemory"; -import route71 from "./routes/setting/vendorConfig/addVendor"; -import route72 from "./routes/setting/vendorConfig/deleteVendor"; -import route73 from "./routes/setting/vendorConfig/getVendorList"; -import route74 from "./routes/setting/vendorConfig/modelTest"; -import route75 from "./routes/setting/vendorConfig/updateVendor"; -import route76 from "./routes/task/getTaskApi"; -import route77 from "./routes/task/getTaskCategories"; -import route78 from "./routes/task/taskDetails"; -import route79 from "./routes/test/test"; +import route63 from "./routes/setting/agentDeploy/agentSetKey"; +import route64 from "./routes/setting/agentDeploy/deployAgentModel"; +import route65 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route66 from "./routes/setting/dbConfig/clearData"; +import route67 from "./routes/setting/getTextModel"; +import route68 from "./routes/setting/loginConfig/getUser"; +import route69 from "./routes/setting/loginConfig/updateUserPwd"; +import route70 from "./routes/setting/memoryConfig/getMemory"; +import route71 from "./routes/setting/memoryConfig/sureMemory"; +import route72 from "./routes/setting/vendorConfig/addVendor"; +import route73 from "./routes/setting/vendorConfig/deleteVendor"; +import route74 from "./routes/setting/vendorConfig/getVendorList"; +import route75 from "./routes/setting/vendorConfig/modelTest"; +import route76 from "./routes/setting/vendorConfig/updateVendor"; +import route77 from "./routes/task/getTaskApi"; +import route78 from "./routes/task/getTaskCategories"; +import route79 from "./routes/task/taskDetails"; +import route80 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -144,21 +145,22 @@ export default async (app: Express) => { app.use("/api/script/updateScript", route60); app.use("/api/scriptAgent/getPlanData", route61); app.use("/api/scriptAgent/setPlanData", route62); - app.use("/api/setting/agentDeploy/deployAgentModel", route63); - app.use("/api/setting/agentDeploy/getAgentDeploy", route64); - app.use("/api/setting/dbConfig/clearData", route65); - app.use("/api/setting/getTextModel", route66); - app.use("/api/setting/loginConfig/getUser", route67); - app.use("/api/setting/loginConfig/updateUserPwd", route68); - app.use("/api/setting/memoryConfig/getMemory", route69); - app.use("/api/setting/memoryConfig/sureMemory", route70); - app.use("/api/setting/vendorConfig/addVendor", route71); - app.use("/api/setting/vendorConfig/deleteVendor", route72); - app.use("/api/setting/vendorConfig/getVendorList", route73); - app.use("/api/setting/vendorConfig/modelTest", route74); - app.use("/api/setting/vendorConfig/updateVendor", route75); - app.use("/api/task/getTaskApi", route76); - app.use("/api/task/getTaskCategories", route77); - app.use("/api/task/taskDetails", route78); - app.use("/api/test/test", route79); + app.use("/api/setting/agentDeploy/agentSetKey", route63); + app.use("/api/setting/agentDeploy/deployAgentModel", route64); + app.use("/api/setting/agentDeploy/getAgentDeploy", route65); + app.use("/api/setting/dbConfig/clearData", route66); + app.use("/api/setting/getTextModel", route67); + app.use("/api/setting/loginConfig/getUser", route68); + app.use("/api/setting/loginConfig/updateUserPwd", route69); + app.use("/api/setting/memoryConfig/getMemory", route70); + app.use("/api/setting/memoryConfig/sureMemory", route71); + app.use("/api/setting/vendorConfig/addVendor", route72); + app.use("/api/setting/vendorConfig/deleteVendor", route73); + app.use("/api/setting/vendorConfig/getVendorList", route74); + app.use("/api/setting/vendorConfig/modelTest", route75); + app.use("/api/setting/vendorConfig/updateVendor", route76); + app.use("/api/task/getTaskApi", route77); + app.use("/api/task/getTaskCategories", route78); + app.use("/api/task/taskDetails", route79); + app.use("/api/test/test", route80); } diff --git a/src/routes/script/getScrptApi.ts b/src/routes/script/getScrptApi.ts index bb01175..c9dc893 100644 --- a/src/routes/script/getScrptApi.ts +++ b/src/routes/script/getScrptApi.ts @@ -41,7 +41,7 @@ export default router.post( name: i.name, content: i.content, createTime: i.createTime, - assets: scriptAssetsMap[i.id!] || [], + relatedAssets: scriptAssetsMap[i.id!] || [], })); res.status(200).send(success(returnData)); }, diff --git a/src/routes/setting/agentDeploy/agentSetKey.ts b/src/routes/setting/agentDeploy/agentSetKey.ts new file mode 100644 index 0000000..22f541a --- /dev/null +++ b/src/routes/setting/agentDeploy/agentSetKey.ts @@ -0,0 +1,22 @@ +import express from "express"; +import { success } from "@/lib/responseFormat"; +import u from "@/utils"; +import { z } from "zod"; +import { validateFields } from "@/middleware/middleware"; +const router = express.Router(); + +export default router.post( + "/", + validateFields({ + id: z.array(z.number()), + }), + async (req, res) => { + const { id } = req.body; + await u.db("o_agentDeploy").whereIn("id", id).where("disabled", "<>", 1).update({ + model: "gpt-4.1", + modelName: "1:gpt-4.1", + vendorId: 1, + }); + res.status(200).send(success("配置成功")); + }, +); diff --git a/src/routes/setting/agentDeploy/deployAgentModel.ts b/src/routes/setting/agentDeploy/deployAgentModel.ts index 22f541a..104dc03 100644 --- a/src/routes/setting/agentDeploy/deployAgentModel.ts +++ b/src/routes/setting/agentDeploy/deployAgentModel.ts @@ -5,18 +5,15 @@ import { z } from "zod"; import { validateFields } from "@/middleware/middleware"; const router = express.Router(); -export default router.post( - "/", - validateFields({ - id: z.array(z.number()), - }), - async (req, res) => { - const { id } = req.body; - await u.db("o_agentDeploy").whereIn("id", id).where("disabled", "<>", 1).update({ - model: "gpt-4.1", - modelName: "1:gpt-4.1", - vendorId: 1, - }); +export default router.post("/", validateFields({ + id: z.number(), + name: z.string(), + model: z.string(), + modelName: z.string(), + vendorId: z.number().nullable(), + desc: z.string(), +}), async (req, res) => { + const { id, name, model, modelName, vendorId, desc } = req.body; + await u.db("o_agentDeploy").where({ id }).update({ id, name, model, modelName, vendorId, desc }); res.status(200).send(success("配置成功")); - }, -); +}); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 3908402..97e7555 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,45 +1,6 @@ -// @db-hash 25c88b2cb37f9deac8b2bb8354113537 +// @db-hash 83c8dadf13c2aee689597b709a690870 //该文件由脚本自动生成,请勿手动修改 -export interface _o_assets_old_20260324 { - 'describe'?: string | null; - 'id'?: number; - 'imageId'?: number | null; - 'name'?: string | null; - '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_assets_old_20260324_1 { - 'assetId'?: number | null; - 'describe'?: string | null; - 'id'?: number; - 'imageId'?: number | null; - 'name'?: string | null; - 'projectId'?: number | null; - 'prompt'?: string | null; - 'remark'?: string | null; - 'scriptId'?: number | null; - 'startTime'?: number | null; - 'state'?: string | null; - 'type'?: string | null; -} -export interface _o_novel_old_20260323 { - 'chapter'?: string | null; - 'chapterData'?: string | null; - 'chapterIndex'?: number | null; - 'createTime'?: number | null; - 'event'?: string | null; - 'eventState'?: number | null; - 'id'?: number; - 'projectId'?: number | null; - 'reel'?: string | null; -} export interface memories { 'content': string; 'createTime': number; @@ -64,7 +25,7 @@ export interface o_agentDeploy { export interface o_agentWorkData { 'createTime'?: number | null; 'data'?: string | null; - 'espisodeId'?: number | null; + 'episodesId'?: number | null; 'id'?: number; 'key'?: string | null; 'projectId'?: number | null; @@ -86,7 +47,6 @@ export interface o_assets { 'remark'?: string | null; 'scriptId'?: number | null; 'startTime'?: number | null; - 'state'?: string | null; 'type'?: string | null; } export interface o_assets2Storyboard { @@ -104,15 +64,6 @@ export interface o_eventChapter { 'id'?: number; 'novelId'?: number | null; } -export interface o_flowData { - 'createTime'?: number | null; - 'data'?: string | null; - 'espisodeId'?: number | null; - 'id'?: number; - 'key'?: string | null; - 'projectId'?: number | null; - 'updateTime'?: number | null; -} export interface o_image { 'assetsId'?: number | null; 'filePath'?: string | null; @@ -244,9 +195,6 @@ export interface o_videoConfig { } export interface DB { - "_o_assets_old_20260324": _o_assets_old_20260324; - "_o_assets_old_20260324_1": _o_assets_old_20260324_1; - "_o_novel_old_20260323": _o_novel_old_20260323; "memories": memories; "o_agentDeploy": o_agentDeploy; "o_agentWorkData": o_agentWorkData; @@ -255,7 +203,6 @@ export interface DB { "o_assets2Storyboard": o_assets2Storyboard; "o_event": o_event; "o_eventChapter": o_eventChapter; - "o_flowData": o_flowData; "o_image": o_image; "o_novel": o_novel; "o_outline": o_outline; diff --git a/src/utils/cleanNovel.ts b/src/utils/cleanNovel.ts index 5d9542c..1d37939 100644 --- a/src/utils/cleanNovel.ts +++ b/src/utils/cleanNovel.ts @@ -41,12 +41,14 @@ class CleanNovel { ], tools: skill.tools, }); + console.log("%c Line:35 🍆 resData", "background:#fca650", resData); const preData = resData.text; this.emitter.emit("item", { id: novel.id, event: preData }); totalEvent.push({ id: novel.id!, event: preData }); } catch (e) { + console.log("%c Line:51 🍩 e", "background:#93c0a4", e); this.emitter.emit("item", { id: novel.id, event: null, errorReason: u.error(e).message }); } }