diff --git a/backend/tests/test_model_parameter_cache.py b/backend/tests/test_model_parameter_cache.py index 0af2d21e..9d387831 100644 --- a/backend/tests/test_model_parameter_cache.py +++ b/backend/tests/test_model_parameter_cache.py @@ -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) && diff --git a/frontend/src/views/system/model/ModelForm.vue b/frontend/src/views/system/model/ModelForm.vue index fa1e5f3b..6f7d1590 100644 --- a/frontend/src/views/system/model/ModelForm.vue +++ b/frontend/src/views/system/model/ModelForm.vue @@ -65,7 +65,13 @@ 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([]) const discovering = ref(false) const discoveryMessage = ref('') @@ -73,6 +79,7 @@ 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 @@ -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')) } @@ -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 = '' @@ -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 = [] @@ -272,6 +280,10 @@ const initForm = (item?: any) => { tempConfigMap = new Map>() 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) => { @@ -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) @@ -368,6 +388,7 @@ defineExpose({ - + - +
-
@@ -502,7 +527,7 @@ defineExpose({ " /> - + ({ id, name })); +window.selectTestSupplier = (id) => form.value.supplierChang(get_supplier(id)); +window.editTestSupplier = (item) => form.value.initForm(item); createApp({ setup() { return () => diff --git a/tests/browser/specs/model-discovery.spec.mjs b/tests/browser/specs/model-discovery.spec.mjs index e8a495bf..6bbaf529 100644 --- a/tests/browser/specs/model-discovery.spec.mjs +++ b/tests/browser/specs/model-discovery.spec.mjs @@ -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); +});