fix: use public model ids and render media results
This commit is contained in:
1 parent
9a946b29e6
commit
ba98b47618
5 files changed
+62
-15
No files matched your search
@@ -17,6 +17,7 @@ export interface CatalogProvider {
|
||||
|
||||
export interface CatalogModel {
|
||||
id: string
|
||||
gatewayModelId?: string
|
||||
logicalModelId: string
|
||||
providerId: string
|
||||
modelKey?: string
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@ export interface NavGroup {
|
||||
export interface ModelItem {
|
||||
logicalModelId?: string
|
||||
id: string
|
||||
/** Public OpenAI-compatible model id returned by GET /v1/models. */
|
||||
gatewayModelId?: string
|
||||
name: string
|
||||
provider: string
|
||||
vendorName?: string
|
||||
|
||||
@@ -348,7 +348,7 @@ async function runModel() {
|
||||
const selectedMode = callMode.value
|
||||
try {
|
||||
if (callMode.value === '异步') {
|
||||
const task = await catalogClient.playgroundCreateMediaTask(apiKey, { model: activeModel.value.id, prompt: prompt.value, mediaUrl: mediaUrl.value.trim() || undefined, mediaType: activeMediaKind.value! })
|
||||
const task = await catalogClient.playgroundCreateMediaTask(apiKey, { model: gatewayModelId(activeModel.value), prompt: prompt.value, mediaUrl: mediaUrl.value.trim() || undefined, mediaType: activeMediaKind.value! })
|
||||
const taskItem = mapAsyncTask(task, activeModel.value, prompt.value)
|
||||
tasks.value.unshift(taskItem)
|
||||
activeTaskId.value = task.id
|
||||
@@ -356,9 +356,9 @@ async function runModel() {
|
||||
scheduleTaskPoll(task.id, apiKey)
|
||||
} else if (selectedMode === '流式') {
|
||||
streamAbort = new AbortController()
|
||||
await catalogClient.playgroundStreamChat(apiKey, { model: activeModel.value.id, prompt: prompt.value, mediaUrl: mediaUrl.value.trim() || undefined, maxTokens: maxOutputTokens.value }, (text, reasoning) => { response.value += text; reasoningOutput.value += reasoning }, streamAbort.signal)
|
||||
await catalogClient.playgroundStreamChat(apiKey, { model: gatewayModelId(activeModel.value), prompt: prompt.value, mediaUrl: mediaUrl.value.trim() || undefined, maxTokens: maxOutputTokens.value }, (text, reasoning) => { response.value += text; reasoningOutput.value += reasoning }, streamAbort.signal)
|
||||
} else {
|
||||
const result = await catalogClient.playgroundChatCompletion(apiKey, { model: activeModel.value.id, prompt: prompt.value, mediaUrl: mediaUrl.value.trim() || undefined, maxTokens: maxOutputTokens.value })
|
||||
const result = await catalogClient.playgroundChatCompletion(apiKey, { model: gatewayModelId(activeModel.value), prompt: prompt.value, mediaUrl: mediaUrl.value.trim() || undefined, maxTokens: maxOutputTokens.value })
|
||||
const choice = result.choices[0]
|
||||
const message = choice?.message
|
||||
const reasoning = typeof message?.reasoning_content === 'string' ? message.reasoning_content : typeof message?.reasoning === 'string' ? message.reasoning : ''
|
||||
@@ -516,13 +516,23 @@ async function createKey() {
|
||||
function mapCatalogModels(items: CatalogModel[], providers: Array<{ id: string; name: string }>): ModelItem[] {
|
||||
const providerNames = new Map(providers.map((provider) => [provider.id, provider.name]))
|
||||
return items.map(item => ({
|
||||
...mapCatalogModel(item), logicalModelId: item.logicalModelId,
|
||||
...mapCatalogModel(item), logicalModelId: item.logicalModelId, gatewayModelId: item.gatewayModelId,
|
||||
provider: providerNames.get(item.providerId) || item.providerId,
|
||||
vendorName: item.vendorName,
|
||||
sourceLabel: item.sourceLabel, pricing: item.pricing, pricingConfigured: item.pricingConfigured, billingReady: item.billingReady, priority: item.priority, maxConcurrency: item.maxConcurrency, executionReady: item.executionReady, inputTypes: item.inputTypes, outputTypes: item.outputTypes,
|
||||
}))
|
||||
}
|
||||
|
||||
/**
|
||||
* The catalog id is an internal route id used for permissions. Requests sent
|
||||
* to the public gateway must use the stable OpenAI-compatible id instead.
|
||||
* Older control planes do not return gatewayModelId, so retain a safe fallback
|
||||
* while they are being upgraded.
|
||||
*/
|
||||
function gatewayModelId(group: ModelItem): string {
|
||||
return group.gatewayModelId || group.modelKey || group.id
|
||||
}
|
||||
|
||||
function mapCatalogModel(item: LogicalModel): ModelItem {
|
||||
const typeLabels: Record<string, ModelType> = { text: '文本', code: '文本', multimodal: '多模态', image: '图像', audio: '音频', video: '视频', embedding: '文本', '3d': '3D' }
|
||||
const modeLabels: Record<string, CallMode> = { sync: '同步', stream: '流式', async: '异步' }
|
||||
@@ -848,14 +858,14 @@ $env:OPENAI_API_KEY="你的 MOYI 用户 API Key"
|
||||
<p v-if="!selectedModel.groups.length" class="drawer-description">该模型已收录,尚无上线分组。管理员完成渠道、分组和计费配置后,即可授权 API Key 并调用。</p>
|
||||
<section v-for="group in selectedModel.groups" :key="group.id" class="catalog-group-detail">
|
||||
<strong>{{ group.sourceLabel || '默认分组' }}</strong><small>{{ group.provider }}</small>
|
||||
<label>调用模型 ID <code>{{ group.id }}</code></label>
|
||||
<button class="text-link" @click="copy(group.id, '调用模型 ID', group.id)"><Copy :size="14" />{{ copySucceeded(group.id) ? '已复制' : '复制调用 ID' }}</button>
|
||||
<label>调用模型 ID <code>{{ gatewayModelId(group) }}</code></label>
|
||||
<button class="text-link" @click="copy(gatewayModelId(group), '调用模型 ID', gatewayModelId(group))"><Copy :size="14" />{{ copySucceeded(gatewayModelId(group)) ? '已复制' : '复制调用 ID' }}</button>
|
||||
<small class="drawer-pricing">标准价:{{ groupStandardPriceLabel(group) }} · {{ groupPriceLabel(group) }} · 对外 {{ groupDiscountLabel(group) }}</small>
|
||||
<button class="button secondary" :disabled="!group.pricingConfigured || group.billingReady === false || group.executionReady === false" @click="tryModel({ ...selectedModel, groups: [group] })">{{ !group.pricingConfigured ? '价格待配置' : group.executionReady === false ? '异步执行器待接入' : group.billingReady === false ? '异步按任务计费待配置' : '试用此分组' }}</button>
|
||||
</section>
|
||||
<template #footer><button class="button primary full" :disabled="!hasCallableGroup(selectedModel)" @click="tryModel(selectedModel)"><Play :size="16" />{{ !selectedModel.groups.length ? '分组待上线' : hasCallableGroup(selectedModel) ? '在线试用' : modelUnavailableLabel(selectedModel) }}</button><button class="button secondary full" @click="selectedModel = null; emit('navigate', 'docs')"><BookOpen :size="16" />查看文档</button></template>
|
||||
</SlidePanel>
|
||||
<SlidePanel v-if="selectedTask" :title="selectedTask.name" eyebrow="TASK DETAILS" @close="selectedTask = null"><MediaResult :media="{ modelUrl: selectedTask.modelUrl, imageUrl: selectedTask.imageUrl, videoUrl: selectedTask.videoUrl, audioUrl: selectedTask.audioUrl, previewUrl: selectedTask.previewUrl, resultUrl: selectedTask.resultUrl, resultFormat: selectedTask.resultFormat }" :pending="selectedTask.status !== '已完成'" /><div class="task-drawer-status"><span class="status-chip" :class="selectedTask.status"><i></i>{{ selectedTask.status }}</span><strong>{{ selectedTask.progress }}%</strong></div><div class="drawer-progress"><span><i :style="{ width: `${selectedTask.progress}%` }"></i></span><small>{{ selectedTask.result }}</small></div><dl class="detail-list"><div><dt>任务 ID</dt><dd><code>{{ selectedTask.id }}</code></dd></div><div><dt>模型</dt><dd>{{ selectedTask.model }}</dd></div><div v-if="selectedTask.provider"><dt>上游通道</dt><dd>{{ selectedTask.provider }}</dd></div><div v-if="selectedTask.creditsConsumed !== undefined"><dt>任务消耗</dt><dd>{{ selectedTask.creditsConsumed }} credits</dd></div><div><dt>创建时间</dt><dd>{{ selectedTask.createdAt }}</dd></div><div><dt>耗时</dt><dd>{{ selectedTask.duration }}</dd></div></dl><div v-if="selectedTask.prompt" class="drawer-note"><Info :size="16" /><span>{{ selectedTask.prompt }}</span></div><template #footer><button v-if="selectedTask.modelUrl" class="button primary full" @click="openTaskAsset(selectedTask.modelUrl)"><Download :size="16" />下载模型文件</button><button v-if="selectedTask.videoUrl" class="button primary full" @click="openTaskAsset(selectedTask.videoUrl)"><ExternalLink :size="16" />打开生成视频</button><button class="button secondary full" @click="selectedTask = null">关闭详情</button></template></SlidePanel>
|
||||
<SlidePanel v-if="selectedTask" :title="selectedTask.name" eyebrow="TASK DETAILS" @close="selectedTask = null"><MediaResult :media="{ modelUrl: selectedTask.modelUrl, imageUrl: selectedTask.imageUrl, videoUrl: selectedTask.videoUrl, audioUrl: selectedTask.audioUrl, previewUrl: selectedTask.previewUrl, resultUrl: selectedTask.resultUrl, resultFormat: selectedTask.resultFormat }" :pending="selectedTask.status === '排队中' || selectedTask.status === '执行中'" /><div class="task-drawer-status"><span class="status-chip" :class="selectedTask.status"><i></i>{{ selectedTask.status }}</span><strong>{{ selectedTask.progress }}%</strong></div><div class="drawer-progress"><span><i :style="{ width: `${selectedTask.progress}%` }"></i></span><small>{{ selectedTask.result }}</small></div><dl class="detail-list"><div><dt>任务 ID</dt><dd><code>{{ selectedTask.id }}</code></dd></div><div><dt>模型</dt><dd>{{ selectedTask.model }}</dd></div><div v-if="selectedTask.provider"><dt>上游通道</dt><dd>{{ selectedTask.provider }}</dd></div><div v-if="selectedTask.creditsConsumed !== undefined"><dt>任务消耗</dt><dd>{{ selectedTask.creditsConsumed }} credits</dd></div><div><dt>创建时间</dt><dd>{{ selectedTask.createdAt }}</dd></div><div><dt>耗时</dt><dd>{{ selectedTask.duration }}</dd></div></dl><div v-if="selectedTask.prompt" class="drawer-note"><Info :size="16" /><span>{{ selectedTask.prompt }}</span></div><template #footer><button v-if="selectedTask.modelUrl" class="button primary full" @click="openTaskAsset(selectedTask.modelUrl)"><Download :size="16" />下载模型文件</button><button v-if="selectedTask.videoUrl" class="button primary full" @click="openTaskAsset(selectedTask.videoUrl)"><ExternalLink :size="16" />打开生成视频</button><button class="button secondary full" @click="selectedTask = null">关闭详情</button></template></SlidePanel>
|
||||
|
||||
<UiModal v-if="deleteKeyTarget" title="删除 API Key" @close="!keyBusy && (deleteKeyTarget = undefined)"><p>确认删除「{{ deleteKeyTarget.name }}」?删除后无法重新启用,已有调用记录和任务会保留。</p><template #footer><button class="button secondary" :disabled="keyBusy" @click="deleteKeyTarget = undefined">取消</button><button class="button danger" :disabled="keyBusy" @click="deleteKey">{{ keyBusy ? '删除中…' : '确认删除' }}</button></template></UiModal>
|
||||
<UiModal v-if="createKeyOpen" title="创建 API Key" eyebrow="NEW CREDENTIAL" @close="createKeyOpen = false"><p class="modal-description">个人 Key 适合个人开发调试,项目 Key 适合服务端应用和团队协作。创建后再配置该 Key 可调用的具体模型。</p><label class="form-label">Key 名称</label><input v-model="keyName" class="text-input" placeholder="例如:生产环境" /><label class="form-label">Key 归属</label><div class="option-list"><button :class="{ active: keyScopeType === 'personal' }" @click="keyScopeType = 'personal'"><span><i></i><strong>个人 Key</strong><small>归属当前账号</small></span><Check v-if="keyScopeType === 'personal'" :size="16" /></button><button :class="{ active: keyScopeType === 'project' }" @click="keyScopeType = 'project'"><span><i></i><strong>项目 Key</strong><small>归属工作区/项目</small></span><Check v-if="keyScopeType === 'project'" :size="16" /></button></div><div v-if="keyScopeType === 'project'"><label class="form-label"><span>选择项目</span><button class="text-link" type="button" @click="openProjectModal">新建项目</button></label><select v-model="selectedProjectId" class="text-input"><option value="" disabled>请选择项目</option><option v-for="project in projects" :key="project.id" :value="project.id">{{ project.name }}</option></select></div><div class="permission-hint"><ShieldCheck :size="16" /><span>Key 创建后默认不开放模型权限,请在下一步选择具体可调用模型。</span></div><template #footer><button class="button secondary" @click="createKeyOpen = false">取消</button><button class="button primary" @click="createKey"><KeyRound :size="16" />生成 Key</button></template></UiModal>
|
||||
|
||||
@@ -16,3 +16,11 @@ test('mediaResult identifies image/audio and rejects unsafe URLs', () => {
|
||||
assert.equal(image.imageUrl, 'https://cdn.example.test/image.png')
|
||||
assert.equal(audio.audioUrl, 'https://cdn.example.test/sound.mp3')
|
||||
})
|
||||
|
||||
test('mediaResult supports provider base64 output and nested media objects', () => {
|
||||
const image = mediaResult({ b64_json: 'iVBORw0KGgo=', format: 'png' }, '')
|
||||
assert.match(image.imageUrl, /^data:image\/png;base64,iVBORw0KGgo=$/)
|
||||
const nested = mediaResult({ image_url: { b64_json: 'iVBORw0KGgo=', mime_type: 'image/png' } }, '')
|
||||
assert.match(nested.imageUrl, /^data:image\/png;base64,iVBORw0KGgo=$/)
|
||||
assert.equal(safeMediaUrl('data:text/html;base64,PGh0bWw+'), undefined)
|
||||
})
|
||||
Reference in new issue
Block a user