fix: 模型级强制参数(kimi-k2.7-code 锁 temperature=1)+ 测速超时/错误文案
- config: ModelInfo.params + MODEL_PARAM_KEYS 白名单 + _parse_model_params(写错即 ConfigError) - adapters: _forced_params 在 payload 组装后强制覆盖;_learn_from_upstream_error 按上游 400 要求修正并重发一次(非原样重试);流式已吐内容则不重发 - main: /v1/models 暴露 params;探针超时 15s→30s;_speedtest_error_text 说清超时/上游原文 - settings: 面板保存保留手写 models[].params(原先会被静默清掉) - gateway.yaml: kimi-k2.7-code params.temperature=1 - 前端: Models 挂锁+参数固定标签;Chat 温度 chip 挂锁+抽屉提示;新增 lock 图标;中英对称 - tests: +10 → 168 passed / 0 failed
This commit is contained in:
1 parent
e4065d31c3
commit
4507dc4b8e
14 files changed
+631
-13
No files matched your search
@@ -66,6 +66,8 @@ const ICONS: Record<string, string> = {
|
||||
inbox: '<path d="M3.4 11.6 6 4.6h8l2.6 7v4.8H3.4z"/><path d="M3.4 11.6h3.2l.9 1.8h5l.9-1.8h3.2"/>',
|
||||
// 第二十四轮:账号停用(禁用符号「圆 + 斜杠」),启用配已有的 play(圆 + 三角)
|
||||
ban: '<circle cx="10" cy="10" r="7"/><path d="M5.1 5.1l9.8 9.8"/>',
|
||||
// 第二十五轮:模型参数被上游固定(挂锁 = 这参数你说了不算,由网关按上游要求锁定)
|
||||
lock: '<rect x="4.6" y="9" width="10.8" height="7.2" rx="2"/><path d="M7 9V6.8a3 3 0 0 1 6 0V9"/>',
|
||||
}
|
||||
|
||||
const body = computed(() => ICONS[props.name] || '')
|
||||
|
||||
@@ -254,6 +254,7 @@ export default {
|
||||
imgMax: 'At most {n} images per message',
|
||||
imgPickErr: 'Image processing failed: {msg}',
|
||||
visionWarn: 'Model {model} does not accept image input — images will be ignored or rejected. Switch to a vision-capable model.',
|
||||
paramLocked: 'Parameters pinned by the gateway: {p} (upstream hard limit; what you set here is overridden before sending)',
|
||||
useVision: 'Switch to {model}',
|
||||
waiting: 'Awaiting input…',
|
||||
send: 'Send',
|
||||
@@ -384,6 +385,8 @@ export default {
|
||||
loadErr: 'Failed to load models',
|
||||
capability: 'Capability',
|
||||
visionTag: 'Vision',
|
||||
paramTag: 'Params locked',
|
||||
paramLocked: 'Parameters pinned by the gateway: {p} (upstream hard limit; values from clients and the speed test are overridden)',
|
||||
allTextModels: 'All text models',
|
||||
providerCard: 'Providers',
|
||||
keyOk: 'Key configured',
|
||||
|
||||
@@ -254,6 +254,7 @@ export default {
|
||||
imgMax: '一条消息最多 {n} 张图片',
|
||||
imgPickErr: '图片处理失败:{msg}',
|
||||
visionWarn: '当前模型 {model} 不支持图像输入,图片会被忽略或直接报错 —— 请换用带视觉能力的模型。',
|
||||
paramLocked: '该模型参数由网关固定:{p}(上游硬约束,你在这里调的值会被网关覆盖后再发送)',
|
||||
useVision: '改用 {model}',
|
||||
waiting: '等待输入…',
|
||||
send: '发送',
|
||||
@@ -384,6 +385,8 @@ export default {
|
||||
loadErr: '加载模型失败',
|
||||
capability: '能力',
|
||||
visionTag: '视觉',
|
||||
paramTag: '参数固定',
|
||||
paramLocked: '该模型参数由网关固定:{p}(上游硬约束,客户端与测速探针传的值都会被覆盖)',
|
||||
allTextModels: '全部文本模型',
|
||||
providerCard: '供应商',
|
||||
keyOk: 'Key 已配置',
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
<span class="chip-sel" :class="{ on: params.stream }" @click="paramsOpen = true">
|
||||
<Icon name="bolt" :size="13" />{{ t('chat.streaming') }}
|
||||
</span>
|
||||
<span class="chip-sel" @click="paramsOpen = true">{{ t('chat.tempShort') }} {{ params.temperature }}</span>
|
||||
<span class="chip-sel" @click="paramsOpen = true" :title="currentPinNote || undefined">{{ t('chat.tempShort') }} {{ params.temperature }}<Icon v-if="currentPinNote" name="lock" :size="11" class="plock" /></span>
|
||||
<span class="chip-sel" @click="paramsOpen = true">
|
||||
{{ t('chat.maxShort') }} {{ params.max_tokens ?? t('common.none') }}
|
||||
</span>
|
||||
@@ -213,6 +213,8 @@
|
||||
<span class="opt">
|
||||
<span>{{ modelLabel(m) }}</span>
|
||||
<Icon v-if="m.vision" name="eye" :size="13" />
|
||||
<!-- 第二十五轮:参数被上游锁定的模型(网关会覆盖客户端传值) -->
|
||||
<Icon v-if="pinned(m)" name="lock" :size="13" class="plock" :title="pinNote(m)" />
|
||||
</span>
|
||||
</el-option>
|
||||
</el-option-group>
|
||||
@@ -236,6 +238,12 @@
|
||||
|
||||
<!-- 参数抽屉:窄屏按屏宽百分比,避免 330px 在小屏上顶到边 -->
|
||||
<el-drawer v-model="paramsOpen" :title="t('chat.params')" :size="isMobile ? '86%' : '330px'" :close-on-click-modal="true">
|
||||
<!-- 第二十五轮:当前模型有上游硬约束的参数时,先说清楚"这里的值会被覆盖后再发",
|
||||
否则用户会以为调了温度没生效(kimi-k2.7-code 只接受 temperature=1 就是这种情况)。 -->
|
||||
<div v-if="currentPinNote" class="pin-note">
|
||||
<Icon name="lock" :size="13" class="plock" />
|
||||
<span>{{ currentPinNote }}</span>
|
||||
</div>
|
||||
<div class="param">
|
||||
<div class="plabel">{{ t('chat.temp') }}</div>
|
||||
<el-slider v-model="params.temperature" :min="0" :max="2" :step="0.05" show-input />
|
||||
@@ -330,6 +338,22 @@ const params = reactive({
|
||||
system: '',
|
||||
})
|
||||
const paramsOpen = ref(false)
|
||||
|
||||
// ── 模型级强制参数(第二十五轮)──
|
||||
// 网关 /v1/models 会回 params(如 kimi-k2.7-code → {temperature: 1}):这些参数由网关
|
||||
// 按上游硬约束覆盖后才发出去。不提示的话,用户把温度从 0.7 调到 0 也看不出区别,
|
||||
// 只会以为"网关把我参数吞了"。这里只做标注,参数本身在 gateway.yaml 里改。
|
||||
function pinned(m: any): boolean {
|
||||
return Object.keys((m && m.params) || {}).length > 0
|
||||
}
|
||||
function pinNote(m: any): string {
|
||||
const ps = (m && m.params) || {}
|
||||
return t('chat.paramLocked', { p: Object.keys(ps).map((k) => `${k}=${ps[k]}`).join(', ') })
|
||||
}
|
||||
const currentPinNote = computed(() => {
|
||||
const m = textModels.value.find((x) => x.id === params.model)
|
||||
return m ? pinNote(m) : ''
|
||||
})
|
||||
const streaming = ref(false)
|
||||
const messages = ref<ChatMessage[]>([])
|
||||
|
||||
@@ -825,6 +849,14 @@ watch(messages, scrollToBottom, { deep: true })
|
||||
/* ── 参数抽屉 ── */
|
||||
.param { margin-bottom: 18px; }
|
||||
.plabel { font-size: 13px; color: var(--muted); margin-bottom: 6px; }
|
||||
/* 第二十五轮:模型参数被上游锁定时的标注(挂锁 + 抽屉顶部说明条) */
|
||||
.plock { color: var(--warn); margin-left: 4px; }
|
||||
.pin-note {
|
||||
display: flex; align-items: flex-start; gap: 6px;
|
||||
margin: 0 0 14px; padding: 8px 10px; border-radius: 8px;
|
||||
font-size: 12px; line-height: 1.5; color: var(--warn); background: var(--warn-soft);
|
||||
}
|
||||
.pin-note .plock { margin-left: 0; margin-top: 2px; }
|
||||
|
||||
/* ── 窄屏 ── */
|
||||
@media (max-width: 768px) {
|
||||
|
||||
@@ -37,6 +37,9 @@
|
||||
<div v-for="m in textModelRows" :key="m.id" class="st-item">
|
||||
<div class="st-row">
|
||||
<Icon v-if="m.vision" name="eye" :size="12" class="vision" />
|
||||
<!-- 第二十五轮:该模型的参数被上游固定(如 temperature 只能是 1),
|
||||
挂锁标注 + 悬浮说明,省掉「为什么我传的参数不生效」这类困惑。 -->
|
||||
<Icon v-if="m.paramNote" name="lock" :size="12" class="plock" :title="m.paramNote" />
|
||||
<span class="code">{{ m.id }}</span>
|
||||
<span class="muted-2 st-prov">{{ m.provider }}</span>
|
||||
<span style="flex:1"></span>
|
||||
@@ -97,12 +100,15 @@
|
||||
<el-table-column :label="t('models.provider')" min-width="150">
|
||||
<template #default="{ row }">{{ row.provider_name || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="t('models.capability')" width="120">
|
||||
<el-table-column :label="t('models.capability')" width="190">
|
||||
<template #default="{ row }">
|
||||
<span v-if="row.vision" class="pill ok cap">
|
||||
<Icon name="eye" :size="12" />{{ t('models.visionTag') }}
|
||||
</span>
|
||||
<span v-else class="muted-2">—</span>
|
||||
<span v-if="paramKeys(row).length" class="pill warn cap" :title="paramNote(row)">
|
||||
<Icon name="lock" :size="12" />{{ t('models.paramTag') }}
|
||||
</span>
|
||||
<span v-if="!row.vision && !paramKeys(row).length" class="muted-2">—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="t('models.keySet')" width="120">
|
||||
@@ -231,9 +237,23 @@ const textModelRows = computed(() =>
|
||||
id: m.id,
|
||||
provider: m.provider_name || '—',
|
||||
vision: !!m.vision,
|
||||
// 模型级强制参数(第二十五轮):被上游固定住的采样参数,用挂锁标注出来。
|
||||
paramNote: paramKeys(m).length ? paramNote(m) : '',
|
||||
})),
|
||||
)
|
||||
|
||||
// ── 模型级强制参数(第二十五轮)──
|
||||
// 后端 /v1/models 在 params 里给出「该模型发往上游前会被强制覆盖的参数」
|
||||
// (例:kimi-k2.7-code 只接受 temperature=1)。这里只做展示,不提供编辑入口。
|
||||
function paramKeys(m: any): string[] {
|
||||
return Object.keys((m && m.params) || {})
|
||||
}
|
||||
function paramNote(m: any): string {
|
||||
const ps = (m && m.params) || {}
|
||||
const txt = paramKeys(m).map((k) => `${k}=${ps[k]}`).join(', ')
|
||||
return t('models.paramLocked', { p: txt })
|
||||
}
|
||||
|
||||
const keySet = computed(() => {
|
||||
const ks: Record<string, boolean> = {}
|
||||
for (const p of Object.values(health.value.providers || {}) as any) ks[p.name] = !!p.api_key_set
|
||||
@@ -286,6 +306,7 @@ onMounted(async () => {
|
||||
.chain-item { display: inline-flex; align-items: center; gap: 6px; }
|
||||
.arrow { color: var(--muted-2); }
|
||||
.vision { color: var(--primary); }
|
||||
.plock { color: var(--warn); }
|
||||
.prov { padding: 10px 0; border-bottom: 1px solid var(--line-2); }
|
||||
.prov:last-child { border-bottom: 0; }
|
||||
.prov-top { display: flex; align-items: center; gap: 8px; }
|
||||
|
||||
Reference in new issue
Block a user