i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 01:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix frontend openai responses alias display

Browse Source
This commit is contained in:
fawney19
2026-04-26 22:09:16 +08:00
parent 0ec4b4c8a4
commit 5cd2244bc2
7 changed files with 115 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
frontend/src/api/endpoints/types/__tests__/api-format.spec.ts Normal file
View File

@@ -0,0 +1,55 @@
import { describe, expect, it } from 'vitest'
import {
API_FORMATS,
formatApiFormat,
formatApiFormatShort,
groupApiFormats,
normalizeApiFormatAlias,
sortApiFormats,
} from '@/api/endpoints/types'
const openaiAlias = (kind: string) => ['openai', kind].join(':')
const legacyEnumAlias = (kind: string) => ['OPENAI', kind].join('_')
describe('api format display helpers', () => {
it('maps historical OpenAI response aliases to current display names', () => {
expect(normalizeApiFormatAlias(openaiAlias('cli'))).toBe(API_FORMATS.OPENAI_RESPONSES)
expect(formatApiFormat(openaiAlias('cli'))).toBe('OpenAI Responses')
expect(formatApiFormatShort(openaiAlias('cli'))).toBe('OR')
expect(normalizeApiFormatAlias(openaiAlias('compact'))).toBe(API_FORMATS.OPENAI_RESPONSES_COMPACT)
expect(formatApiFormat(openaiAlias('compact'))).toBe('OpenAI Responses Compact')
expect(formatApiFormatShort(openaiAlias('compact'))).toBe('ORC')
})
it('maps historical uppercase enum aliases to current display names', () => {
expect(normalizeApiFormatAlias(legacyEnumAlias('CLI'))).toBe(API_FORMATS.OPENAI_RESPONSES)
expect(formatApiFormat(legacyEnumAlias('CLI'))).toBe('OpenAI Responses')
expect(formatApiFormatShort(legacyEnumAlias('CLI'))).toBe('OR')
expect(normalizeApiFormatAlias(legacyEnumAlias('COMPACT'))).toBe(API_FORMATS.OPENAI_RESPONSES_COMPACT)
expect(formatApiFormat(legacyEnumAlias('COMPACT'))).toBe('OpenAI Responses Compact')
expect(formatApiFormatShort(legacyEnumAlias('COMPACT'))).toBe('ORC')
})
it('sorts historical aliases in the same slot as their current formats', () => {
expect(sortApiFormats([
openaiAlias('compact'),
API_FORMATS.OPENAI,
openaiAlias('cli'),
])).toEqual([
API_FORMATS.OPENAI,
openaiAlias('cli'),
openaiAlias('compact'),
])
})
it('groups uppercase historical aliases under OpenAI', () => {
expect(groupApiFormats([legacyEnumAlias('CLI')])).toEqual([{
family: 'openai',
label: 'OpenAI',
formats: [legacyEnumAlias('CLI')],
}])
})
})

50
frontend/src/api/endpoints/types/api-format.ts
View File

@@ -111,6 +111,27 @@ export function parseApiFormat(format: string): { family: string; kind: string }
return { family: format.slice(0, idx).toLowerCase(), kind: format.slice(idx + 1).toLowerCase() }
}
export function normalizeApiFormatAlias(format: string | null | undefined): string {
const raw = format?.trim() ?? ''
switch (raw.toLowerCase()) {
case 'openai:cli':
return API_FORMATS.OPENAI_RESPONSES
case 'openai:compact':
return API_FORMATS.OPENAI_RESPONSES_COMPACT
default:
break
}
switch (raw.toUpperCase()) {
case 'OPENAI_CLI':
return API_FORMATS.OPENAI_RESPONSES
case 'OPENAI_COMPACT':
return API_FORMATS.OPENAI_RESPONSES_COMPACT
default:
return raw
}
}
// 工具函数：按 family 分组并排序 API 格式数组
export interface ApiFormatGroup {
family: string
@@ -122,7 +143,7 @@ export function groupApiFormats(formats: string[]): ApiFormatGroup[] {
const sorted = sortApiFormats(formats)
const groups = new Map<string, string[]>()
for (const f of sorted) {
const { family } = parseApiFormat(f)
const { family } = parseApiFormat(normalizeApiFormatAlias(f))
if (!groups.has(family)) groups.set(family, [])
groups.get(family)?.push(f)
}
@@ -145,13 +166,26 @@ export function groupApiFormats(formats: string[]): ApiFormatGroup[] {
// 工具函数：将 API 格式签名转为友好显示名称
export function formatApiFormat(format: string | null | undefined): string {
if (!format) return '-'
const raw = format.trim()
const upper = raw.toUpperCase()
return API_FORMAT_LABELS[raw]
|| API_FORMAT_LABELS[raw.toLowerCase()]
const normalized = normalizeApiFormatAlias(format)
if (!normalized) return '-'
const upper = normalized.toUpperCase()
return API_FORMAT_LABELS[normalized]
|| API_FORMAT_LABELS[normalized.toLowerCase()]
|| API_FORMAT_LABELS[legacyUppercaseApiFormatKey(upper)]
|| API_FORMAT_LABELS[upper]
|| raw
|| normalized
}
export function formatApiFormatShort(format: string | null | undefined): string {
if (!format) return '-'
const normalized = normalizeApiFormatAlias(format)
if (!normalized) return '-'
const upper = normalized.toUpperCase()
return API_FORMAT_SHORT[normalized]
|| API_FORMAT_SHORT[normalized.toLowerCase()]
|| API_FORMAT_SHORT[legacyUppercaseApiFormatKey(upper)]
|| API_FORMAT_SHORT[upper]
|| normalized.substring(0, 2)
}
function legacyUppercaseApiFormatKey(value: string): string {
@@ -168,8 +202,8 @@ function legacyUppercaseApiFormatKey(value: string): string {
// 工具函数：按标准顺序排序 API 格式数组
export function sortApiFormats(formats: string[]): string[] {
return [...formats].sort((a, b) => {
const aIdx = API_FORMAT_ORDER.indexOf(a)
const bIdx = API_FORMAT_ORDER.indexOf(b)
const aIdx = API_FORMAT_ORDER.indexOf(normalizeApiFormatAlias(a))
const bIdx = API_FORMAT_ORDER.indexOf(normalizeApiFormatAlias(b))
if (aIdx === -1 && bIdx === -1) return 0
if (aIdx === -1) return 1
if (bIdx === -1) return -1

4
frontend/src/features/providers/components/KeyAllowedModelsEditDialog.vue
View File

@@ -287,7 +287,7 @@
:key="fmt"
class="text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground"
>
{{ API_FORMAT_SHORT[fmt] || fmt }}
{{ formatApiFormatShort(fmt) }}
</span>
</div>
<button
@@ -375,7 +375,7 @@ import {
type AllowedModels,
} from '@/api/endpoints'
import { useUpstreamModelsCache } from '../composables/useUpstreamModelsCache'
import { API_FORMAT_SHORT, type UpstreamModel } from '@/api/endpoints/types'
import { formatApiFormatShort, type UpstreamModel } from '@/api/endpoints/types'
interface AvailableModel {
name: string

14
frontend/src/features/providers/components/PriorityManagementDialog.vue
View File

@@ -125,7 +125,7 @@
:key="fmt"
class="text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground whitespace-nowrap"
>
{{ API_FORMAT_SHORT[fmt] || fmt }}
{{ formatApiFormatShort(fmt) }}
</span>
</template>
</div>
@@ -472,8 +472,14 @@ import { updateProvider, updateProviderKey } from '@/api/endpoints'
import { getProvidersSummary, type ProviderWithEndpointsSummary } from '@/api/endpoints'
import { adminApi } from '@/api/admin'
import { batchQueryBalance, type ActionResultResponse, type BalanceInfo } from '@/api/providerOps'
import { API_FORMAT_SHORT } from '@/api/endpoints/types'
import { sortApiFormats, groupApiFormats, parseApiFormat, API_FORMAT_KIND_LABELS } from '@/api/endpoints/types/api-format'
import {
sortApiFormats,
groupApiFormats,
parseApiFormat,
API_FORMAT_KIND_LABELS,
formatApiFormatShort,
normalizeApiFormatAlias,
} from '@/api/endpoints/types/api-format'
import { log } from '@/utils/logger'
interface KeyWithMeta {
@@ -893,7 +899,7 @@ const groupedFormats = computed(() => {
// 获取格式的 kind 显示名称
function formatKind(format: string): string {
const { kind } = parseApiFormat(format)
const { kind } = parseApiFormat(normalizeApiFormatAlias(format))
return API_FORMAT_KIND_LABELS[kind] || kind || format
}

5
frontend/src/features/providers/components/ProviderDetailDrawer.vue
View File

@@ -861,7 +861,7 @@
class="text-muted-foreground/40"
>/</span>
<span :class="{ 'text-destructive': isFormatCircuitOpen(key, format) }">
{{ API_FORMAT_SHORT[format] || format }}
{{ formatApiFormatShort(format) }}
</span>
<span
v-if="editingMultiplierKey !== key.id || editingMultiplierFormat !== format"
@@ -1150,7 +1150,6 @@ import {
type EndpointAPIKey,
type Model,
API_FORMAT_ORDER,
API_FORMAT_SHORT,
sortApiFormats,
} from '@/api/endpoints'
import type {
@@ -1162,7 +1161,7 @@ import type {
QuotaStatusSnapshot,
QuotaWindowSnapshot,
} from '@/api/endpoints/types'
import { formatApiFormat } from '@/api/endpoints/types/api-format'
import { formatApiFormat, formatApiFormatShort } from '@/api/endpoints/types/api-format'
import { isOAuthAccountProviderType, isKeyManagedProviderType } from '../utils/providerTypeUtils'
import {
isProviderQuotaAutoRefreshCoolingDown,

4
frontend/src/features/providers/components/ProviderMobileCard.vue
View File

@@ -200,7 +200,7 @@
<!-- 上排：缩写 + 百分比 -->
<div class="flex items-center justify-between text-[10px] leading-none">
<span class="font-medium text-muted-foreground/80">
{{ API_FORMAT_SHORT[endpoint.api_format] || endpoint.api_format.substring(0,2) }}
{{ formatApiFormatShort(endpoint.api_format) }}
</span>
<span class="font-medium text-muted-foreground/80">
{{ isEndpointAvailable(endpoint) ? `${(endpoint.health_score * 100).toFixed(0)}%` : '-' }}
@@ -236,7 +236,7 @@ import {
} from 'lucide-vue-next'
import Button from '@/components/ui/button.vue'
import Badge from '@/components/ui/badge.vue'
import { type ProviderWithEndpointsSummary, API_FORMAT_SHORT } from '@/api/endpoints'
import { type ProviderWithEndpointsSummary, formatApiFormatShort } from '@/api/endpoints'
import { formatBillingType } from '@/utils/format'
import { sortEndpoints, isEndpointAvailable, getEndpointDotColor, getEndpointTooltip } from '@/features/providers/composables/useEndpointStatus'
import { isKeyManagedProviderType } from '../utils/providerTypeUtils'

4
frontend/src/features/providers/components/ProviderTableRow.vue
View File

@@ -106,7 +106,7 @@
<!-- 上排：缩写 + 百分比 -->
<div class="flex items-center justify-between text-[10px] leading-none">
<span class="font-medium text-muted-foreground/80">
{{ API_FORMAT_SHORT[endpoint.api_format] || endpoint.api_format.substring(0,2) }}
{{ formatApiFormatShort(endpoint.api_format) }}
</span>
<span class="font-medium text-muted-foreground/80">
{{ isEndpointAvailable(endpoint) ? `${(endpoint.health_score * 100).toFixed(0)}%` : '-' }}
@@ -209,7 +209,7 @@ import Badge from '@/components/ui/badge.vue'
import TableRow from '@/components/ui/table-row.vue'
import TableCell from '@/components/ui/table-cell.vue'
import ProviderBalanceCell from './ProviderBalanceCell.vue'
import { type ProviderWithEndpointsSummary, API_FORMAT_SHORT } from '@/api/endpoints'
import { type ProviderWithEndpointsSummary, formatApiFormatShort } from '@/api/endpoints'
import { sortEndpoints, isEndpointAvailable, getEndpointDotColor, getEndpointTooltip } from '@/features/providers/composables/useEndpointStatus'
import type { BalanceExtraItem } from '@/features/providers/auth-templates'