fix: 模型管理审查修复与归档
- 修复 registry 测试 ai mock 缺失 createProviderRegistry 导出 - 新增 POST /api/providers/test 支持未保存供应商配置连通性测试 - 供应商表单新增测试连接按钮,新建默认 openai-compatible - 连通性测试按 ok 展示成功/失败,不再统一 success 样式 - 模型表单新建时也可测试供应商连接 - 模型页使用独立 provider 列表避免分页/搜索影响 - 移除模型管理组件内联 style - 新增 ProviderTestResultResponse 共享响应类型 - 新增 bun run format:check 脚本 - 补充关键测试覆盖(删除关联、连通性、默认类型、表单测试) - 更新 docs/user/usage.md、docs/development/*、design.md、tasks.md - 归档 change 至 openspec/changes/archive/2026-05-29-add-model-management
This commit is contained in:
@@ -2,13 +2,25 @@ import { describe, expect, mock, test } from "bun:test";
|
||||
|
||||
import { createMigratedTestDatabase } from "../../helpers";
|
||||
|
||||
let generateTextImpl: (_opts: unknown) => unknown = () => ({});
|
||||
|
||||
void mock.module("ai", () => ({
|
||||
createProviderRegistry: (providers: Record<string, { languageModel: (modelId: string) => unknown }>) => ({
|
||||
languageModel: (id: string) => {
|
||||
const [providerId, modelId] = id.split(":");
|
||||
const provider = providers[providerId ?? ""];
|
||||
if (!provider || !modelId) throw new Error(`No such provider: ${id}`);
|
||||
return provider.languageModel(modelId);
|
||||
},
|
||||
}),
|
||||
generateText: mock((opts: unknown) => generateTextImpl(opts)),
|
||||
}));
|
||||
|
||||
describe("AI registry", () => {
|
||||
test("testProviderConnection rejects invalid config", async () => {
|
||||
void mock.module("ai", () => ({
|
||||
generateText: mock(() => {
|
||||
throw new Error("Connection failed");
|
||||
}),
|
||||
}));
|
||||
generateTextImpl = () => {
|
||||
throw new Error("Connection failed");
|
||||
};
|
||||
|
||||
const { testProviderConnection } = await import("../../../src/server/ai/registry");
|
||||
|
||||
@@ -25,9 +37,7 @@ describe("AI registry", () => {
|
||||
});
|
||||
|
||||
test("testProviderConnection return shape is correct", async () => {
|
||||
void mock.module("ai", () => ({
|
||||
generateText: mock((_opts: unknown) => ({})),
|
||||
}));
|
||||
generateTextImpl = () => ({});
|
||||
|
||||
const { testProviderConnection } = await import("../../../src/server/ai/registry");
|
||||
|
||||
@@ -61,6 +71,7 @@ describe("AI registry", () => {
|
||||
const registry = buildProviderRegistry(handle.db);
|
||||
|
||||
expect(() => registry.languageModel("pv1:gpt-4o")).not.toThrow();
|
||||
expect(() => registry.languageModel("pv2:claude-3")).toThrow();
|
||||
|
||||
handle.cleanup();
|
||||
});
|
||||
|
||||
@@ -1,13 +1,24 @@
|
||||
import type Database from "bun:sqlite";
|
||||
|
||||
import { describe, expect, test } from "bun:test";
|
||||
import { describe, expect, mock, test } from "bun:test";
|
||||
|
||||
import type { Provider, RuntimeMode } from "../../../src/shared/api";
|
||||
|
||||
import { createModel } from "../../../src/server/db/models";
|
||||
import { createProvider } from "../../../src/server/db/providers";
|
||||
import { createMigratedMemoryTestDatabase } from "../../helpers";
|
||||
|
||||
const MODE: RuntimeMode = "test";
|
||||
|
||||
let generateTextImpl: (_opts: unknown) => unknown = () => ({});
|
||||
|
||||
void mock.module("ai", () => ({
|
||||
createProviderRegistry: () => ({
|
||||
languageModel: () => ({}),
|
||||
}),
|
||||
generateText: mock((opts: unknown) => generateTextImpl(opts)),
|
||||
}));
|
||||
|
||||
async function createProviderViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleCreateProvider: h } = await import("../../../src/server/routes/providers/create");
|
||||
return h(req, db, MODE);
|
||||
@@ -49,7 +60,15 @@ async function listProvidersViaHandler(req: Request, db: Database): Promise<Resp
|
||||
return h(req, db, MODE);
|
||||
}
|
||||
|
||||
import { createProvider } from "../../../src/server/db/providers";
|
||||
async function testProviderConfigViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleTestProviderConfig: h } = await import("../../../src/server/routes/providers/test");
|
||||
return h(req, db, MODE);
|
||||
}
|
||||
|
||||
async function testProviderViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleTestProvider: h } = await import("../../../src/server/routes/providers/test");
|
||||
return h(req, db, MODE);
|
||||
}
|
||||
|
||||
async function updateProviderViaHandler(req: Request, db: Database): Promise<Response> {
|
||||
const { handleUpdateProvider: h } = await import("../../../src/server/routes/providers/update");
|
||||
@@ -167,6 +186,62 @@ describe("供应商 API 路由", () => {
|
||||
});
|
||||
});
|
||||
|
||||
test("DELETE /api/providers/:id 存在关联模型时返回 409", async () => {
|
||||
await withRouteDb(async (db) => {
|
||||
const provider = createTestProvider(db, "有关联模型");
|
||||
const modelResult = createModel(db, {
|
||||
capabilities: ["text"],
|
||||
modelId: "gpt-4o",
|
||||
name: "GPT-4o",
|
||||
providerId: provider.id,
|
||||
});
|
||||
if ("error" in modelResult) throw new Error(modelResult.error);
|
||||
|
||||
const req = new Request(`http://localhost/api/providers/${provider.id}`, { method: "DELETE" });
|
||||
const res = await deleteProviderViaHandler(req, db);
|
||||
expect(res.status).toBe(409);
|
||||
const body = (await res.json()) as { error: string };
|
||||
expect(body.error).toContain("存在模型");
|
||||
});
|
||||
});
|
||||
|
||||
test("POST /api/providers/:id/test 返回连通性失败结果", async () => {
|
||||
await withRouteDb(async (db) => {
|
||||
generateTextImpl = () => {
|
||||
throw new Error("bad key");
|
||||
};
|
||||
const provider = createTestProvider(db, "测试失败供应商");
|
||||
|
||||
const req = new Request(`http://localhost/api/providers/${provider.id}/test`, { method: "POST" });
|
||||
const res = await testProviderViaHandler(req, db);
|
||||
expect(res.status).toBe(200);
|
||||
const body = (await res.json()) as { providerTestResponse: { message: string; ok: boolean } };
|
||||
expect(body.providerTestResponse.ok).toBe(false);
|
||||
expect(body.providerTestResponse.message).toContain("连接失败");
|
||||
generateTextImpl = () => ({});
|
||||
});
|
||||
});
|
||||
|
||||
test("POST /api/providers/test 使用表单配置测试连通性", async () => {
|
||||
await withRouteDb(async (db) => {
|
||||
generateTextImpl = () => ({});
|
||||
const req = new Request("http://localhost/api/providers/test", {
|
||||
body: JSON.stringify({
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
name: "OpenAI",
|
||||
type: "openai",
|
||||
}),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
method: "POST",
|
||||
});
|
||||
const res = await testProviderConfigViaHandler(req, db);
|
||||
expect(res.status).toBe(200);
|
||||
const body = (await res.json()) as { providerTestResponse: { message: string; ok: boolean } };
|
||||
expect(body.providerTestResponse).toEqual({ message: "连接成功", ok: true });
|
||||
});
|
||||
});
|
||||
|
||||
test("创建同名供应商返回 409", async () => {
|
||||
await withRouteDb(async (db) => {
|
||||
const req1 = new Request("http://localhost/api/providers", {
|
||||
|
||||
@@ -80,6 +80,8 @@ describe("ModelTable", () => {
|
||||
expect(screen.getByText("GPT-4o")).not.toBeNull();
|
||||
expect(screen.getByText("gpt-4o")).not.toBeNull();
|
||||
expect(screen.getByText("DeepSeek Chat")).not.toBeNull();
|
||||
expect(screen.getByText("OpenAI")).not.toBeNull();
|
||||
expect(screen.getByText("DeepSeek")).not.toBeNull();
|
||||
});
|
||||
|
||||
test("模型表格操作触发 enable/disable/delete", async () => {
|
||||
|
||||
@@ -86,4 +86,26 @@ describe("ProviderTable", () => {
|
||||
fireEvent.click(enableButtons[0]!);
|
||||
await waitFor(() => expect(onEnable).toHaveBeenCalledWith("pv2"));
|
||||
});
|
||||
|
||||
test("供应商表格操作触发连接测试", async () => {
|
||||
const onTest = mock(() => Promise.resolve({ message: "连接失败", ok: false }));
|
||||
|
||||
renderWithProviders(
|
||||
createElement(ProviderTable, {
|
||||
data: { items: [ENABLED_PROVIDER], page: 1, pageSize: 20, total: 1 },
|
||||
loading: false,
|
||||
onDelete: () => Promise.resolve(),
|
||||
onDisable: () => Promise.resolve(),
|
||||
onEdit: () => undefined,
|
||||
onEnable: () => Promise.resolve(),
|
||||
onPageChange: () => undefined,
|
||||
onTest,
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
}),
|
||||
);
|
||||
|
||||
fireEvent.click(screen.getByRole("button", { name: "测试连接" }));
|
||||
await waitFor(() => expect(onTest).toHaveBeenCalledWith("pv1"));
|
||||
});
|
||||
});
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
enableProvider,
|
||||
fetchProvider,
|
||||
fetchProviderList,
|
||||
testProviderConfig,
|
||||
testProviderConnection,
|
||||
updateProvider,
|
||||
} from "../../../src/web/hooks/use-providers";
|
||||
@@ -89,6 +90,27 @@ describe("use-providers request helpers", () => {
|
||||
expect(result).toEqual({ message: "ok", ok: true });
|
||||
});
|
||||
|
||||
test("testProviderConfig posts form config and parses response", async () => {
|
||||
const calls = installFetchMock(() => jsonResponse({ providerTestResponse: { message: "ok", ok: true } }));
|
||||
|
||||
const result = await testProviderConfig({
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
name: "OpenAI",
|
||||
type: "openai-compatible",
|
||||
});
|
||||
|
||||
expect(result).toEqual({ message: "ok", ok: true });
|
||||
expect(calls[0]?.method).toBe("POST");
|
||||
expect(calls[0]?.url).toBe("/api/providers/test");
|
||||
expect(jsonBody(calls[0]?.body)).toEqual({
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
name: "OpenAI",
|
||||
type: "openai-compatible",
|
||||
});
|
||||
});
|
||||
|
||||
test("error response uses backend error field", async () => {
|
||||
installFetchMock(() => jsonResponse({ error: "dup" }, { status: 409 }));
|
||||
|
||||
|
||||
@@ -58,6 +58,7 @@ describe("ProviderFormModal", () => {
|
||||
onCancel: () => undefined,
|
||||
onCreate: () => Promise.resolve(),
|
||||
onOpenChange: () => undefined,
|
||||
onTest: () => Promise.resolve({ message: "连接成功", ok: true }),
|
||||
onUpdate: (args: unknown) => {
|
||||
updateCalls.push(args);
|
||||
return Promise.resolve();
|
||||
@@ -74,6 +75,78 @@ describe("ProviderFormModal", () => {
|
||||
await waitFor(() => expect(updateCalls.length).toBe(1));
|
||||
expect(updateCalls[0]).toEqual({ data: { name: "New OpenAI" }, id: "pv1" });
|
||||
});
|
||||
|
||||
test("新建供应商默认使用 openai-compatible 类型", async () => {
|
||||
const createCalls: unknown[] = [];
|
||||
|
||||
renderWithProviders(
|
||||
createElement(ProviderFormModal, {
|
||||
editingProvider: null,
|
||||
onCancel: () => undefined,
|
||||
onCreate: (data: unknown) => {
|
||||
createCalls.push(data);
|
||||
return Promise.resolve();
|
||||
},
|
||||
onOpenChange: () => undefined,
|
||||
onTest: () => Promise.resolve({ message: "连接成功", ok: true }),
|
||||
onUpdate: () => Promise.resolve(),
|
||||
open: true,
|
||||
submitting: false,
|
||||
}),
|
||||
);
|
||||
|
||||
await waitFor(() => expect(screen.getByPlaceholderText("请输入供应商名称")).not.toBeNull());
|
||||
fireEvent.change(screen.getByPlaceholderText("请输入供应商名称"), { target: { value: "兼容供应商" } });
|
||||
fireEvent.change(screen.getByPlaceholderText("https://api.openai.com/v1"), {
|
||||
target: { value: "https://api.test.com/v1" },
|
||||
});
|
||||
fireEvent.change(screen.getByPlaceholderText("请输入 API Key"), { target: { value: "sk-test" } });
|
||||
clickLatestConfirmButton();
|
||||
|
||||
await waitFor(() => expect(createCalls.length).toBe(1));
|
||||
expect(createCalls[0]).toEqual({
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.test.com/v1",
|
||||
name: "兼容供应商",
|
||||
type: "openai-compatible",
|
||||
});
|
||||
});
|
||||
|
||||
test("供应商表单可使用当前表单配置测试连接", async () => {
|
||||
const testCalls: unknown[] = [];
|
||||
|
||||
renderWithProviders(
|
||||
createElement(ProviderFormModal, {
|
||||
editingProvider: null,
|
||||
onCancel: () => undefined,
|
||||
onCreate: () => Promise.resolve(),
|
||||
onOpenChange: () => undefined,
|
||||
onTest: (data: unknown) => {
|
||||
testCalls.push(data);
|
||||
return Promise.resolve({ message: "连接成功", ok: true });
|
||||
},
|
||||
onUpdate: () => Promise.resolve(),
|
||||
open: true,
|
||||
submitting: false,
|
||||
}),
|
||||
);
|
||||
|
||||
await waitFor(() => expect(screen.getByPlaceholderText("请输入供应商名称")).not.toBeNull());
|
||||
fireEvent.change(screen.getByPlaceholderText("请输入供应商名称"), { target: { value: "兼容供应商" } });
|
||||
fireEvent.change(screen.getByPlaceholderText("https://api.openai.com/v1"), {
|
||||
target: { value: "https://api.test.com/v1" },
|
||||
});
|
||||
fireEvent.change(screen.getByPlaceholderText("请输入 API Key"), { target: { value: "sk-test" } });
|
||||
fireEvent.click(screen.getByRole("button", { name: "测试连接" }));
|
||||
|
||||
await waitFor(() => expect(testCalls.length).toBe(1));
|
||||
expect(testCalls[0]).toEqual({
|
||||
apiKey: "sk-test",
|
||||
baseUrl: "https://api.test.com/v1",
|
||||
name: "兼容供应商",
|
||||
type: "openai-compatible",
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("ModelFormModal", () => {
|
||||
@@ -93,6 +166,7 @@ describe("ModelFormModal", () => {
|
||||
open: true,
|
||||
providers: [ENABLED_PROVIDER, DISABLED_PROVIDER],
|
||||
submitting: false,
|
||||
testConnection: () => Promise.resolve({ message: "连接成功", ok: true }),
|
||||
}),
|
||||
);
|
||||
|
||||
@@ -117,6 +191,7 @@ describe("ModelFormModal", () => {
|
||||
open: true,
|
||||
providers: [ENABLED_PROVIDER],
|
||||
submitting: false,
|
||||
testConnection: () => Promise.resolve({ message: "连接成功", ok: true }),
|
||||
}),
|
||||
);
|
||||
|
||||
@@ -124,4 +199,29 @@ describe("ModelFormModal", () => {
|
||||
clickLatestConfirmButton();
|
||||
expect(onCreate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test("新建模型时可测试所选供应商连接", async () => {
|
||||
const testConnection = mock(() => Promise.resolve({ message: "连接成功", ok: true }));
|
||||
|
||||
renderWithProviders(
|
||||
createElement(ModelFormModal, {
|
||||
editingModel: null,
|
||||
onCancel: () => undefined,
|
||||
onCreate: () => Promise.resolve(),
|
||||
onOpenChange: () => undefined,
|
||||
onUpdate: () => Promise.resolve(),
|
||||
open: true,
|
||||
providers: [ENABLED_PROVIDER],
|
||||
submitting: false,
|
||||
testConnection,
|
||||
}),
|
||||
);
|
||||
|
||||
await waitFor(() => expect(screen.getByText("测试连接")).not.toBeNull());
|
||||
fireEvent.mouseDown(screen.getByRole("combobox"));
|
||||
fireEvent.click(await screen.findByText("OpenAI"));
|
||||
fireEvent.click(screen.getByRole("button", { name: "测试连接" }));
|
||||
|
||||
await waitFor(() => expect(testConnection).toHaveBeenCalledWith("pv1"));
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user