chore: harden world labs task logging
This commit is contained in:
parent
f4214bf3a9
commit
e211e41c25
@ -5,6 +5,7 @@ import { db } from "@/lib/db";
|
|||||||
import { model3dAsset } from "@/lib/db/schema";
|
import { model3dAsset } from "@/lib/db/schema";
|
||||||
import { resolveThreeDModelAliasId } from "@/lib/model3d/model-alias-config";
|
import { resolveThreeDModelAliasId } from "@/lib/model3d/model-alias-config";
|
||||||
import { getThreeDModelAliasConfigForRuntime } from "@/lib/model3d/model-alias-config-server";
|
import { getThreeDModelAliasConfigForRuntime } from "@/lib/model3d/model-alias-config-server";
|
||||||
|
import { createLogger } from "@/lib/observability/logger";
|
||||||
import { uploadFile } from "@/lib/storage/service";
|
import { uploadFile } from "@/lib/storage/service";
|
||||||
import { WorldLabsApiError, worldLabsRequest } from "@/lib/worldlabs/client";
|
import { WorldLabsApiError, worldLabsRequest } from "@/lib/worldlabs/client";
|
||||||
import { getWorldLabsProviderConfig } from "@/lib/worldlabs/server";
|
import { getWorldLabsProviderConfig } from "@/lib/worldlabs/server";
|
||||||
@ -17,6 +18,8 @@ import type {
|
|||||||
export const runtime = "nodejs";
|
export const runtime = "nodejs";
|
||||||
export const maxDuration = 120;
|
export const maxDuration = 120;
|
||||||
|
|
||||||
|
const logger = createLogger("world-labs-task-status");
|
||||||
|
|
||||||
type ArchiveCacheItem = {
|
type ArchiveCacheItem = {
|
||||||
sourceUrl: string;
|
sourceUrl: string;
|
||||||
archivedUrl: string;
|
archivedUrl: string;
|
||||||
@ -209,7 +212,7 @@ async function archiveRemoteAssetIfNeeded(params: {
|
|||||||
|
|
||||||
const contentType = upstream.headers.get("content-type");
|
const contentType = upstream.headers.get("content-type");
|
||||||
if (params.skipHtml && /\btext\/html\b/i.test(String(contentType || ""))) {
|
if (params.skipHtml && /\btext\/html\b/i.test(String(contentType || ""))) {
|
||||||
console.warn("[WorldLabsArchive] skip html viewer url", {
|
logger.warn("archive skipped html viewer", {
|
||||||
cacheKey: params.cacheKey,
|
cacheKey: params.cacheKey,
|
||||||
sourceUrl,
|
sourceUrl,
|
||||||
});
|
});
|
||||||
@ -236,10 +239,10 @@ async function archiveRemoteAssetIfNeeded(params: {
|
|||||||
});
|
});
|
||||||
return uploaded.url;
|
return uploaded.url;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[WorldLabsArchive] failed", {
|
logger.warn("archive failed", {
|
||||||
cacheKey: params.cacheKey,
|
cacheKey: params.cacheKey,
|
||||||
sourceUrl,
|
sourceUrl,
|
||||||
error: error instanceof Error ? error.message : String(error),
|
error,
|
||||||
});
|
});
|
||||||
return null;
|
return null;
|
||||||
} finally {
|
} finally {
|
||||||
@ -477,9 +480,9 @@ export async function GET(request: Request, { params }: RouteParams) {
|
|||||||
error: operation.error.message,
|
error: operation.error.message,
|
||||||
assetPayload: failedAssetPayload,
|
assetPayload: failedAssetPayload,
|
||||||
});
|
});
|
||||||
console.warn("[WorldLabsTask] failed status", {
|
logger.warn("task failed status", {
|
||||||
elapsedMs: Date.now() - startedAt,
|
elapsedMs: Date.now() - startedAt,
|
||||||
taskId: normalizedTaskId,
|
taskIdLength: normalizedTaskId.length,
|
||||||
providerId: config.providerId || null,
|
providerId: config.providerId || null,
|
||||||
error: operation.error.message,
|
error: operation.error.message,
|
||||||
});
|
});
|
||||||
@ -536,11 +539,11 @@ export async function GET(request: Request, { params }: RouteParams) {
|
|||||||
operationMetadata: operation.metadata ?? null,
|
operationMetadata: operation.metadata ?? null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
console.info("[WorldLabsTask] assets pending", {
|
logger.info("task assets pending", {
|
||||||
elapsedMs: Date.now() - startedAt,
|
elapsedMs: Date.now() - startedAt,
|
||||||
taskId: normalizedTaskId,
|
taskIdLength: normalizedTaskId.length,
|
||||||
providerId: config.providerId || null,
|
providerId: config.providerId || null,
|
||||||
worldId: getStringValue(world.world_id) || worldId || null,
|
worldIdLength: String(getStringValue(world.world_id) || worldId || "").length,
|
||||||
});
|
});
|
||||||
return NextResponse.json({
|
return NextResponse.json({
|
||||||
success: true,
|
success: true,
|
||||||
@ -648,11 +651,11 @@ export async function GET(request: Request, { params }: RouteParams) {
|
|||||||
? new Date().toISOString()
|
? new Date().toISOString()
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
console.info("[WorldLabsTask] success status", {
|
logger.info("task success status", {
|
||||||
elapsedMs: Date.now() - startedAt,
|
elapsedMs: Date.now() - startedAt,
|
||||||
taskId: normalizedTaskId,
|
taskIdLength: normalizedTaskId.length,
|
||||||
providerId: config.providerId || null,
|
providerId: config.providerId || null,
|
||||||
worldId: assetPayload.worldId,
|
worldIdLength: String(assetPayload.worldId || "").length,
|
||||||
hasMesh: Boolean(stableModelUrl),
|
hasMesh: Boolean(stableModelUrl),
|
||||||
hasPano: Boolean(stablePanoUrl),
|
hasPano: Boolean(stablePanoUrl),
|
||||||
hasThumbnail: Boolean(stableThumbnailUrl),
|
hasThumbnail: Boolean(stableThumbnailUrl),
|
||||||
@ -723,11 +726,10 @@ export async function GET(request: Request, { params }: RouteParams) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[WorldLabsTask] status failed", {
|
logger.error("task status failed", error, {
|
||||||
elapsedMs: Date.now() - startedAt,
|
elapsedMs: Date.now() - startedAt,
|
||||||
taskId: normalizedTaskIdForLog,
|
taskIdLength: String(normalizedTaskIdForLog || "").length,
|
||||||
providerId: providerForLog,
|
providerId: providerForLog,
|
||||||
error: error instanceof Error ? error.message : String(error),
|
|
||||||
});
|
});
|
||||||
if (error instanceof WorldLabsApiError) {
|
if (error instanceof WorldLabsApiError) {
|
||||||
return NextResponse.json(
|
return NextResponse.json(
|
||||||
|
|||||||
@ -10,6 +10,7 @@ import {
|
|||||||
resolveThreeDModelRealId,
|
resolveThreeDModelRealId,
|
||||||
} from "@/lib/model3d/model-alias-config";
|
} from "@/lib/model3d/model-alias-config";
|
||||||
import { getThreeDModelAliasConfigForRuntime } from "@/lib/model3d/model-alias-config-server";
|
import { getThreeDModelAliasConfigForRuntime } from "@/lib/model3d/model-alias-config-server";
|
||||||
|
import { createLogger } from "@/lib/observability/logger";
|
||||||
import { get3DWorldCreditCost } from "@/lib/points/config";
|
import { get3DWorldCreditCost } from "@/lib/points/config";
|
||||||
import { WorldLabsApiError, worldLabsRequest } from "@/lib/worldlabs/client";
|
import { WorldLabsApiError, worldLabsRequest } from "@/lib/worldlabs/client";
|
||||||
import {
|
import {
|
||||||
@ -22,6 +23,8 @@ import type { WorldLabsModel, WorldLabsOperation } from "@/lib/worldlabs/types";
|
|||||||
export const runtime = "nodejs";
|
export const runtime = "nodejs";
|
||||||
export const maxDuration = 60;
|
export const maxDuration = 60;
|
||||||
|
|
||||||
|
const logger = createLogger("world-labs-task-create");
|
||||||
|
|
||||||
type WorldTaskMode = "text" | "image" | "multi-image" | "video";
|
type WorldTaskMode = "text" | "image" | "multi-image" | "video";
|
||||||
|
|
||||||
type CreateWorldTaskRequest = {
|
type CreateWorldTaskRequest = {
|
||||||
@ -287,13 +290,18 @@ export async function POST(request: Request) {
|
|||||||
note: `3D世界生成消耗积分(${worldModelDisplayName})`,
|
note: `3D世界生成消耗积分(${worldModelDisplayName})`,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[Points] Failed to consume World Labs 3D points:", error);
|
logger.error("points consume failed", error, {
|
||||||
|
userId: session.user.id,
|
||||||
|
unitCost,
|
||||||
|
mode,
|
||||||
|
model: resolvedWorldModel || "marble-1.1",
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.info("[WorldLabsTask] created", {
|
logger.info("task created", {
|
||||||
elapsedMs: Date.now() - startedAt,
|
elapsedMs: Date.now() - startedAt,
|
||||||
taskId,
|
taskIdLength: taskId.length,
|
||||||
mode,
|
mode,
|
||||||
model: resolvedWorldModel || "marble-1.1",
|
model: resolvedWorldModel || "marble-1.1",
|
||||||
providerId: usedProvider.providerId || null,
|
providerId: usedProvider.providerId || null,
|
||||||
@ -314,12 +322,11 @@ export async function POST(request: Request) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[WorldLabsTask] create failed", {
|
logger.error("task create failed", error, {
|
||||||
elapsedMs: Date.now() - startedAt,
|
elapsedMs: Date.now() - startedAt,
|
||||||
mode: modeForLog,
|
mode: modeForLog,
|
||||||
model: modelForLog,
|
model: modelForLog,
|
||||||
providerId: providerForLog,
|
providerId: providerForLog,
|
||||||
error: error instanceof Error ? error.message : String(error),
|
|
||||||
});
|
});
|
||||||
if (error instanceof WorldLabsApiError) {
|
if (error instanceof WorldLabsApiError) {
|
||||||
return NextResponse.json(
|
return NextResponse.json(
|
||||||
|
|||||||
@ -35,6 +35,8 @@ const files = [
|
|||||||
"app/api/canvas/world/upload/route.ts",
|
"app/api/canvas/world/upload/route.ts",
|
||||||
"app/api/canvas/3d/tasks/route.ts",
|
"app/api/canvas/3d/tasks/route.ts",
|
||||||
"app/api/canvas/3d/tasks/[taskId]/route.ts",
|
"app/api/canvas/3d/tasks/[taskId]/route.ts",
|
||||||
|
"app/api/canvas/world/tasks/route.ts",
|
||||||
|
"app/api/canvas/world/tasks/[taskId]/route.ts",
|
||||||
];
|
];
|
||||||
|
|
||||||
const consolePattern = /\bconsole\.(log|warn|error|info|debug)\b/g;
|
const consolePattern = /\bconsole\.(log|warn|error|info|debug)\b/g;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user