feat: modularize gateway requests and recover settlements
This commit is contained in:
1 parent
7785cda6a6
commit
5533a483d9
40 files changed
+1598
-232
No files matched your search
+67
-3
@@ -308,7 +308,7 @@ class PlatformAdminPostgresTest {
|
||||
} 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("api",saved.get("request_source"),"a caller-supplied source header must not reclassify a public API request");
|
||||
assertEquals("Local test browser",saved.get("user_agent"));
|
||||
assertEquals(80L,saved.get("cached_input_units"));
|
||||
assertEquals(5L,saved.get("cache_write_units"));
|
||||
@@ -482,7 +482,13 @@ class PlatformAdminPostgresTest {
|
||||
.withProperty("moyi.providers.deepseek.base-url","http://127.0.0.1:"+upstream.getAddress().getPort()+"/v1");
|
||||
var provider=new com.moyi.controlplane.provider.OpenAiCompatibleProvider(json,environment,jdbc,new SecretCipher("local-test"));
|
||||
try {
|
||||
var controller=new com.moyi.controlplane.gateway.GatewayController(catalog,provider,org.mockito.Mockito.mock(com.moyi.controlplane.gateway.GatewayGuard.class),f.billing(),json);
|
||||
var guard=org.mockito.Mockito.mock(com.moyi.controlplane.gateway.GatewayGuard.class);
|
||||
org.mockito.Mockito.doReturn(org.mockito.Mockito.mock(com.moyi.controlplane.gateway.GatewayGuard.Admission.class))
|
||||
.when(guard).acquire(org.mockito.ArgumentMatchers.anyMap(),org.mockito.ArgumentMatchers.any(java.util.UUID.class),org.mockito.ArgumentMatchers.anyLong());
|
||||
var requestExecution=new com.moyi.controlplane.gateway.request.GatewayRequestExecutionService(
|
||||
f.billing(),new com.moyi.controlplane.gateway.request.ApiRequestRiskPolicy(
|
||||
com.moyi.controlplane.gateway.request.ApiRequestRiskEngine.allowAll()));
|
||||
var controller=new com.moyi.controlplane.gateway.GatewayController(catalog,provider,guard,requestExecution,json);
|
||||
var http=MockMvcBuilders.standaloneSetup(controller).setControllerAdvice(new ApiExceptionHandler()).build();
|
||||
var input=new LinkedHashMap<>(f.request().body());
|
||||
http.perform(post("/v1/chat/completions").header("Authorization","Bearer "+key).header("Idempotency-Key","retry-test").contentType("application/json").content(json.writeValueAsBytes(input)))
|
||||
@@ -494,7 +500,7 @@ class PlatformAdminPostgresTest {
|
||||
.andExpect(status().isOk()).andExpect(content().contentTypeCompatibleWith("text/event-stream")).andReturn().getResponse().getContentAsString();
|
||||
assertTrue(streamed.endsWith("data: [DONE]\n\n")); assertFalse(streamed.contains("private-alias"));
|
||||
assertEquals(new BigDecimal("0.99932000"),jdbc.queryForObject("SELECT balance FROM user_wallets WHERE user_id=?",BigDecimal.class,memberId));
|
||||
assertEquals(1,jdbc.queryForObject("SELECT count(*) FROM usage_events WHERE call_mode='stream' AND request_source='playground' AND cost_amount=0.00034 AND first_token_ms IS NOT NULL",Integer.class));
|
||||
assertEquals(1,jdbc.queryForObject("SELECT count(*) FROM usage_events WHERE call_mode='stream' AND request_source='api' AND cost_amount=0.00034 AND first_token_ms IS NOT NULL",Integer.class));
|
||||
mode.set("no-usage");
|
||||
var failed=http.perform(post("/v1/chat/completions").header("Authorization","Bearer "+key).contentType("application/json").content(json.writeValueAsBytes(input))).andReturn().getResponse().getContentAsString();
|
||||
assertTrue(failed.contains("UPSTREAM_USAGE_MISSING"));
|
||||
@@ -530,4 +536,62 @@ class PlatformAdminPostgresTest {
|
||||
f.billing().fail(ticket,"SETTLEMENT_FAILED","Test rollback",5);
|
||||
assertEquals(0,jdbc.queryForObject("SELECT reserved_balance FROM user_wallets WHERE user_id=?",BigDecimal.class,memberId).signum());
|
||||
}
|
||||
|
||||
@Test void explicitRequestMetadataPersistsWithoutThreadLocalHttpContext() {
|
||||
var f=chatFixture(); wallet.grant(ownerToken,memberId,UUID.randomUUID(),"1","metadata test",meta);
|
||||
var metadata=com.moyi.controlplane.gateway.request.ApiRequestMetadata.playground("198.51.100.7");
|
||||
var ticket=f.billing().reserve(f.key(),f.model(),f.request(),"metadata",metadata);
|
||||
var saved=jdbc.queryForMap("SELECT request_source,host(source_ip) AS client_ip FROM usage_events WHERE id=?",ticket.id());
|
||||
assertEquals("playground",saved.get("request_source"));
|
||||
assertEquals("198.51.100.7",saved.get("client_ip"));
|
||||
f.billing().fail(ticket,"TEST_COMPLETE","metadata fixture",1);
|
||||
|
||||
var audit=context.getBean(UsageAuditService.class);
|
||||
audit.recordTask(memberId,UUID.fromString(String.valueOf(f.key().get("id"))),String.valueOf(f.model().get("id")),
|
||||
String.valueOf(f.model().get("providerId")),"metadata-task","queued",Map.of(),null,null,null,
|
||||
com.moyi.controlplane.gateway.request.ApiRequestMetadata.fromHttp("203.0.113.8"));
|
||||
saved=jdbc.queryForMap("SELECT request_source,host(source_ip) AS client_ip FROM usage_events WHERE provider_task_id='metadata-task'");
|
||||
assertEquals("api",saved.get("request_source"));
|
||||
assertEquals("203.0.113.8",saved.get("client_ip"));
|
||||
}
|
||||
|
||||
@Test void gatewaySettlementFailureKeepsDurableMeterAndRecoversExactlyOnce() {
|
||||
var f=chatFixture(); wallet.grant(ownerToken,memberId,UUID.randomUUID(),"1","recoverable settlement test",meta);
|
||||
var billing=f.billing();
|
||||
var execution=new com.moyi.controlplane.gateway.request.GatewayRequestExecutionService(billing,
|
||||
new com.moyi.controlplane.gateway.request.ApiRequestRiskPolicy(
|
||||
com.moyi.controlplane.gateway.request.ApiRequestRiskEngine.allowAll()));
|
||||
var requestContext=new com.moyi.controlplane.gateway.request.ApiRequestContext(memberId,
|
||||
UUID.fromString(String.valueOf(f.key().get("id"))),
|
||||
com.moyi.controlplane.gateway.request.ApiRequestProtocol.CHAT_COMPLETIONS,
|
||||
String.valueOf(f.model().get("id")),String.valueOf(f.model().get("id")),false,
|
||||
f.request().reservedInputTokens(),f.request().maxOutputTokens(),
|
||||
com.moyi.controlplane.gateway.request.ApiRequestMetadata.internal(),System.nanoTime());
|
||||
jdbc.execute("ALTER TABLE usage_events ADD CONSTRAINT test_reject_recoverable_cost CHECK (cost_amount IS NULL OR cost_amount=0)");
|
||||
try {
|
||||
String result=execution.execute(requestContext,f.key(),f.model(),f.request(),null,
|
||||
() -> (com.moyi.controlplane.gateway.request.ApiRequestAdmission)()->{},
|
||||
ticket -> { execution.settle(ticket,meteredResult(),5,null); return "unexpected"; },
|
||||
failure -> failure instanceof ApiException api ? api : new ApiException("CALL_INTERRUPTED","interrupted",502),
|
||||
ApiException::getCode);
|
||||
assertEquals("SETTLEMENT_PENDING",result);
|
||||
UUID ticketId=jdbc.queryForObject("SELECT id FROM chat_billing_requests WHERE user_id=? ORDER BY created_at DESC LIMIT 1",UUID.class,memberId);
|
||||
assertEquals("pending",jdbc.queryForObject("SELECT status FROM chat_billing_requests WHERE id=?",String.class,ticketId));
|
||||
assertNotNull(jdbc.queryForObject("SELECT settlement_usage FROM chat_billing_requests WHERE id=?",Object.class,ticketId));
|
||||
assertTrue(jdbc.queryForObject("SELECT reserved_balance FROM user_wallets WHERE user_id=?",BigDecimal.class,memberId).signum()>0);
|
||||
assertEquals(0,jdbc.queryForObject("SELECT count(*) FROM wallet_entries WHERE request_id=?",Integer.class,ticketId));
|
||||
|
||||
jdbc.execute("ALTER TABLE usage_events DROP CONSTRAINT test_reject_recoverable_cost");
|
||||
jdbc.update("UPDATE chat_billing_requests SET expires_at=now()-interval '1 second' WHERE id=?",ticketId);
|
||||
billing.recoverExpired();
|
||||
billing.recoverExpired();
|
||||
|
||||
assertEquals("succeeded",jdbc.queryForObject("SELECT status FROM chat_billing_requests WHERE id=?",String.class,ticketId));
|
||||
assertEquals(new BigDecimal("0.99966000"),jdbc.queryForObject("SELECT balance FROM user_wallets WHERE user_id=?",BigDecimal.class,memberId));
|
||||
assertEquals(0,jdbc.queryForObject("SELECT reserved_balance FROM user_wallets WHERE user_id=?",BigDecimal.class,memberId).signum());
|
||||
assertEquals(1,jdbc.queryForObject("SELECT count(*) FROM wallet_entries WHERE request_id=?",Integer.class,ticketId));
|
||||
} finally {
|
||||
jdbc.execute("ALTER TABLE usage_events DROP CONSTRAINT IF EXISTS test_reject_recoverable_cost");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user