feat: improve media playground inputs and outputs
This commit is contained in:
1 parent
88c55cc6a9
commit
9a946b29e6
7 files changed
+225
-39
No files matched your search
@@ -1,5 +1,6 @@
|
||||
export type CatalogModelType = 'text' | 'code' | 'multimodal' | 'image' | 'audio' | 'video' | 'embedding' | '3d'
|
||||
export type CatalogCallMode = 'sync' | 'stream' | 'async'
|
||||
export type AsyncMediaType = '3d' | 'video' | 'image' | 'audio'
|
||||
|
||||
export interface CatalogProvider {
|
||||
id: string
|
||||
@@ -230,12 +231,21 @@ export interface AsyncTaskResult {
|
||||
updated_at?: string
|
||||
createdAt?: string
|
||||
completedAt?: string
|
||||
result?: { format?: string; url?: string; modelUrl?: string; previewUrl?: string; videoUrl?: string; creditsConsumed?: number; [key: string]: unknown }
|
||||
output?: { modelUrl?: string; previewUrl?: string; videoUrl?: string }
|
||||
result?: { format?: string; url?: string; modelUrl?: string; previewUrl?: string; videoUrl?: string; imageUrl?: string; audioUrl?: string; mimeType?: string; creditsConsumed?: number; [key: string]: unknown }
|
||||
output?: { modelUrl?: string; previewUrl?: string; videoUrl?: string; imageUrl?: string; audioUrl?: string; url?: string; format?: string; mimeType?: string }
|
||||
creditsConsumed?: number
|
||||
error?: { code?: number; message?: string }
|
||||
}
|
||||
|
||||
/** OpenAI-compatible multimodal content. Keep text-only calls byte-for-byte compatible. */
|
||||
function userMessage(prompt: string, mediaUrl?: string): string | Array<Record<string, unknown>> {
|
||||
if (!mediaUrl) return prompt
|
||||
return [
|
||||
{ type: 'text', text: prompt },
|
||||
{ type: 'image_url', image_url: { url: mediaUrl } },
|
||||
]
|
||||
}
|
||||
|
||||
export class CatalogApiError extends Error {
|
||||
constructor(readonly status: number, message: string, readonly code?: string) {
|
||||
super(message)
|
||||
@@ -327,27 +337,27 @@ class HttpCatalogClient {
|
||||
return response.blob()
|
||||
}
|
||||
|
||||
async chatCompletion(apiKey: string, input: { model: string; prompt: string; maxTokens?: number }) {
|
||||
async chatCompletion(apiKey: string, input: { model: string; prompt: string; maxTokens?: number; mediaUrl?: string }) {
|
||||
return this.request<ChatCompletionResult>('/v1/chat/completions', {
|
||||
method: 'POST',
|
||||
headers: { Authorization: `Bearer ${apiKey}`, 'X-Moyi-Source': 'playground', 'Idempotency-Key': crypto.randomUUID() },
|
||||
body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: input.prompt }], max_tokens: input.maxTokens || 4096 }),
|
||||
body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: userMessage(input.prompt, input.mediaUrl) }], max_tokens: input.maxTokens || 4096 }),
|
||||
})
|
||||
}
|
||||
|
||||
async playgroundChatCompletion(keyId: string, input: { model: string; prompt: string; maxTokens?: number }) {
|
||||
async playgroundChatCompletion(keyId: string, input: { model: string; prompt: string; maxTokens?: number; mediaUrl?: string }) {
|
||||
return this.request<ChatCompletionResult>(`/api/playground/keys/${encodeURIComponent(keyId)}/chat/completions`, {
|
||||
method: 'POST',
|
||||
headers: { 'X-Moyi-Source': 'playground', 'Idempotency-Key': crypto.randomUUID() },
|
||||
body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: input.prompt }], max_tokens: input.maxTokens || 4096 }),
|
||||
body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: userMessage(input.prompt, input.mediaUrl) }], max_tokens: input.maxTokens || 4096 }),
|
||||
})
|
||||
}
|
||||
|
||||
async streamChat(apiKey: string, input: { model: string; prompt: string; maxTokens: number }, onDelta: (content: string, reasoning: string) => void, signal: AbortSignal) {
|
||||
async streamChat(apiKey: string, input: { model: string; prompt: string; maxTokens: number; mediaUrl?: string }, onDelta: (content: string, reasoning: string) => void, signal: AbortSignal) {
|
||||
const response = await fetch(`${this.baseUrl}/v1/chat/completions`, {
|
||||
method: 'POST', credentials: 'include', signal,
|
||||
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}`, 'X-Moyi-Source': 'playground', 'Idempotency-Key': crypto.randomUUID() },
|
||||
body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: input.prompt }], stream: true, max_tokens: input.maxTokens }),
|
||||
body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: userMessage(input.prompt, input.mediaUrl) }], stream: true, max_tokens: input.maxTokens }),
|
||||
})
|
||||
if (!response.ok) {
|
||||
const error = await response.json().catch(() => ({}))
|
||||
@@ -358,11 +368,11 @@ class HttpCatalogClient {
|
||||
await readChatStream(response.body, onDelta)
|
||||
}
|
||||
|
||||
async playgroundStreamChat(keyId: string, input: { model: string; prompt: string; maxTokens: number }, onDelta: (content: string, reasoning: string) => void, signal: AbortSignal) {
|
||||
async playgroundStreamChat(keyId: string, input: { model: string; prompt: string; maxTokens: number; mediaUrl?: string }, onDelta: (content: string, reasoning: string) => void, signal: AbortSignal) {
|
||||
const response = await fetch(`${this.baseUrl}/api/playground/keys/${encodeURIComponent(keyId)}/chat/completions`, {
|
||||
method: 'POST', credentials: 'include', signal,
|
||||
headers: { 'Content-Type': 'application/json', 'X-Moyi-Source': 'playground', 'Idempotency-Key': crypto.randomUUID() },
|
||||
body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: input.prompt }], stream: true, max_tokens: input.maxTokens }),
|
||||
body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: userMessage(input.prompt, input.mediaUrl) }], stream: true, max_tokens: input.maxTokens }),
|
||||
})
|
||||
if (!response.ok) {
|
||||
const error = await response.json().catch(() => ({}))
|
||||
@@ -373,18 +383,18 @@ class HttpCatalogClient {
|
||||
await readChatStream(response.body, onDelta)
|
||||
}
|
||||
|
||||
async createMediaTask(apiKey: string, input: { model: string; prompt: string; mediaType: '3d' | 'video' }) {
|
||||
const payload = await this.request<{ task: AsyncTaskResult }>(input.mediaType === 'video' ? '/v1/video/tasks' : '/v1/3d/tasks', {
|
||||
async createMediaTask(apiKey: string, input: { model: string; prompt: string; mediaType: AsyncMediaType; mediaUrl?: string }) {
|
||||
const payload = await this.request<{ task: AsyncTaskResult }>(`/v1/${input.mediaType}/tasks`, {
|
||||
method: 'POST',
|
||||
headers: { Authorization: `Bearer ${apiKey}`, 'X-Moyi-Source': 'playground' },
|
||||
body: JSON.stringify({ model: input.model, prompt: input.prompt }),
|
||||
body: JSON.stringify({ model: input.model, prompt: input.prompt, ...(input.mediaUrl ? { media_url: input.mediaUrl } : {}) }),
|
||||
})
|
||||
return payload.task
|
||||
}
|
||||
|
||||
async playgroundCreateMediaTask(keyId: string, input: { model: string; prompt: string; mediaType: '3d' | 'video' }) {
|
||||
const payload = await this.request<{ task: AsyncTaskResult }>(`/api/playground/keys/${encodeURIComponent(keyId)}/${input.mediaType === 'video' ? 'video' : '3d'}/tasks`, {
|
||||
method: 'POST', headers: { 'X-Moyi-Source': 'playground' }, body: JSON.stringify({ model: input.model, prompt: input.prompt }),
|
||||
async playgroundCreateMediaTask(keyId: string, input: { model: string; prompt: string; mediaType: AsyncMediaType; mediaUrl?: string }) {
|
||||
const payload = await this.request<{ task: AsyncTaskResult }>(`/api/playground/keys/${encodeURIComponent(keyId)}/${input.mediaType}/tasks`, {
|
||||
method: 'POST', headers: { 'X-Moyi-Source': 'playground' }, body: JSON.stringify({ model: input.model, prompt: input.prompt, ...(input.mediaUrl ? { media_url: input.mediaUrl } : {}) }),
|
||||
})
|
||||
return payload.task
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
export interface MediaResult {
|
||||
imageUrl?: string
|
||||
videoUrl?: string
|
||||
audioUrl?: string
|
||||
modelUrl?: string
|
||||
previewUrl?: string
|
||||
resultUrl?: string
|
||||
resultFormat?: string
|
||||
}
|
||||
|
||||
export function safeMediaUrl(value: unknown): string | undefined {
|
||||
if (typeof value !== 'string' || !value.trim()) return undefined
|
||||
try {
|
||||
const url = new URL(value)
|
||||
return url.protocol === 'https:' || url.protocol === 'http:' ? url.href : undefined
|
||||
} catch { return undefined }
|
||||
}
|
||||
|
||||
/** 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 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),
|
||||
resultUrl: url,
|
||||
resultFormat: format || suffix,
|
||||
}
|
||||
}
|
||||
|
||||
export function mediaTypeLabel(type: string): string {
|
||||
return ({ text: '文本', image: '图片', image_url: '图片', video: '视频', audio: '音频', '3d': '3D', glb: 'GLB 模型', multimodal: '多模态' })[type.toLowerCase()] || type
|
||||
}
|
||||
|
||||
export function generationLabel(type: string): string {
|
||||
return ({ 视频: '生成视频', 图像: '生成图片', 音频: '生成音频', '3D': '生成 3D' })[type] || '提交任务'
|
||||
}
|
||||
Reference in new issue
Block a user