更新所有ai调用方法

This commit is contained in:
zhishi 2026-02-06 14:18:30 +08:00
parent 709c0cbd5a
commit bcf130b2f0
12 changed files with 102 additions and 99 deletions

View File

@ -104,9 +104,7 @@ async function generateGridPrompt(options: GridPromptOptions): Promise<GridPromp
if (!mainPrompts) return { prompt: errData, gridLayout: layout };
const chatModel = await u.ai.text({});
const result = await chatModel!.invoke({
const result = await u.ai.text.invoke({
messages: [
{
role: "system",

View File

@ -215,8 +215,7 @@ async function filterRelevantAssets(prompts: string[], allResources: ResourceIte
return availableImages;
}
const chatModel = await u.ai.text({});
const result = await chatModel!.invoke({
const result = await u.ai.text.invoke({
messages: [
{
role: "user",
@ -231,23 +230,24 @@ ${availableResources.map((r) => `- ${r.name}${r.intro}`).join("\n")}
`,
},
],
responseFormat: {
type: "json_schema",
jsonSchema: {
name: "filteredAssets",
strict: true,
schema: z.toJSONSchema(filteredAssetsSchema),
},
output: {
relevantAssets: z
.array(
z.object({
name: z.string().describe("资产名称"),
reason: z.string().describe("选择该资产的原因"),
}),
)
.describe("与分镜内容相关的资产列表"),
},
});
const data = result?.json as z.infer<typeof filteredAssetsSchema>;
if (!data?.relevantAssets || data.relevantAssets.length === 0) {
if (!result?.relevantAssets || result.relevantAssets.length === 0) {
return availableImages;
}
const relevantNames = new Set(data.relevantAssets.map((a) => a.name));
const relevantNames = new Set(result.relevantAssets.map((a) => a.name));
const filteredImages = availableImages.filter((img) => relevantNames.has(img.name));
return filteredImages.length > 0 ? filteredImages : availableImages;
@ -318,7 +318,7 @@ export default async (cells: { prompt: string }[], scriptId: number, projectId:
const processedImages = await processImages(filteredImages);
const contentStr = await u.ai.generateImage({
const contentStr = await u.ai.image({
systemPrompt: resourcesMapPrompts,
prompt: prompts,
size: "4K",

View File

@ -343,7 +343,7 @@ export default async (cells: { prompt: string }[], scriptId: number, projectId:
const processedImages = await processImages(filteredImages);
const contentStr = await u.ai.generateImage({
const contentStr = await u.ai.image({
systemPrompt: resourcesMapPrompts,
prompt: prompts,
size: "4K",

View File

@ -124,7 +124,7 @@ export default router.post(
assetsId: id,
});
const contentStr = await u.ai.generateImage({
const contentStr = await u.ai.image({
systemPrompt,
prompt: userPrompt,
imageBase64: base64 ? [base64] : [],

View File

@ -22,7 +22,7 @@ async function superResolutionAndSave(
projectId: number,
videoRatio: string,
): Promise<{ ossPath: string; base64: string }> {
const contentStr = await u.ai.generateImage({
const contentStr = await u.ai.image({
aspectRatio: videoRatio,
size: "1K",
resType: "b64",

View File

@ -8,7 +8,6 @@ expressWs(router as unknown as Application);
router.ws("/", async (ws, req) => {
let agent: Storyboard;
const config = await u.getConfig("language");
const projectId = req.query.projectId;
const scriptId = req.query.scriptId;
@ -20,10 +19,6 @@ router.ws("/", async (ws, req) => {
agent = new Storyboard(Number(projectId), Number(scriptId));
agent.modelName = config.model ?? "";
agent.baseURL = config.baseURL ?? "";
agent.apiKey = config.apiKey ?? "";
const existing = await u
.db("t_chatHistory")
.where({ projectId: Number(projectId) })

View File

@ -6,11 +6,13 @@ import { z } from "zod";
const router = express.Router();
// 图片项schema
const imageItemSchema = z.object({
id: z.number(),
filePath: z.string(),
prompt: z.string().optional(),
}).nullable();
const imageItemSchema = z
.object({
id: z.number(),
filePath: z.string(),
prompt: z.string().optional(),
})
.nullable();
// 新增视频配置
export default router.post(
@ -22,31 +24,24 @@ export default router.post(
mode: z.enum(["startEnd", "multi", "single"]),
startFrame: imageItemSchema.optional(),
endFrame: imageItemSchema.optional(),
images: z.array(z.object({
id: z.number(),
filePath: z.string(),
prompt: z.string().optional(),
})).optional(),
images: z
.array(
z.object({
id: z.number(),
filePath: z.string(),
prompt: z.string().optional(),
}),
)
.optional(),
resolution: z.string(),
duration: z.number(),
prompt: z.string().optional(),
}),
async (req, res) => {
const {
scriptId,
projectId,
manufacturer,
mode,
startFrame,
endFrame,
images,
resolution,
duration,
prompt
} = req.body;
const { scriptId, projectId, manufacturer, mode, startFrame, endFrame, images, resolution, duration, prompt } = req.body;
// 生成新ID
const maxIdResult = await u.db("t_videoConfig").max("id as maxId").first();
const maxIdResult: any = await u.db("t_videoConfig").max("id as maxId").first();
const newId = (maxIdResult?.maxId || 0) + 1;
const now = Date.now();
@ -68,23 +63,25 @@ export default router.post(
updateTime: now,
});
res.status(200).send(success({
message: "新增视频配置成功",
data: {
id: newId,
scriptId,
projectId,
manufacturer,
mode,
startFrame,
endFrame,
images: images || [],
resolution,
duration,
prompt: prompt || "",
selectedResultId: null,
createdAt: new Date(now).toISOString(),
}
}));
res.status(200).send(
success({
message: "新增视频配置成功",
data: {
id: newId,
scriptId,
projectId,
manufacturer,
mode,
startFrame,
endFrame,
images: images || [],
resolution,
duration,
prompt: prompt || "",
selectedResultId: null,
createdAt: new Date(now).toISOString(),
},
}),
);
},
);

View File

@ -44,7 +44,7 @@ export default router.post(
// 过滤掉空值
let fileUrl = filePath.filter((p: string) => p && p.trim() !== "");
if (fileUrl.length === 0) {
return res.status(400).send(error("请至少选择一张图片"));
}
@ -149,17 +149,14 @@ ${prompt}
3.
4. logo
`;
const videoPath = await u.ai.generateVideo(
{
imageBase64,
savePath,
prompt: inputPrompt,
duration: duration as any,
aspectRatio: resolution as any,
},
type!,
);
const videoPath = await u.ai.video({
imageBase64,
savePath,
prompt: inputPrompt,
duration: duration as any,
aspectRatio: resolution as any,
resolution: resolution as any,
});
if (videoPath) {
// 生成成功,更新状态为 1

View File

@ -47,24 +47,29 @@ export default router.post(
// 获取更新后的数据
const updatedConfig = await u.db("t_videoConfig").where({ id }).first();
res.status(200).send(success({
message: "更新视频配置成功",
data: {
id: updatedConfig.id,
scriptId: updatedConfig.scriptId,
projectId: updatedConfig.projectId,
manufacturer: updatedConfig.manufacturer,
mode: updatedConfig.mode,
startFrame: updatedConfig.startFrame ? JSON.parse(updatedConfig.startFrame) : null,
endFrame: updatedConfig.endFrame ? JSON.parse(updatedConfig.endFrame) : null,
images: updatedConfig.images ? JSON.parse(updatedConfig.images) : [],
resolution: updatedConfig.resolution,
duration: updatedConfig.duration,
prompt: updatedConfig.prompt,
selectedResultId: updatedConfig.selectedResultId,
createdAt: new Date(updatedConfig.createTime).toISOString(),
}
}));
if (updatedConfig) {
res.status(200).send(
success({
message: "更新视频配置成功",
data: {
id: updatedConfig.id,
scriptId: updatedConfig.scriptId,
projectId: updatedConfig.projectId,
manufacturer: updatedConfig.manufacturer,
mode: updatedConfig.mode,
startFrame: updatedConfig.startFrame ? JSON.parse(updatedConfig.startFrame) : null,
endFrame: updatedConfig.endFrame ? JSON.parse(updatedConfig.endFrame) : null,
images: updatedConfig.images ? JSON.parse(updatedConfig.images) : [],
resolution: updatedConfig.resolution,
duration: updatedConfig.duration,
prompt: updatedConfig.prompt,
selectedResultId: updatedConfig.selectedResultId,
createdAt: new Date(updatedConfig.createTime!).toISOString(),
},
}),
);
} else {
res.status(200).send(error("更新配置失败"));
}
},
);

View File

@ -63,5 +63,5 @@ export default async (input: ImageConfig, config?: AIConfig) => {
let imageUrl = await manufacturerFn(input, { model, apiKey, baseURL });
if (!input.resType) input.resType = "b64";
if (input.resType === "b64" && imageUrl.startsWith("http")) imageUrl = await urlToBase64(imageUrl);
return input;
return imageUrl;
};

View File

@ -4,6 +4,7 @@ import { createZhipu } from "zhipu-ai-provider";
import { createQwen } from "qwen-ai-provider";
import { createGoogleGenerativeAI } from "@ai-sdk/google";
import { createAnthropic } from "@ai-sdk/anthropic";
import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
interface Owned {
manufacturer: string;
@ -18,7 +19,8 @@ interface Owned {
| typeof createZhipu
| typeof createQwen
| typeof createGoogleGenerativeAI
| typeof createAnthropic;
| typeof createAnthropic
| typeof createOpenAICompatible;
}
const modelList: Owned[] = [
@ -409,6 +411,15 @@ const modelList: Owned[] = [
instance: createAnthropic,
tool: true,
},
{
manufacturer: "other",
model: "gpt-4.1",
responseFormat: "schema",
image: true,
think: false,
instance: createOpenAICompatible,
tool: true,
},
];
export default modelList;

View File

@ -79,7 +79,7 @@ async function convertDirectiveAndImages(images: Record<string, string>, directi
*/
export default async (images: Record<string, string>, directive: string, projectId: number) => {
const { prompt, images: base64Images } = await convertDirectiveAndImages(images, directive);
const contentStr = await u.ai.generateImage({
const contentStr = await u.ai.image({
systemPrompt: "根据用户提供的具体修改指令,对上传的图片进行智能编辑。",
prompt: prompt,
imageBase64: base64Images,