Merge branch '108' of https://github.com/HBAI-Ltd/Toonflow-app into 108
This commit is contained in:
commit
66581ea57c
@ -276,6 +276,7 @@ export default async (knex: Knex, forceInit: boolean = false): Promise<void> =>
|
||||
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<void> =>
|
||||
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"]);
|
||||
|
||||
182
src/router.ts
182
src/router.ts
@ -1,4 +1,4 @@
|
||||
// @routes-hash 4149c7e96379bfdba20853678db5c921
|
||||
// @routes-hash dbac61c96fe5d9d9a361d24721d77197
|
||||
import { Express } from "express";
|
||||
|
||||
import route1 from "./routes/agents/clearMemory";
|
||||
@ -16,50 +16,52 @@ 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 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/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);
|
||||
@ -77,48 +79,50 @@ export default async (app: Express) => {
|
||||
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/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/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);
|
||||
}
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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({
|
||||
|
||||
@ -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 = "";
|
||||
@ -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({
|
||||
|
||||
33
src/routes/cornerScape/getAllAssets.ts
Normal file
33
src/routes/cornerScape/getAllAssets.ts
Normal file
@ -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));
|
||||
},
|
||||
);
|
||||
24
src/routes/modelSelect/getModelDetail.ts
Normal file
24
src/routes/modelSelect/getModelDetail.ts
Normal file
@ -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));
|
||||
},
|
||||
);
|
||||
4
src/types/database.d.ts
vendored
4
src/types/database.d.ts
vendored
@ -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;
|
||||
|
||||
@ -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<string> {
|
||||
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<string[]> {
|
||||
@ -54,8 +64,26 @@ class Memory {
|
||||
} catch {}
|
||||
return [];
|
||||
}
|
||||
private async getConfigData<T extends Record<string, string | number>>(defaults: T): Promise<T> {
|
||||
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<string, string | null> = {};
|
||||
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<string, string | number>)[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() {
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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";
|
||||
@ -56,7 +57,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 +83,11 @@ class CleanNovel {
|
||||
});
|
||||
let resData;
|
||||
try {
|
||||
resData = await intansce.text.invoke(
|
||||
{
|
||||
messages: [
|
||||
{
|
||||
role: "system",
|
||||
content: `
|
||||
resData = await intansce.invoke({
|
||||
messages: [
|
||||
{
|
||||
role: "system",
|
||||
content: `
|
||||
你是专业剧本结构分析师,负责将用户提供的章节文本拆分为标准情节单元。请严格遵循以下规则执行。
|
||||
|
||||
━━━━━━━━━━━━━━━━━━━━━━━━━━━━
|
||||
@ -116,10 +116,11 @@ class CleanNovel {
|
||||
- 单个章节拆分为多个情节单元;
|
||||
- 遗漏任何章节。
|
||||
`,
|
||||
},
|
||||
...cleanText,
|
||||
],
|
||||
output: {
|
||||
},
|
||||
...cleanText,
|
||||
],
|
||||
output: Output.object({
|
||||
schema: z.object({
|
||||
event: z.array(
|
||||
z
|
||||
.object({
|
||||
@ -133,17 +134,16 @@ class CleanNovel {
|
||||
})
|
||||
.describe("事件必须在100-200字说明起因经过结果,不可将单一章节或细小场景独立成事件,"),
|
||||
),
|
||||
},
|
||||
},
|
||||
{ modelName: "gpt-4.1" },
|
||||
);
|
||||
}),
|
||||
}),
|
||||
});
|
||||
} catch (e) {
|
||||
taskRecord(-1, u.error(e).message);
|
||||
throw e;
|
||||
}
|
||||
taskRecord(1);
|
||||
|
||||
preData = resData as Novel;
|
||||
preData = JSON.parse(resData.text);
|
||||
|
||||
const newEvents = preData?.event || [];
|
||||
newEvents.forEach((newItem) => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user