feat: modularize gateway requests and recover settlements

This commit is contained in:
xpp committed 2026-10-21 18:24:30 +08:00
1 parent 7785cda6a6
commit 5533a483d9
40 files changed
+1598 -232

No files matched your search

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.moyi.controlplane.auth.AuthService;
import com.moyi.controlplane.common.ApiException;
import com.moyi.controlplane.gateway.GatewayGuard;
import com.moyi.controlplane.gateway.request.ApiRequestMetadata;
import java.nio.charset.StandardCharsets;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -50,14 +51,22 @@ public class UsageAuditService {
}
public void startChat(UUID id, UUID userId, UUID keyId, Map<String,Object> model, Map<String,Object> input) {
String agent=null, source="api";
startChat(id,userId,keyId,model,input,ApiRequestMetadata.internal());
}
public void startChat(UUID id, UUID userId, UUID keyId, Map<String,Object> model, Map<String,Object> input,
ApiRequestMetadata metadata) {
String agent=null, source=source(metadata);
String ip=metadata == null ? null : metadata.clientIp();
var attributes=org.springframework.web.context.request.RequestContextHolder.getRequestAttributes();
if(attributes instanceof org.springframework.web.context.request.ServletRequestAttributes servlet) {
agent=servlet.getRequest().getHeader("User-Agent");
if("playground".equals(servlet.getRequest().getHeader("X-Moyi-Source"))) source="playground";
var request=servlet.getRequest();
agent=request.getHeader("User-Agent");
if(ip==null) ip=request.getRemoteAddr();
if(metadata==null || metadata.source()==ApiRequestMetadata.Source.INTERNAL) source=isPlaygroundRequest(request)?"playground":"api";
}
jdbc.update("INSERT INTO usage_events(id,request_id,user_id,api_key_id,model_id,provider_id,event_kind,status,input_payload,endpoint,call_mode,request_source,user_agent,reasoning_effort) VALUES (?,?,?,?,?,?,'call','running',?::jsonb,'/v1/chat/completions',?,?,?,?)",
id,id.toString(),userId,keyId,model.get("id"),model.get("providerId"),json(input),Boolean.TRUE.equals(input.get("stream"))?"stream":"sync",source,
jdbc.update("INSERT INTO usage_events(id,request_id,user_id,api_key_id,model_id,provider_id,event_kind,status,input_payload,endpoint,call_mode,request_source,source_ip,user_agent,reasoning_effort) VALUES (?,?,?,?,?,?,'call','running',?::jsonb,'/v1/chat/completions',?,?,CAST(? AS inet),?,?)",
id,id.toString(),userId,keyId,model.get("id"),model.get("providerId"),json(input),Boolean.TRUE.equals(input.get("stream"))?"stream":"sync",source,blankToNull(ip),
agent==null?null:agent.substring(0,Math.min(1000,agent.length())),input.get("reasoning_effort")==null?null:String.valueOf(input.get("reasoning_effort")).substring(0,Math.min(32,String.valueOf(input.get("reasoning_effort")).length())));
}
@@ -83,9 +92,18 @@ public class UsageAuditService {
public void recordTask(
UUID userId, UUID apiKeyId, String modelId, String providerId, String taskId,
String status, Object input, Object output, String errorCode, String errorMessage
) {
recordTask(userId,apiKeyId,modelId,providerId,taskId,status,input,output,errorCode,errorMessage,ApiRequestMetadata.internal());
}
public void recordTask(
UUID userId, UUID apiKeyId, String modelId, String providerId, String taskId,
String status, Object input, Object output, String errorCode, String errorMessage,
ApiRequestMetadata metadata
) {
record(userId, apiKeyId, modelId, providerId, "task", status, null, 0, 0,
input, output, taskId, errorCode, errorMessage, null, null);
input, output, taskId, errorCode, errorMessage, metadata == null ? null : metadata.clientIp(), null,
metadata == null ? null : source(metadata));
}
public void updateTask(String taskId, String status, Object output, String errorCode, String errorMessage) {
@@ -345,14 +363,20 @@ public class UsageAuditService {
}
private void record(UUID userId, UUID keyId, String modelId, String providerId, String kind, String status, Integer latency, long inputUnits, long outputUnits, Object input, Object output, String taskId, String errorCode, String errorMessage, String ip, String userAgent) {
record(userId,keyId,modelId,providerId,kind,status,latency,inputUnits,outputUnits,input,output,taskId,errorCode,errorMessage,ip,userAgent,null);
}
private void record(UUID userId, UUID keyId, String modelId, String providerId, String kind, String status, Integer latency, long inputUnits, long outputUnits, Object input, Object output, String taskId, String errorCode, String errorMessage, String ip, String userAgent, String explicitSource) {
String endpoint=null, source=null;
var attributes=org.springframework.web.context.request.RequestContextHolder.getRequestAttributes();
if(attributes instanceof org.springframework.web.context.request.ServletRequestAttributes servlet) {
var request=servlet.getRequest();
endpoint=request.getRequestURI();
userAgent=request.getHeader("User-Agent");
source="playground".equals(request.getHeader("X-Moyi-Source")) ? "playground" : "api";
if(ip==null) ip=request.getRemoteAddr();
source=explicitSource == null ? (isPlaygroundRequest(request) ? "playground" : "api") : explicitSource;
}
if(source==null) source=explicitSource;
JsonNode payload=objectMapper.valueToTree(output);
Long cached=usageNumber(payload,"/usage/prompt_tokens_details/cached_tokens");
if(cached==null) cached=usageNumber(payload,"/usage/prompt_cache_hit_tokens");
@@ -370,6 +394,15 @@ public class UsageAuditService {
return value.isIntegralNumber() && value.canConvertToLong() && value.longValue()>=0 ? value.longValue() : null;
}
/** Source attribution is based on the matched server route, not a spoofable client header. */
private boolean isPlaygroundRequest(jakarta.servlet.http.HttpServletRequest request) {
return request.getRequestURI() != null && request.getRequestURI().startsWith("/api/playground/keys/");
}
private String source(ApiRequestMetadata metadata) {
return metadata != null && metadata.source()==ApiRequestMetadata.Source.PLAYGROUND ? "playground" : "api";
}
private String json(Object value) {
if (value == null) return null;
try {