diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index 84576b5..810f57b 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -44,7 +44,9 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => builder: (table) => { table.integer("id").notNullable(); table.string("name"); - table.text("styles"); + table.text("fileUrl"); + table.text("label"); + table.text("prompt"); table.primary(["id"]); table.unique(["id"]); }, diff --git a/src/router.ts b/src/router.ts index 2382c1f..b5367a2 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,164 +1,170 @@ -// @routes-hash a1ebcce277ce90155e2edf126144b986 +// @routes-hash e5412607050f3ece1b12347ec4c93276 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; import route2 from "./routes/agents/getMemory"; -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/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 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"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); app.use("/api/agents/getMemory", route2); - 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/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/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); } diff --git a/src/routes/artStyle/addArtStyle.ts b/src/routes/artStyle/addArtStyle.ts new file mode 100644 index 0000000..76cd18d --- /dev/null +++ b/src/routes/artStyle/addArtStyle.ts @@ -0,0 +1,30 @@ +import express from "express"; +import u from "@/utils"; +import { z } from "zod"; +import { v4 as uuidv4 } from "uuid"; +import { success } from "@/lib/responseFormat"; +import { validateFields } from "@/middleware/middleware"; +const router = express.Router(); + +export default router.post( + "/", + validateFields({ + name: z.string(), + fileUrl: z.string(), + prompt: z.string(), + }), + async (req, res) => { + const { name, fileUrl, prompt } = req.body; + const imagePath = `/artStyle/${uuidv4()}.jpg`; + const matches = fileUrl.match(/^data:image\/\w+;base64,(.+)$/); + const realBase64 = matches ? matches[1] : fileUrl; + await u.oss.writeFile(imagePath, Buffer.from(realBase64, "base64")); + await u.db("o_artStyle").insert({ + name, + fileUrl: imagePath, + label: name, + prompt, + }); + res.status(200).send(success("艺术风格添加成功")); + }, +); diff --git a/src/routes/artStyle/editArtStyle.ts b/src/routes/artStyle/editArtStyle.ts new file mode 100644 index 0000000..c05af26 --- /dev/null +++ b/src/routes/artStyle/editArtStyle.ts @@ -0,0 +1,34 @@ +import express from "express"; +import u from "@/utils"; +import { z } from "zod"; +import { v4 as uuidv4 } from "uuid"; +import { success } from "@/lib/responseFormat"; +import { validateFields } from "@/middleware/middleware"; +const router = express.Router(); + +export default router.post( + "/", + validateFields({ + id: z.number(), + name: z.string(), + fileUrl: z.string(), + prompt: z.string(), + }), + async (req, res) => { + const { id, name, fileUrl, prompt } = req.body; + const imagePath = `/artStyle/${uuidv4()}.jpg`; + const matches = fileUrl.match(/^data:image\/\w+;base64,(.+)$/); + const realBase64 = matches ? matches[1] : fileUrl; + await u.oss.writeFile(imagePath, Buffer.from(realBase64, "base64")); + await u + .db("o_artStyle") + .update({ + name, + fileUrl: imagePath, + label: name, + prompt, + }) + .where("id", id); + res.status(200).send(success("艺术风格编辑成功")); + }, +); diff --git a/src/routes/artStyle/extractStylePrompt.ts b/src/routes/artStyle/extractStylePrompt.ts new file mode 100644 index 0000000..8ca781d --- /dev/null +++ b/src/routes/artStyle/extractStylePrompt.ts @@ -0,0 +1,37 @@ +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({ + images: z.array(z.string()), + }), + async (req, res) => { + const { images } = req.body; + try { + const resText = await u.Ai.Text("universalAgent").invoke({ + system: + '请根据以下图片数据，提取出图片的画风提示词，用于生成图片时指定风格，要求简洁且具有艺术性,只需要画风提示词，不需要其他内容："比如：`(画风：2D动漫风格,2d animation style)`,`(画风：照片级真人超写实,photorealistic, lifelike, ultra detailed)`，`(画风：3D国创,Chinese 3D animation style)`等,如果图片风格无法描述，可以返回`无法描述`,多张图片时，只输出一个综合的画风提示词，要求包含所有图片的共同风格特征，输出格式必须严格按照示例中的格式，必须包含`画风`二字，且必须使用括号括起来，括号内必须包含中文和英文的画风描述，并用逗号分隔，英文部分需要翻译成地道的英文提示词', + messages: [ + { + role: "user", + content: [ + ...images.map((image: string) => ({ + type: "image" as const, + image, + })), + ], + }, + ], + }); + res.status(200).send(success(resText.text)); + } catch (e) { + const err = u.error(e); + res.status(500).send({ message: err.message }); + } + }, +); diff --git a/src/routes/artStyle/getArtStyle.ts b/src/routes/artStyle/getArtStyle.ts index 2619518..789e03c 100644 --- a/src/routes/artStyle/getArtStyle.ts +++ b/src/routes/artStyle/getArtStyle.ts @@ -1,19 +1,15 @@ 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({ - name: z.string(), - }), - async (req, res) => { - const { name } = req.body; - const data = await u.db("o_artStyle").where("name", name).select("styles").first(); - const styles = data?.styles ? JSON.parse(data.styles) : []; - res.status(200).send(success(styles)); - }, -); +export default router.post("/", async (req, res) => { + const list = await u.db("o_artStyle").select("*"); + const data = await Promise.all( + list.map(async (item: any) => { + const fileUrl = await u.oss.getFileUrl(item.fileUrl); + return { ...item, fileUrl }; + }), + ); + res.status(200).send(success(data)); +}); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 97e7555..0527267 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash 83c8dadf13c2aee689597b709a690870 +// @db-hash 47c0e014bdbd44b60c4ebc95f4d99e0e //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -32,9 +32,11 @@ export interface o_agentWorkData { 'updateTime'?: number | null; } export interface o_artStyle { + 'fileUrl'?: string | null; 'id'?: number; + 'label'?: string | null; 'name'?: string | null; - 'styles'?: string | null; + 'prompt'?: string | null; } export interface o_assets { 'assetsId'?: number | null;