Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/tests/test_model_parameter_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'modelForm', 'modelRef', 'advancedSetting', 'tempConfigMap', 'curId',
'currentSupplier', 'modelList', 'initForm', 'handleParamsDel', 'supplierChang',
'formatAdvancedSetting', 'baseModelChange', 'getSupplierDomain', 'getModelDefaultArgs',
'submitModel', 'isGeneric', 'initializing', 'invalidateDiscovery',
'submitModel', 'canDiscoverModels', 'initializing', 'selectedModelDomain', 'invalidateDiscovery',
'discoveryVersion', 'discovering', 'discoveredModels', 'discoveryMessage', 'discoveryState', 'discoveryErrorDetail',
]);
const selected = ast.statements.filter(statement => ts.isVariableStatement(statement) &&
Expand Down
63 changes: 44 additions & 19 deletions frontend/src/views/system/model/ModelForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,21 @@ const modelList = computed(() => {
}
return base_model_options(modelForm.supplier, modelForm.model_type)
})
const isGeneric = computed(() => modelForm.supplier === 15)
// OpenAI-compatible chat does not guarantee a models endpoint; failures remain non-blocking.
const canDiscoverModels = computed(
() =>
!!currentSupplier.value &&
modelForm.protocol === 1 &&
!['azure', 'vllm'].includes(currentSupplier.value.type || '')
)
const discoveredModels = ref<string[]>([])
const discovering = ref(false)
const discoveryMessage = ref('')
const discoveryErrorDetail = ref('')
const discoveryState = ref<'idle' | 'success' | 'empty' | 'error'>('idle')
let discoveryVersion = 0
let initializing = false
let selectedModelDomain = ''
const invalidateDiscovery = () => {
discoveryVersion++
discovering.value = false
Expand All @@ -87,7 +94,7 @@ watch(() => [modelForm.api_domain, modelForm.api_key, modelForm.supplier], inval
watch(
() => modelForm.api_domain,
() => {
if (isGeneric.value && !initializing && modelForm.api_key) {
if (canDiscoverModels.value && !initializing && modelForm.api_key) {
modelForm.api_key = ''
ElMessage.info(t('model.discovery_key_reset'))
}
Expand All @@ -96,7 +103,7 @@ watch(
)
onBeforeUnmount(invalidateDiscovery)
const fetchModels = async () => {
if (discovering.value || !modelForm.api_domain.trim()) return
if (!canDiscoverModels.value || discovering.value || !modelForm.api_domain.trim()) return
const version = ++discoveryVersion
discovering.value = true
discoveryMessage.value = ''
Expand Down Expand Up @@ -254,10 +261,11 @@ const beforeClose = () => {
const supplierChang = (supplier: any) => {
initializing = true
invalidateDiscovery()
if (isGeneric.value || supplier.id === 15) modelForm.api_key = ''
modelForm.api_key = ''
modelForm.supplier = supplier.id
const config = supplier.model_config[modelForm.model_type || 0]
modelForm.api_domain = config.api_domain
selectedModelDomain = config.api_domain
modelForm.base_model = ''
modelForm.protocol = supplier.type === 'vllm' ? 2 : 1
advancedSetting.value = []
Expand All @@ -272,6 +280,10 @@ const initForm = (item?: any) => {
tempConfigMap = new Map<string, Array<any>>()
if (item) {
Object.assign(modelForm, { ...item })
selectedModelDomain =
modelList.value?.find((model) => model.name === item.base_model)?.api_domain ||
getSupplierDomain() ||
''
if (item?.config_list?.length) {
advancedSetting.value = item.config_list
advancedSetting.value.forEach((ele: any) => {
Expand Down Expand Up @@ -300,9 +312,17 @@ const baseModelChange = (val: string) => {
return
}
const current_model = modelList.value?.find((model: any) => model.name == val)
if (current_model && !isGeneric.value) {
modelForm.api_domain = current_model.api_domain || getSupplierDomain() || ''
const nextDomain = current_model?.api_domain || getSupplierDomain() || ''
// Follow built-in per-model endpoints only while the address still uses the previous default.
// Preserve custom addresses and invalidate credentials/results if the endpoint changes.
if (
current_model &&
(!canDiscoverModels.value ||
modelForm.api_domain === (selectedModelDomain || getSupplierDomain()))
) {
modelForm.api_domain = nextDomain
}
selectedModelDomain = nextDomain
const current_config_list = tempConfigMap.get(`${modelForm.supplier}-${modelForm.base_model}`)
if (current_config_list) {
formatAdvancedSetting(current_config_list)
Expand Down Expand Up @@ -368,6 +388,7 @@ defineExpose({
<el-form
ref="modelRef"
:rules="rules"
:validate-on-rule-change="false"
label-position="top"
:model="modelForm"
style="width: 100%"
Expand Down Expand Up @@ -400,7 +421,11 @@ defineExpose({
/>
</el-select>
</el-form-item>
<el-form-item v-if="isGeneric" prop="api_domain" :label="t('model.api_domain_name')">
<el-form-item
v-if="canDiscoverModels"
prop="api_domain"
:label="t('model.api_domain_name')"
>
<el-input
v-model="modelForm.api_domain"
clearable
Expand All @@ -409,7 +434,7 @@ defineExpose({
"
/>
</el-form-item>
<el-form-item v-if="isGeneric" prop="api_key" label="API Key">
<el-form-item v-if="canDiscoverModels" prop="api_key" label="API Key">
<el-input
v-model="modelForm.api_key"
clearable
Expand All @@ -420,14 +445,14 @@ defineExpose({
</el-form-item>
<el-form-item
class="custom-require"
:class="isGeneric && 'generic-base-model'"
:class="canDiscoverModels && 'discovery-base-model'"
prop="base_model"
>
<template #label
><span class="custom-require_danger">{{ t('model.basic_model') }}</span>
<span v-if="!isGeneric" class="enter">{{ t('model.enter_to_add') }}</span>
<span v-if="!canDiscoverModels" class="enter">{{ t('model.enter_to_add') }}</span>
<el-button
v-if="isGeneric"
v-if="canDiscoverModels"
class="discovery-button"
:class="{ 'is-retry': discoveryState === 'error' }"
:link="discoveryState !== 'error' && !discovering"
Expand All @@ -450,7 +475,7 @@ defineExpose({
</el-button>
</template>
<div
v-if="isGeneric && discoveryState === 'error' && discoveryMessage"
v-if="canDiscoverModels && discoveryState === 'error' && discoveryMessage"
class="discovery-status error"
:title="discoveryErrorDetail"
role="status"
Expand All @@ -460,8 +485,8 @@ defineExpose({
<el-select
v-model="modelForm['base_model']"
style="width: 100%"
:offset="isGeneric && discoveryState === 'success' ? 34 : 12"
:popper-class="isGeneric ? 'discovery-model-options' : ''"
:offset="canDiscoverModels && discoveryState === 'success' ? 34 : 12"
:popper-class="canDiscoverModels ? 'discovery-model-options' : ''"
filterable
allow-create
default-first-option
Expand All @@ -474,14 +499,14 @@ defineExpose({
:label="item.name"
:value="item.name"
/>
<template v-if="isGeneric" #footer
<template v-if="canDiscoverModels" #footer
><span class="discovery-select-hint">{{
t('model.discovery_input_hint')
}}</span></template
>
</el-select>
<div
v-if="isGeneric && discoveryState !== 'error' && discoveryMessage"
v-if="canDiscoverModels && discoveryState !== 'error' && discoveryMessage"
class="discovery-status"
:class="discoveryState"
role="status"
Expand All @@ -490,7 +515,7 @@ defineExpose({
</div>
</el-form-item>
<el-form-item
v-if="modelSelected && !isGeneric"
v-if="modelSelected && !canDiscoverModels"
prop="api_domain"
:label="t('model.api_domain_name')"
>
Expand All @@ -502,7 +527,7 @@ defineExpose({
"
/>
</el-form-item>
<el-form-item v-if="modelSelected && !isGeneric" prop="api_key" label="API Key">
<el-form-item v-if="modelSelected && !canDiscoverModels" prop="api_key" label="API Key">
<el-input
v-model="modelForm.api_key"
clearable
Expand Down Expand Up @@ -643,7 +668,7 @@ defineExpose({
align-items: center;
}

.generic-base-model {
.discovery-base-model {
:deep(.ed-form-item__label) {
width: 100%;
display: flex;
Expand Down
6 changes: 4 additions & 2 deletions tests/browser/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ npm --prefix tests/browser test -- --config=cas.config.mjs
这不验证真实持久化、客户 CAS 服务或最终用户登录;后端地址、编码和票据回归在
独立 xpack 仓库的 `tests/test_cas_urls.py`。

## 通用 OpenAI 模型列表回归
## OpenAI 兼容供应商模型列表回归

```sh
npm --prefix tests/browser test -- --config=model-discovery.config.mjs
Expand All @@ -167,7 +167,9 @@ npm --prefix tests/browser test -- --config=model-discovery.config.mjs
禁止重复请求、地址变化清空 Key、过期响应忽略及失败/空列表保留历史模型与高级参数。
另以真实 `Model.vue` 验证保留原抽屉尺寸、取消/保存按钮、高级设置默认展开,
并检查新增模型列表功能的原型状态;夹具使用内存模型详情,不访问业务数据库或真实供应商,
不替代完整登录、模型持久化和真实供应商连接验证。
覆盖供应商注册表中所有当前开放供应商的获取和手动回退,以及供应商切换时清空凭据、
忽略旧响应,保留模型专用默认端点并保护自定义地址。供应商列表接口全部使用合成响应,
不代表各供应商实际提供列表接口;不替代完整登录、模型持久化和真实供应商连接验证。
后端 `tests/test_model_discovery.py` 覆盖真实 HTTP 客户端及本机隔离服务、错误分类、
协议/路径约束、响应上限,并提取实际 handler 配合真实权限装饰器验证身份拒绝路径;
不代表完整应用中间件和路由注册集成验证。
Expand Down
5 changes: 4 additions & 1 deletion tests/browser/fixtures/model-discovery/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ import ElementPlus from "element-plus-secondary";
import "element-plus-secondary/dist/index.css";
import Form from "@/views/system/model/ModelForm.vue";
import zh from "@/i18n/zh-CN.json";
import { get_supplier } from "@/entity/supplier";
import { get_supplier, supplierList } from "@/entity/supplier";
const form = ref();
const visible = ref(true);
window.testSuppliers = supplierList.map(({ id, name }) => ({ id, name }));
window.selectTestSupplier = (id) => form.value.supplierChang(get_supplier(id));
window.editTestSupplier = (item) => form.value.initForm(item);
createApp({
setup() {
return () =>
Expand Down
117 changes: 117 additions & 0 deletions tests/browser/specs/model-discovery.spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,120 @@ test("original drawer preserves interaction while discovery matches prototype st
await dialog.getByRole("button", { name: "取消", exact: true }).click();
await expect(dialog).not.toBeVisible();
});

test("every active compatible supplier exposes discovery and keeps manual fallback", async ({
page,
}) => {
const suppliers = await page.evaluate(() => window.testSuppliers);
let requested = 0;
await page.route("**/api/system/aimodel/models", async (route) => {
requested++;
expect(route.request().postDataJSON().api_key).toBe("synthetic-key");
await route.fulfill({ json: { models: ["discovered-model"] } });
});
for (const supplier of suppliers) {
await test.step(supplier.name, async () => {
await page.evaluate((id) => window.selectTestSupplier(id), supplier.id);
await expect(domain(page)).toBeVisible();
await expect(key(page)).toHaveValue("");
await key(page).fill("synthetic-key");
await fetchButton(page).click();
await expect(page.getByRole("status")).toHaveText("已获取 1 个模型");
await model(page).click();
await page
.getByRole("option", { name: "discovered-model", exact: true })
.click();
await page
.getByPlaceholder("请输入模型名称", { exact: true })
.fill(supplier.name);
await page.getByRole("button", { name: "Save", exact: true }).click();
await expect
.poll(() => page.evaluate(() => window.savedModel?.base_model))
.toBe("discovered-model");
await page.route("**/api/system/aimodel/models", (route) =>
route.fulfill({ json: { models: [], error: "unsupported" } }),
);
await fetchButton(page).click();
await expect(page.getByRole("status")).toContainText("获取失败");
await model(page).locator("input").fill("manual-model");
await page
.getByRole("option", { name: "manual-model", exact: true })
.click();
await page.getByRole("button", { name: "Save", exact: true }).click();
await expect
.poll(() => page.evaluate(() => window.savedModel?.base_model))
.toBe("manual-model");
await page.unroute("**/api/system/aimodel/models");
await page.route("**/api/system/aimodel/models", async (route) => {
requested++;
expect(route.request().postDataJSON().api_key).toBe("synthetic-key");
await route.fulfill({ json: { models: ["discovered-model"] } });
});
});
}
expect(requested).toBe(suppliers.length);
});

test("per-model defaults still change endpoints and custom addresses survive selection", async ({
page,
}) => {
await page.evaluate(() => window.selectTestSupplier(5));
await key(page).fill("synthetic-key");
await model(page).click();
await page.getByRole("option", { name: "x1", exact: true }).click();
await expect(domain(page)).toHaveValue(
"https://spark-api-open.xf-yun.com/v2/",
);
await expect(key(page)).toHaveValue("");
await domain(page).fill("http://127.0.0.1:4232/custom/v1");
await key(page).fill("synthetic-key");
await model(page).click();
await page.getByRole("option", { name: "4.0Ultra", exact: true }).click();
await expect(domain(page)).toHaveValue("http://127.0.0.1:4232/custom/v1");
await expect(key(page)).toHaveValue("synthetic-key");
await page.evaluate(() => window.selectTestSupplier(3));
await expect(key(page)).toHaveValue("");
});

test("non-compatible historical protocol does not expose discovery", async ({
page,
}) => {
await page.evaluate(() =>
window.editTestSupplier({
id: "1",
supplier: 15,
name: "Legacy",
model_type: 0,
base_model: "legacy",
api_domain: "http://127.0.0.1:4232/v1",
api_key: "",
protocol: 2,
config_list: [],
}),
);
await expect(fetchButton(page)).toHaveCount(0);
});

test("switching vendors ignores in-flight results and clears credentials", async ({
page,
}) => {
await page.evaluate(() => window.selectTestSupplier(3));
await key(page).fill("synthetic-key");
let release;
await page.route("**/api/system/aimodel/models", async (route) => {
await new Promise((resolve) => (release = resolve));
await route.fulfill({ json: { models: ["old-vendor-result"] } });
});
await fetchButton(page).click();
await expect.poll(() => Boolean(release)).toBe(true);
await page.evaluate(() => window.selectTestSupplier(7));
await expect(key(page)).toHaveValue("");
const response = page.waitForResponse("**/api/system/aimodel/models");
release();
await response;
await expect(page.getByRole("status")).toHaveCount(0);
await model(page).click();
await expect(
page.getByRole("option", { name: "old-vendor-result", exact: true }),
).toHaveCount(0);
});
Loading