mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 01:10:23 +08:00
Add provider key cycle stats reset handling
This commit is contained in:
@@ -209,6 +209,18 @@ export async function clearOAuthInvalid(keyId: string): Promise<{ message: strin
|
||||
return response.data
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置 Key 的当前周期统计起点(Codex 号池)
|
||||
*/
|
||||
export async function resetProviderKeyCycleStats(keyId: string): Promise<{
|
||||
message: string
|
||||
reset_at: number
|
||||
windows: number
|
||||
}> {
|
||||
const response = await client.post(`/api/admin/endpoints/keys/${keyId}/reset-cycle-stats`)
|
||||
return response.data
|
||||
}
|
||||
|
||||
/**
|
||||
* 刷新 Provider 的所有 Key 限额信息(Codex / Antigravity)
|
||||
*/
|
||||
|
||||
@@ -107,7 +107,7 @@ describe('poolManagementState', () => {
|
||||
status: 'all',
|
||||
page: 1,
|
||||
pageSize: 50,
|
||||
sortBy: null,
|
||||
sortBy: 'imported_at',
|
||||
sortOrder: 'desc',
|
||||
statsMode: 'current_cycle',
|
||||
}),
|
||||
|
||||
@@ -36,6 +36,7 @@ describe('poolMobilePresentation', () => {
|
||||
canRefreshToken: true,
|
||||
canClearCooldown: true,
|
||||
canRecoverHealth: true,
|
||||
canResetCycleStats: true,
|
||||
canDownloadOrCopy: true,
|
||||
hasProxy: true,
|
||||
}),
|
||||
@@ -43,6 +44,7 @@ describe('poolMobilePresentation', () => {
|
||||
primary: [
|
||||
'copy_or_download',
|
||||
'refresh_token',
|
||||
'reset_cycle_stats',
|
||||
'clear_cooldown',
|
||||
'recover_health',
|
||||
'permissions',
|
||||
|
||||
@@ -43,7 +43,7 @@ export const DEFAULT_POOL_MANAGEMENT_VIEW_STATE: PoolManagementViewState = {
|
||||
status: 'all',
|
||||
page: 1,
|
||||
pageSize: 50,
|
||||
sortBy: null,
|
||||
sortBy: 'imported_at',
|
||||
sortOrder: 'desc',
|
||||
statsMode: 'current_cycle',
|
||||
}
|
||||
@@ -76,7 +76,7 @@ function normalizeSortBy(value: unknown): PoolManagementSortBy | null {
|
||||
if (value === 'imported_at' || value === 'last_used_at') {
|
||||
return value
|
||||
}
|
||||
return null
|
||||
return DEFAULT_POOL_MANAGEMENT_VIEW_STATE.sortBy
|
||||
}
|
||||
|
||||
function normalizeSortOrder(value: unknown): PoolManagementSortOrder {
|
||||
@@ -156,6 +156,8 @@ export function buildPoolManagementQueryPatch(
|
||||
): Record<string, string | undefined> {
|
||||
const normalized = normalizeViewState(state)
|
||||
const search = normalized.search.trim()
|
||||
const isDefaultSort = normalized.sortBy === DEFAULT_POOL_MANAGEMENT_VIEW_STATE.sortBy
|
||||
&& normalized.sortOrder === DEFAULT_POOL_MANAGEMENT_VIEW_STATE.sortOrder
|
||||
|
||||
return {
|
||||
providerId: normalized.providerId || undefined,
|
||||
@@ -166,8 +168,8 @@ export function buildPoolManagementQueryPatch(
|
||||
normalized.pageSize === DEFAULT_POOL_MANAGEMENT_VIEW_STATE.pageSize
|
||||
? undefined
|
||||
: String(normalized.pageSize),
|
||||
sortBy: normalized.sortBy || undefined,
|
||||
sortOrder: normalized.sortBy ? normalized.sortOrder : undefined,
|
||||
sortBy: isDefaultSort ? undefined : normalized.sortBy || undefined,
|
||||
sortOrder: isDefaultSort ? undefined : normalized.sortBy ? normalized.sortOrder : undefined,
|
||||
statsMode: normalized.statsMode === 'account_total' ? 'account_total' : undefined,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ export interface PoolMobileTagInput {
|
||||
export type PoolMobileActionId =
|
||||
| 'copy_or_download'
|
||||
| 'refresh_token'
|
||||
| 'reset_cycle_stats'
|
||||
| 'clear_cooldown'
|
||||
| 'recover_health'
|
||||
| 'permissions'
|
||||
@@ -33,6 +34,7 @@ export interface PoolMobileActionInput {
|
||||
canDownloadOrCopy?: boolean
|
||||
canRefreshToken?: boolean
|
||||
showRefreshToken?: boolean
|
||||
canResetCycleStats?: boolean
|
||||
canClearCooldown?: boolean
|
||||
canRecoverHealth?: boolean
|
||||
hasProxy?: boolean
|
||||
@@ -70,6 +72,9 @@ export function splitPoolMobileActions(input: PoolMobileActionInput): {
|
||||
if (showRefreshToken) {
|
||||
primary.push('refresh_token')
|
||||
}
|
||||
if (input.canResetCycleStats) {
|
||||
primary.push('reset_cycle_stats')
|
||||
}
|
||||
if (input.canClearCooldown) {
|
||||
primary.push('clear_cooldown')
|
||||
}
|
||||
@@ -92,6 +97,9 @@ export function splitPoolMobileActions(input: PoolMobileActionInput): {
|
||||
if (showRefreshToken) {
|
||||
primary.push('refresh_token')
|
||||
}
|
||||
if (input.canResetCycleStats) {
|
||||
primary.push('reset_cycle_stats')
|
||||
}
|
||||
if (input.canClearCooldown) {
|
||||
primary.push('clear_cooldown')
|
||||
}
|
||||
|
||||
@@ -75,19 +75,21 @@
|
||||
|
||||
<!-- 子节点(同提供商的其他尝试,不包含首次) -->
|
||||
<div
|
||||
v-if="group.retryCount > 0 && isGroupSelected(group)"
|
||||
v-if="group.retryCount > 0"
|
||||
class="sub-dots"
|
||||
>
|
||||
<button
|
||||
v-for="(attempt, idx) in group.allAttempts.slice(1)"
|
||||
:key="attempt.id"
|
||||
type="button"
|
||||
class="sub-dot"
|
||||
:class="[
|
||||
getStatusColorClass(getDisplayStatus(attempt)),
|
||||
{ active: selectedAttemptIndex === idx + 1 }
|
||||
{ active: isAttemptSelected(group, idx + 1) }
|
||||
]"
|
||||
:title="attempt.key_name || `Key ${idx + 2}`"
|
||||
@click.stop="selectedAttemptIndex = idx + 1"
|
||||
:title="formatAttemptDotTitle(attempt)"
|
||||
:aria-label="formatAttemptDotTitle(attempt)"
|
||||
@click.stop="selectAttemptInGroup(group, idx + 1)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -780,20 +782,28 @@ const STATUS_PRIORITY: Record<string, number> = {
|
||||
success: 4,
|
||||
}
|
||||
|
||||
// 候选时间线(按实际执行顺序排序)
|
||||
const isParticipatedCandidate = (candidate: CandidateRecord): boolean => {
|
||||
if (candidate.status === 'available' || candidate.status === 'unused') return false
|
||||
if (candidate.status === 'pending' && !candidate.started_at) return false
|
||||
return true
|
||||
}
|
||||
|
||||
const compareBySchedulingOrder = (a: CandidateRecord, b: CandidateRecord): number => {
|
||||
if (a.candidate_index !== b.candidate_index) {
|
||||
return a.candidate_index - b.candidate_index
|
||||
}
|
||||
if (a.retry_index !== b.retry_index) {
|
||||
return a.retry_index - b.retry_index
|
||||
}
|
||||
return new Date(a.created_at).getTime() - new Date(b.created_at).getTime()
|
||||
}
|
||||
|
||||
// 候选时间线(按调度顺序排序;lazy 加载的跳过候选通常没有 started_at)
|
||||
const rawTimeline = computed<CandidateRecord[]>(() => {
|
||||
if (!trace.value) return []
|
||||
return [...trace.value.candidates]
|
||||
.filter(c => TIMELINE_STATUS.includes(c.status))
|
||||
.sort((a, b) => {
|
||||
const startedA = a.started_at ? new Date(a.started_at).getTime() : Infinity
|
||||
const startedB = b.started_at ? new Date(b.started_at).getTime() : Infinity
|
||||
if (startedA !== startedB) return startedA - startedB
|
||||
if (a.candidate_index !== b.candidate_index) {
|
||||
return a.candidate_index - b.candidate_index
|
||||
}
|
||||
return a.retry_index - b.retry_index
|
||||
})
|
||||
.sort(compareBySchedulingOrder)
|
||||
})
|
||||
|
||||
|
||||
@@ -919,7 +929,7 @@ const buildProviderGroups = (items: CandidateRecord[]): NodeGroup[] => {
|
||||
|
||||
// 将相同 Provider 的所有请求合并为组(同提供商的 Key 放在子节点)
|
||||
const groupedTimeline = computed<NodeGroup[]>(() => {
|
||||
const providerGroups = buildProviderGroups(timeline.value)
|
||||
const providerGroups = buildProviderGroups(timeline.value.filter(isParticipatedCandidate))
|
||||
if (poolAttemptsByGroup.value.size === 0) {
|
||||
return providerGroups
|
||||
}
|
||||
@@ -929,12 +939,7 @@ const groupedTimeline = computed<NodeGroup[]>(() => {
|
||||
const poolGroups: NodeGroup[] = []
|
||||
|
||||
for (const [groupId, attemptsRaw] of poolAttemptsByGroup.value.entries()) {
|
||||
const attempts = [...attemptsRaw].sort((a, b) => {
|
||||
if (a.candidate_index !== b.candidate_index) {
|
||||
return a.candidate_index - b.candidate_index
|
||||
}
|
||||
return a.retry_index - b.retry_index
|
||||
})
|
||||
const attempts = [...attemptsRaw].sort(compareBySchedulingOrder)
|
||||
if (attempts.length === 0) continue
|
||||
|
||||
const visibleAttempts = buildPoolGroupVisibleAttempts(attempts)
|
||||
@@ -1638,6 +1643,32 @@ const selectFirstAttempt = (group: NodeGroup) => {
|
||||
}
|
||||
}
|
||||
|
||||
const selectAttemptInGroup = (group: NodeGroup, attemptIndex: number) => {
|
||||
const groupIndex = groupedTimeline.value.findIndex(g => g.id === group.id && g.startIndex === group.startIndex)
|
||||
if (groupIndex < 0) return
|
||||
selectedGroupIndex.value = groupIndex
|
||||
selectedAttemptIndex.value = attemptIndex
|
||||
}
|
||||
|
||||
const isAttemptSelected = (group: NodeGroup, attemptIndex: number) => {
|
||||
return isGroupSelected(group) && selectedAttemptIndex.value === attemptIndex
|
||||
}
|
||||
|
||||
const formatCandidateAttemptIndex = (attempt: CandidateRecord): string => {
|
||||
return attempt.retry_index > 0
|
||||
? `#${attempt.candidate_index}.${attempt.retry_index}`
|
||||
: `#${attempt.candidate_index}`
|
||||
}
|
||||
|
||||
const formatAttemptDotTitle = (attempt: CandidateRecord): string => {
|
||||
const parts = [
|
||||
formatCandidateAttemptIndex(attempt),
|
||||
attempt.key_name || attempt.key_account_label || attempt.key_preview || '未知 Key',
|
||||
getStatusLabel(getDisplayStatus(attempt)),
|
||||
]
|
||||
return parts.filter(Boolean).join(' · ')
|
||||
}
|
||||
|
||||
// 导航到上/下一组
|
||||
const navigateGroup = (direction: number) => {
|
||||
const newIndex = selectedGroupIndex.value + direction
|
||||
@@ -1837,8 +1868,17 @@ const getStatusColorClass = (status: string) => {
|
||||
}
|
||||
|
||||
// 展示状态:进行中态优先(包括 started 但未 finished 的中间态),再按 HTTP 状态码兜底
|
||||
const getDisplayStatus = (attempt: CandidateRecord | null | undefined): string => {
|
||||
function getDisplayStatus(attempt: CandidateRecord | null | undefined): string {
|
||||
if (!attempt) return 'available'
|
||||
if (
|
||||
attempt.status === 'success' ||
|
||||
attempt.status === 'failed' ||
|
||||
attempt.status === 'cancelled' ||
|
||||
attempt.status === 'skipped' ||
|
||||
attempt.status === 'stream_interrupted'
|
||||
) {
|
||||
return attempt.status
|
||||
}
|
||||
const hasFinished = Boolean(attempt.finished_at)
|
||||
const isExplicitPending = (attempt.status === 'pending' || attempt.status === 'streaming') && !hasFinished
|
||||
const isImplicitPending = Boolean(
|
||||
|
||||
@@ -311,10 +311,10 @@
|
||||
<colgroup v-if="isAdmin">
|
||||
<col class="w-[8%]">
|
||||
<col class="w-[12%]">
|
||||
<col class="w-[14%]">
|
||||
<col class="w-[16%]">
|
||||
<col class="w-[16%]">
|
||||
<col class="w-[17%]">
|
||||
<col class="w-[6%]">
|
||||
<col class="w-[15%]">
|
||||
<col class="w-[10%]">
|
||||
<col class="w-[10%]">
|
||||
<col class="w-[6%]">
|
||||
<col class="w-[9%]">
|
||||
@@ -322,9 +322,9 @@
|
||||
<colgroup v-else>
|
||||
<col class="w-[9%]">
|
||||
<col class="w-[17%]">
|
||||
<col class="w-[24%]">
|
||||
<col class="w-[15%]">
|
||||
<col class="w-[7%]">
|
||||
<col class="w-[22%]">
|
||||
<col class="w-[14%]">
|
||||
<col class="w-[10%]">
|
||||
<col class="w-[11%]">
|
||||
<col class="w-[7%]">
|
||||
<col class="w-[10%]">
|
||||
@@ -360,7 +360,7 @@
|
||||
密钥
|
||||
</TableHead>
|
||||
<SortableTableHead
|
||||
class="h-12 font-semibold w-[16%]"
|
||||
:class="['h-12 font-semibold', isAdmin ? 'w-[14%]' : 'w-[22%]']"
|
||||
column-key="model"
|
||||
:sortable="false"
|
||||
:filter-active="filterModel !== '__all__'"
|
||||
@@ -397,7 +397,7 @@
|
||||
</template>
|
||||
</SortableTableHead>
|
||||
<SortableTableHead
|
||||
class="h-12 font-semibold w-[17%]"
|
||||
:class="['h-12 font-semibold', isAdmin ? 'w-[15%]' : 'w-[14%]']"
|
||||
column-key="api_format"
|
||||
:sortable="false"
|
||||
:filter-active="filterApiFormat !== '__all__'"
|
||||
@@ -415,7 +415,7 @@
|
||||
</template>
|
||||
</SortableTableHead>
|
||||
<SortableTableHead
|
||||
class="h-12 font-semibold w-[6%] text-center"
|
||||
class="h-12 font-semibold w-[10%] text-center"
|
||||
column-key="status"
|
||||
:sortable="false"
|
||||
align="center"
|
||||
@@ -509,7 +509,7 @@
|
||||
</div>
|
||||
</TableCell>
|
||||
<TableCell
|
||||
class="font-medium py-4 w-[16%]"
|
||||
:class="['font-medium py-4', isAdmin ? 'w-[14%]' : 'w-[22%]']"
|
||||
:title="getModelTooltip(record)"
|
||||
>
|
||||
<div
|
||||
@@ -596,7 +596,7 @@
|
||||
</div>
|
||||
</TableCell>
|
||||
<TableCell
|
||||
class="py-4 w-[17%]"
|
||||
:class="['py-4', isAdmin ? 'w-[15%]' : 'w-[14%]']"
|
||||
:title="getApiFormatTooltip(record)"
|
||||
>
|
||||
<!-- 有格式转换或同族格式差异:两行显示 -->
|
||||
@@ -631,7 +631,7 @@
|
||||
class="text-muted-foreground text-xs"
|
||||
>-</span>
|
||||
</TableCell>
|
||||
<TableCell class="text-center py-4 w-[6%]">
|
||||
<TableCell class="text-center py-4 w-[10%]">
|
||||
<!-- 优先显示请求状态 -->
|
||||
<Badge
|
||||
v-if="getDisplayStatus(record) === 'pending'"
|
||||
|
||||
@@ -0,0 +1,272 @@
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import { createApp, defineComponent, h, nextTick, type App } from 'vue'
|
||||
|
||||
import type { CandidateRecord, RequestTrace } from '@/api/requestTrace'
|
||||
import HorizontalRequestTimeline from '../HorizontalRequestTimeline.vue'
|
||||
|
||||
vi.mock('@/components/ui/card.vue', async () => {
|
||||
const { defineComponent, h } = await import('vue')
|
||||
return {
|
||||
default: defineComponent({
|
||||
name: 'CardStub',
|
||||
setup(_, { slots }) {
|
||||
return () => h('section', slots.default?.())
|
||||
},
|
||||
}),
|
||||
}
|
||||
})
|
||||
|
||||
vi.mock('@/components/ui/badge.vue', async () => {
|
||||
const { defineComponent, h } = await import('vue')
|
||||
return {
|
||||
default: defineComponent({
|
||||
name: 'BadgeStub',
|
||||
setup(_, { slots }) {
|
||||
return () => h('span', slots.default?.())
|
||||
},
|
||||
}),
|
||||
}
|
||||
})
|
||||
|
||||
vi.mock('@/components/ui/skeleton.vue', async () => {
|
||||
const { defineComponent, h } = await import('vue')
|
||||
return {
|
||||
default: defineComponent({
|
||||
name: 'SkeletonStub',
|
||||
setup() {
|
||||
return () => h('div')
|
||||
},
|
||||
}),
|
||||
}
|
||||
})
|
||||
|
||||
vi.mock('../JsonContentPanel.vue', async () => {
|
||||
const { defineComponent, h } = await import('vue')
|
||||
return {
|
||||
default: defineComponent({
|
||||
name: 'JsonContentPanelStub',
|
||||
setup() {
|
||||
return () => h('div')
|
||||
},
|
||||
}),
|
||||
}
|
||||
})
|
||||
|
||||
vi.mock('lucide-vue-next', async () => {
|
||||
const { defineComponent, h } = await import('vue')
|
||||
const Icon = defineComponent({
|
||||
name: 'IconStub',
|
||||
setup() {
|
||||
return () => h('span')
|
||||
},
|
||||
})
|
||||
|
||||
return {
|
||||
ChevronLeft: Icon,
|
||||
ChevronRight: Icon,
|
||||
ExternalLink: Icon,
|
||||
}
|
||||
})
|
||||
|
||||
const mountedApps: Array<{ app: App, root: HTMLElement }> = []
|
||||
|
||||
function buildCandidate(overrides: Partial<CandidateRecord> = {}): CandidateRecord {
|
||||
return {
|
||||
id: 'cand-1',
|
||||
request_id: 'req-1',
|
||||
candidate_index: 0,
|
||||
retry_index: 0,
|
||||
provider_id: 'provider-1',
|
||||
provider_name: 'Provider 1',
|
||||
key_id: 'key-1',
|
||||
key_name: 'Key 1',
|
||||
status: 'failed',
|
||||
is_cached: false,
|
||||
created_at: '2026-05-06T12:00:00.000Z',
|
||||
started_at: '2026-05-06T12:00:00.000Z',
|
||||
finished_at: '2026-05-06T12:00:01.000Z',
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
|
||||
function buildTrace(candidates: CandidateRecord[]): RequestTrace {
|
||||
return {
|
||||
request_id: 'req-1',
|
||||
total_candidates: candidates.length,
|
||||
final_status: 'success',
|
||||
total_latency_ms: 1000,
|
||||
candidates,
|
||||
}
|
||||
}
|
||||
|
||||
function mountTimeline(traceData: RequestTrace) {
|
||||
const root = document.createElement('div')
|
||||
document.body.appendChild(root)
|
||||
const app = createApp(HorizontalRequestTimeline, {
|
||||
requestId: traceData.request_id,
|
||||
traceData,
|
||||
})
|
||||
app.mount(root)
|
||||
mountedApps.push({ app, root })
|
||||
return root
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
for (const { app, root } of mountedApps.splice(0)) {
|
||||
app.unmount()
|
||||
root.remove()
|
||||
}
|
||||
})
|
||||
|
||||
describe('HorizontalRequestTimeline', () => {
|
||||
it('keeps attempted keys visible for ordinary provider groups that are not selected', async () => {
|
||||
const trace = buildTrace([
|
||||
buildCandidate({
|
||||
id: 'provider-a-key-1',
|
||||
provider_id: 'provider-a',
|
||||
provider_name: 'Provider A',
|
||||
key_id: 'key-a-1',
|
||||
key_name: 'Key A1',
|
||||
candidate_index: 0,
|
||||
status: 'failed',
|
||||
}),
|
||||
buildCandidate({
|
||||
id: 'provider-a-key-2',
|
||||
provider_id: 'provider-a',
|
||||
provider_name: 'Provider A',
|
||||
key_id: 'key-a-2',
|
||||
key_name: 'Key A2',
|
||||
candidate_index: 1,
|
||||
status: 'failed',
|
||||
}),
|
||||
buildCandidate({
|
||||
id: 'provider-b-key-1',
|
||||
provider_id: 'provider-b',
|
||||
provider_name: 'Provider B',
|
||||
key_id: 'key-b-1',
|
||||
key_name: 'Key B1',
|
||||
candidate_index: 2,
|
||||
status: 'failed',
|
||||
}),
|
||||
buildCandidate({
|
||||
id: 'provider-b-key-2',
|
||||
provider_id: 'provider-b',
|
||||
provider_name: 'Provider B',
|
||||
key_id: 'key-b-2',
|
||||
key_name: 'Key B2',
|
||||
candidate_index: 3,
|
||||
status: 'success',
|
||||
}),
|
||||
])
|
||||
|
||||
const root = mountTimeline(trace)
|
||||
await nextTick()
|
||||
|
||||
const subDots = [...root.querySelectorAll<HTMLButtonElement>('.sub-dot')]
|
||||
expect(subDots).toHaveLength(2)
|
||||
expect(subDots.map(dot => dot.getAttribute('title'))).toEqual([
|
||||
'#1 · Key A2 · 失败',
|
||||
'#3 · Key B2 · 成功',
|
||||
])
|
||||
})
|
||||
|
||||
it('orders visible candidates by scheduling index and hides unstarted lazy candidates', async () => {
|
||||
const trace = buildTrace([
|
||||
buildCandidate({
|
||||
id: 'cand-success',
|
||||
provider_id: 'provider-success',
|
||||
provider_name: 'Provider Success',
|
||||
key_id: 'key-success',
|
||||
key_name: 'Success Key',
|
||||
candidate_index: 4,
|
||||
status: 'success',
|
||||
started_at: '2026-05-06T12:00:04.000Z',
|
||||
finished_at: '2026-05-06T12:00:05.000Z',
|
||||
}),
|
||||
buildCandidate({
|
||||
id: 'cand-available',
|
||||
provider_id: 'provider-available',
|
||||
provider_name: 'Provider Available',
|
||||
key_id: 'key-available',
|
||||
key_name: 'Available Key',
|
||||
candidate_index: 0,
|
||||
status: 'available',
|
||||
started_at: undefined,
|
||||
finished_at: undefined,
|
||||
}),
|
||||
buildCandidate({
|
||||
id: 'cand-skipped',
|
||||
provider_id: 'provider-skipped',
|
||||
provider_name: 'Provider Skipped',
|
||||
key_id: 'key-skipped',
|
||||
key_name: 'Skipped Key',
|
||||
candidate_index: 1,
|
||||
status: 'skipped',
|
||||
started_at: undefined,
|
||||
finished_at: undefined,
|
||||
}),
|
||||
buildCandidate({
|
||||
id: 'cand-pending-unstarted',
|
||||
provider_id: 'provider-pending',
|
||||
provider_name: 'Provider Pending',
|
||||
key_id: 'key-pending',
|
||||
key_name: 'Pending Key',
|
||||
candidate_index: 2,
|
||||
status: 'pending',
|
||||
started_at: undefined,
|
||||
finished_at: undefined,
|
||||
}),
|
||||
buildCandidate({
|
||||
id: 'cand-failed',
|
||||
provider_id: 'provider-failed',
|
||||
provider_name: 'Provider Failed',
|
||||
key_id: 'key-failed',
|
||||
key_name: 'Failed Key',
|
||||
candidate_index: 3,
|
||||
status: 'failed',
|
||||
started_at: '2026-05-06T12:00:03.000Z',
|
||||
finished_at: '2026-05-06T12:00:04.000Z',
|
||||
}),
|
||||
])
|
||||
|
||||
const root = mountTimeline(trace)
|
||||
await nextTick()
|
||||
|
||||
const labels = [...root.querySelectorAll<HTMLElement>('.node-label')]
|
||||
.map(label => label.textContent?.trim())
|
||||
expect(labels).toEqual(['Provider Skipped', 'Provider Failed', 'Provider Success'])
|
||||
})
|
||||
|
||||
it('uses candidate terminal status for node colors instead of overriding with HTTP code', async () => {
|
||||
const trace = buildTrace([
|
||||
buildCandidate({
|
||||
id: 'cand-body-error',
|
||||
provider_id: 'provider-body-error',
|
||||
provider_name: 'Provider Body Error',
|
||||
key_id: 'key-body-error',
|
||||
key_name: 'Body Error Key',
|
||||
candidate_index: 0,
|
||||
status: 'failed',
|
||||
status_code: 200,
|
||||
}),
|
||||
buildCandidate({
|
||||
id: 'cand-success',
|
||||
provider_id: 'provider-success',
|
||||
provider_name: 'Provider Success',
|
||||
key_id: 'key-success',
|
||||
key_name: 'Success Key',
|
||||
candidate_index: 1,
|
||||
status: 'success',
|
||||
status_code: 200,
|
||||
}),
|
||||
])
|
||||
|
||||
const root = mountTimeline(trace)
|
||||
await nextTick()
|
||||
|
||||
const nodeDots = [...root.querySelectorAll<HTMLElement>('.node-dot')]
|
||||
expect(nodeDots[0].classList.contains('status-failed')).toBe(true)
|
||||
expect(nodeDots[0].classList.contains('status-success')).toBe(false)
|
||||
expect(nodeDots[1].classList.contains('status-success')).toBe(true)
|
||||
})
|
||||
})
|
||||
@@ -189,7 +189,7 @@ describe('poolTrace', () => {
|
||||
expect(isAttemptedCandidate(buildCandidate({ status: 'unused' }))).toBe(false)
|
||||
})
|
||||
|
||||
it('shows only attempted pool children when attempted nodes exist', () => {
|
||||
it('keeps skipped pool children visible when attempted nodes exist', () => {
|
||||
const attempts = buildPoolGroupVisibleAttempts([
|
||||
buildCandidate({
|
||||
id: 'cand-skipped',
|
||||
@@ -210,10 +210,10 @@ describe('poolTrace', () => {
|
||||
}),
|
||||
])
|
||||
|
||||
expect(attempts.map(item => item.id)).toEqual(['cand-failed', 'cand-success'])
|
||||
expect(attempts.map(item => item.id)).toEqual(['cand-skipped', 'cand-failed', 'cand-success'])
|
||||
})
|
||||
|
||||
it('collapses all-skipped pool nodes to a single provider node', () => {
|
||||
it('keeps all skipped pool children visible', () => {
|
||||
const attempts = buildPoolGroupVisibleAttempts([
|
||||
buildCandidate({
|
||||
id: 'cand-skipped-1',
|
||||
@@ -227,6 +227,6 @@ describe('poolTrace', () => {
|
||||
}),
|
||||
])
|
||||
|
||||
expect(attempts.map(item => item.id)).toEqual(['cand-skipped-2'])
|
||||
expect(attempts.map(item => item.id)).toEqual(['cand-skipped-1', 'cand-skipped-2'])
|
||||
})
|
||||
})
|
||||
|
||||
@@ -91,12 +91,19 @@ describe('usage status helpers', () => {
|
||||
expect(isUsageRecordFailed(record)).toBe(true)
|
||||
})
|
||||
|
||||
it('treats explicit success status code as authoritative for the timeline', () => {
|
||||
it('prefers terminal request lifecycle status over status code for the timeline', () => {
|
||||
expect(resolveTimelineFinalStatus({
|
||||
traceFinalStatus: 'success',
|
||||
requestStatus: 'failed',
|
||||
statusCode: 200,
|
||||
})).toBe('success')
|
||||
})).toBe('failed')
|
||||
})
|
||||
|
||||
it('prefers terminal trace status over status code when request lifecycle is absent', () => {
|
||||
expect(resolveTimelineFinalStatus({
|
||||
traceFinalStatus: 'failed',
|
||||
statusCode: 200,
|
||||
})).toBe('failed')
|
||||
})
|
||||
|
||||
it('falls back to request lifecycle status when status code and trace are missing', () => {
|
||||
|
||||
@@ -68,14 +68,7 @@ export const isAttemptedCandidate = (
|
||||
export function buildPoolGroupVisibleAttempts(
|
||||
attempts: CandidateRecord[],
|
||||
): CandidateRecord[] {
|
||||
if (attempts.length === 0) return []
|
||||
|
||||
const attempted = attempts.filter(isAttemptedCandidate)
|
||||
if (attempted.length > 0) {
|
||||
return attempted
|
||||
}
|
||||
|
||||
return [attempts[attempts.length - 1]]
|
||||
return attempts.filter(isPoolParticipatedCandidate)
|
||||
}
|
||||
|
||||
export const parseTimelineStatus = (value: unknown): CandidateRecord['status'] | null => {
|
||||
|
||||
@@ -272,8 +272,9 @@ export function resolveTimelineFinalStatus(params: {
|
||||
requestStatus?: RequestStatusLike
|
||||
statusCode?: number
|
||||
}): TimelineFinalStatus {
|
||||
if (typeof params.statusCode === 'number') {
|
||||
return params.statusCode >= 200 && params.statusCode < 400 ? 'success' : 'failed'
|
||||
const requestStatus = mapRequestStatusToTimelineStatus(params.requestStatus)
|
||||
if (requestStatus === 'success' || requestStatus === 'failed' || requestStatus === 'cancelled') {
|
||||
return requestStatus
|
||||
}
|
||||
|
||||
const traceStatus = normalizeTimelineFinalStatus(params.traceFinalStatus)
|
||||
@@ -281,9 +282,8 @@ export function resolveTimelineFinalStatus(params: {
|
||||
return traceStatus
|
||||
}
|
||||
|
||||
const requestStatus = mapRequestStatusToTimelineStatus(params.requestStatus)
|
||||
if (requestStatus === 'success' || requestStatus === 'failed' || requestStatus === 'cancelled') {
|
||||
return requestStatus
|
||||
if (typeof params.statusCode === 'number') {
|
||||
return params.statusCode >= 200 && params.statusCode < 400 ? 'success' : 'failed'
|
||||
}
|
||||
|
||||
if (params.hasPendingCandidates) {
|
||||
|
||||
@@ -76,34 +76,6 @@
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="showCodexStatsModeSwitch"
|
||||
class="flex items-center"
|
||||
data-testid="pool-mobile-header-actions"
|
||||
>
|
||||
<div
|
||||
class="group inline-flex min-h-12 flex-col items-center justify-center gap-1 rounded-md border border-border/50 bg-muted/20 px-2.5 py-1.5 text-xs transition-all duration-200 hover:border-primary/40 hover:bg-muted/40"
|
||||
data-testid="pool-stats-mode-control"
|
||||
>
|
||||
<div class="flex items-center gap-1 leading-none">
|
||||
<span
|
||||
class="font-medium transition-colors"
|
||||
:class="!codexCurrentCycleStatsEnabled ? 'text-foreground/90' : 'text-muted-foreground/80'"
|
||||
>累计</span>
|
||||
<span class="text-muted-foreground/50 transition-colors group-hover:text-muted-foreground/80">/</span>
|
||||
<span
|
||||
class="font-medium transition-colors"
|
||||
:class="codexCurrentCycleStatsEnabled ? 'text-foreground/90' : 'text-muted-foreground/80'"
|
||||
>周期</span>
|
||||
</div>
|
||||
<Switch
|
||||
v-model="codexCurrentCycleStatsEnabled"
|
||||
class="shrink-0"
|
||||
aria-label="Codex 统计模式"
|
||||
data-testid="pool-stats-mode-switch"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="selectedProviderId"
|
||||
class="flex items-center gap-1"
|
||||
@@ -259,33 +231,6 @@
|
||||
v-if="selectedProviderId"
|
||||
class="h-4 w-px bg-border"
|
||||
/>
|
||||
<div
|
||||
v-if="showCodexStatsModeSwitch"
|
||||
class="group inline-flex min-h-12 flex-col items-center justify-center gap-1 rounded-md border border-border/50 bg-muted/20 px-2.5 py-1.5 text-xs transition-all duration-200 hover:border-primary/40 hover:bg-muted/40"
|
||||
data-testid="pool-stats-mode-control"
|
||||
>
|
||||
<div class="flex items-center gap-1 leading-none">
|
||||
<span
|
||||
class="font-medium transition-colors"
|
||||
:class="!codexCurrentCycleStatsEnabled ? 'text-foreground/90' : 'text-muted-foreground/80'"
|
||||
>累计</span>
|
||||
<span class="text-muted-foreground/50 transition-colors group-hover:text-muted-foreground/80">/</span>
|
||||
<span
|
||||
class="font-medium transition-colors"
|
||||
:class="codexCurrentCycleStatsEnabled ? 'text-foreground/90' : 'text-muted-foreground/80'"
|
||||
>周期</span>
|
||||
</div>
|
||||
<Switch
|
||||
v-model="codexCurrentCycleStatsEnabled"
|
||||
class="shrink-0"
|
||||
aria-label="Codex 统计模式"
|
||||
data-testid="pool-stats-mode-switch"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
v-if="showCodexStatsModeSwitch"
|
||||
class="h-4 w-px bg-border"
|
||||
/>
|
||||
<Button
|
||||
v-if="selectedProviderId"
|
||||
variant="ghost"
|
||||
@@ -418,7 +363,21 @@
|
||||
class="px-2 font-semibold text-center whitespace-nowrap"
|
||||
:style="{ width: desktopColumnWidths.stats }"
|
||||
>
|
||||
统计
|
||||
<div class="flex items-center justify-center gap-1.5">
|
||||
<button
|
||||
v-if="showCodexStatsModeToggle"
|
||||
type="button"
|
||||
class="inline-flex h-6 w-6 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground"
|
||||
:title="poolStatsMode === 'current_cycle' ? '切换为总计统计' : '切换为周期统计'"
|
||||
:aria-label="poolStatsMode === 'current_cycle' ? '切换为总计统计' : '切换为周期统计'"
|
||||
:aria-pressed="poolStatsMode === 'current_cycle'"
|
||||
data-testid="pool-stats-mode-control"
|
||||
@click.stop="togglePoolStatsMode"
|
||||
>
|
||||
<Repeat2 class="h-3.5 w-3.5" />
|
||||
</button>
|
||||
<span>统计</span>
|
||||
</div>
|
||||
</TableHead>
|
||||
<SortableTableHead
|
||||
class="font-semibold text-center whitespace-nowrap"
|
||||
@@ -631,41 +590,66 @@
|
||||
<TableCell class="py-3 px-2 align-middle">
|
||||
<div
|
||||
v-if="isPoolKeyCycleStatsDisplay(key)"
|
||||
class="mx-auto w-[136px] space-y-1.5 text-[10px] leading-4"
|
||||
class="mx-auto w-[188px] text-[10px] leading-4"
|
||||
data-testid="pool-stats-cycle-groups"
|
||||
>
|
||||
<div
|
||||
v-for="group in getPoolKeyCycleStatsGroups(key)"
|
||||
:key="`${key.key_id}-${group.code}-desktop-stats`"
|
||||
:data-testid="`pool-stats-cycle-group-${group.code}`"
|
||||
class="grid min-h-16 w-[188px] grid-cols-[38px_64px_10px_64px] items-center gap-x-1"
|
||||
data-testid="pool-stats-cycle-grid"
|
||||
>
|
||||
<div class="text-[9px] text-muted-foreground/70 font-medium mb-0.5">{{ group.label }}</div>
|
||||
<div
|
||||
v-for="metric in group.metrics"
|
||||
:key="`${group.code}-${metric.key}`"
|
||||
class="flex items-center justify-between gap-2"
|
||||
<span aria-hidden="true" />
|
||||
<span
|
||||
class="text-center text-[9px] font-semibold text-muted-foreground/80"
|
||||
data-testid="pool-stats-cycle-group-5h"
|
||||
>5H</span>
|
||||
<span class="text-center text-muted-foreground/50">|</span>
|
||||
<span
|
||||
class="text-center text-[9px] font-semibold text-muted-foreground/80"
|
||||
data-testid="pool-stats-cycle-group-weekly"
|
||||
>周</span>
|
||||
|
||||
<template
|
||||
v-for="row in getPoolKeyCycleStatsRows(key)"
|
||||
:key="`${key.key_id}-${row.key}-desktop-cycle-row`"
|
||||
>
|
||||
<span class="text-muted-foreground">{{ metric.label }}</span>
|
||||
<span class="text-muted-foreground truncate">{{ row.label }}</span>
|
||||
<span
|
||||
class="tabular-nums text-foreground/90"
|
||||
:class="metric.missing ? 'text-muted-foreground/80' : ''"
|
||||
:data-testid="`pool-stats-${group.code}-${metric.key}`"
|
||||
>{{ metric.value }}</span>
|
||||
</div>
|
||||
class="min-w-0 truncate text-center tabular-nums text-foreground/90"
|
||||
:class="row.fiveH.missing ? 'text-muted-foreground/80' : ''"
|
||||
:data-testid="`pool-stats-5h-${row.key}`"
|
||||
:title="row.fiveH.value"
|
||||
>{{ row.fiveH.value }}</span>
|
||||
<span class="text-center text-muted-foreground/50">|</span>
|
||||
<span
|
||||
class="min-w-0 truncate text-center tabular-nums text-foreground/90"
|
||||
:class="row.weekly.missing ? 'text-muted-foreground/80' : ''"
|
||||
:data-testid="`pool-stats-weekly-${row.key}`"
|
||||
:title="row.weekly.value"
|
||||
>{{ row.weekly.value }}</span>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-else
|
||||
class="grid grid-rows-3 gap-0.5 w-[136px] mx-auto text-[10px] leading-4"
|
||||
class="grid min-h-16 w-[188px] grid-rows-4 gap-0 mx-auto text-[10px] leading-4"
|
||||
data-testid="pool-stats-account-total"
|
||||
>
|
||||
<div
|
||||
class="invisible h-4"
|
||||
aria-hidden="true"
|
||||
>
|
||||
-
|
||||
</div>
|
||||
<div
|
||||
v-for="metric in getPoolKeyAccountStatsMetrics(key)"
|
||||
:key="`${key.key_id}-${metric.key}-account-total`"
|
||||
class="flex items-center justify-between gap-2"
|
||||
class="grid grid-cols-[64px_124px] items-center"
|
||||
>
|
||||
<span class="text-muted-foreground">{{ metric.label }}</span>
|
||||
<span class="tabular-nums text-foreground/90">
|
||||
<span class="text-muted-foreground truncate">{{ metric.label }}</span>
|
||||
<span
|
||||
class="min-w-0 truncate text-center tabular-nums text-foreground/90"
|
||||
:title="metric.value"
|
||||
>
|
||||
{{ metric.value }}
|
||||
</span>
|
||||
</div>
|
||||
@@ -702,6 +686,21 @@
|
||||
>
|
||||
<RefreshCw class="w-3.5 h-3.5" />
|
||||
</Button>
|
||||
<Button
|
||||
v-if="canResetCycleStats(key)"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="h-7 w-7 text-muted-foreground hover:text-foreground"
|
||||
:disabled="resettingCycleKeyId === key.key_id"
|
||||
title="重置周期统计"
|
||||
data-testid="pool-reset-cycle-stats"
|
||||
@click="handleResetCycleStats(key)"
|
||||
>
|
||||
<RotateCcw
|
||||
class="w-3.5 h-3.5"
|
||||
:class="{ 'animate-spin': resettingCycleKeyId === key.key_id }"
|
||||
/>
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
@@ -869,35 +868,56 @@
|
||||
<div class="space-y-1 text-center">
|
||||
<template v-if="isPoolKeyCycleStatsDisplay(key)">
|
||||
<div
|
||||
v-for="group in getPoolKeyCycleStatsGroups(key)"
|
||||
:key="`${key.key_id}-${group.code}-mobile-stats`"
|
||||
class="flex items-start gap-3 text-left"
|
||||
:data-testid="`pool-mobile-stats-cycle-group-${group.code}`"
|
||||
class="grid min-h-16 w-[188px] grid-cols-[38px_64px_10px_64px] items-center gap-x-1 text-left"
|
||||
data-testid="pool-mobile-stats-cycle-grid"
|
||||
>
|
||||
<span class="w-10 shrink-0 pt-0.5 text-[10px] font-semibold text-foreground">{{ group.label }}</span>
|
||||
<div class="min-w-0 flex-1 space-y-0.5">
|
||||
<div
|
||||
v-for="metric in group.metrics"
|
||||
:key="`${group.code}-${metric.key}-mobile`"
|
||||
class="flex items-center justify-between gap-2"
|
||||
>
|
||||
<span class="text-muted-foreground">{{ metric.label }}</span>
|
||||
<span
|
||||
class="font-medium text-foreground/90 tabular-nums"
|
||||
:class="metric.missing ? 'text-muted-foreground/80' : ''"
|
||||
>{{ metric.value }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<span aria-hidden="true" />
|
||||
<span
|
||||
class="text-center text-[10px] font-semibold text-foreground"
|
||||
data-testid="pool-mobile-stats-cycle-group-5h"
|
||||
>5H</span>
|
||||
<span class="text-center text-muted-foreground/50">|</span>
|
||||
<span
|
||||
class="text-center text-[10px] font-semibold text-foreground"
|
||||
data-testid="pool-mobile-stats-cycle-group-weekly"
|
||||
>周</span>
|
||||
|
||||
<template
|
||||
v-for="row in getPoolKeyCycleStatsRows(key)"
|
||||
:key="`${key.key_id}-${row.key}-mobile-cycle-row`"
|
||||
>
|
||||
<span class="text-muted-foreground truncate">{{ row.label }}</span>
|
||||
<span
|
||||
class="min-w-0 truncate text-center font-medium text-foreground/90 tabular-nums"
|
||||
:class="row.fiveH.missing ? 'text-muted-foreground/80' : ''"
|
||||
:title="row.fiveH.value"
|
||||
>{{ row.fiveH.value }}</span>
|
||||
<span class="text-center text-muted-foreground/50">|</span>
|
||||
<span
|
||||
class="min-w-0 truncate text-center font-medium text-foreground/90 tabular-nums"
|
||||
:class="row.weekly.missing ? 'text-muted-foreground/80' : ''"
|
||||
:title="row.weekly.value"
|
||||
>{{ row.weekly.value }}</span>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div
|
||||
class="invisible h-4"
|
||||
aria-hidden="true"
|
||||
>
|
||||
-
|
||||
</div>
|
||||
<div
|
||||
v-for="metric in getPoolKeyAccountStatsMetrics(key)"
|
||||
:key="`${key.key_id}-${metric.key}-mobile-account-total`"
|
||||
class="flex items-center justify-between gap-2"
|
||||
class="grid h-4 w-[188px] grid-cols-[64px_124px] items-center text-left"
|
||||
>
|
||||
<span class="text-muted-foreground">{{ metric.label }}</span>
|
||||
<span class="font-medium text-foreground/90">{{ metric.value }}</span>
|
||||
<span class="text-muted-foreground truncate">{{ metric.label }}</span>
|
||||
<span
|
||||
class="min-w-0 truncate text-center font-medium text-foreground/90"
|
||||
:title="metric.value"
|
||||
>{{ metric.value }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<div class="flex items-center justify-between gap-2 border-t border-border/40 pt-1 mt-1">
|
||||
@@ -1072,6 +1092,20 @@
|
||||
</div>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
<Button
|
||||
v-else-if="actionId === 'reset_cycle_stats'"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="h-7 w-7 shrink-0 text-muted-foreground hover:text-foreground"
|
||||
:disabled="resettingCycleKeyId === key.key_id"
|
||||
title="重置周期统计"
|
||||
@click="handleResetCycleStats(key)"
|
||||
>
|
||||
<RotateCcw
|
||||
class="w-3.5 h-3.5"
|
||||
:class="{ 'animate-spin': resettingCycleKeyId === key.key_id }"
|
||||
/>
|
||||
</Button>
|
||||
<Button
|
||||
v-else-if="actionId === 'edit'"
|
||||
variant="ghost"
|
||||
@@ -1232,6 +1266,8 @@ import {
|
||||
Copy,
|
||||
Shield,
|
||||
Globe,
|
||||
Repeat2,
|
||||
RotateCcw,
|
||||
SquarePen,
|
||||
Trash2,
|
||||
Users,
|
||||
@@ -1257,7 +1293,6 @@ import {
|
||||
SortableTableHead,
|
||||
TableFilterMenu,
|
||||
TableCell,
|
||||
Switch,
|
||||
Pagination,
|
||||
Popover,
|
||||
PopoverTrigger,
|
||||
@@ -1282,6 +1317,7 @@ import {
|
||||
deleteEndpointKey,
|
||||
updateProviderKey,
|
||||
refreshProviderQuota,
|
||||
resetProviderKeyCycleStats,
|
||||
} from '@/api/endpoints/keys'
|
||||
import { refreshProviderOAuth } from '@/api/endpoints/provider_oauth'
|
||||
import type {
|
||||
@@ -1596,13 +1632,7 @@ const selectedProviderType = computed(() => {
|
||||
return String(fromOverview || '').trim().toLowerCase()
|
||||
})
|
||||
|
||||
const showCodexStatsModeSwitch = computed(() => selectedProviderType.value === 'codex')
|
||||
const codexCurrentCycleStatsEnabled = computed({
|
||||
get: () => poolStatsMode.value === 'current_cycle',
|
||||
set: (enabled: boolean) => {
|
||||
poolStatsMode.value = enabled ? 'current_cycle' : 'account_total'
|
||||
},
|
||||
})
|
||||
const showCodexStatsModeToggle = computed(() => selectedProviderType.value === 'codex')
|
||||
|
||||
const selectedProviderStatusText = computed(() => {
|
||||
if (!selectedProviderId.value) return ''
|
||||
@@ -1632,9 +1662,9 @@ const showAccountQuotaColumn = computed(() => {
|
||||
const desktopColumnWidths = computed(() => {
|
||||
if (showAccountQuotaColumn.value) {
|
||||
return {
|
||||
name: '24%',
|
||||
name: '22%',
|
||||
quota: '21%',
|
||||
stats: '13%',
|
||||
stats: '15%',
|
||||
imported: '10%',
|
||||
lastUsed: '9%',
|
||||
status: '7%',
|
||||
@@ -1732,6 +1762,7 @@ const poolStatsMode = ref<PoolManagementStatsMode>(restoredViewState.statsMode)
|
||||
const hasPoolKeyFilters = computed(() => searchQuery.value.trim().length > 0 || statusFilter.value !== 'all')
|
||||
const MANUAL_QUOTA_REFRESH_COOLDOWN_SECONDS = 5 * 60
|
||||
const refreshingOAuthKeyId = ref<string | null>(null)
|
||||
const resettingCycleKeyId = ref<string | null>(null)
|
||||
const savingProxyKeyId = ref<string | null>(null)
|
||||
const proxyDesktopPopoverOpenKeyId = ref<string | null>(null)
|
||||
const proxyMobilePopoverOpenKeyId = ref<string | null>(null)
|
||||
@@ -1746,6 +1777,12 @@ const keyFormDialogOpen = ref(false)
|
||||
const oauthKeyEditDialogOpen = ref(false)
|
||||
const editingKeyDetail = ref<PoolKeyDetail | null>(null)
|
||||
|
||||
function togglePoolStatsMode() {
|
||||
poolStatsMode.value = poolStatsMode.value === 'current_cycle'
|
||||
? 'account_total'
|
||||
: 'current_cycle'
|
||||
}
|
||||
|
||||
function clearPoolKeyFilters() {
|
||||
if (!hasPoolKeyFilters.value) return
|
||||
suppressFiltersWatch = true
|
||||
@@ -1864,6 +1901,20 @@ interface QuotaProgressItem {
|
||||
updatedAtSeconds?: number | null
|
||||
}
|
||||
|
||||
interface PoolCodexCycleStatsRow {
|
||||
key: PoolStatsMetric['key']
|
||||
label: string
|
||||
fiveH: PoolStatsMetric
|
||||
weekly: PoolStatsMetric
|
||||
}
|
||||
|
||||
const CODEX_CYCLE_STAT_KEYS: Array<PoolStatsMetric['key']> = ['request_count', 'total_tokens', 'total_cost_usd']
|
||||
const CODEX_CYCLE_STAT_LABELS: Record<PoolStatsMetric['key'], string> = {
|
||||
request_count: '请求',
|
||||
total_tokens: 'Token',
|
||||
total_cost_usd: '费用',
|
||||
}
|
||||
|
||||
type PoolKeyUiState = {
|
||||
rowClass: string
|
||||
schedulingBadgeLabel: string
|
||||
@@ -1926,6 +1977,7 @@ const keyUiStateMap = computed<Record<string, PoolKeyUiState>>(() => {
|
||||
mobileActionIds: splitPoolMobileActions({
|
||||
canDownloadOrCopy: true,
|
||||
showRefreshToken: showOAuthRefreshControl,
|
||||
canResetCycleStats: canResetCycleStats(key),
|
||||
canClearCooldown: Boolean(key.cooldown_reason),
|
||||
hasProxy: true,
|
||||
}).primary,
|
||||
@@ -1949,6 +2001,39 @@ function getPoolKeyCycleStatsGroups(key: PoolKeyDetail): PoolCodexCycleStatsGrou
|
||||
return display.kind === 'codex_cycle' ? display.groups : []
|
||||
}
|
||||
|
||||
function createMissingCycleMetric(key: PoolStatsMetric['key']): PoolStatsMetric {
|
||||
return {
|
||||
key,
|
||||
label: CODEX_CYCLE_STAT_LABELS[key],
|
||||
value: '—',
|
||||
missing: true,
|
||||
}
|
||||
}
|
||||
|
||||
function findCycleMetric(
|
||||
group: PoolCodexCycleStatsGroup | undefined,
|
||||
key: PoolStatsMetric['key'],
|
||||
): PoolStatsMetric {
|
||||
return group?.metrics.find(metric => metric.key === key) ?? createMissingCycleMetric(key)
|
||||
}
|
||||
|
||||
function getPoolKeyCycleStatsRows(key: PoolKeyDetail): PoolCodexCycleStatsRow[] {
|
||||
const groups = getPoolKeyCycleStatsGroups(key)
|
||||
const fiveHGroup = groups.find(group => group.code === '5h')
|
||||
const weeklyGroup = groups.find(group => group.code === 'weekly')
|
||||
|
||||
return CODEX_CYCLE_STAT_KEYS.map((metricKey) => {
|
||||
const fiveH = findCycleMetric(fiveHGroup, metricKey)
|
||||
const weekly = findCycleMetric(weeklyGroup, metricKey)
|
||||
return {
|
||||
key: metricKey,
|
||||
label: CODEX_CYCLE_STAT_LABELS[metricKey],
|
||||
fiveH,
|
||||
weekly,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function getPoolKeyAccountStatsMetrics(key: PoolKeyDetail): PoolStatsMetric[] {
|
||||
const display = getPoolKeyStatsDisplay(key)
|
||||
return display.kind === 'account_total'
|
||||
@@ -1963,6 +2048,10 @@ const quotaRefreshSupported = computed(() => {
|
||||
|| selectedProviderType.value === 'chatgpt_web'
|
||||
})
|
||||
|
||||
function canResetCycleStats(_key: PoolKeyDetail): boolean {
|
||||
return selectedProviderType.value === 'codex' && Boolean(_key.key_id)
|
||||
}
|
||||
|
||||
const refreshCurrentPageLoading = computed(() => {
|
||||
return keysLoading.value || refreshingCurrentPageQuota.value
|
||||
})
|
||||
@@ -2519,6 +2608,28 @@ async function clearCooldown(keyId: string) {
|
||||
}
|
||||
}
|
||||
|
||||
async function handleResetCycleStats(key: PoolKeyDetail) {
|
||||
if (resettingCycleKeyId.value || !canResetCycleStats(key)) return
|
||||
|
||||
const confirmed = await confirm({
|
||||
title: '重置周期统计',
|
||||
message: `确定要将账号 "${key.key_name || key.key_id.slice(0, 8)}" 的 5H / 周统计从当前时间重新开始计算吗?`,
|
||||
confirmText: '重置',
|
||||
})
|
||||
if (!confirmed) return
|
||||
|
||||
resettingCycleKeyId.value = key.key_id
|
||||
try {
|
||||
const result = await resetProviderKeyCycleStats(key.key_id)
|
||||
success(result.message || '周期统计已重置')
|
||||
await loadKeys()
|
||||
} catch (err) {
|
||||
showError(parseApiError(err, '重置周期统计失败'))
|
||||
} finally {
|
||||
resettingCycleKeyId.value = null
|
||||
}
|
||||
}
|
||||
|
||||
async function toggleKeyActive(key: PoolKeyDetail) {
|
||||
if (togglingKeyId.value) return
|
||||
togglingKeyId.value = key.key_id
|
||||
|
||||
@@ -17,6 +17,7 @@ const endpointMocks = vi.hoisted(() => ({
|
||||
deleteEndpointKey: vi.fn(),
|
||||
updateProviderKey: vi.fn(),
|
||||
refreshProviderQuota: vi.fn(),
|
||||
resetProviderKeyCycleStats: vi.fn(),
|
||||
refreshProviderOAuth: vi.fn(),
|
||||
}))
|
||||
|
||||
@@ -50,6 +51,7 @@ vi.mock('@/api/endpoints/keys', () => ({
|
||||
deleteEndpointKey: endpointMocks.deleteEndpointKey,
|
||||
updateProviderKey: endpointMocks.updateProviderKey,
|
||||
refreshProviderQuota: endpointMocks.refreshProviderQuota,
|
||||
resetProviderKeyCycleStats: endpointMocks.resetProviderKeyCycleStats,
|
||||
}))
|
||||
|
||||
vi.mock('@/api/endpoints/provider_oauth', () => ({
|
||||
@@ -130,6 +132,8 @@ vi.mock('lucide-vue-next', async () => {
|
||||
Copy: Icon,
|
||||
Shield: Icon,
|
||||
Globe: Icon,
|
||||
Repeat2: Icon,
|
||||
RotateCcw: Icon,
|
||||
SquarePen: Icon,
|
||||
Trash2: Icon,
|
||||
Users: Icon,
|
||||
@@ -468,11 +472,13 @@ beforeEach(() => {
|
||||
endpointMocks.deleteEndpointKey.mockReset()
|
||||
endpointMocks.updateProviderKey.mockReset()
|
||||
endpointMocks.refreshProviderQuota.mockReset()
|
||||
endpointMocks.resetProviderKeyCycleStats.mockReset()
|
||||
endpointMocks.refreshProviderOAuth.mockReset()
|
||||
|
||||
endpointMocks.getPoolSchedulingPresets.mockResolvedValue([])
|
||||
endpointMocks.clearPoolCooldown.mockResolvedValue({ message: 'ok' })
|
||||
endpointMocks.refreshProviderQuota.mockResolvedValue({ success: 0, failed: 0 })
|
||||
endpointMocks.resetProviderKeyCycleStats.mockResolvedValue({ message: '已重置周期统计', reset_at: 123, windows: 2 })
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
@@ -483,7 +489,7 @@ afterEach(() => {
|
||||
})
|
||||
|
||||
describe('PoolManagement Codex cycle stats mode', () => {
|
||||
it('defaults Codex providers to current-cycle groups and toggles back to account totals', async () => {
|
||||
it('renders Codex current-cycle stats by default with a header icon toggle', async () => {
|
||||
const codexKey = createPoolKey('codex')
|
||||
endpointMocks.getPoolOverview.mockResolvedValue({ items: [createOverview('codex')] })
|
||||
endpointMocks.listPoolKeys.mockResolvedValue(createKeyPage(codexKey))
|
||||
@@ -492,52 +498,96 @@ describe('PoolManagement Codex cycle stats mode', () => {
|
||||
const root = mountPoolManagement()
|
||||
await settle()
|
||||
|
||||
const modeSwitch = root.querySelector<HTMLInputElement>('[data-testid="pool-stats-mode-switch"]')
|
||||
expect(modeSwitch).not.toBeNull()
|
||||
expect(modeSwitch?.checked).toBe(true)
|
||||
expect(root.querySelector('[data-testid="pool-stats-mode-switch"]')).toBeNull()
|
||||
const modeButton = root.querySelector<HTMLButtonElement>('[data-testid="pool-stats-mode-control"]')
|
||||
expect(modeButton).not.toBeNull()
|
||||
expect(modeButton?.getAttribute('title')).toBe('切换为总计统计')
|
||||
expect(root.querySelectorAll('[data-testid="pool-stats-cycle-group-5h"]').length).toBeGreaterThan(0)
|
||||
expect(root.querySelectorAll('[data-testid="pool-stats-cycle-group-weekly"]').length).toBeGreaterThan(0)
|
||||
expect(root.querySelector('[data-testid="pool-stats-5h-request_count"]')?.textContent?.trim()).toBe('7')
|
||||
expect(root.querySelector('[data-testid="pool-stats-weekly-total_tokens"]')?.textContent?.trim()).toBe('0')
|
||||
expect(root.querySelector('[data-testid="pool-stats-cycle-grid"]')?.className).toContain('grid-cols-[38px_64px_10px_64px]')
|
||||
expect(root.querySelector('[data-testid="pool-stats-cycle-grid"]')?.className).toContain('w-[188px]')
|
||||
expect(root.querySelector('[data-testid="pool-stats-cycle-grid"]')?.className).toContain('min-h-16')
|
||||
expect(root.querySelector('[data-testid="pool-stats-5h-request_count"]')?.className).toContain('text-center')
|
||||
expect(root.querySelector('[data-testid="pool-stats-weekly-total_tokens"]')?.className).toContain('text-center')
|
||||
expect(endpointMocks.listPoolKeys).toHaveBeenLastCalledWith(
|
||||
'codex-provider',
|
||||
expect.objectContaining({
|
||||
sort_by: 'imported_at',
|
||||
sort_order: 'desc',
|
||||
}),
|
||||
expect.anything(),
|
||||
)
|
||||
expect(root.textContent).not.toContain('累计')
|
||||
expect(root.textContent).not.toContain('总计')
|
||||
})
|
||||
|
||||
if (!modeSwitch) throw new Error('expected stats switch')
|
||||
modeSwitch.checked = false
|
||||
modeSwitch.dispatchEvent(new Event('change', { bubbles: true }))
|
||||
it('refreshes quota only for keys on the current page', async () => {
|
||||
const pageKeys = [
|
||||
createPoolKey('codex', { key_id: 'codex-page-key-1', quota_updated_at: null }),
|
||||
createPoolKey('codex', { key_id: 'codex-page-key-2', quota_updated_at: null }),
|
||||
]
|
||||
endpointMocks.getPoolOverview.mockResolvedValue({
|
||||
items: [{ ...createOverview('codex'), total_keys: 120 }],
|
||||
})
|
||||
endpointMocks.listPoolKeys.mockResolvedValue({
|
||||
total: 120,
|
||||
page: 1,
|
||||
page_size: 50,
|
||||
keys: pageKeys,
|
||||
})
|
||||
endpointMocks.getProvider.mockResolvedValue(createProvider('codex'))
|
||||
endpointMocks.refreshProviderQuota.mockResolvedValue({
|
||||
success: 2,
|
||||
failed: 0,
|
||||
total: 2,
|
||||
results: [],
|
||||
})
|
||||
|
||||
const root = mountPoolManagement()
|
||||
await settle()
|
||||
|
||||
const refreshButton = root.querySelector('button[title="刷新数据和额度"]') as HTMLButtonElement | null
|
||||
expect(refreshButton).not.toBeNull()
|
||||
refreshButton?.click()
|
||||
await settle()
|
||||
|
||||
expect(endpointMocks.refreshProviderQuota).toHaveBeenCalledTimes(1)
|
||||
expect(endpointMocks.refreshProviderQuota).toHaveBeenCalledWith(
|
||||
'codex-provider',
|
||||
['codex-page-key-1', 'codex-page-key-2'],
|
||||
)
|
||||
expect(endpointMocks.refreshProviderQuota).not.toHaveBeenCalledWith('codex-provider')
|
||||
})
|
||||
|
||||
it('toggles Codex stats to account totals and persists the choice', async () => {
|
||||
const codexKey = createPoolKey('codex')
|
||||
endpointMocks.getPoolOverview.mockResolvedValue({ items: [createOverview('codex')] })
|
||||
endpointMocks.listPoolKeys.mockResolvedValue(createKeyPage(codexKey))
|
||||
endpointMocks.getProvider.mockResolvedValue(createProvider('codex'))
|
||||
|
||||
const root = mountPoolManagement()
|
||||
await settle()
|
||||
|
||||
const modeButton = root.querySelector<HTMLButtonElement>('[data-testid="pool-stats-mode-control"]')
|
||||
expect(modeButton).not.toBeNull()
|
||||
modeButton?.click()
|
||||
await settle()
|
||||
|
||||
expect(root.querySelector('[data-testid="pool-stats-account-total"]')).not.toBeNull()
|
||||
expect(root.querySelector('[data-testid="pool-stats-account-total"]')?.className).toContain('w-[188px]')
|
||||
expect(root.querySelector('[data-testid="pool-stats-account-total"]')?.className).toContain('grid-rows-4')
|
||||
expect(root.querySelector('[data-testid="pool-stats-account-total"]')?.className).toContain('min-h-16')
|
||||
expect(root.querySelector('[data-testid="pool-stats-cycle-group-5h"]')).toBeNull()
|
||||
expect(routeMocks.query.statsMode).toBe('account_total')
|
||||
expect(window.sessionStorage.getItem(POOL_MANAGEMENT_VIEW_STORAGE_KEY)).toContain('"statsMode":"account_total"')
|
||||
expect(root.querySelector('[data-testid="pool-stats-account-total"]')).not.toBeNull()
|
||||
expect(root.textContent).toContain('9,876')
|
||||
expect(root.textContent).toContain('4.3M')
|
||||
expect(root.textContent).toContain('$8.77')
|
||||
expect(modeButton?.getAttribute('title')).toBe('切换为周期统计')
|
||||
})
|
||||
|
||||
it('renders the Codex stats switch in header actions instead of a standalone mode bar', async () => {
|
||||
const codexKey = createPoolKey('codex')
|
||||
endpointMocks.getPoolOverview.mockResolvedValue({ items: [createOverview('codex')] })
|
||||
endpointMocks.listPoolKeys.mockResolvedValue(createKeyPage(codexKey))
|
||||
endpointMocks.getProvider.mockResolvedValue(createProvider('codex'))
|
||||
|
||||
const root = mountPoolManagement()
|
||||
await settle()
|
||||
|
||||
const desktopHeaderActions = root.querySelector('[data-testid="pool-header-actions"]')
|
||||
const mobileHeaderActions = root.querySelector('[data-testid="pool-mobile-header-actions"]')
|
||||
const modeControls = Array.from(root.querySelectorAll('[data-testid="pool-stats-mode-control"]'))
|
||||
|
||||
expect(desktopHeaderActions?.querySelector('[data-testid="pool-stats-mode-control"]')).not.toBeNull()
|
||||
expect(mobileHeaderActions?.querySelector('[data-testid="pool-stats-mode-control"]')).not.toBeNull()
|
||||
expect(modeControls).toHaveLength(2)
|
||||
expect(modeControls.every(control => control.closest('[data-testid="pool-header-actions"], [data-testid="pool-mobile-header-actions"]'))).toBe(true)
|
||||
expect(desktopHeaderActions?.textContent).toContain('累计')
|
||||
expect(desktopHeaderActions?.textContent).toContain('周期')
|
||||
expect(root.textContent).not.toContain('Codex 统计模式')
|
||||
expect(root.textContent).not.toContain('当前周期显示 5H 与周窗口')
|
||||
})
|
||||
|
||||
it('restores stored Codex account-total mode when the query omits statsMode', async () => {
|
||||
it('restores stored and query account-total mode for Codex providers', async () => {
|
||||
seedStoredStatsMode('account_total')
|
||||
routeMocks.query.statsMode = 'account_total'
|
||||
const codexKey = createPoolKey('codex')
|
||||
endpointMocks.getPoolOverview.mockResolvedValue({ items: [createOverview('codex')] })
|
||||
endpointMocks.listPoolKeys.mockResolvedValue(createKeyPage(codexKey))
|
||||
@@ -546,18 +596,13 @@ describe('PoolManagement Codex cycle stats mode', () => {
|
||||
const root = mountPoolManagement()
|
||||
await settle()
|
||||
|
||||
const modeSwitch = root.querySelector<HTMLInputElement>('[data-testid="pool-stats-mode-switch"]')
|
||||
expect(modeSwitch).not.toBeNull()
|
||||
expect(modeSwitch?.checked).toBe(false)
|
||||
expect(root.querySelector('[data-testid="pool-stats-account-total"]')).not.toBeNull()
|
||||
expect(root.querySelector('[data-testid="pool-stats-cycle-group-5h"]')).toBeNull()
|
||||
expect(routeMocks.query.statsMode).toBe('account_total')
|
||||
expect(window.sessionStorage.getItem(POOL_MANAGEMENT_VIEW_STORAGE_KEY)).toContain('"statsMode":"account_total"')
|
||||
})
|
||||
|
||||
it('lets a current-cycle statsMode query override stored Codex account-total mode', async () => {
|
||||
seedStoredStatsMode('account_total')
|
||||
routeMocks.query.statsMode = 'current_cycle'
|
||||
it('resets Codex cycle stats from the action column', async () => {
|
||||
const codexKey = createPoolKey('codex')
|
||||
endpointMocks.getPoolOverview.mockResolvedValue({ items: [createOverview('codex')] })
|
||||
endpointMocks.listPoolKeys.mockResolvedValue(createKeyPage(codexKey))
|
||||
@@ -566,13 +611,14 @@ describe('PoolManagement Codex cycle stats mode', () => {
|
||||
const root = mountPoolManagement()
|
||||
await settle()
|
||||
|
||||
const modeSwitch = root.querySelector<HTMLInputElement>('[data-testid="pool-stats-mode-switch"]')
|
||||
expect(modeSwitch).not.toBeNull()
|
||||
expect(modeSwitch?.checked).toBe(true)
|
||||
expect(root.querySelector('[data-testid="pool-stats-cycle-group-5h"]')).not.toBeNull()
|
||||
expect(root.querySelector('[data-testid="pool-stats-account-total"]')).toBeNull()
|
||||
expect(routeMocks.query.statsMode).toBeUndefined()
|
||||
expect(window.sessionStorage.getItem(POOL_MANAGEMENT_VIEW_STORAGE_KEY)).toContain('"statsMode":"current_cycle"')
|
||||
const resetButton = root.querySelector<HTMLButtonElement>('[data-testid="pool-reset-cycle-stats"]')
|
||||
expect(resetButton).not.toBeNull()
|
||||
|
||||
resetButton?.click()
|
||||
await settle()
|
||||
|
||||
expect(endpointMocks.resetProviderKeyCycleStats).toHaveBeenCalledWith(codexKey.key_id)
|
||||
expect(endpointMocks.listPoolKeys).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
|
||||
it('hides the stats mode switch for non-Codex providers and keeps account totals', async () => {
|
||||
@@ -590,6 +636,7 @@ describe('PoolManagement Codex cycle stats mode', () => {
|
||||
|
||||
expect(root.querySelector('[data-testid="pool-stats-mode-switch"]')).toBeNull()
|
||||
expect(root.querySelector('[data-testid="pool-stats-mode-control"]')).toBeNull()
|
||||
expect(root.querySelector('[data-testid="pool-reset-cycle-stats"]')).toBeNull()
|
||||
expect(root.querySelector('[data-testid="pool-stats-cycle-group-5h"]')).toBeNull()
|
||||
expect(root.querySelector('[data-testid="pool-stats-account-total"]')).not.toBeNull()
|
||||
expect(root.textContent).toContain('12')
|
||||
|
||||
Reference in New Issue
Block a user