feat: 移除图片生成记录中的尺寸字段,调整归档逻辑以支持异步处理
This commit is contained in:
@@ -1,8 +1,13 @@
|
||||
// server/api/images/generate.post.ts - 图片生成接口:创建记录、流式调用上游生图、归档图床并返回图片地址。
|
||||
// server/api/images/generate.post.ts - 图片生成接口:创建记录、流式调用上游生图并在响应后异步归档图床。
|
||||
import { setImmediate } from "node:timers";
|
||||
import type {
|
||||
IImageGenerateData,
|
||||
IImageGenerateRequest
|
||||
} from "#shared/types/openai";
|
||||
import {
|
||||
finishImageGenerationArchiveFailed,
|
||||
finishImageGenerationArchiveSuccess
|
||||
} from "~~/server/utils";
|
||||
|
||||
type ApiLogger = ReturnType<typeof createApiLogger>;
|
||||
|
||||
@@ -15,9 +20,9 @@ type ApiLogger = ReturnType<typeof createApiLogger>;
|
||||
* 3. 创建 RUNNING 生图记录,并递增全局请求/进行中统计。
|
||||
* 4. 在服务端确保并读取 AIArtStudio 完整 key,完整 key 不返回前端。
|
||||
* 5. 调用 Chat Completions 流式生图接口,累积 SSE delta content 并提取最终图片 URL。
|
||||
* 6. 尝试把上游图片下载后上传到 Lsky 图床;图床失败不阻断本次生图成功。
|
||||
* 7. 成功时写入上游 URL、图床 URL、完整上游响应、图床响应和耗时。
|
||||
* 8. 失败时把记录标记为 FAILED;鉴权失败会清理本地登录态并返回 401。
|
||||
* 6. 上游返回图片 URL 后立刻把生图结果落库为 SUCCEEDED,并马上返回前端。
|
||||
* 7. 响应返回后再用后台异步任务上传 Lsky;归档失败只补写记录和日志,不影响本次响应。
|
||||
* 8. 主链路失败时把记录标记为 FAILED;鉴权失败会清理本地登录态并返回 401。
|
||||
*/
|
||||
export default defineEventHandler(async (event) => {
|
||||
const logger = createApiLogger("images.generate");
|
||||
@@ -85,41 +90,32 @@ export default defineEventHandler(async (event) => {
|
||||
hasUsage: hasStreamUsage(result.upstreamResponse)
|
||||
});
|
||||
|
||||
stage = "upload_lsky";
|
||||
// 归档图床用于长期保存;失败时仍继续返回 NewAPI 上游图片 URL。
|
||||
const archiveResult = await archiveGeneratedImage({
|
||||
imageUrl: result.imageUrl,
|
||||
userId,
|
||||
recordId: record.id,
|
||||
createdAt: record.startedAt,
|
||||
logger
|
||||
});
|
||||
logger.info("图床归档完成", {
|
||||
recordId: record.id.toString(),
|
||||
hosted: Boolean(archiveResult.hostedImageUrl),
|
||||
mimeType: archiveResult.imageMimeType
|
||||
});
|
||||
|
||||
stage = "finish_success_record";
|
||||
await finishImageGenerationSuccess(record.id, record.startedAt, {
|
||||
imageUrl: result.imageUrl,
|
||||
hostedImageUrl: archiveResult.hostedImageUrl,
|
||||
imageMimeType: archiveResult.imageMimeType,
|
||||
revisedPrompt: result.revisedPrompt,
|
||||
upstreamResponse: result.upstreamResponse,
|
||||
hostedResponse: archiveResult.hostedResponse,
|
||||
errorMessage: archiveResult.errorMessage
|
||||
upstreamResponse: result.upstreamResponse
|
||||
});
|
||||
|
||||
logger.done("成功", {
|
||||
recordId: record.id.toString(),
|
||||
hosted: Boolean(archiveResult.hostedImageUrl)
|
||||
archiveScheduled: true
|
||||
});
|
||||
|
||||
const finishedRecord = record;
|
||||
setImmediate(() => {
|
||||
void archiveGeneratedImageInBackground({
|
||||
imageUrl: result.imageUrl,
|
||||
userId,
|
||||
recordId: finishedRecord.id,
|
||||
createdAt: finishedRecord.startedAt,
|
||||
logger
|
||||
});
|
||||
});
|
||||
|
||||
return createSuccessResponse<IImageGenerateData>(
|
||||
{
|
||||
imageUrl: result.imageUrl,
|
||||
hostedImageUrl: archiveResult.hostedImageUrl,
|
||||
revisedPrompt: result.revisedPrompt
|
||||
},
|
||||
"图片生成成功"
|
||||
@@ -154,8 +150,8 @@ export default defineEventHandler(async (event) => {
|
||||
}
|
||||
});
|
||||
|
||||
/** 将生成图上传到 Lsky,返回图床地址;归档失败时降级为空结果 */
|
||||
const archiveGeneratedImage = async ({
|
||||
/** 响应返回后异步归档图片,成功则补写图床字段,失败则补写本地错误文案 */
|
||||
const archiveGeneratedImageInBackground = async ({
|
||||
imageUrl,
|
||||
userId,
|
||||
recordId,
|
||||
@@ -167,14 +163,12 @@ const archiveGeneratedImage = async ({
|
||||
recordId: bigint;
|
||||
createdAt: Date;
|
||||
logger: ApiLogger;
|
||||
}): Promise<{
|
||||
hostedImageUrl: string | null;
|
||||
imageMimeType: string | null;
|
||||
hostedResponse: unknown;
|
||||
errorMessage: string | null;
|
||||
}> => {
|
||||
}) => {
|
||||
logger.info("后台归档开始", {
|
||||
recordId: recordId.toString()
|
||||
});
|
||||
|
||||
try {
|
||||
// 图床归档失败不能阻断本次生成结果,前端仍可使用上游图片 URL。
|
||||
const identity = await getUserArchiveIdentity(userId);
|
||||
const uploaded = await uploadImageFromUrl({
|
||||
imageUrl,
|
||||
@@ -184,24 +178,29 @@ const archiveGeneratedImage = async ({
|
||||
createdAt
|
||||
});
|
||||
|
||||
return {
|
||||
await finishImageGenerationArchiveSuccess(recordId, {
|
||||
hostedImageUrl: uploaded.publicUrl,
|
||||
imageMimeType: uploaded.mimetype,
|
||||
hostedResponse: uploaded.response,
|
||||
errorMessage: null
|
||||
};
|
||||
hostedResponse: uploaded.response
|
||||
});
|
||||
|
||||
logger.info("后台归档成功", {
|
||||
recordId: recordId.toString(),
|
||||
mimeType: uploaded.mimetype,
|
||||
hosted: true
|
||||
});
|
||||
} catch (error) {
|
||||
logger.error("图床归档失败", {
|
||||
logger.error("后台归档失败", {
|
||||
recordId: recordId.toString(),
|
||||
error: toSafeLogError(error)
|
||||
});
|
||||
|
||||
return {
|
||||
hostedImageUrl: null,
|
||||
imageMimeType: null,
|
||||
hostedResponse: null,
|
||||
errorMessage: "图片生成成功,但图片归档失败"
|
||||
};
|
||||
await finishImageGenerationArchiveFailed(recordId).catch((recordError) => {
|
||||
logger.error("更新归档失败记录失败", {
|
||||
recordId: recordId.toString(),
|
||||
error: toSafeLogError(recordError)
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user