refactor: 简化模型管理，移除启用/禁用，优化测试和布局

- 移除供应商/模型启用禁用能力，清理DB schema/migration/API/前端 - 供应商测试改为Base URL连通性+/models探测 - 新增POST /api/models/test模型连接测试 - 新增GET /api/providers/options专用供应商选项接口 - 统一工具栏为ModelsToolbar，参考项目管理布局 - 模型弹窗优化：默认能力、响应式3列标签、并排数值 - 前后端正整数校验、供应商下拉loading/error/empty状态 - 表格列宽统一，操作列/名称列固定宽度
2026-05-29 18:03:33 +08:00
parent 9241c782e6
commit 34e915ccf4
39 changed files with 895 additions and 961 deletions
--- a/tests/web/components/ModelTable.test.tsx
+++ b/tests/web/components/ModelTable.test.tsx
@@ -2,38 +2,27 @@ import { fireEvent, screen, waitFor } from "@testing-library/react";
 import { describe, expect, mock, test } from "bun:test";
 import { createElement } from "react";

-import type { Model, Provider } from "../../../src/shared/api";
+import type { Model, ProviderOption } from "../../../src/shared/api";

 import { ModelTable } from "../../../src/web/pages/models/components/ModelTable";
 import { renderWithProviders } from "../test-utils";

-const ENABLED_PROVIDER: Provider = {
-  apiKey: "sk-test",
-  baseUrl: "https://api.openai.com/v1",
-  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: true,
+const OPENAI_PROVIDER: ProviderOption = {
  id: "pv1",
  name: "OpenAI",
  type: "openai",
-  updatedAt: "2024-01-01T00:00:00.000Z",
 };

-const DISABLED_PROVIDER: Provider = {
-  apiKey: "sk-off",
-  baseUrl: "https://api.deepseek.com/v1",
-  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: false,
+const DEEPSEEK_PROVIDER: ProviderOption = {
  id: "pv2",
  name: "DeepSeek",
  type: "openai-compatible",
-  updatedAt: "2024-01-01T00:00:00.000Z",
 };

 const ENABLED_MODEL: Model = {
  capabilities: ["text", "reasoning"],
  contextLength: 128000,
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: true,
  id: "m1",
  maxOutputTokens: 4096,
  modelId: "gpt-4o",
@@ -46,7 +35,6 @@ const DISABLED_MODEL: Model = {
  capabilities: ["text"],
  contextLength: null,
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: false,
  id: "m2",
  maxOutputTokens: null,
  modelId: "deepseek-chat",
@@ -67,51 +55,45 @@ describe("ModelTable", () => {
        data: { items: [ENABLED_MODEL, DISABLED_MODEL], page: 1, pageSize: 20, total: 2 },
        loading: false,
        onDelete: () => Promise.resolve(),
-        onDisable: () => Promise.resolve(),
        onEdit: () => undefined,
-        onEnable: () => Promise.resolve(),
        onPageChange: () => undefined,
        page: 1,
        pageSize: 20,
-        providers: [ENABLED_PROVIDER, DISABLED_PROVIDER],
+        providers: [OPENAI_PROVIDER, DEEPSEEK_PROVIDER],
      }),
    );

    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();
+    expect(screen.queryByText("状态")).toBeNull();
+    expect(screen.queryByRole("button", { name: /启用|禁用/ })).toBeNull();
  });

-  test("模型表格操作触发 enable/disable/delete", async () => {
-    const onDisable = mock(() => Promise.resolve());
-    const onEnable = mock(() => Promise.resolve());
+  test("模型表格操作触发 edit/delete", async () => {
    const onDelete = mock(() => Promise.resolve());
+    const onEdit = mock(() => undefined);

    renderWithProviders(
      createElement(ModelTable, {
        data: { items: [ENABLED_MODEL, DISABLED_MODEL], page: 1, pageSize: 20, total: 2 },
        loading: false,
        onDelete,
-        onDisable,
-        onEdit: () => undefined,
-        onEnable,
+        onEdit,
        onPageChange: () => undefined,
        page: 1,
        pageSize: 20,
-        providers: [ENABLED_PROVIDER, DISABLED_PROVIDER],
+        providers: [OPENAI_PROVIDER, DEEPSEEK_PROVIDER],
      }),
    );

-    const disableButtons = screen.getAllByRole("button", { name: /禁用/ });
-    fireEvent.click(disableButtons[0]!);
-    await waitFor(() => expect(screen.getByText("确认禁用此模型？")).not.toBeNull());
-    clickLatestConfirmButton();
-    await waitFor(() => expect(onDisable).toHaveBeenCalledWith("m1"));
+    fireEvent.click(screen.getAllByRole("button", { name: /编辑/ })[0]!);
+    expect(onEdit).toHaveBeenCalledWith(ENABLED_MODEL);

-    const enableButtons = screen.getAllByRole("button", { name: /启用/ });
-    fireEvent.click(enableButtons[0]!);
-    await waitFor(() => expect(onEnable).toHaveBeenCalledWith("m2"));
+    fireEvent.click(screen.getAllByRole("button", { name: /删除/ })[0]!);
+    await waitFor(() => expect(screen.getByText("确认删除此模型？")).not.toBeNull());
+    clickLatestConfirmButton();
+    await waitFor(() => expect(onDelete).toHaveBeenCalledWith("m1"));
  });
 });
--- a/tests/web/components/ProviderTable.test.tsx
+++ b/tests/web/components/ProviderTable.test.tsx
@@ -7,22 +7,20 @@ import type { Provider } from "../../../src/shared/api";
 import { ProviderTable } from "../../../src/web/pages/models/components/ProviderTable";
 import { renderWithProviders } from "../test-utils";

-const ENABLED_PROVIDER: Provider = {
+const OPENAI_PROVIDER: Provider = {
  apiKey: "sk-test",
  baseUrl: "https://api.openai.com/v1",
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: true,
  id: "pv1",
  name: "OpenAI",
  type: "openai",
  updatedAt: "2024-01-01T00:00:00.000Z",
 };

-const DISABLED_PROVIDER: Provider = {
+const DEEPSEEK_PROVIDER: Provider = {
  apiKey: "sk-off",
  baseUrl: "https://api.deepseek.com/v1",
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: false,
  id: "pv2",
  name: "DeepSeek",
  type: "openai-compatible",
@@ -38,14 +36,11 @@ describe("ProviderTable", () => {
  test("渲染供应商表格数据", () => {
    renderWithProviders(
      createElement(ProviderTable, {
-        data: { items: [ENABLED_PROVIDER, DISABLED_PROVIDER], page: 1, pageSize: 20, total: 2 },
+        data: { items: [OPENAI_PROVIDER, DEEPSEEK_PROVIDER], page: 1, pageSize: 20, total: 2 },
        loading: false,
        onDelete: () => Promise.resolve(),
-        onDisable: () => Promise.resolve(),
        onEdit: () => undefined,
-        onEnable: () => Promise.resolve(),
        onPageChange: () => undefined,
-        onTest: () => Promise.resolve({ message: "ok", ok: true }),
        page: 1,
        pageSize: 20,
      }),
@@ -54,58 +49,33 @@ describe("ProviderTable", () => {
    expect(screen.getAllByText("OpenAI").length).toBeGreaterThan(0);
    expect(screen.getByText("DeepSeek")).not.toBeNull();
    expect(screen.getByText("https://api.openai.com/v1")).not.toBeNull();
+    expect(screen.queryByText("状态")).toBeNull();
+    expect(screen.queryByRole("button", { name: "测试连接" })).toBeNull();
+    expect(screen.queryByRole("button", { name: /启用|禁用/ })).toBeNull();
  });

-  test("供应商表格操作触发 enable/disable/delete", async () => {
-    const onDisable = mock(() => Promise.resolve());
-    const onEnable = mock(() => Promise.resolve());
+  test("供应商表格操作触发 edit/delete", async () => {
    const onDelete = mock(() => Promise.resolve());
+    const onEdit = mock(() => undefined);

    renderWithProviders(
      createElement(ProviderTable, {
-        data: { items: [ENABLED_PROVIDER, DISABLED_PROVIDER], page: 1, pageSize: 20, total: 2 },
+        data: { items: [OPENAI_PROVIDER, DEEPSEEK_PROVIDER], page: 1, pageSize: 20, total: 2 },
        loading: false,
        onDelete,
-        onDisable,
-        onEdit: () => undefined,
-        onEnable,
+        onEdit,
        onPageChange: () => undefined,
-        onTest: () => Promise.resolve({ message: "ok", ok: true }),
        page: 1,
        pageSize: 20,
      }),
    );

-    const disableButtons = screen.getAllByRole("button", { name: /禁用/ });
-    fireEvent.click(disableButtons[0]!);
-    await waitFor(() => expect(screen.getByText("确认禁用此供应商？")).not.toBeNull());
+    fireEvent.click(screen.getAllByRole("button", { name: /编辑/ })[0]!);
+    expect(onEdit).toHaveBeenCalledWith(OPENAI_PROVIDER);
+
+    fireEvent.click(screen.getAllByRole("button", { name: /删除/ })[0]!);
+    await waitFor(() => expect(screen.getByText("确认删除此供应商？")).not.toBeNull());
    clickLatestConfirmButton();
-    await waitFor(() => expect(onDisable).toHaveBeenCalledWith("pv1"));
-
-    const enableButtons = screen.getAllByRole("button", { name: /启用/ });
-    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"));
+    await waitFor(() => expect(onDelete).toHaveBeenCalledWith("pv1"));
  });
 });
--- a/tests/web/hooks/use-models.test.ts
+++ b/tests/web/hooks/use-models.test.ts
@@ -3,10 +3,9 @@ import { describe, expect, test } from "bun:test";
 import {
  createModel,
  deleteModel,
-  disableModel,
-  enableModel,
  fetchModel,
  fetchModelList,
+  testModelConnection,
  updateModel,
 } from "../../../src/web/hooks/use-models";
 import { installFetchMock, jsonResponse } from "../test-utils";
@@ -15,7 +14,6 @@ const MODEL = {
  capabilities: ["text"] as Array<"text">,
  contextLength: null,
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: true,
  id: "m1",
  maxOutputTokens: null,
  modelId: "gpt-4o",
@@ -50,7 +48,7 @@ describe("use-models request helpers", () => {
    expect(calls[0]?.url).toContain("keyword=GPT");
  });

-  test("模型 CRUD 与 enable/disable 使用正确 method、URL 与 body", async () => {
+  test("模型 CRUD 使用正确 method、URL 与 body", async () => {
    const calls = installFetchMock((call) => {
      if (call.method === "DELETE") return new Response(null, { status: 204 });
      return jsonResponse(
@@ -66,16 +64,12 @@ describe("use-models request helpers", () => {
      providerId: "pv1",
    });
    await updateModel("m1", { name: "GPT-4o Mini" });
-    await enableModel("m1");
-    await disableModel("m1");
    await deleteModel("m1");
    await fetchModel("m1");

    expect(calls.map((call) => `${call.method} ${call.url}`)).toEqual([
      "POST /api/models",
      "PATCH /api/models/m1",
-      "POST /api/models/m1/enable",
-      "POST /api/models/m1/disable",
      "DELETE /api/models/m1",
      "GET /api/models/m1",
    ]);
@@ -102,4 +96,16 @@ describe("use-models request helpers", () => {

    await expectRejectsWithMessage(() => fetchModel("m-missing"), "HTTP 500");
  });
+
+  test("testModelConnection 调用正确 URL 和 body", async () => {
+    const calls = installFetchMock(() => jsonResponse({ modelTestResponse: { message: "模型连接成功", ok: true } }));
+
+    const result = await testModelConnection({ modelId: "gpt-4o", providerId: "pv1" });
+
+    expect(result.ok).toBe(true);
+    expect(result.message).toBe("模型连接成功");
+    expect(calls[0]?.method).toBe("POST");
+    expect(calls[0]?.url).toBe("/api/models/test");
+    expect(jsonBody(calls[0]?.body)).toEqual({ modelId: "gpt-4o", providerId: "pv1" });
+  });
 });
--- a/tests/web/hooks/use-providers.test.ts
+++ b/tests/web/hooks/use-providers.test.ts
@@ -3,12 +3,10 @@ import { describe, expect, test } from "bun:test";
 import {
  createProvider,
  deleteProvider,
-  disableProvider,
-  enableProvider,
  fetchProvider,
  fetchProviderList,
+  fetchProviderOptions,
  testProviderConfig,
-  testProviderConnection,
  updateProvider,
 } from "../../../src/web/hooks/use-providers";
 import { installFetchMock, jsonResponse } from "../test-utils";
@@ -17,7 +15,6 @@ const PROVIDER = {
  apiKey: "sk-test",
  baseUrl: "https://api.openai.com/v1",
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: true,
  id: "pv1",
  name: "OpenAI",
  type: "openai" as const,
@@ -49,7 +46,7 @@ describe("use-providers request helpers", () => {
    expect(calls[0]?.url).toBe("/api/providers?page=1&pageSize=20&keyword=OpenAI");
  });

-  test("CRUD and enable/disable use correct method, URL and body", async () => {
+  test("CRUD uses correct method, URL and body", async () => {
    const calls = installFetchMock((call) => {
      if (call.method === "DELETE") return new Response(null, { status: 204 });
      return jsonResponse(
@@ -60,16 +57,12 @@ describe("use-providers request helpers", () => {

    await createProvider({ apiKey: "sk-test", baseUrl: "https://api.openai.com/v1", name: "OpenAI", type: "openai" });
    await updateProvider("pv1", { name: "New OpenAI" });
-    await enableProvider("pv1");
-    await disableProvider("pv1");
    await deleteProvider("pv1");
    await fetchProvider("pv1");

    expect(calls.map((c) => c.method + " " + c.url)).toEqual([
      "POST /api/providers",
      "PATCH /api/providers/pv1",
-      "POST /api/providers/pv1/enable",
-      "POST /api/providers/pv1/disable",
      "DELETE /api/providers/pv1",
      "GET /api/providers/pv1",
    ]);
@@ -82,12 +75,14 @@ describe("use-providers request helpers", () => {
    expect(jsonBody(calls[1]?.body)).toEqual({ name: "New OpenAI" });
  });

-  test("testProviderConnection uses correct URL and parses response", async () => {
-    installFetchMock(() => jsonResponse({ providerTestResponse: { message: "ok", ok: true } }));
+  test("fetchProviderOptions uses dedicated minimal endpoint", async () => {
+    const calls = installFetchMock(() => jsonResponse({ items: [{ id: "pv1", name: "OpenAI", type: "openai" }] }));

-    const result = await testProviderConnection("pv1");
+    const result = await fetchProviderOptions();

-    expect(result).toEqual({ message: "ok", ok: true });
+    expect(result.items).toEqual([{ id: "pv1", name: "OpenAI", type: "openai" }]);
+    expect(calls[0]?.method).toBe("GET");
+    expect(calls[0]?.url).toBe("/api/providers/options");
  });

  test("testProviderConfig posts form config and parses response", async () => {
--- a/tests/web/routes/models.test.tsx
+++ b/tests/web/routes/models.test.tsx
@@ -12,7 +12,6 @@ const ENABLED_PROVIDER: Provider = {
  apiKey: "sk-test",
  baseUrl: "https://api.openai.com/v1",
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: true,
  id: "pv1",
  name: "OpenAI",
  type: "openai",
@@ -23,7 +22,6 @@ const DISABLED_PROVIDER: Provider = {
  apiKey: "sk-off",
  baseUrl: "https://api.deepseek.com/v1",
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: false,
  id: "pv2",
  name: "DeepSeek",
  type: "openai-compatible",
@@ -34,7 +32,6 @@ const ENABLED_MODEL: Model = {
  capabilities: ["text", "reasoning"],
  contextLength: 128000,
  createdAt: "2024-01-01T00:00:00.000Z",
-  enabled: true,
  id: "m1",
  maxOutputTokens: 4096,
  modelId: "gpt-4o",
@@ -165,8 +162,9 @@ describe("ModelFormModal", () => {
        },
        open: true,
        providers: [ENABLED_PROVIDER, DISABLED_PROVIDER],
+        providersError: null,
+        providersLoading: false,
        submitting: false,
-        testConnection: () => Promise.resolve({ message: "连接成功", ok: true }),
      }),
    );

@@ -190,8 +188,9 @@ describe("ModelFormModal", () => {
        onUpdate: () => Promise.resolve(),
        open: true,
        providers: [ENABLED_PROVIDER],
+        providersError: null,
+        providersLoading: false,
        submitting: false,
-        testConnection: () => Promise.resolve({ message: "连接成功", ok: true }),
      }),
    );

@@ -200,9 +199,7 @@ describe("ModelFormModal", () => {
    expect(onCreate).not.toHaveBeenCalled();
  });

-  test("新建模型时可测试所选供应商连接", async () => {
-    const testConnection = mock(() => Promise.resolve({ message: "连接成功", ok: true }));
-
+  test("新建模型默认选中文本和推理能力", async () => {
    renderWithProviders(
      createElement(ModelFormModal, {
        editingModel: null,
@@ -212,16 +209,111 @@ describe("ModelFormModal", () => {
        onUpdate: () => Promise.resolve(),
        open: true,
        providers: [ENABLED_PROVIDER],
+        providersError: null,
+        providersLoading: false,
        submitting: false,
-        testConnection,
      }),
    );

-    await waitFor(() => expect(screen.getByText("测试连接")).not.toBeNull());
+    await waitFor(() => expect(screen.getByLabelText("文本")).not.toBeNull());
+    const textCheckbox = screen.getByLabelText("文本");
+    const reasoningCheckbox = screen.getByLabelText("推理");
+    expect((textCheckbox as { checked?: boolean }).checked).toBe(true);
+    expect((reasoningCheckbox as { checked?: boolean }).checked).toBe(true);
+  });
+
+  test("新建模型展示供应商 options 列表", async () => {
+    renderWithProviders(
+      createElement(ModelFormModal, {
+        editingModel: null,
+        onCancel: () => undefined,
+        onCreate: () => Promise.resolve(),
+        onOpenChange: () => undefined,
+        onUpdate: () => Promise.resolve(),
+        open: true,
+        providers: [ENABLED_PROVIDER, DISABLED_PROVIDER],
+        providersError: null,
+        providersLoading: false,
+        submitting: false,
+      }),
+    );
+
+    await waitFor(() => expect(screen.getByPlaceholderText("请输入模型名称")).not.toBeNull());
    fireEvent.mouseDown(screen.getByRole("combobox"));
-    fireEvent.click(await screen.findByText("OpenAI"));
+
+    expect(await screen.findByText("OpenAI")).not.toBeNull();
+    expect(await screen.findByText("DeepSeek")).not.toBeNull();
+  });
+
+  test("供应商下拉展示加载错误提示", async () => {
+    renderWithProviders(
+      createElement(ModelFormModal, {
+        editingModel: null,
+        onCancel: () => undefined,
+        onCreate: () => Promise.resolve(),
+        onOpenChange: () => undefined,
+        onUpdate: () => Promise.resolve(),
+        open: true,
+        providers: [],
+        providersError: new Error("options failed"),
+        providersLoading: false,
+        submitting: false,
+      }),
+    );
+
+    await waitFor(() => expect(screen.getByPlaceholderText("请输入模型名称")).not.toBeNull());
+    fireEvent.mouseDown(screen.getByRole("combobox"));
+
+    expect(await screen.findByText("供应商加载失败：options failed")).not.toBeNull();
+  });
+
+  test("编辑模型时可测试模型连接", async () => {
+    const testModelConnection = mock(() => Promise.resolve({ message: "模型连接成功", ok: true }));
+
+    renderWithProviders(
+      createElement(ModelFormModal, {
+        editingModel: ENABLED_MODEL,
+        onCancel: () => undefined,
+        onCreate: () => Promise.resolve(),
+        onOpenChange: () => undefined,
+        onUpdate: () => Promise.resolve(),
+        open: true,
+        providers: [ENABLED_PROVIDER],
+        providersError: null,
+        providersLoading: false,
+        submitting: false,
+        testModelConnection,
+      }),
+    );
+
+    await waitFor(() => expect(screen.getByRole("button", { name: "测试连接" })).not.toBeNull());
    fireEvent.click(screen.getByRole("button", { name: "测试连接" }));

-    await waitFor(() => expect(testConnection).toHaveBeenCalledWith("pv1"));
+    await waitFor(() =>
+      expect(testModelConnection).toHaveBeenCalledWith({
+        modelId: "gpt-4o",
+        providerId: "pv1",
+      }),
+    );
+  });
+
+  test("新建模型也显示测试连接按钮", async () => {
+    renderWithProviders(
+      createElement(ModelFormModal, {
+        editingModel: null,
+        onCancel: () => undefined,
+        onCreate: () => Promise.resolve(),
+        onOpenChange: () => undefined,
+        onUpdate: () => Promise.resolve(),
+        open: true,
+        providers: [ENABLED_PROVIDER],
+        providersError: null,
+        providersLoading: false,
+        submitting: false,
+        testModelConnection: () => Promise.resolve({ message: "ok", ok: true }),
+      }),
+    );
+
+    await waitFor(() => expect(screen.getByRole("button", { name: "测试连接" })).not.toBeNull());
  });
 });
--- a/tests/web/test-utils.tsx
+++ b/tests/web/test-utils.tsx
@@ -7,6 +7,8 @@ import { MemoryRouter } from "react-router";

 import { ErrorBoundary } from "../../src/web/components/ErrorBoundary";

+const REAL_FETCH = globalThis.fetch.bind(globalThis);
+
 // Mock recharts BEFORE any component imports
 void mock.module("recharts", () => ({
  Area: () => null,
@@ -34,6 +36,7 @@ export function installFetchMock(handler: (call: FetchMockCall) => Promise<Respo
  const mocked = (async (input: RequestInfo | URL, init?: RequestInit) => {
    const request = input instanceof Request ? input : undefined;
    const url = request?.url ?? (typeof input === "string" ? input : input instanceof URL ? input.href : input.url);
+    if (url.startsWith("http://") || url.startsWith("https://")) return REAL_FETCH(input, init);
    const call: FetchMockCall = {
      body: init?.body ?? null,
      method: init?.method ?? request?.method ?? "GET",