fix: use public model ids and render media results

This commit is contained in:
wlx committed 2026-09-29 01:26:28 +08:00
1 parent 9a946b29e6
commit ba98b47618
5 files changed
+62 -15

No files matched your search

+1
View File
@@ -17,6 +17,7 @@ export interface CatalogProvider {
export interface CatalogModel {
id: string
gatewayModelId?: string
logicalModelId: string
providerId: string
modelKey?: string
+34 -8
View File
@@ -8,30 +8,56 @@ export interface MediaResult {
resultFormat?: string
}
const DATA_MEDIA_RE = /^data:(image|video|audio|model)\/[a-z0-9.+-]+;base64,[a-z0-9+/\s]+=*$/i
export function safeMediaUrl(value: unknown): string | undefined {
if (typeof value !== 'string' || !value.trim()) return undefined
const candidate = value.trim()
// Providers sometimes return base64 media instead of a hosted URL. Only
// accept data URLs for media and require a base64 payload; never render
// arbitrary data/javascript URLs from an upstream response.
if (DATA_MEDIA_RE.test(candidate)) return candidate.replace(/\s+/g, '')
try {
const url = new URL(value)
const url = new URL(candidate)
return url.protocol === 'https:' || url.protocol === 'http:' ? url.href : undefined
} catch { return undefined }
}
function base64DataUrl(value: unknown, mimeType: unknown, format: string): string | undefined {
if (typeof value !== 'string' || !value.trim()) return undefined
const payload = value.trim().replace(/\s+/g, '')
if (!/^[a-z0-9+/]+={0,2}$/i.test(payload) || payload.length % 4 === 1) return undefined
const mime = typeof mimeType === 'string' && /^(image|video|audio|model)\/[a-z0-9.+-]+$/i.test(mimeType)
? mimeType.toLowerCase()
: ({ png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', webp: 'image/webp', gif: 'image/gif', mp4: 'video/mp4', webm: 'video/webm', mp3: 'audio/mpeg', wav: 'audio/wav', ogg: 'audio/ogg', glb: 'model/gltf-binary', gltf: 'model/gltf+json' } as Record<string, string>)[format]
return mime ? `data:${mime};base64,${payload}` : undefined
}
function mediaValue(value: unknown, mimeType: unknown, format: string): string | undefined {
if (typeof value === 'string') return safeMediaUrl(value) || base64DataUrl(value, mimeType, format)
if (!value || typeof value !== 'object') return undefined
const object = value as { url?: unknown; b64_json?: unknown; base64?: unknown; mime_type?: unknown; mimeType?: unknown; format?: unknown }
const objectMime = object.mimeType || object.mime_type || mimeType
const objectFormat = typeof object.format === 'string' ? object.format.toLowerCase() : format
return mediaValue(object.url, objectMime, objectFormat) || base64DataUrl(object.b64_json || object.base64, objectMime, objectFormat)
}
/** Normalize generation assets without treating every provider's generic URL as a 3D model. */
export function mediaResult(result: Record<string, unknown> = {}, type = ''): MediaResult {
const format = typeof result.format === 'string' ? result.format.toLowerCase() : ''
const url = safeMediaUrl(result.url)
const mime = typeof result.mimeType === 'string' ? result.mimeType.toLowerCase() : ''
const mime = typeof result.mimeType === 'string' ? result.mimeType.toLowerCase() : typeof result.mime_type === 'string' ? result.mime_type.toLowerCase() : ''
const url = mediaValue(result.url, mime, format) || base64DataUrl(result.b64_json || result.base64 || result.data, mime, format)
const suffix = url ? new URL(url).pathname.toLowerCase().split('.').pop() : ''
const isImage = type === '图像' || type === 'image' || mime.startsWith('image/') || /^(png|jpe?g|webp|gif|avif)$/.test(format || suffix || '')
const isVideo = type === '视频' || type === 'video' || mime.startsWith('video/') || /^(mp4|webm|mov)$/.test(format || suffix || '')
const isAudio = type === '音频' || type === 'audio' || mime.startsWith('audio/') || /^(mp3|wav|ogg|m4a|flac|aac)$/.test(format || suffix || '')
const isModel = type === '3D' || type === '3d' || /^(glb|gltf|obj|fbx|stl)$/.test(format || suffix || '')
return {
imageUrl: safeMediaUrl(result.imageUrl) || (isImage ? url : undefined),
videoUrl: safeMediaUrl(result.videoUrl) || (isVideo ? url : undefined),
audioUrl: safeMediaUrl(result.audioUrl) || (isAudio ? url : undefined),
modelUrl: safeMediaUrl(result.modelUrl) || (isModel ? url : undefined),
previewUrl: safeMediaUrl(result.previewUrl),
imageUrl: mediaValue(result.imageUrl, mime, format) || mediaValue(result.image_url, mime, format) || (isImage ? url : undefined),
videoUrl: mediaValue(result.videoUrl, mime, format) || mediaValue(result.video_url, mime, format) || (isVideo ? url : undefined),
audioUrl: mediaValue(result.audioUrl, mime, format) || mediaValue(result.audio_url, mime, format) || (isAudio ? url : undefined),
modelUrl: mediaValue(result.modelUrl, mime, format) || (isModel ? url : undefined),
previewUrl: mediaValue(result.previewUrl, mime, format),
resultUrl: url,
resultFormat: format || suffix,
}