From 6fd5e12ee3ff41ca3976ae93097757d56f89f5cb Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 16 Nov 2026 17:00:28 +0800 Subject: [PATCH] feat(model): discover OpenAI-compatible base models --- backend/apps/system/api/aimodel.py | 12 +- backend/apps/system/crud/model_discovery.py | 82 +++++++ .../apps/system/schemas/ai_model_schema.py | 8 +- backend/locales/en.json | 10 +- backend/locales/ko-KR.json | 10 +- backend/locales/th-TH.json | 10 +- backend/locales/zh-CN.json | 10 +- backend/locales/zh-TW.json | 10 +- backend/tests/test_model_discovery.py | 221 +++++++++++++++++ backend/tests/test_model_parameter_cache.py | 3 +- frontend/src/api/system.ts | 8 + frontend/src/i18n/en.json | 10 + frontend/src/i18n/ko-KR.json | 10 + frontend/src/i18n/th-TH.json | 10 + frontend/src/i18n/zh-CN.json | 10 + frontend/src/i18n/zh-TW.json | 10 + frontend/src/views/system/model/ModelForm.vue | 230 +++++++++++++++++- tests/browser/README.md | 16 ++ .../fixtures/model-discovery/bridge.mjs | 37 +++ .../fixtures/model-discovery/full.html | 2 + .../browser/fixtures/model-discovery/full.js | 16 ++ .../fixtures/model-discovery/index.html | 2 + .../browser/fixtures/model-discovery/main.js | 67 +++++ .../fixtures/model-discovery/server.mjs | 46 ++++ tests/browser/model-discovery.config.mjs | 19 ++ tests/browser/specs/model-discovery.spec.mjs | 201 +++++++++++++++ 26 files changed, 1053 insertions(+), 17 deletions(-) create mode 100644 backend/apps/system/crud/model_discovery.py create mode 100644 backend/tests/test_model_discovery.py create mode 100644 tests/browser/fixtures/model-discovery/bridge.mjs create mode 100644 tests/browser/fixtures/model-discovery/full.html create mode 100644 tests/browser/fixtures/model-discovery/full.js create mode 100644 tests/browser/fixtures/model-discovery/index.html create mode 100644 tests/browser/fixtures/model-discovery/main.js create mode 100644 tests/browser/fixtures/model-discovery/server.mjs create mode 100644 tests/browser/model-discovery.config.mjs create mode 100644 tests/browser/specs/model-discovery.spec.mjs diff --git a/backend/apps/system/api/aimodel.py b/backend/apps/system/api/aimodel.py index 3280d96f7..b25c005cd 100644 --- a/backend/apps/system/api/aimodel.py +++ b/backend/apps/system/api/aimodel.py @@ -7,11 +7,12 @@ from apps.ai_model.model_factory import LLMConfig, LLMFactory from apps.swagger.i18n import PLACEHOLDER_PREFIX +from apps.system.crud.model_discovery import discover_models, ModelDiscoveryError from apps.system.crud.aimodel_manage import get_ai_model_list_by_workspace from apps.system.crud.workspace_model import resolve_model_id, get_model_impacts, apply_model_impact_resolutions from apps.system.schemas.workspace_model import ModelMappingUpdate, ModelImpactResolution, ModelImpact from apps.system.models.system_model import AiModelDetail, AiModelWorkspaceMapping, AiModelBrief -from apps.system.schemas.ai_model_schema import AiModelConfigItem, AiModelCreator, AiModelEditor, AiModelGridItem +from apps.system.schemas.ai_model_schema import AiModelConfigItem, AiModelCreator, AiModelEditor, AiModelGridItem, ModelDiscoveryRequest from apps.system.schemas.permission import SqlbotPermission, require_permissions from common.core.deps import SessionDep, Trans, CurrentUser, CurrentAssistant from common.utils.crypto import sqlbot_decrypt @@ -23,6 +24,15 @@ from common.audit.schemas.logger_decorator import LogConfig, system_log +@router.post("/models", include_in_schema=False) +@require_permissions(permission=SqlbotPermission(role=['admin'])) +async def list_provider_models(info: ModelDiscoveryRequest, trans: Trans): + try: + return {'models': await discover_models(info.api_domain, info.api_key.get_secret_value())} + except ModelDiscoveryError as error: + return {'models': [], 'error': trans(f'i18n_model_discovery.{error}')} + + @router.post("/status", include_in_schema=False) @require_permissions(permission=SqlbotPermission(role=['admin'])) async def check_llm(info: AiModelCreator, trans: Trans): diff --git a/backend/apps/system/crud/model_discovery.py b/backend/apps/system/crud/model_discovery.py new file mode 100644 index 000000000..bafdd9469 --- /dev/null +++ b/backend/apps/system/crud/model_discovery.py @@ -0,0 +1,82 @@ +"""Bounded, administrator initiated OpenAI-compatible model discovery.""" + +import asyncio +import json +from urllib.parse import urlsplit, urlunsplit + +import httpx + +MAX_BYTES = 1024 * 1024 +MAX_MODELS = 2000 + + +class ModelDiscoveryError(Exception): + """Only a safe classification crosses the HTTP boundary.""" + + +def models_url(base: str) -> str: + try: + parts = urlsplit(base) + if ( + parts.scheme not in ("http", "https") + or not parts.hostname + or parts.username is not None + or parts.password is not None + or parts.query + or parts.fragment + or "\\" in base + or any(c.isspace() or ord(c) < 32 for c in base) + ): + raise ValueError + _ = parts.port + return urlunsplit( + (parts.scheme, parts.netloc, parts.path.rstrip("/") + "/models", "", "") + ) + except ValueError: + raise ModelDiscoveryError("address") from None + + +async def discover_models(base: str, key: str) -> list[str]: + url = models_url(base) + if len(key) > 16384 or any(ord(c) < 32 or ord(c) > 126 for c in key): + raise ModelDiscoveryError("credentials") + headers = {"Authorization": f"Bearer {key}"} if key else {} + try: + async with asyncio.timeout(10): + async with httpx.AsyncClient( + follow_redirects=False, trust_env=False, timeout=10 + ) as client: + async with client.stream("GET", url, headers=headers) as response: + if response.status_code in (401, 403): + raise ModelDiscoveryError("credentials") + if response.status_code in (404, 405, 501): + raise ModelDiscoveryError("unsupported") + if response.status_code != 200: + raise ModelDiscoveryError("failed") + body = bytearray() + async for chunk in response.aiter_bytes(chunk_size=65536): + body.extend(chunk) + if len(body) > MAX_BYTES: + raise ModelDiscoveryError("invalid") + payload = json.loads(body) + rows = payload.get("data") if isinstance(payload, dict) else None + if not isinstance(rows, list) or len(rows) > MAX_MODELS: + raise ModelDiscoveryError("invalid") + result = [] + for row in rows: + model_id = row.get("id") if isinstance(row, dict) else None + if ( + not isinstance(model_id, str) + or not model_id.strip() + or len(model_id) > 255 + or any(ord(c) < 32 for c in model_id) + or (key and key in model_id) + ): + raise ModelDiscoveryError("invalid") + if model_id not in result: + result.append(model_id) + return result + except (TimeoutError, httpx.TimeoutException): + raise ModelDiscoveryError("timeout") from None + except (httpx.HTTPError, httpx.InvalidURL, ValueError): + raise ModelDiscoveryError("failed") from None diff --git a/backend/apps/system/schemas/ai_model_schema.py b/backend/apps/system/schemas/ai_model_schema.py index 7f523eb93..0f93193d9 100644 --- a/backend/apps/system/schemas/ai_model_schema.py +++ b/backend/apps/system/schemas/ai_model_schema.py @@ -1,6 +1,6 @@ from typing import List -from pydantic import BaseModel, Field +from pydantic import BaseModel, Field, SecretStr from apps.swagger.i18n import PLACEHOLDER_PREFIX from common.core.schemas import BaseCreatorDTO @@ -27,4 +27,8 @@ class AiModelCreator(AiModelItem): config_list: List[AiModelConfigItem] = Field(description=f"{PLACEHOLDER_PREFIX}config_list") class AiModelEditor(AiModelCreator, BaseCreatorDTO): - pass \ No newline at end of file + pass + +class ModelDiscoveryRequest(BaseModel): + api_domain: str = Field(max_length=2048) + api_key: SecretStr = Field(default=SecretStr("")) diff --git a/backend/locales/en.json b/backend/locales/en.json index 4e4bdc3fb..baded8dfb 100644 --- a/backend/locales/en.json +++ b/backend/locales/en.json @@ -216,5 +216,13 @@ }, "i18n_parameter": { "invalid_embedding_parameter": "Invalid embedding parameter: {key}. Similarities and weights must be finite numbers from 0 to 1; candidate counts must be positive integers." - } + }, + "i18n_model_discovery": { + "address": "Invalid API base address.", + "credentials": "Authentication failed. Check the API Key.", + "unsupported": "This service does not support model listing.", + "failed": "Model listing failed. You can enter a model ID manually.", + "invalid": "The model list is invalid or exceeds the size limit.", + "timeout": "Fetching models timed out." +} } diff --git a/backend/locales/ko-KR.json b/backend/locales/ko-KR.json index 195ece263..614fa3ea6 100644 --- a/backend/locales/ko-KR.json +++ b/backend/locales/ko-KR.json @@ -216,5 +216,13 @@ }, "i18n_parameter": { "invalid_embedding_parameter": "벡터 매개변수 {key}이(가) 유효하지 않습니다. 유사도와 가중치는 0~1 사이의 유한한 수, 후보 수는 양의 정수여야 합니다." - } + }, + "i18n_model_discovery": { + "address": "API 기본 주소가 잘못되었습니다.", + "credentials": "인증에 실패했습니다. API Key를 확인하세요.", + "unsupported": "이 서비스는 모델 목록을 지원하지 않습니다.", + "failed": "모델 목록을 가져오지 못했습니다. 모델 ID를 직접 입력할 수 있습니다.", + "invalid": "모델 목록 형식이 잘못되었거나 크기 제한을 초과했습니다.", + "timeout": "모델 목록 요청 시간이 초과되었습니다." +} } diff --git a/backend/locales/th-TH.json b/backend/locales/th-TH.json index aedf260ca..307516219 100644 --- a/backend/locales/th-TH.json +++ b/backend/locales/th-TH.json @@ -216,5 +216,13 @@ }, "i18n_parameter": { "invalid_embedding_parameter": "พารามิเตอร์เวกเตอร์ {key} ไม่ถูกต้อง ความคล้ายคลึงและน้ำหนักต้องเป็นจำนวนจำกัดระหว่าง 0 ถึง 1 และจำนวนรายการต้องเป็นจำนวนเต็มบวก" - } + }, + "i18n_model_discovery": { + "address": "ที่อยู่ฐาน API ไม่ถูกต้อง", + "credentials": "การยืนยันตัวตนล้มเหลว โปรดตรวจสอบ API Key", + "unsupported": "บริการนี้ไม่รองรับรายการโมเดล", + "failed": "ดึงรายการโมเดลไม่สำเร็จ คุณสามารถป้อน ID โมเดลด้วยตนเองได้", + "invalid": "รูปแบบรายการโมเดลไม่ถูกต้องหรือเกินขนาดที่กำหนด", + "timeout": "หมดเวลาในการดึงรายการโมเดล" +} } diff --git a/backend/locales/zh-CN.json b/backend/locales/zh-CN.json index 2ca53c75c..e690131c7 100644 --- a/backend/locales/zh-CN.json +++ b/backend/locales/zh-CN.json @@ -216,5 +216,13 @@ }, "i18n_parameter": { "invalid_embedding_parameter": "向量参数 {key} 无效。相似度和权重必须是 0~1 的有限数值,候选数量必须是正整数。" - } + }, + "i18n_model_discovery": { + "address": "API 基地址无效。", + "credentials": "鉴权失败,请检查 API Key。", + "unsupported": "此服务不支持获取模型列表。", + "failed": "获取模型列表失败,可手动输入模型 ID。", + "invalid": "模型列表格式无效或超出大小限制。", + "timeout": "获取模型列表超时。" +} } diff --git a/backend/locales/zh-TW.json b/backend/locales/zh-TW.json index f8e722b33..7f3c643c1 100644 --- a/backend/locales/zh-TW.json +++ b/backend/locales/zh-TW.json @@ -216,5 +216,13 @@ }, "i18n_parameter": { "invalid_embedding_parameter": "向量參數 {key} 無效。相似度與權重必須是 0~1 的有限數值,候選數量必須是正整數。" - } + }, + "i18n_model_discovery": { + "address": "API 基底位址無效。", + "credentials": "驗證失敗,請檢查 API Key。", + "unsupported": "此服務不支援取得模型清單。", + "failed": "取得模型清單失敗,可手動輸入模型 ID。", + "invalid": "模型清單格式無效或超出大小限制。", + "timeout": "取得模型清單逾時。" +} } diff --git a/backend/tests/test_model_discovery.py b/backend/tests/test_model_discovery.py new file mode 100644 index 000000000..e264db200 --- /dev/null +++ b/backend/tests/test_model_discovery.py @@ -0,0 +1,221 @@ +"""Offline model discovery protocol and real permission decorator regression.""" + +import ast +import asyncio +import json +from pathlib import Path +from types import SimpleNamespace +from unittest.mock import patch + +import httpx +import pytest +from fastapi import HTTPException + +from apps.system.crud import model_discovery as discovery +from apps.system.schemas.ai_model_schema import ModelDiscoveryRequest + + +def run_response( + status=200, payload=None, key="", base="http://model.test/prefix/v1/", headers=None +): + requests = [] + real_client = httpx.AsyncClient + + async def serve(request): + requests.append(request) + return httpx.Response(status, json=payload, headers=headers) + + with patch.object( + discovery.httpx, + "AsyncClient", + lambda **kwargs: real_client(**kwargs, transport=httpx.MockTransport(serve)), + ): + result = asyncio.run(discovery.discover_models(base, key)) + return result, requests + + +def test_list_ids_no_key_and_path(): + result, requests = run_response( + payload={"data": [{"id": "a"}, {"id": "a"}, {"id": "b"}]} + ) + assert result == ["a", "b"] + assert str(requests[0].url) == "http://model.test/prefix/v1/models" + assert "authorization" not in requests[0].headers + result, requests = run_response(payload={"data": []}, key="synthetic-secret") + assert result == [] + assert requests[0].headers["authorization"] == "Bearer synthetic-secret" + + +@pytest.mark.parametrize( + "status,code", + [ + (401, "credentials"), + (403, "credentials"), + (404, "unsupported"), + (405, "unsupported"), + (501, "unsupported"), + (500, "failed"), + (302, "failed"), + ], +) +def test_failures_and_no_redirect(status, code): + with pytest.raises(discovery.ModelDiscoveryError, match=code): + run_response( + status, {"data": []}, headers={"Location": "http://other.test/models"} + ) + + +@pytest.mark.parametrize( + "payload", + [ + {}, + [], + {"data": {}}, + {"data": [{"id": ""}]}, + {"data": [{"id": 123}]}, + {"data": [{"id": "a" * 256}]}, + {"data": [{"id": "synthetic-secret"}]}, + {"data": [{"id": "x\n"}]}, + {"data": [{"id": "a"}] * 2001}, + ], +) +def test_invalid_payload(payload): + with pytest.raises(discovery.ModelDiscoveryError, match="invalid"): + run_response(payload=payload, key="synthetic-secret") + + +@pytest.mark.parametrize( + "base", + [ + "file:///etc/passwd", + "ftp://model.test", + "http://a@b/v1", + "http://a/v1?key=x", + "http://a/v1#x", + "http://a:bad", + "http://a\\b", + "http://a/ x", + ], +) +def test_reject_invalid_url_before_request(base): + with pytest.raises(discovery.ModelDiscoveryError, match="address"): + discovery.models_url(base) + + +def test_timeout_and_size(): + real_client = httpx.AsyncClient + + async def serve(_request): + raise httpx.ReadTimeout("synthetic-secret") + + with patch.object( + discovery.httpx, + "AsyncClient", + lambda **kwargs: real_client(**kwargs, transport=httpx.MockTransport(serve)), + ): + with pytest.raises(discovery.ModelDiscoveryError, match="timeout"): + asyncio.run( + discovery.discover_models("http://model.test", "synthetic-secret") + ) + with patch.object(discovery, "MAX_BYTES", 10): + with pytest.raises(discovery.ModelDiscoveryError, match="invalid"): + run_response(payload={"data": [{"id": "a"}]}) + + +def test_real_route_permission_and_safe_error(): + import sqlbot_xpack # noqa: F401 -- initialize released wheel + + from apps.system.schemas.permission import ( + RequestContext, + SqlbotPermission, + require_permissions, + ) + + namespace = { + "router": SimpleNamespace(post=lambda *a, **kw: lambda f: f), + "require_permissions": require_permissions, + "SqlbotPermission": SqlbotPermission, + "ModelDiscoveryRequest": ModelDiscoveryRequest, + "Trans": object, + "discover_models": discovery.discover_models, + "ModelDiscoveryError": discovery.ModelDiscoveryError, + } + path = Path(__file__).parents[1] / "apps/system/api/aimodel.py" + node = next( + n + for n in ast.parse(path.read_text()).body + if getattr(n, "name", "") == "list_provider_models" + ) + exec( + compile(ast.Module(body=[node], type_ignores=[]), str(path), "exec"), namespace + ) + handler = namespace["list_provider_models"] + info = ModelDiscoveryRequest( + api_domain="file:///invalid", api_key="synthetic-secret" + ) + assert "synthetic-secret" not in repr(info) + for user in [ + None, + SimpleNamespace(oid=1, isAdmin=False, weight=0), + SimpleNamespace(oid=1, isAdmin=False, weight=1), + ]: + request = SimpleNamespace( + state=SimpleNamespace(current_user=user, assistant=None), headers={} + ) + with patch.object(RequestContext, "get_request", return_value=request): + with pytest.raises(Exception) as rejected: + asyncio.run(handler(info, lambda key: key)) + if user is None: + assert isinstance(rejected.value, HTTPException) + assert rejected.value.status_code == 401 + else: + assert str(rejected.value) == "Only administrators are allowed to call!" + request = SimpleNamespace( + state=SimpleNamespace( + current_user=SimpleNamespace(oid=1, isAdmin=True), assistant=None + ), + headers={}, + ) + with patch.object(RequestContext, "get_request", return_value=request): + result = asyncio.run(handler(info, lambda key: key)) + assert result == {"models": [], "error": "i18n_model_discovery.address"} + assert "synthetic-secret" not in json.dumps(result) + + +def test_loopback_http_service(): + """Exercise the actual HTTP transport against a synthetic private service.""" + from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer + from threading import Thread + + received = [] + + class Handler(BaseHTTPRequestHandler): + def log_message(self, *_args): + pass + + def do_GET(self): + received.append((self.path, self.headers.get("Authorization"))) + self.send_response(200) + self.send_header("Content-Type", "application/json") + self.end_headers() + self.wfile.write( + b'{"data":[{"id":"loopback-chat"},{"id":"loopback-chat"}]}' + ) + + server = ThreadingHTTPServer(("127.0.0.1", 0), Handler) + thread = Thread(target=server.serve_forever, daemon=True) + thread.start() + try: + base = f"http://127.0.0.1:{server.server_port}/custom/v1" + assert asyncio.run(discovery.discover_models(base, "")) == ["loopback-chat"] + assert asyncio.run(discovery.discover_models(base, "synthetic-secret")) == [ + "loopback-chat" + ] + assert received == [ + ("/custom/v1/models", None), + ("/custom/v1/models", "Bearer synthetic-secret"), + ] + finally: + server.shutdown() + server.server_close() + thread.join() diff --git a/backend/tests/test_model_parameter_cache.py b/backend/tests/test_model_parameter_cache.py index 70dc2cb12..0af2d21e4 100644 --- a/backend/tests/test_model_parameter_cache.py +++ b/backend/tests/test_model_parameter_cache.py @@ -21,7 +21,8 @@ 'modelForm', 'modelRef', 'advancedSetting', 'tempConfigMap', 'curId', 'currentSupplier', 'modelList', 'initForm', 'handleParamsDel', 'supplierChang', 'formatAdvancedSetting', 'baseModelChange', 'getSupplierDomain', 'getModelDefaultArgs', - 'submitModel', + 'submitModel', 'isGeneric', 'initializing', 'invalidateDiscovery', + 'discoveryVersion', 'discovering', 'discoveredModels', 'discoveryMessage', 'discoveryState', 'discoveryErrorDetail', ]); const selected = ast.statements.filter(statement => ts.isVariableStatement(statement) && statement.declarationList.declarations.some(declaration => names.has(declaration.name.getText(ast)))); diff --git a/frontend/src/api/system.ts b/frontend/src/api/system.ts index cd461fe54..3f2372af9 100644 --- a/frontend/src/api/system.ts +++ b/frontend/src/api/system.ts @@ -2,6 +2,14 @@ import { request } from '@/utils/request' import type { ModelImpactResolution } from './workspace' export const modelApi = { + discover: (api_domain: string, api_key: string) => + request.post<{ models: string[]; error?: string }>( + '/system/aimodel/models', + { api_domain, api_key }, + { + requestOptions: { customError: true, silent: true }, + } + ), queryAll: (keyword?: string) => request.get('/system/aimodel', { params: keyword ? { keyword } : {} }), add: (data: any) => { diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index 444af764c..b8958ded3 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -534,6 +534,16 @@ "get_schema": "Get Schema" }, "model": { + "discovery_loading": "Fetching...", + "discovery_retry": "Retry", + "discovery_input_hint": "Search or enter a model ID manually", + + "discovery_fetch": "Get model list", + "discovery_success": "Fetched {count} models", + "discovery_empty": "No models returned. You can enter a model ID manually.", + "discovery_failed": "Failed to fetch models. Check the address or credentials; you can enter a model ID manually.", + "discovery_key_reset": "The API address changed. Re-enter the API Key if authentication is required.", + "int": "Integer", "float": "Float", "string": "String", diff --git a/frontend/src/i18n/ko-KR.json b/frontend/src/i18n/ko-KR.json index c2e73644f..d147b4238 100644 --- a/frontend/src/i18n/ko-KR.json +++ b/frontend/src/i18n/ko-KR.json @@ -534,6 +534,16 @@ "get_schema": "스키마 가져오기" }, "model": { + "discovery_loading": "가져오는 중...", + "discovery_retry": "다시 가져오기", + "discovery_input_hint": "검색하거나 모델 ID를 직접 입력하세요", + + "discovery_fetch": "모델 목록 가져오기", + "discovery_success": "모델 {count}개를 가져왔습니다", + "discovery_empty": "반환된 모델이 없습니다. 모델 ID를 직접 입력할 수 있습니다.", + "discovery_failed": "가져오지 못했습니다. 주소 또는 인증 정보를 확인하거나 모델 ID를 직접 입력하세요.", + "discovery_key_reset": "API 주소가 변경되었습니다. 인증이 필요하면 API Key를 다시 입력하세요.", + "int": "정수", "float": "소수", "string": "문자열", diff --git a/frontend/src/i18n/th-TH.json b/frontend/src/i18n/th-TH.json index 0dcafbb67..2d791a849 100644 --- a/frontend/src/i18n/th-TH.json +++ b/frontend/src/i18n/th-TH.json @@ -534,6 +534,16 @@ "get_schema": "ดึง Schema" }, "model": { + "discovery_loading": "กำลังดึง...", + "discovery_retry": "ดึงอีกครั้ง", + "discovery_input_hint": "ค้นหาหรือป้อน ID โมเดลด้วยตนเอง", + + "discovery_fetch": "ดึงรายการโมเดล", + "discovery_success": "ดึงโมเดลแล้ว {count} รายการ", + "discovery_empty": "ไม่มีโมเดลที่ส่งกลับ คุณสามารถป้อน ID โมเดลด้วยตนเองได้", + "discovery_failed": "ดึงรายการไม่สำเร็จ โปรดตรวจสอบที่อยู่หรือข้อมูลรับรอง หรือป้อน ID โมเดลด้วยตนเอง", + "discovery_key_reset": "ที่อยู่ API เปลี่ยนแล้ว หากต้องยืนยันตัวตน โปรดป้อน API Key อีกครั้ง", + "int": "จำนวนเต็ม", "float": "เลขทศนิยม", "string": "ข้อความ", diff --git a/frontend/src/i18n/zh-CN.json b/frontend/src/i18n/zh-CN.json index ff150491e..bedca992d 100644 --- a/frontend/src/i18n/zh-CN.json +++ b/frontend/src/i18n/zh-CN.json @@ -534,6 +534,16 @@ "get_schema": "获取Schema" }, "model": { + "discovery_loading": "获取中...", + "discovery_retry": "重新获取", + "discovery_input_hint": "支持搜索或手动输入模型 ID", + + "discovery_fetch": "获取模型列表", + "discovery_success": "已获取 {count} 个模型", + "discovery_empty": "未返回模型,可手动输入模型 ID。", + "discovery_failed": "获取失败,请检查地址或凭据。可手动输入模型 ID。", + "discovery_key_reset": "API 地址已变化,如需鉴权,请重新填写 API Key。", + "int": "整数", "float": "小数", "string": "字符串", diff --git a/frontend/src/i18n/zh-TW.json b/frontend/src/i18n/zh-TW.json index 72d202a22..e7c45ba74 100644 --- a/frontend/src/i18n/zh-TW.json +++ b/frontend/src/i18n/zh-TW.json @@ -534,6 +534,16 @@ "get_schema": "取得Schema" }, "model": { + "discovery_loading": "取得中...", + "discovery_retry": "重新取得", + "discovery_input_hint": "支援搜尋或手動輸入模型 ID", + + "discovery_fetch": "取得模型清單", + "discovery_success": "已取得 {count} 個模型", + "discovery_empty": "未傳回模型,可手動輸入模型 ID。", + "discovery_failed": "取得失敗,請檢查位址或憑證。可手動輸入模型 ID。", + "discovery_key_reset": "API 位址已變更,如需驗證,請重新填寫 API Key。", + "int": "整數", "float": "小數", "string": "字串", diff --git a/frontend/src/views/system/model/ModelForm.vue b/frontend/src/views/system/model/ModelForm.vue index ea619783b..fa1e5f3bf 100644 --- a/frontend/src/views/system/model/ModelForm.vue +++ b/frontend/src/views/system/model/ModelForm.vue @@ -1,10 +1,12 @@ diff --git a/tests/browser/fixtures/model-discovery/full.js b/tests/browser/fixtures/model-discovery/full.js new file mode 100644 index 000000000..a00589780 --- /dev/null +++ b/tests/browser/fixtures/model-discovery/full.js @@ -0,0 +1,16 @@ +import { createApp } from "vue"; +import { createPinia } from "pinia"; +import { createI18n } from "vue-i18n"; +import ElementPlus, { ElMessage } from "element-plus-secondary"; +import "element-plus-secondary/dist/index.css"; +import "@/style.less"; +import Model from "@/views/system/model/Model.vue"; +import zh from "@/i18n/zh-CN.json"; +window.ElMessage = ElMessage; +createApp(Model) + .use(createPinia()) + .use(ElementPlus) + .use( + createI18n({ legacy: false, locale: "zh-CN", messages: { "zh-CN": zh } }), + ) + .mount("#app"); diff --git a/tests/browser/fixtures/model-discovery/index.html b/tests/browser/fixtures/model-discovery/index.html new file mode 100644 index 000000000..941ba207b --- /dev/null +++ b/tests/browser/fixtures/model-discovery/index.html @@ -0,0 +1,2 @@ +
+ diff --git a/tests/browser/fixtures/model-discovery/main.js b/tests/browser/fixtures/model-discovery/main.js new file mode 100644 index 000000000..66d7cb780 --- /dev/null +++ b/tests/browser/fixtures/model-discovery/main.js @@ -0,0 +1,67 @@ +import { ElMessage } from "element-plus-secondary"; +window.ElMessage = ElMessage; +import { createApp, h, ref, nextTick } from "vue"; +import { createI18n } from "vue-i18n"; +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"; +const form = ref(); +const visible = ref(true); +createApp({ + setup() { + return () => + h("div", [ + visible.value + ? h(Form, { + ref: form, + onSubmit: (data) => (window.savedModel = data), + activeName: "通用OpenAI", + editModel: true, + }) + : null, + h( + "button", + { onClick: () => (visible.value = !visible.value) }, + "Toggle form", + ), + h("button", { onClick: () => form.value.submitModel() }, "Save"), + h( + "button", + { + onClick: async () => { + await nextTick(); + form.value.supplierChang(get_supplier(15)); + }, + }, + "New generic", + ), + h( + "button", + { + onClick: () => + form.value.initForm({ + id: "1", + supplier: 15, + name: "Synthetic", + base_model: "legacy-custom", + model_type: 0, + api_domain: "http://127.0.0.1:4232/v1", + api_key: "", + config_list: [ + { key: "temperature", name: "temperature", val: 0.33 }, + ], + protocol: 1, + }), + }, + "Edit legacy", + ), + ]); + }, +}) + .use(ElementPlus) + .use( + createI18n({ legacy: false, locale: "zh-CN", messages: { "zh-CN": zh } }), + ) + .mount("#app"); diff --git a/tests/browser/fixtures/model-discovery/server.mjs b/tests/browser/fixtures/model-discovery/server.mjs new file mode 100644 index 000000000..e8d2c3d77 --- /dev/null +++ b/tests/browser/fixtures/model-discovery/server.mjs @@ -0,0 +1,46 @@ +import { createRequire } from "node:module"; +import { fileURLToPath } from "node:url"; +import path from "node:path"; +const root = fileURLToPath(new URL(".", import.meta.url)); +const frontend = path.resolve(root, "../../../../frontend"); +const require = createRequire(path.join(frontend, "package.json")); +const { createServer } = await import(require.resolve("vite")); +const { default: vue } = await import(require.resolve("@vitejs/plugin-vue")); +const { default: svg } = await import(require.resolve("vite-svg-loader")); +const bridge = path.join(root, "bridge.mjs"); +const server = await createServer({ + configFile: false, + root, + cacheDir: "../../output/model-discovery-vite", + plugins: [vue(), svg()], + resolve: { + alias: [ + ...["@/utils/request"].map((find) => ({ find, replacement: bridge })), + { find: "@", replacement: path.join(frontend, "src") }, + ...[ + "vue", + "pinia", + "vue-i18n", + "element-plus-secondary", + "axios", + "json-bigint", + ].map((name) => ({ + find: name, + replacement: path.join(frontend, "node_modules", name), + })), + ], + }, + define: { "import.meta.env.VITE_API_BASE_URL": JSON.stringify("/api/v1") }, + server: { + host: "127.0.0.1", + port: 4231, + strictPort: true, + fs: { allow: [root, frontend] }, + }, +}); +await server.listen(); +for (const signal of ["SIGINT", "SIGTERM"]) + process.on(signal, async () => { + await server.close(); + process.exit(); + }); diff --git a/tests/browser/model-discovery.config.mjs b/tests/browser/model-discovery.config.mjs new file mode 100644 index 000000000..994b0948d --- /dev/null +++ b/tests/browser/model-discovery.config.mjs @@ -0,0 +1,19 @@ +import { defineConfig } from "@playwright/test"; +import base from "./playwright.config.mjs"; +export default defineConfig({ + ...base, + webServer: { + command: "node fixtures/model-discovery/server.mjs", + url: "http://127.0.0.1:4231", + reuseExistingServer: false, + timeout: 30000, + }, + projects: [ + { + name: "model-discovery", + testMatch: "model-discovery.spec.mjs", + use: { baseURL: "http://127.0.0.1:4231" }, + }, + ], + outputDir: "output/model-discovery-results", +}); diff --git a/tests/browser/specs/model-discovery.spec.mjs b/tests/browser/specs/model-discovery.spec.mjs new file mode 100644 index 000000000..e8a495bfc --- /dev/null +++ b/tests/browser/specs/model-discovery.spec.mjs @@ -0,0 +1,201 @@ +import { test, expect } from "@playwright/test"; +const fetchButton = (page) => + page.getByRole("button", { + name: /获取模型列表|重新获取|获取中/, + exact: false, + }); +const domain = (page) => + page.getByPlaceholder("请输入API 域名", { exact: true }); +const key = (page) => page.getByPlaceholder("请输入API Key", { exact: true }); +const model = (page) => page.locator(".ed-select,.el-select").nth(1); +test.beforeEach(async ({ page }) => { + await page.goto("/"); + await page.getByRole("button", { name: "New generic", exact: true }).click(); +}); +test("fetch without key, deduplicate, search, preserve address, and save manual model", async ({ + page, +}) => { + await expect(domain(page)).toBeVisible(); + await expect(key(page)).toBeVisible(); + await page.route("**/api/system/aimodel/models", async (route) => { + expect(route.request().postDataJSON().api_key).toBe(""); + await route.fulfill({ + json: { models: ["demo-chat", "demo-chat", "demo-code"] }, + }); + }); + await domain(page).fill("http://127.0.0.1:4232/v1"); + await fetchButton(page).click(); + await expect(page.getByRole("status")).toContainText("2 个模型"); + await model(page).click(); + await expect( + page.getByRole("option", { name: "demo-chat", exact: true }), + ).toHaveCount(1); + await page.getByRole("option", { name: "gpt-4.1", exact: true }).click(); + await expect(domain(page)).toHaveValue("http://127.0.0.1:4232/v1"); + await model(page).locator("input").fill("manual-model"); + await page.getByRole("option", { name: "manual-model", exact: true }).click(); + await page + .getByPlaceholder("请输入模型名称", { exact: true }) + .fill("Synthetic"); + await page.getByRole("button", { name: "Save", exact: true }).click(); + await expect + .poll(() => page.evaluate(() => window.savedModel?.base_model)) + .toBe("manual-model"); +}); +test("loading, stale responses and credential binding", async ({ page }) => { + let release; + await page.route("**/api/system/aimodel/models", async (route) => { + await new Promise((resolve) => (release = resolve)); + await route.fulfill({ json: { models: ["stale-model"] } }); + }); + await key(page).fill("synthetic-key"); + await fetchButton(page).click(); + await expect(fetchButton(page)).toBeDisabled(); + await domain(page).fill("http://127.0.0.1:4233/v1"); + await expect(key(page)).toHaveValue(""); + release(); + await expect(page.getByRole("status")).toHaveCount(0); + await model(page).click(); + await expect( + page.getByRole("option", { name: "stale-model", exact: true }), + ).toHaveCount(0); +}); +test("empty and failure preserve legacy selection and parameters", async ({ + page, +}) => { + await page.getByRole("button", { name: "Edit legacy", exact: true }).click(); + for (const result of [ + { models: [] }, + { models: [], error: "鉴权失败,请检查 API Key。" }, + ]) { + await page.route("**/api/system/aimodel/models", (route) => + route.fulfill({ json: result }), + ); + await fetchButton(page).click(); + await expect(page.getByRole("status")).toContainText( + result.error ? "获取失败" : "未返回模型", + ); + await expect(model(page)).toContainText("legacy-custom"); + await expect(page.getByText("0.33", { exact: true })).toBeVisible(); + await expect(domain(page)).toHaveValue("http://127.0.0.1:4232/v1"); + } +}); + +test("key changes invalidate results and reopening ignores pending response", async ({ + page, +}) => { + let release; + let calls = 0; + await page.route("**/api/system/aimodel/models", async (route) => { + calls++; + if (calls === 1) + return route.fulfill({ json: { models: ["first-result"] } }); + await new Promise((resolve) => (release = resolve)); + await route.fulfill({ json: { models: ["closed-result"] } }); + }); + await fetchButton(page).click(); + await expect(page.getByRole("status")).toContainText("1 个模型"); + await key(page).fill("changed-synthetic-key"); + await expect(page.getByRole("status")).toHaveCount(0); + await fetchButton(page).click(); + await expect.poll(() => calls).toBe(2); + await page.getByRole("button", { name: "Toggle form", exact: true }).click(); + const response = page.waitForResponse("**/api/system/aimodel/models"); + release(); + await response; + await page.getByRole("button", { name: "Toggle form", exact: true }).click(); + await page.getByRole("button", { name: "New generic", exact: true }).click(); + await expect(page.getByRole("status")).toHaveCount(0); + await model(page).click(); + await expect( + page.getByRole("option", { name: "closed-result", exact: true }), + ).toHaveCount(0); +}); + +test("original drawer preserves interaction while discovery matches prototype states", async ({ + page, +}, testInfo) => { + const mutations = []; + page.on("request", (request) => { + if ( + request.method() !== "GET" && + /\/aimodel\/?$/.test(new URL(request.url()).pathname) + ) + mutations.push(request.url()); + }); + await page.setViewportSize({ width: 1280, height: 1024 }); + await page.goto("/full.html"); + await page.getByRole("button", { name: "编辑", exact: true }).click(); + const dialog = page.getByRole("dialog"); + await expect(dialog).toContainText("编辑通用OpenAI"); + await expect( + dialog.getByRole("button", { name: "验证连接", exact: true }), + ).toHaveCount(0); + await expect(page.locator(".params-table")).toBeVisible(); + await expect(page.locator(".generic-model-drawer")).toHaveCount(0); + const drawerBox = await dialog.boundingBox(); + expect(drawerBox.width).toBe(1280); + expect(drawerBox.height).toBe(924); + await expect( + dialog.getByRole("button", { name: "取消", exact: true }), + ).toBeVisible(); + await expect( + dialog.getByRole("button", { name: "保存", exact: true }), + ).toBeVisible(); + const inputBox = await model(page).boundingBox(); + const buttonBox = await fetchButton(page).boundingBox(); + expect( + Math.abs(buttonBox.x + buttonBox.width - inputBox.x - inputBox.width), + ).toBeLessThan(24); + let release; + await page.route("**/api/system/aimodel/models", async (route) => { + await new Promise((resolve) => (release = resolve)); + await route.fulfill({ + json: { models: ["demo-chat", "demo-reasoner", "demo-code"] }, + }); + }); + await fetchButton(page).click(); + await expect( + dialog.getByRole("button", { name: "获取中...", exact: true }), + ).toBeDisabled(); + await expect.poll(() => Boolean(release)).toBe(true); + await dialog.screenshot({ + path: testInfo.outputPath("prototype-loading.png"), + }); + release(); + await expect(page.getByRole("status")).toHaveText("已获取 3 个模型"); + await expect(page.getByRole("status")).toHaveCSS("color", "rgb(0, 138, 0)"); + await model(page).click(); + await expect( + page.getByText("支持搜索或手动输入模型 ID", { exact: true }), + ).toBeVisible(); + await page.waitForTimeout(300); + await dialog.screenshot({ + path: testInfo.outputPath("prototype-success.png"), + }); + await page.keyboard.press("Escape"); + await page.route("**/api/system/aimodel/models", (route) => + route.fulfill({ + json: { models: [], error: "鉴权失败,请检查 API Key。" }, + }), + ); + await fetchButton(page).click(); + await expect(page.getByRole("status")).toHaveText( + "获取失败,请检查地址或凭据。可手动输入模型 ID。", + ); + await expect(page.getByRole("status")).toHaveCSS("color", "rgb(255, 0, 0)"); + await expect( + dialog.getByRole("button", { name: "重新获取", exact: true }), + ).toBeVisible(); + await page.route("**/api/system/aimodel/models", (route) => + route.fulfill({ json: { models: [] } }), + ); + await fetchButton(page).click(); + await expect(page.getByRole("status")).toHaveText( + "未返回模型,可手动输入模型 ID。", + ); + await dialog.screenshot({ path: testInfo.outputPath("prototype-empty.png") }); + expect(mutations).toEqual([]); + await dialog.getByRole("button", { name: "取消", exact: true }).click(); + await expect(dialog).not.toBeVisible(); +});