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

merge(main): 解决 usage 模型展示契约冲突

Browse Source
This commit is contained in:
MMEXA
2026-07-18 19:26:14 +08:00
parent ac3796af84 e3d97b573b
commit 0c3f51bcec
12 changed files with 446 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/features/usage/components/__tests__/RequestDetailDrawer.pricing.spec.ts
+16 -14
View File
@@ -165,19 +165,21 @@ describe('RequestDetailDrawer settlement pricing', () => {
expect(document.body.querySelector('[data-request-detail-model-badge="cyber"]')?.textContent)
.toContain('Cyber')
const modelLayout = document.body.querySelector(
'[data-request-detail-model-layout="stacked"]',
'[data-request-detail-model-layout="inline"]',
)
expect(modelLayout?.firstElementChild?.textContent).toContain('gpt-5')
expect(modelLayout?.firstElementChild?.textContent).toContain('->')
expect(modelLayout?.firstElementChild?.textContent).toContain('gpt-5.1')
expect(modelLayout?.firstElementChild?.querySelector('[data-request-detail-model-badge]'))
.toBeNull()
const modelBadgesRow = modelLayout?.querySelector(
'[data-request-detail-model-badges-row]',
)
expect(modelBadgesRow?.textContent).toContain('xhigh -> max')
expect(modelBadgesRow?.textContent).toContain('Fast')
expect(modelBadgesRow?.textContent).toContain('Cyber')
const modelRow = modelLayout?.firstElementChild
expect(modelRow?.textContent).toContain('gpt-5')
expect(modelRow?.textContent).toContain('->')
expect(modelRow?.textContent).toContain('gpt-5.1')
expect(modelRow?.querySelector('[data-usage-model-target]')?.classList.contains('basis-full'))
.toBe(true)
expect(modelRow?.querySelector('[data-request-detail-model-badge="reasoning"]')?.textContent)
.toContain('xhigh -> max')
expect(modelRow?.querySelector('[data-request-detail-model-badge="fast"]')?.textContent)
.toContain('Fast')
expect(modelRow?.querySelector('[data-request-detail-model-badge="cyber"]')?.textContent)
.toContain('Cyber')
expect(modelLayout?.querySelector('[data-request-detail-model-badges-row]')).toBeNull()
const serviceTierFacts = document.body.querySelector('[data-testid="service-tier-facts"]')
expect([...serviceTierFacts?.querySelectorAll('dt') ?? []].map(node => node.textContent?.trim()))
.toEqual(['上游请求层级', '计费层级'])
@@ -359,7 +361,7 @@ describe('RequestDetailDrawer settlement pricing', () => {
await vi.waitFor(() => {
expect(apiMocks.getRequestDetail).toHaveBeenCalledTimes(1)
expect(document.body.querySelector('[data-usage-model-target]')?.textContent?.trim())
.toBe('gpt-5.1')
.toBe('->gpt-5.1')
expect(document.body.querySelector('[data-request-detail-model-badge="reasoning"]')?.textContent?.trim())
.toBe('xhigh -> max')
expect(document.body.querySelector('[data-request-detail-model-badge="fast"]')).toBeNull()
@@ -414,7 +416,7 @@ describe('RequestDetailDrawer settlement pricing', () => {
await vi.waitFor(() => {
expect(document.body.querySelector('[data-usage-model-target]')?.textContent?.trim())
.toBe('gpt-5.1-2026-07-17')
.toBe('->gpt-5.1-2026-07-17')
})
})
frontend/src/features/usage/components/__tests__/UsageRecordsTable.spec.ts
+15 -18
View File
@@ -327,7 +327,7 @@ describe('UsageRecordsTable', () => {
.toBe('会话压缩')
})
it('shows mapping, reasoning, Fast, and Cyber together in the model area', () => {
it('shows mapping, reasoning, Fast, and Cyber in the model area', () => {
const root = mountUsageRecordsTable([buildRecord({
model: 'gpt-5',
target_model: 'gpt-5.1',
@@ -364,25 +364,25 @@ describe('UsageRecordsTable', () => {
expect(fastBadge?.classList.contains('border-amber-400/50')).toBe(false)
expect(fastBadge?.classList.contains('!bg-transparent')).toBe(false)
expect(fastBadge?.classList.contains('bg-amber-400/10')).toBe(false)
expect(fastBadge?.classList.contains('text-amber-700')).toBe(true)
expect(fastBadge?.classList.contains('text-blue-500')).toBe(true)
expect(cyberBadge?.classList.contains('border-primary/30')).toBe(true)
expect(cyberBadge?.classList.contains('bg-primary/5')).toBe(true)
expect(cyberBadge?.classList.contains('text-rose-600')).toBe(true)
expect(cyberBadge?.classList.contains('text-rose-500')).toBe(true)
expect(cyberBadges.length).toBeGreaterThan(0)
expect([...cyberBadges].every(badge => badge.textContent?.trim() === 'Cyber')).toBe(true)
expect([...cyberBadges].every(badge => badge.title === '上游 Cyber Policy 拒绝')).toBe(true)
const stackedLayout = root.querySelector('[data-usage-model-layout="stacked"]')
expect(stackedLayout).not.toBeNull()
const modelRow = stackedLayout?.firstElementChild
const inlineLayout = root.querySelector('[data-usage-model-layout="inline"]')
expect(inlineLayout).not.toBeNull()
const modelRow = inlineLayout?.firstElementChild
expect(modelRow?.textContent).toContain('gpt-5')
expect(modelRow?.textContent).toContain('->')
expect(modelRow?.textContent).toContain('gpt-5.1')
expect(modelRow?.querySelector('[data-usage-model-badge]')).toBeNull()
const badgesRow = stackedLayout?.querySelector('[data-usage-model-badges-row]')
expect(badgesRow?.textContent).toContain('xhigh -> max')
expect(badgesRow?.textContent).toContain('Fast')
expect(badgesRow?.textContent).toContain('Cyber')
expect(modelRow?.querySelector('[data-usage-model-target]')?.classList.contains('basis-full')).toBe(true)
expect(modelRow?.querySelector('[data-usage-model-target]')?.classList.contains('order-last')).toBe(true)
expect(modelRow?.querySelector('[data-usage-model-badge="reasoning"]')?.textContent).toContain('xhigh -> max')
expect(modelRow?.querySelector('[data-usage-model-badge="fast"]')?.textContent).toContain('Fast')
expect(modelRow?.querySelector('[data-usage-model-badge="cyber"]')?.textContent).toContain('Cyber')
})
it('stacks three model badges even without a model mapping', () => {
@@ -398,13 +398,10 @@ describe('UsageRecordsTable', () => {
})])
const stackedLayout = root.querySelector('[data-usage-model-layout="stacked"]')
expect(stackedLayout?.firstElementChild?.textContent?.trim()).toBe('gpt-5')
expect(stackedLayout?.querySelector('[data-usage-model-badges-row]')?.textContent)
.toContain('xhigh')
expect(stackedLayout?.querySelector('[data-usage-model-badges-row]')?.textContent)
.toContain('Fast')
expect(stackedLayout?.querySelector('[data-usage-model-badges-row]')?.textContent)
.toContain('Cyber')
expect(stackedLayout?.textContent).toContain('gpt-5')
expect(stackedLayout?.textContent).toContain('xhigh')
expect(stackedLayout?.textContent).toContain('Fast')
expect(stackedLayout?.textContent).toContain('Cyber')
})
it.each(['priority', 'fast', ' Priority ', 'FAST'])(