# Conflicts:
#	src/router.ts
This commit is contained in:
小帅 2026-03-24 14:25:52 +08:00
commit 92c5181323
10 changed files with 204 additions and 191 deletions

View File

@ -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,

View File

@ -117,14 +117,13 @@ export default (resTool: ResTool, toolsNames?: string[]) => {
type: i.type,
describe: i.desc,
projectId: resTool.data.projectId,
state: "未生成",
});
assetId.push(id);
}
await u.db("o_script_assets").insert(assetId.map((i) => ({ scriptId, assetId: i })));
await u.db("o_scriptAssets").insert(assetId.map((i) => ({ scriptId, assetId: i })));
}
socket.emit("setPlanData", { key: "script", value: scriptId });
return true;
},
}),

View File

@ -1,170 +1,166 @@
// @routes-hash e5412607050f3ece1b12347ec4c93276
// @routes-hash 5a08bddffb3b0f7c62f76b6d862f1459
import { Express } from "express";
import route1 from "./routes/agents/clearMemory";
import route2 from "./routes/agents/getMemory";
import route3 from "./routes/artStyle/addArtStyle";
import route4 from "./routes/artStyle/editArtStyle";
import route5 from "./routes/artStyle/extractStylePrompt";
import route6 from "./routes/artStyle/getArtStyle";
import route7 from "./routes/assets/addAssets";
import route8 from "./routes/assets/batchDelete";
import route9 from "./routes/assets/batchGenerationData";
import route10 from "./routes/assets/delAssets";
import route11 from "./routes/assets/getAssetsApi";
import route12 from "./routes/assets/getImage";
import route13 from "./routes/assets/saveAssets";
import route14 from "./routes/assets/updateAssets";
import route15 from "./routes/assets/uploadClip";
import route16 from "./routes/assetsGenerate/generateAssets";
import route17 from "./routes/assetsGenerate/polishAssetsPrompt";
import route18 from "./routes/cornerScape/getAllAssets";
import route19 from "./routes/general/generalStatistics";
import route20 from "./routes/general/getSingleProject";
import route21 from "./routes/general/updateProject";
import route22 from "./routes/login/login";
import route23 from "./routes/migrate/migrateData";
import route24 from "./routes/modelSelect/getModelDetail";
import route25 from "./routes/modelSelect/getModelList";
import route26 from "./routes/novel/addNovel";
import route27 from "./routes/novel/batchDeleteNovel";
import route28 from "./routes/novel/delNovel";
import route29 from "./routes/novel/event/batchDeleteEvent";
import route30 from "./routes/novel/event/deletEvent";
import route31 from "./routes/novel/event/generateEvents";
import route32 from "./routes/novel/event/getEvent";
import route33 from "./routes/novel/getNovel";
import route34 from "./routes/novel/getNovelEventState";
import route35 from "./routes/novel/getNovelIndex";
import route36 from "./routes/novel/updateNovel";
import route37 from "./routes/other/deleteAllData";
import route38 from "./routes/other/getCaptcha";
import route39 from "./routes/production/assets/getAssetsData";
import route40 from "./routes/production/editStoryboard/generateStoryboardImage";
import route41 from "./routes/production/editStoryboard/getStoryboardFlow";
import route42 from "./routes/production/editStoryboard/saveStoryboardFlow";
import route43 from "./routes/production/editStoryboard/updateStoryboardFlow";
import route44 from "./routes/production/exportImage";
import route45 from "./routes/production/getFlowData";
import route46 from "./routes/production/getProductionData";
import route47 from "./routes/production/getStoryboardData";
import route48 from "./routes/production/saveFlowData";
import route49 from "./routes/production/workbench/confirmSelection";
import route50 from "./routes/production/workbench/delVideo";
import route51 from "./routes/production/workbench/generateVideo";
import route52 from "./routes/production/workbench/getChatLines";
import route53 from "./routes/production/workbench/getVideoModelDetail";
import route54 from "./routes/production/workbench/videoPolling";
import route55 from "./routes/project/addProject";
import route56 from "./routes/project/delProject";
import route57 from "./routes/project/editProject";
import route58 from "./routes/project/getProject";
import route59 from "./routes/script/addScript";
import route60 from "./routes/script/delScript";
import route61 from "./routes/script/exportScript";
import route62 from "./routes/script/getScrptApi";
import route63 from "./routes/script/updateScript";
import route64 from "./routes/scriptAgent/getPlanData";
import route65 from "./routes/scriptAgent/setPlanData";
import route66 from "./routes/setting/agentDeploy/deployAgentModel";
import route67 from "./routes/setting/agentDeploy/getAgentDeploy";
import route68 from "./routes/setting/dbConfig/clearData";
import route69 from "./routes/setting/getTextModel";
import route70 from "./routes/setting/loginConfig/getUser";
import route71 from "./routes/setting/loginConfig/updateUserPwd";
import route72 from "./routes/setting/memoryConfig/getMemory";
import route73 from "./routes/setting/memoryConfig/sureMemory";
import route74 from "./routes/setting/vendorConfig/addVendor";
import route75 from "./routes/setting/vendorConfig/deleteVendor";
import route76 from "./routes/setting/vendorConfig/getVendorList";
import route77 from "./routes/setting/vendorConfig/modelTest";
import route78 from "./routes/setting/vendorConfig/updateVendor";
import route79 from "./routes/task/getTaskApi";
import route80 from "./routes/task/getTaskCategories";
import route81 from "./routes/task/taskDetails";
import route82 from "./routes/test/test";
import route3 from "./routes/artStyle/getArtStyle";
import route4 from "./routes/assets/addAssets";
import route5 from "./routes/assets/batchDelete";
import route6 from "./routes/assets/batchGenerationData";
import route7 from "./routes/assets/delAssets";
import route8 from "./routes/assets/getAssetsApi";
import route9 from "./routes/assets/getImage";
import route10 from "./routes/assets/saveAssets";
import route11 from "./routes/assets/updateAssets";
import route12 from "./routes/assets/uploadClip";
import route13 from "./routes/assetsGenerate/generateAssets";
import route14 from "./routes/assetsGenerate/polishAssetsPrompt";
import route15 from "./routes/cornerScape/getAllAssets";
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/getModelDetail";
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/getNovelEventState";
import route32 from "./routes/novel/getNovelIndex";
import route33 from "./routes/novel/updateNovel";
import route34 from "./routes/other/deleteAllData";
import route35 from "./routes/other/getCaptcha";
import route36 from "./routes/production/assets/getAssetsData";
import route37 from "./routes/production/editStoryboard/generateStoryboardImage";
import route38 from "./routes/production/editStoryboard/getStoryboardFlow";
import route39 from "./routes/production/editStoryboard/saveStoryboardFlow";
import route40 from "./routes/production/editStoryboard/updateStoryboardFlow";
import route41 from "./routes/production/exportImage";
import route42 from "./routes/production/getFlowData";
import route43 from "./routes/production/getProductionData";
import route44 from "./routes/production/getStoryboardData";
import route45 from "./routes/production/saveFlowData";
import route46 from "./routes/production/workbench/confirmSelection";
import route47 from "./routes/production/workbench/delVideo";
import route48 from "./routes/production/workbench/generateVideo";
import route49 from "./routes/production/workbench/getChatLines";
import route50 from "./routes/production/workbench/getVideoModelDetail";
import route51 from "./routes/production/workbench/videoPolling";
import route52 from "./routes/project/addProject";
import route53 from "./routes/project/delProject";
import route54 from "./routes/project/editProject";
import route55 from "./routes/project/getProject";
import route56 from "./routes/script/addScript";
import route57 from "./routes/script/delScript";
import route58 from "./routes/script/exportScript";
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/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);
app.use("/api/agents/getMemory", route2);
app.use("/api/artStyle/addArtStyle", route3);
app.use("/api/artStyle/editArtStyle", route4);
app.use("/api/artStyle/extractStylePrompt", route5);
app.use("/api/artStyle/getArtStyle", route6);
app.use("/api/assets/addAssets", route7);
app.use("/api/assets/batchDelete", route8);
app.use("/api/assets/batchGenerationData", route9);
app.use("/api/assets/delAssets", route10);
app.use("/api/assets/getAssetsApi", route11);
app.use("/api/assets/getImage", route12);
app.use("/api/assets/saveAssets", route13);
app.use("/api/assets/updateAssets", route14);
app.use("/api/assets/uploadClip", route15);
app.use("/api/assetsGenerate/generateAssets", route16);
app.use("/api/assetsGenerate/polishAssetsPrompt", route17);
app.use("/api/cornerScape/getAllAssets", route18);
app.use("/api/general/generalStatistics", route19);
app.use("/api/general/getSingleProject", route20);
app.use("/api/general/updateProject", route21);
app.use("/api/login/login", route22);
app.use("/api/migrate/migrateData", route23);
app.use("/api/modelSelect/getModelDetail", route24);
app.use("/api/modelSelect/getModelList", route25);
app.use("/api/novel/addNovel", route26);
app.use("/api/novel/batchDeleteNovel", route27);
app.use("/api/novel/delNovel", route28);
app.use("/api/novel/event/batchDeleteEvent", route29);
app.use("/api/novel/event/deletEvent", route30);
app.use("/api/novel/event/generateEvents", route31);
app.use("/api/novel/event/getEvent", route32);
app.use("/api/novel/getNovel", route33);
app.use("/api/novel/getNovelEventState", route34);
app.use("/api/novel/getNovelIndex", route35);
app.use("/api/novel/updateNovel", route36);
app.use("/api/other/deleteAllData", route37);
app.use("/api/other/getCaptcha", route38);
app.use("/api/production/assets/getAssetsData", route39);
app.use("/api/production/editStoryboard/generateStoryboardImage", route40);
app.use("/api/production/editStoryboard/getStoryboardFlow", route41);
app.use("/api/production/editStoryboard/saveStoryboardFlow", route42);
app.use("/api/production/editStoryboard/updateStoryboardFlow", route43);
app.use("/api/production/exportImage", route44);
app.use("/api/production/getFlowData", route45);
app.use("/api/production/getProductionData", route46);
app.use("/api/production/getStoryboardData", route47);
app.use("/api/production/saveFlowData", route48);
app.use("/api/production/workbench/confirmSelection", route49);
app.use("/api/production/workbench/delVideo", route50);
app.use("/api/production/workbench/generateVideo", route51);
app.use("/api/production/workbench/getChatLines", route52);
app.use("/api/production/workbench/getVideoModelDetail", route53);
app.use("/api/production/workbench/videoPolling", route54);
app.use("/api/project/addProject", route55);
app.use("/api/project/delProject", route56);
app.use("/api/project/editProject", route57);
app.use("/api/project/getProject", route58);
app.use("/api/script/addScript", route59);
app.use("/api/script/delScript", route60);
app.use("/api/script/exportScript", route61);
app.use("/api/script/getScrptApi", route62);
app.use("/api/script/updateScript", route63);
app.use("/api/scriptAgent/getPlanData", route64);
app.use("/api/scriptAgent/setPlanData", route65);
app.use("/api/setting/agentDeploy/deployAgentModel", route66);
app.use("/api/setting/agentDeploy/getAgentDeploy", route67);
app.use("/api/setting/dbConfig/clearData", route68);
app.use("/api/setting/getTextModel", route69);
app.use("/api/setting/loginConfig/getUser", route70);
app.use("/api/setting/loginConfig/updateUserPwd", route71);
app.use("/api/setting/memoryConfig/getMemory", route72);
app.use("/api/setting/memoryConfig/sureMemory", route73);
app.use("/api/setting/vendorConfig/addVendor", route74);
app.use("/api/setting/vendorConfig/deleteVendor", route75);
app.use("/api/setting/vendorConfig/getVendorList", route76);
app.use("/api/setting/vendorConfig/modelTest", route77);
app.use("/api/setting/vendorConfig/updateVendor", route78);
app.use("/api/task/getTaskApi", route79);
app.use("/api/task/getTaskCategories", route80);
app.use("/api/task/taskDetails", route81);
app.use("/api/test/test", route82);
app.use("/api/artStyle/getArtStyle", route3);
app.use("/api/assets/addAssets", route4);
app.use("/api/assets/batchDelete", route5);
app.use("/api/assets/batchGenerationData", route6);
app.use("/api/assets/delAssets", route7);
app.use("/api/assets/getAssetsApi", route8);
app.use("/api/assets/getImage", route9);
app.use("/api/assets/saveAssets", route10);
app.use("/api/assets/updateAssets", route11);
app.use("/api/assets/uploadClip", route12);
app.use("/api/assetsGenerate/generateAssets", route13);
app.use("/api/assetsGenerate/polishAssetsPrompt", route14);
app.use("/api/cornerScape/getAllAssets", 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/getModelDetail", 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/getNovelEventState", route31);
app.use("/api/novel/getNovelIndex", route32);
app.use("/api/novel/updateNovel", route33);
app.use("/api/other/deleteAllData", route34);
app.use("/api/other/getCaptcha", route35);
app.use("/api/production/assets/getAssetsData", route36);
app.use("/api/production/editStoryboard/generateStoryboardImage", route37);
app.use("/api/production/editStoryboard/getStoryboardFlow", route38);
app.use("/api/production/editStoryboard/saveStoryboardFlow", route39);
app.use("/api/production/editStoryboard/updateStoryboardFlow", route40);
app.use("/api/production/exportImage", route41);
app.use("/api/production/getFlowData", route42);
app.use("/api/production/getProductionData", route43);
app.use("/api/production/getStoryboardData", route44);
app.use("/api/production/saveFlowData", route45);
app.use("/api/production/workbench/confirmSelection", route46);
app.use("/api/production/workbench/delVideo", route47);
app.use("/api/production/workbench/generateVideo", route48);
app.use("/api/production/workbench/getChatLines", route49);
app.use("/api/production/workbench/getVideoModelDetail", route50);
app.use("/api/production/workbench/videoPolling", route51);
app.use("/api/project/addProject", route52);
app.use("/api/project/delProject", route53);
app.use("/api/project/editProject", route54);
app.use("/api/project/getProject", route55);
app.use("/api/script/addScript", route56);
app.use("/api/script/delScript", route57);
app.use("/api/script/exportScript", route58);
app.use("/api/script/getScrptApi", route59);
app.use("/api/script/updateScript", route60);
app.use("/api/scriptAgent/getPlanData", route61);
app.use("/api/scriptAgent/setPlanData", route62);
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);
}

View File

@ -28,7 +28,7 @@ export default router.post(
query = query.andWhere("name", "like", `%${name}%`);
}
// 分页查询
const parentAssets = await query.where("o_assets.assetId", null).offset(offset).limit(limit);
const parentAssets = await query.where("o_assets.assetsId", null).offset(offset).limit(limit);
// 获取所有子资产供关联使用
let childQuery = u
@ -37,7 +37,7 @@ export default router.post(
.select("o_assets.*", "o_image.filePath")
.where("o_assets.projectId", projectId)
.andWhere("o_assets.type", type)
.whereNotNull("o_assets.assetId");
.whereNotNull("o_assets.assetsId");
if (name) {
childQuery = childQuery.andWhere("o_assets.name", "like", `%${name}%`);
}
@ -47,7 +47,7 @@ export default router.post(
const result = await Promise.all(
parentAssets.map(async (parent) => ({
...parent,
sonAssets: childAssets.filter((child) => child.assetId === parent.id),
sonAssets: childAssets.filter((child) => child.assetsId === parent.id),
src: parent.filePath && (await u.oss.getFileUrl(parent.filePath!)),
})),
);
@ -57,7 +57,7 @@ export default router.post(
.db("o_assets")
.where("projectId", projectId)
.andWhere("type", type)
.andWhere("assetId", null)
.andWhere("assetsId", null)
.andWhere((qb) => {
if (name) {
qb.andWhere("name", "like", `%${name}%`);

View File

@ -13,7 +13,7 @@ export default router.post(
}),
async (req, res) => {
const { projectId } = req.body;
const parentAssetsData = await u.db("o_assets").where("projectId", projectId).whereNotNull("assetId");
const parentAssetsData = await u.db("o_assets").where("projectId", projectId).whereNotNull("assetsId");
const parentIds = parentAssetsData.map((i) => i.id);
const sonAssetsData = await u.db("o_assets").whereIn("assetsId", parentIds);
const sonAssetsMap: Record<number, o_assets[]> = {};

View File

@ -33,7 +33,7 @@ export default router.post(
.leftJoin("o_image", "o_assets.imageId", "o_image.id")
.select("o_assets.*", "o_image.filePath")
.where("o_assets.projectId", projectId)
.whereNotNull("o_assets.assetId");
.whereNotNull("o_assets.assetsId");
if (!sqlData) {
const flowData: FlowData = {
@ -47,7 +47,7 @@ export default router.post(
src: item.filePath && (await u.oss.getFileUrl(item.filePath!)),
derive: await Promise.all(
childAssetsData
.filter((child) => child.assetId === item.id)
.filter((child) => child.assetsId === item.id)
.map(async (child) => ({
id: child.id,
assetsId: item.id,

View File

@ -28,7 +28,6 @@ export default router.post(
data.map((i) => i.id),
)
.select("o_assets.id", "o_assets.name", "o_scriptAssets.scriptId");
console.log("%c Line:23 🍷 assetsData", "background:#ffdd4d", assetsData);
const scriptAssetsMap: Record<number, { id: number; name: string }[]> = {};
assetsData.forEach((i) => {
if (scriptAssetsMap[i.scriptId]) {
@ -42,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));
},

View File

@ -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("配置成功"));
},
);

View File

@ -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("配置成功"));
},
);
});

View File

@ -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 });
}
}