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

merge(main): sync latest main into security branch

Browse Source
This commit is contained in:
elky
2026-09-05 00:30:16 +08:00
parent 1c89b5f9ab 27b0381a9a
commit 0e3bd7eff4
40 changed files with 2513 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/admin/PoolManagement.vue
+11 -2
View File
@@ -1153,6 +1153,7 @@ import {
getCodexResetCreditAvailableCount,
getCodexResetCreditReservationIdempotencyKey,
getVisibleCodexResetCreditItems,
mergeCodexQuotaDisplays,
readPendingCodexResetCreditIdempotencyKey,
rememberPendingCodexResetCreditIdempotencyKey,
} from '@/features/providers/components/codex-reset-credit-display'
@@ -2235,9 +2236,17 @@ function applyQuotaRefreshResultToCurrentPage(result: Awaited<ReturnType<typeof
}
function getCodexResetCredits(key: PoolKeyDetail) {
return getQuotaSnapshotProviderType(key) === 'codex'
? key.status_snapshot?.quota?.reset_credits ?? null
if (getQuotaSnapshotProviderType(key) !== 'codex') return null
const snapshot = key.status_snapshot?.quota?.reset_credits
const snapshotUpdatedAt = key.status_snapshot?.quota?.updated_at
const snapshotDisplay = snapshot
? {
...(typeof snapshotUpdatedAt === 'number' ? { updated_at: snapshotUpdatedAt } : {}),
reset_credits: snapshot,
}
: null
return mergeCodexQuotaDisplays(snapshotDisplay, key.upstream_metadata?.codex)?.reset_credits ?? null
}
function getCodexCredentialGeneration(key: PoolKeyDetail): string | null | undefined {
frontend/src/views/admin/RoutingProfiles.vue
+6
View File
@@ -745,6 +745,7 @@
<RoutingPriorityPolicyEditor
:config="activeConfigForReading"
:model="activePerModelPolicy.model"
:model-id="globalModelIdFor(activePerModelPolicy.model)"
:priority-mode="modelPriorityMode(activePerModelPolicy.model)"
:scheduling-mode="modelSchedulingMode(activePerModelPolicy.model)"
:show-priority-mode="false"
@@ -1458,6 +1459,11 @@ function globalModelLabel(modelName: string): string {
return `${model.display_name} (${model.name})`
}
function globalModelIdFor(modelName: string): string | undefined {
const normalizedName = modelName.trim()
return globalModels.value.find(item => item.name.trim() === normalizedName)?.id
}
function replaceGroup(group: RoutingGroupRecord, select = true): void {
const normalized = normalizeRecord(group)
const index = groups.value.findIndex(item => item.id === normalized.id)