diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java index 98a8290..e9ecc14 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java @@ -147,6 +147,31 @@ class PlatformAdminPostgresTest { assertThrows(ApiException.class, () -> catalog.updateProvider(channelId,Map.of("name","bad"),memberToken,auth)); } + @Test void publicCatalogIncludesPendingModelsAndKeyCanKeepMultipleModelGrants() throws Exception { + var pending = catalog.saveDefinition(null,Map.of("publicName","Pending Catalog Model","type","text","mode","sync"),ownerToken,auth); + var first = catalog.listModels(false).getFirst(); + var second = catalog.listModels(false).stream().filter(item -> !item.get("logicalModelId").equals(first.get("logicalModelId"))).findFirst().orElseThrow(); + var mvc = MockMvcBuilders.standaloneSetup(new CatalogController(catalog,auth)).setControllerAdvice(new ApiExceptionHandler()).build(); + var cookie = new Cookie("moyi_session",memberToken); + var response = mvc.perform(get("/api/models").cookie(cookie)).andExpect(status().isOk()).andReturn(); + var payload = json.readTree(response.getResponse().getContentAsString()); + assertEquals(catalog.listDefinitions(false).size(),payload.get("logicalModels").size()); + assertTrue(payload.get("logicalModels").size() > 250); + assertTrue(payload.get("logicalModels").findValuesAsText("id").contains(pending.get("id"))); + assertFalse(payload.get("models").findValuesAsText("logicalModelId").contains(pending.get("id"))); + var created = catalog.createKey(memberToken,Map.of("name","Multiple models"),auth); + var keyId = ((Map)created.get("apiKey")).get("id").toString(); + var ids = List.of(first.get("id").toString(),second.get("id").toString()); + mvc.perform(post("/api/keys/"+keyId+"/models").cookie(cookie).contentType("application/json").content(json.writeValueAsString(Map.of("modelIds",ids)))) + .andExpect(status().isOk()).andExpect(jsonPath("$.apiKey.modelIds.length()").value(2)); + assertEquals(ids, catalog.listKeys(memberToken,auth).stream().filter(key -> keyId.equals(key.get("id").toString())).findFirst().orElseThrow().get("modelIds")); + var authenticated = catalog.authenticateKey(created.get("key").toString()); + for (String id : ids) assertTrue(catalog.keyCanInvoke(authenticated,id)); + assertThrows(ApiException.class, () -> catalog.updateKeyModels(memberToken,keyId,List.of(pending.get("id").toString()),auth)); + catalog.updateKeyModels(memberToken,keyId,List.of(ids.get(1)),auth); + assertEquals(List.of(ids.get(1)),catalog.listKeys(memberToken,auth).stream().filter(key -> keyId.equals(key.get("id").toString())).findFirst().orElseThrow().get("modelIds")); + } + @Test void grantsAreExactAuditedIdempotentAndConcurrent() throws Exception { assertThrows(ApiException.class, () -> wallet.grant(memberToken,memberId,UUID.randomUUID(),"1","unauthorized",meta)); for (String invalid : List.of("0","-1","1.001","NaN","1000000.01")) assertThrows(ApiException.class, () -> wallet.grant(ownerToken,memberId,UUID.randomUUID(),invalid,"invalid",meta)); diff --git a/docs/17-catalog-and-key-selection.md b/docs/17-catalog-and-key-selection.md new file mode 100644 index 0000000..e4aaf71 --- /dev/null +++ b/docs/17-catalog-and-key-selection.md @@ -0,0 +1,18 @@ +# 模型目录与多模型 Key 授权 + +用户端此前只使用 `/api/models` 的 `models` 字段(可用分组),未使用 `logicalModels`(已发布模型)。因此已导入但分组未启用的模型只出现在管理端。 + +现在模型广场按已发布模型展示,每个模型只显示一张卡片,详情中列出可调用分组、调用 ID 和价格。无可用分组的模型显示“待上线”,试用按钮禁用。管理员停用或删除的模型不会显示。模型列表和权限授予仍使用原有的渠道、模型、分组状态检查,本次没有新增数据库迁移,也没有批量启用或调整价格。 + +API Key 权限窗口支持同时勾选多个模型,再选择各自的分组;只有一个分组时自动选中。顶部显示全部已选分组,搜索与翻页不清空授权,可以逐项移除或清空。保存的是原有分组 ID 数组,旧 Key 无需重新创建。 + +模型广场、管理端模型/渠道和 API Key 列表默认每页 12 项,可选 24/48 项。权限列表默认每页 8 个模型,可选 16/32 项。筛选或每页数量改变时回到首页;删除导致页数减少时自动回到有效页。 + +## 验证 + +- `cd prototype; npm test`:目录合并、无可用分组的模型、多模型授权集合和分页边界,以及既有流式响应测试。 +- `PlatformAdminPostgresTest#publicCatalogIncludesPendingModelsAndKeyCanKeepMultipleModelGrants`:隔离 PostgreSQL 上读取用户目录,通过 HTTP 保存两个不同模型的授权、重新读取,再撤掉其中一个;确认不能授权未上线的模型定义 ID。 +- `cd prototype; npm run dev -- --host 127.0.0.1 --port 4178` 后打开 `/tests/catalog-preview.html`:本地测试页提供 315 个模型、10 个有上线分组的模型和 14 个 Key。所有 fetch 请求由页面内存响应,不使用真实凭据、不调用中转站。测试页不进入生产构建。 +- 页面回归:模型目录第 27 页、筛选重置、待上线详情、跨页选两个模型共三个分组、保存重开、撤掉单个分组、管理端末页。 + +上线后刷新浏览器,在模型广场查看新目录。待上线条目需要管理员完成渠道凭据、分组人民币售价和启用配置后才能用于真实调用。 diff --git a/prototype/package.json b/prototype/package.json index 1fb35ba..45dd635 100644 --- a/prototype/package.json +++ b/prototype/package.json @@ -4,6 +4,7 @@ "version": "0.1.0", "type": "module", "scripts": { + "test": "node --experimental-strip-types --test tests/*.test.mjs", "dev": "vite", "build": "vue-tsc --noEmit && vite build", "preview": "vite preview" diff --git a/prototype/src/components/CatalogAdmin.vue b/prototype/src/components/CatalogAdmin.vue index 3c4c1e0..9635a91 100644 --- a/prototype/src/components/CatalogAdmin.vue +++ b/prototype/src/components/CatalogAdmin.vue @@ -3,6 +3,8 @@ import { computed, onMounted, reactive, ref, watch } from 'vue' import { Plus, Pencil, RefreshCcw, Search, Trash2 } from 'lucide-vue-next' import { catalogClient, type CatalogProvider, type CatalogModel, type LogicalModel } from '../services/catalog' import UiModal from './UiModal.vue' +import ListPagination from './ListPagination.vue' +import { usePagination } from '../composables/usePagination' const props = defineProps<{ section: 'models' | 'channels' }>() const emit = defineEmits<{ notify: [message: string] }>() @@ -30,6 +32,9 @@ const model = reactive({ publicName: '', modelKey: '', type: 'text' as LogicalMo const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', cachedInput: '', unit: 'CNY / 1M tokens', priority: '100', maxConcurrency: '1', status: 'active' as CatalogModel['status'] }) const shownModels = computed(() => models.value.filter(item => `${item.publicName} ${item.modelKey || ''}`.toLowerCase().includes(query.value.toLowerCase()))) const shownChannels = computed(() => channels.value.filter(item => `${item.name} ${item.code}`.toLowerCase().includes(query.value.toLowerCase()))) +const { page: modelPage, pageSize: modelPageSize, pagedItems: pagedModels } = usePagination(shownModels) +const { page: channelPage, pageSize: channelPageSize, pagedItems: pagedChannels } = usePagination(shownChannels) +watch(query, () => { modelPage.value = 1; channelPage.value = 1 }) const channelName = (id: string) => channels.value.find(item => item.id === id)?.name || id const modelGroups = (id: string) => groups.value.filter(item => item.logicalModelId === id) @@ -103,15 +108,18 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider

{{ props.section === 'channels' ? '渠道管理' : '模型与分组' }}

{{ error }}

+

启用模型后会显示在用户端模型广场。分组与所属渠道也启用后,用户才能为 API Key 选择该分组;调用前还需完成凭据和计费配置。

加载中…

-
渠道来源 / 协议Base URL凭据状态操作
{{ item.name }}{{ item.code }}{{ item.sourceType }}{{ item.protocol }}{{ item.baseUrl || '未配置' }}{{ item.credentialMasked || '未配置' }}
暂无渠道
-