fix: show published models and support multi-model key selection

This commit is contained in:
wlx committed 2026-09-22 03:09:07 +08:00
1 parent 1a57de5bf9
commit 0a44a0802b
14 files changed
+360 -60

No files matched your search

@@ -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));