feat(console): add deletion lifecycle, usage history and balance adjustments
This commit is contained in:
1 parent
32e977df5c
commit
7360cf3ebe
18 files changed
+832
-68
No files matched your search
+130
@@ -7,6 +7,8 @@ import com.moyi.controlplane.common.ApiException;
|
||||
import com.moyi.controlplane.common.ApiExceptionHandler;
|
||||
import com.moyi.controlplane.security.SecretCipher;
|
||||
import com.moyi.controlplane.wallet.WalletService;
|
||||
import com.moyi.controlplane.catalog.CatalogController;
|
||||
import com.moyi.controlplane.usage.*;
|
||||
import jakarta.servlet.http.Cookie;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
@@ -156,6 +158,134 @@ class PlatformAdminPostgresTest {
|
||||
assertEquals(0,new BigDecimal("12.60").compareTo((BigDecimal)catalog.overview(memberToken,auth).get("availableCredit")));
|
||||
}
|
||||
|
||||
@Test void deletedCatalogAndKeysCannotReturnButHistorySurvives() throws Exception {
|
||||
var channel=catalog.createProvider(Map.of("code","lifecycle-channel","name","Lifecycle Channel"),ownerToken,auth);
|
||||
String channelId=channel.get("id").toString();
|
||||
var model=catalog.saveDefinition(null,Map.of("publicName","Lifecycle Model","type","text","mode","sync"),ownerToken,auth);
|
||||
String modelId=model.get("id").toString();
|
||||
var group=catalog.createModel(Map.of("logicalModelId",modelId,"providerId",channelId,"sourceLabel","Primary","upstreamModel","test"),ownerToken,auth);
|
||||
String groupId=group.get("id").toString();
|
||||
var created=catalog.createKey(memberToken,Map.of("name","History Key","modelIds",List.of(groupId)),auth);
|
||||
String secret=created.get("key").toString();
|
||||
UUID keyId=(UUID)catalog.authenticateKey(secret).get("id");
|
||||
MockMvc http=MockMvcBuilders.standaloneSetup(new CatalogController(catalog,auth)).setControllerAdvice(new ApiExceptionHandler()).build();
|
||||
http.perform(delete("/api/keys/"+keyId).cookie(new Cookie("moyi_session",memberToken))).andExpect(status().isConflict());
|
||||
http.perform(patch("/api/keys/"+keyId+"/status").cookie(new Cookie("moyi_session",ownerToken)).contentType("application/json").content("{\"status\":\"disabled\"}")).andExpect(status().isNotFound());
|
||||
catalog.revokeKey(memberToken,keyId.toString(),auth);
|
||||
assertNull(catalog.authenticateKey(secret));
|
||||
catalog.setKeyStatus(memberToken,keyId.toString(),"active",auth);
|
||||
assertNotNull(catalog.authenticateKey(secret));
|
||||
new UsageAuditService(jdbc,json).recordCall(memberId,keyId,groupId,channelId,"succeeded",120,10,20,Map.of("messages",List.of(Map.of("role","user","content","history prompt"))),Map.of("reply","saved response"),null,null);
|
||||
jdbc.update("INSERT INTO model_tasks(id,user_id,api_key_id,model_id,task_type,status,prompt) VALUES ('history-task',?,?,?,'3d','succeeded','test')",memberId,keyId,groupId);
|
||||
catalog.revokeKey(memberToken,keyId.toString(),auth);
|
||||
http.perform(delete("/api/keys/"+keyId).cookie(new Cookie("moyi_session",memberToken))).andExpect(status().isNoContent());
|
||||
assertTrue(catalog.listKeys(memberToken,auth).isEmpty());
|
||||
assertNull(catalog.authenticateKey(secret));
|
||||
assertThrows(ApiException.class,()->catalog.setKeyStatus(memberToken,keyId.toString(),"active",auth));
|
||||
assertEquals(1,jdbc.queryForObject("SELECT count(*) FROM model_tasks WHERE id='history-task'",Integer.class));
|
||||
assertThrows(ApiException.class,()->catalog.deleteCatalog("model",modelId,memberToken,auth));
|
||||
assertEquals("CHANNEL_IN_USE",assertThrows(ApiException.class,()->catalog.deleteCatalog("channel",channelId,ownerToken,auth)).getCode());
|
||||
catalog.deleteCatalog("group",groupId,ownerToken,auth);
|
||||
assertNull(catalog.activeModel(groupId));
|
||||
assertThrows(ApiException.class,()->catalog.updateModel(groupId,Map.of("status","active"),ownerToken,auth));
|
||||
// The removed name can be reused without granting the replacement to existing keys.
|
||||
var replacement=catalog.createModel(Map.of("logicalModelId",modelId,"providerId",channelId,"sourceLabel","Primary","upstreamModel","test"),ownerToken,auth);
|
||||
catalog.deleteCatalog("model",modelId,ownerToken,auth);
|
||||
assertNull(catalog.activeModel(replacement.get("id").toString()));
|
||||
catalog.deleteCatalog("channel",channelId,ownerToken,auth);
|
||||
assertThrows(ApiException.class,()->catalog.updateProvider(channelId,Map.of("status","active"),ownerToken,auth));
|
||||
assertDoesNotThrow(()->catalog.createProvider(Map.of("code","lifecycle-channel","name","New Channel"),ownerToken,auth));
|
||||
var history=new UserUsageService(jdbc,auth,json);
|
||||
UUID usageId=jdbc.queryForObject("SELECT id FROM usage_events WHERE user_id=?",UUID.class,memberId);
|
||||
var detail=history.detail(memberToken,usageId);
|
||||
assertEquals("History Key",detail.get("keyName"));
|
||||
assertEquals("Lifecycle Model",detail.get("modelName"));
|
||||
assertEquals("Lifecycle Channel",detail.get("providerName"));
|
||||
assertEquals("saved response",json.valueToTree(detail.get("output")).get("reply").asText());
|
||||
}
|
||||
|
||||
@Test void walletAdjustmentsSerializeAndCannotOverdrawOrReplayTwice() throws Exception {
|
||||
wallet.grant(ownerToken,memberId,UUID.randomUUID(),"100","initial",meta);
|
||||
UUID request=UUID.randomUUID();
|
||||
try(var pool=Executors.newFixedThreadPool(2)) {
|
||||
var a=pool.submit(()->wallet.adjust(ownerToken,memberId,request,"decrease","20","correction","100",meta));
|
||||
var b=pool.submit(()->wallet.adjust(ownerToken,memberId,request,"decrease","20","correction","100",meta));
|
||||
assertEquals(a.get(10,TimeUnit.SECONDS).get("id"),b.get(10,TimeUnit.SECONDS).get("id"));
|
||||
}
|
||||
assertEquals("BALANCE_CHANGED",assertThrows(ApiException.class,()->wallet.adjust(ownerToken,memberId,UUID.randomUUID(),"set","50","stale","100",meta)).getCode());
|
||||
assertEquals("INSUFFICIENT_BALANCE",assertThrows(ApiException.class,()->wallet.adjust(ownerToken,memberId,UUID.randomUUID(),"decrease","81","too much","80",meta)).getCode());
|
||||
assertThrows(ApiException.class,()->wallet.adjust(memberToken,memberId,UUID.randomUUID(),"set","10","forbidden","80",meta));
|
||||
wallet.adjust(ownerToken,memberId,UUID.randomUUID(),"set","0","reset","80",meta);
|
||||
assertEquals(0,BigDecimal.ZERO.compareTo(jdbc.queryForObject("SELECT balance FROM user_wallets WHERE user_id=?",BigDecimal.class,memberId)));
|
||||
assertEquals(3,wallet.entries(ownerToken,memberId).size());
|
||||
assertEquals(0,BigDecimal.ZERO.compareTo(jdbc.queryForObject("SELECT SUM(amount) FROM wallet_entries WHERE user_id=?",BigDecimal.class,memberId)));
|
||||
assertThrows(ApiException.class,()->wallet.adjust(ownerToken,memberId,request,"increase","20","correction","100",meta));
|
||||
}
|
||||
|
||||
@Test void usageFiltersSummaryDetailsAndExportsStayWithinTheSessionOwner() throws Exception {
|
||||
var key=catalog.createKey(memberToken,Map.of("name","=formula key"),auth);
|
||||
UUID keyId=(UUID)catalog.authenticateKey(key.get("key").toString()).get("id");
|
||||
String groupId=jdbc.queryForObject("SELECT id FROM model_catalog ORDER BY id LIMIT 1",String.class);
|
||||
String modelId=jdbc.queryForObject("SELECT logical_model_id FROM model_catalog WHERE id=?",String.class,groupId);
|
||||
String providerId=jdbc.queryForObject("SELECT provider_id FROM model_catalog WHERE id=?",String.class,groupId);
|
||||
var audit=new UsageAuditService(jdbc,json);
|
||||
for(int i=0;i<23;i++) audit.recordCall(memberId,keyId,groupId,providerId,"succeeded",100,10,20,Map.of("prompt","member only","api_key","hidden"),Map.of("reply","saved"),null,null);
|
||||
UUID other=auth.requireUser(ownerToken).id();
|
||||
audit.recordCall(other,null,groupId,providerId,"failed",900,1000,1000,Map.of("prompt","owner confidential"),null,"ERR","internal");
|
||||
jdbc.update("UPDATE usage_events SET user_agent='Test Client', request_source='playground', endpoint='/v1/chat/completions', cost_amount=0.5, cached_input_units=2 WHERE user_id=?",memberId);
|
||||
jdbc.update("UPDATE usage_events SET admin_note='admin private note' WHERE user_id=?",memberId);
|
||||
var service=new UserUsageService(jdbc,auth,json);
|
||||
var f=new UserUsageService.Filters(keyId.toString(),modelId,groupId,"succeeded","call","sync","playground","recorded","Client",null,null,2,20,"time","desc");
|
||||
var result=service.list(memberToken,f);
|
||||
assertEquals(23L,result.get("total")); assertEquals(3,((List<?>)result.get("records")).size());
|
||||
var summary=(Map<?,?>)result.get("summary");
|
||||
assertEquals(0,new BigDecimal("11.5").compareTo((BigDecimal)summary.get("totalCost")));
|
||||
assertEquals(0,new BigDecimal("230").compareTo((BigDecimal)summary.get("inputUnits")));
|
||||
var csv=service.exportCsv(memberToken,f);
|
||||
assertEquals(24,csv.lines().count()); assertTrue(csv.contains("'=formula key")); assertFalse(csv.contains("owner confidential"));
|
||||
UUID otherId=jdbc.queryForObject("SELECT id FROM usage_events WHERE user_id=?",UUID.class,other);
|
||||
assertThrows(ApiException.class,()->service.detail(memberToken,otherId));
|
||||
UUID ownId=jdbc.queryForObject("SELECT id FROM usage_events WHERE user_id=? LIMIT 1",UUID.class,memberId);
|
||||
var detail=service.detail(memberToken,ownId);
|
||||
assertFalse(detail.containsKey("adminNote")); assertFalse(detail.containsKey("sourceIp"));
|
||||
assertEquals("[REDACTED]",json.valueToTree(detail.get("input")).get("api_key").asText());
|
||||
MockMvc http=MockMvcBuilders.standaloneSetup(new UserUsageController(service)).setControllerAdvice(new ApiExceptionHandler()).build();
|
||||
http.perform(get("/api/usage").cookie(new Cookie("moyi_session",memberToken)).param("keyId",keyId.toString()).param("page","2").param("size","20"))
|
||||
.andExpect(status().isOk()).andExpect(jsonPath("$.total").value(23)).andExpect(jsonPath("$.records.length()").value(3));
|
||||
http.perform(get("/api/usage/"+otherId).cookie(new Cookie("moyi_session",memberToken))).andExpect(status().isNotFound());
|
||||
http.perform(get("/api/usage/options").cookie(new Cookie("moyi_session",memberToken))).andExpect(status().isOk());
|
||||
http.perform(get("/api/usage/export").cookie(new Cookie("moyi_session",memberToken)).param("status","failed"))
|
||||
.andExpect(status().isOk()).andExpect(content().string(org.hamcrest.Matchers.not(org.hamcrest.Matchers.containsString("owner confidential"))));
|
||||
}
|
||||
|
||||
@Test void requestMetadataAndCacheUsageAreRecordedWithoutExposingSecrets() throws Exception {
|
||||
String groupId=jdbc.queryForObject("SELECT id FROM model_catalog ORDER BY id LIMIT 1",String.class);
|
||||
String providerId=jdbc.queryForObject("SELECT provider_id FROM model_catalog WHERE id=?",String.class,groupId);
|
||||
var audit=new UsageAuditService(jdbc,json);
|
||||
var request=new org.springframework.mock.web.MockHttpServletRequest("POST","/v1/chat/completions");
|
||||
request.addHeader("X-Moyi-Source","playground");
|
||||
request.addHeader("User-Agent","Local test browser");
|
||||
org.springframework.web.context.request.RequestContextHolder.setRequestAttributes(new org.springframework.web.context.request.ServletRequestAttributes(request));
|
||||
try {
|
||||
audit.recordCall(memberId,null,groupId,providerId,"succeeded",200,100,20,
|
||||
Map.of("prompt","hello","authorization","hidden"),
|
||||
Map.of("usage",Map.of("prompt_tokens_details",Map.of("cached_tokens",80),"cache_creation_input_tokens",5)),null,null);
|
||||
} finally { org.springframework.web.context.request.RequestContextHolder.resetRequestAttributes(); }
|
||||
var saved=jdbc.queryForMap("SELECT * FROM usage_events WHERE user_id=?",memberId);
|
||||
assertEquals("/v1/chat/completions",saved.get("endpoint"));
|
||||
assertEquals("playground",saved.get("request_source"));
|
||||
assertEquals("Local test browser",saved.get("user_agent"));
|
||||
assertEquals(80L,saved.get("cached_input_units"));
|
||||
assertEquals(5L,saved.get("cache_write_units"));
|
||||
assertNull(saved.get("cost_amount"));
|
||||
assertNull(saved.get("first_token_ms"));
|
||||
assertFalse(saved.get("input_payload").toString().contains("hidden"));
|
||||
audit.recordTask(memberId,null,groupId,providerId,"local-timing-task","queued",Map.of("prompt","hello"),null,null,null);
|
||||
jdbc.update("UPDATE usage_events SET created_at=now()-interval '2 seconds' WHERE provider_task_id='local-timing-task'");
|
||||
audit.updateTask("local-timing-task","succeeded",Map.of("url","https://example.test/result"),null,null);
|
||||
assertTrue(jdbc.queryForObject("SELECT latency_ms>=2000 FROM usage_events WHERE provider_task_id='local-timing-task'",Boolean.class));
|
||||
}
|
||||
|
||||
@Test void directCreationCannotEscalateAndOtpIsRequiredOnBothChannels() throws Exception {
|
||||
MockMvc http = MockMvcBuilders.standaloneSetup(new AuthController(auth,verification,168,false)).setControllerAdvice(new ApiExceptionHandler()).build();
|
||||
http.perform(post("/api/admin/users").cookie(new Cookie("moyi_session",ownerToken)).contentType("application/json").content("{\"account\":\"created_user\",\"password\":\"test-password\",\"role\":\"super_admin\"}"))
|
||||
|
||||
Reference in new issue
Block a user