refactor: 前端全面替换 any 为 unknown 并统一错误处理,后端用量记录补写请求头/体

- 前端 API 层、stores、conversation 解析器、组件全面替换 any 为 unknown/具体类型
- 错误处理统一使用 parseApiError/getErrorStatus 替代 err.response?.data?.detail 模式
- 后端 handler/TaskService/UsageLifecycle/StreamTracker 链路传递 request_headers/request_body
- streaming/pending 状态更新时可补写客户端和提供商的请求头及请求体
- 新增 TaskService 和 UsageService 相关测试
This commit is contained in:
fawney19
2026-02-22 00:43:41 +08:00
parent 98e60e8f74
commit cf2eee222e
121 changed files with 1652 additions and 1179 deletions

View File

@@ -66,21 +66,21 @@
class="bg-muted/30"
>
<div
v-for="model in group.models"
:key="model.modelId"
v-for="item in group.models"
:key="item.modelId"
class="flex flex-col gap-0.5 pl-7 pr-2.5 py-1.5 cursor-pointer text-xs border-t"
:class="selectedModel?.modelId === model.modelId && selectedModel?.providerId === model.providerId
:class="selectedModel?.modelId === item.modelId && selectedModel?.providerId === item.providerId
? 'bg-primary text-primary-foreground'
: 'hover:bg-muted'"
@click="selectModel(model)"
@click="selectModel(item)"
>
<span class="truncate font-medium">{{ model.modelName }}</span>
<span class="truncate font-medium">{{ item.modelName }}</span>
<span
class="truncate text-[10px]"
:class="selectedModel?.modelId === model.modelId && selectedModel?.providerId === model.providerId
:class="selectedModel?.modelId === item.modelId && selectedModel?.providerId === item.providerId
? 'text-primary-foreground/70'
: 'text-muted-foreground'"
>{{ model.modelId }}</span>
>{{ item.modelId }}</span>
</div>
</div>
</div>
@@ -363,6 +363,7 @@ import { useToast } from '@/composables/useToast'
import { useFormDialog } from '@/composables/useFormDialog'
import { parseNumberInput, sortResolutionEntries } from '@/utils/form'
import { log } from '@/utils/logger'
import { parseApiError } from '@/utils/errorParser'
import TieredPricingEditor from './TieredPricingEditor.vue'
import {
getModelsDevList,
@@ -436,7 +437,7 @@ const groupedModels = computed(() => {
models: []
})
}
groups.get(model.providerId)!.models.push(model)
groups.get(model.providerId)?.models.push(model)
}
// 转换为数组并排序
@@ -506,7 +507,7 @@ interface FormData {
display_name: string
default_price_per_request?: number
supported_capabilities?: string[]
config?: Record<string, any>
config?: Record<string, unknown>
is_active?: boolean
}
@@ -524,7 +525,7 @@ const form = ref<FormData>(defaultForm())
const KEEP_FALSE_CONFIG_KEYS = new Set(['streaming'])
// 设置 config 字段
function setConfigField(key: string, value: any) {
function setConfigField(key: string, value: unknown) {
if (!form.value.config) {
form.value.config = {}
}
@@ -535,41 +536,41 @@ function setConfigField(key: string, value: any) {
}
}
function getNested(obj: any, path: string): any {
function getNested(obj: unknown, path: string): unknown {
if (!obj || typeof obj !== 'object') return undefined
const parts = path.split('.').filter(Boolean)
let cur: any = obj
let cur = obj as Record<string, unknown>
for (const p of parts) {
if (!cur || typeof cur !== 'object') return undefined
cur = cur[p]
cur = cur[p] as Record<string, unknown>
}
return cur
}
function setNested(obj: any, path: string, value: any) {
function setNested(obj: unknown, path: string, value: unknown) {
if (!obj || typeof obj !== 'object') return
const parts = path.split('.').filter(Boolean)
if (parts.length === 0) return
let cur: any = obj
let cur = obj as Record<string, unknown>
for (let i = 0; i < parts.length - 1; i++) {
const p = parts[i]
if (!cur[p] || typeof cur[p] !== 'object') {
cur[p] = {}
}
cur = cur[p]
cur = cur[p] as Record<string, unknown>
}
cur[parts[parts.length - 1]] = value
}
function deleteNested(obj: any, path: string) {
function deleteNested(obj: unknown, path: string) {
if (!obj || typeof obj !== 'object') return
const parts = path.split('.').filter(Boolean)
if (parts.length === 0) return
let cur: any = obj
let cur = obj as Record<string, unknown>
for (let i = 0; i < parts.length - 1; i++) {
const p = parts[i]
if (!cur[p] || typeof cur[p] !== 'object') return
cur = cur[p]
cur = cur[p] as Record<string, unknown>
}
delete cur[parts[parts.length - 1]]
}
@@ -577,9 +578,9 @@ function deleteNested(obj: any, path: string) {
function pruneEmptyBillingConfig() {
const cfg = form.value.config
if (!cfg || typeof cfg !== 'object') return
const billing = cfg.billing
const billing = cfg.billing as Record<string, unknown> | undefined
if (!billing || typeof billing !== 'object') return
const video = billing.video
const video = billing.video as Record<string, unknown> | undefined
if (video && typeof video === 'object' && Object.keys(video).length === 0) {
delete billing.video
}
@@ -611,7 +612,7 @@ function loadVideoPricingFromConfig() {
const raw = getNested(cfg, 'billing.video.price_per_second_by_resolution')
if (raw && typeof raw === 'object' && !Array.isArray(raw)) {
// 按分辨率从低到高排序
const sortedEntries = sortResolutionEntries(Object.entries(raw))
const sortedEntries = sortResolutionEntries(Object.entries(raw as Record<string, unknown>))
videoResolutionPrices.value = sortedEntries.map(([k, v]) => ({
resolution: String(k),
price_per_second: typeof v === 'number' ? v : undefined,
@@ -722,7 +723,7 @@ function selectModel(model: ModelsDevModelItem) {
form.value.display_name = model.modelName
// 构建 config
const config: Record<string, any> = {
const config: Record<string, unknown> = {
streaming: true,
}
if (model.supportsVision) config.vision = true
@@ -848,8 +849,8 @@ async function handleSubmit() {
success('模型更新成功')
} else {
const createData: GlobalModelCreate = {
name: form.value.name!,
display_name: form.value.display_name!,
name: form.value.name ?? '',
display_name: form.value.display_name ?? '',
config: cleanConfig,
default_price_per_request: form.value.default_price_per_request ?? undefined,
default_tiered_pricing: finalTieredPricing,
@@ -861,8 +862,8 @@ async function handleSubmit() {
}
emit('update:open', false)
emit('success')
} catch (err: any) {
showError(err.response?.data?.detail || err.message, isEditMode.value ? '更新失败' : '创建失败')
} catch (err: unknown) {
showError(parseApiError(err, isEditMode.value ? '更新失败' : '创建失败'), isEditMode.value ? '更新失败' : '创建失败')
} finally {
submitting.value = false
}

View File

@@ -469,6 +469,7 @@ import TableCell from '@/components/ui/table-cell.vue'
import RoutingTab from './RoutingTab.vue'
import ModelMappingsTab from './ModelMappingsTab.vue'
import { sortResolutionEntries } from '@/utils/form'
import { parseApiError } from '@/utils/errorParser'
import { getGlobalModelRoutingPreview } from '@/api/global-models'
// 使用外部类型定义
@@ -479,15 +480,16 @@ import type { RoutingProviderInfo } from '@/api/global-models'
const props = withDefaults(defineProps<Props>(), {
hasBlockingDialogOpen: false,
capabilities: () => [],
})
const emit = defineEmits<{
'update:open': [value: boolean]
'editModel': [model: GlobalModelResponse]
'toggleModelStatus': [model: GlobalModelResponse]
'addProvider': []
'editProvider': [provider: any]
'deleteProvider': [provider: any]
'toggleProviderStatus': [provider: any]
'editProvider': [provider: Record<string, unknown>]
'deleteProvider': [provider: Record<string, unknown>]
'toggleProviderStatus': [provider: Record<string, unknown>]
'refreshModel': []
'linkProvider': [providerId: string]
'linkProviders': [providerIds: string[]]
@@ -520,8 +522,8 @@ async function loadRoutingData() {
try {
routingData.value = await getGlobalModelRoutingPreview(props.model.id)
} catch (err: any) {
routingError.value = err.response?.data?.detail || '加载失败'
} catch (err: unknown) {
routingError.value = parseApiError(err, '加载失败')
} finally {
routingLoading.value = false
}

View File

@@ -606,6 +606,7 @@ import {
import { API_FORMAT_ORDER } from '@/api/endpoints/types'
import { formatApiFormat } from '@/api/endpoints/types/api-format'
import { recoverKeyHealth } from '@/api/endpoints/health'
import { parseApiError } from '@/utils/errorParser'
import { useToast } from '@/composables/useToast'
import { useCountdownTimer, getProbeCountdown } from '@/composables/useCountdownTimer'
import { MAX_MODEL_NAME_LENGTH, createLRURegexCache, getCompiledModelMappingRegex } from '@/features/models/utils/model-mapping-regex'
@@ -696,7 +697,8 @@ const apiFormatGroups = computed<ApiFormatGroup[]>(() => {
formatMap.set(format, { providers: [], allKeys: [] })
}
const data = formatMap.get(format)!
const data = formatMap.get(format)
if (!data) continue
// 添加 provider entry
data.providers.push({
@@ -739,7 +741,7 @@ const apiFormatGroups = computed<ApiFormatGroup[]>(() => {
if (!keyGroupMap.has(priority)) {
keyGroupMap.set(priority, [])
}
keyGroupMap.get(priority)!.push(keyEntry)
keyGroupMap.get(priority)?.push(keyEntry)
}
// 转换为分组数组并排序
@@ -847,8 +849,8 @@ async function loadRoutingData() {
internalRoutingData.value = data
compiledGlobalModelMappingRegexes.value = compiled
} catch (err: any) {
internalError.value = err.response?.data?.detail || '加载失败'
} catch (err: unknown) {
internalError.value = parseApiError(err, '加载失败')
} finally {
internalLoading.value = false
}
@@ -977,7 +979,7 @@ function getKeyPriorityGroups(keys: RoutingKeyInfo[]): KeyPriorityGroup[] {
keys: []
})
}
groups.get(priority)!.keys.push(key)
groups.get(priority)?.keys.push(key)
}
return Array.from(groups.values()).sort((a, b) => {
@@ -1121,8 +1123,8 @@ async function handleRecoverKey(keyId: string, apiFormat: string) {
// 通知父组件刷新数据
emit('refresh')
showSuccess(result.message || 'Key 已恢复')
} catch (err: any) {
showError(err.response?.data?.detail || 'Key 恢复失败', '错误')
} catch (err: unknown) {
showError(parseApiError(err, 'Key 恢复失败'), '错误')
}
}

View File

@@ -48,10 +48,12 @@ export function createLRURegexCache(maxSize: number): LRURegexCache {
return {
get: (key: string) => {
if (!cache.has(key)) return undefined
const value = cache.get(key)!
cache.delete(key)
cache.set(key, value)
return value
const value = cache.get(key)
if (value !== undefined) {
cache.delete(key)
cache.set(key, value)
}
return value ?? null
},
set: (key: string, value: RegExp | null) => {
if (cache.has(key)) {