feat: publish readable model ids and media task adapters

This commit is contained in:
wlx committed 2026-09-29 01:29:07 +08:00
1 parent ba98b47618
commit 94eaee7b95
16 files changed
+654 -41

No files matched your search

@@ -41,16 +41,16 @@ public class GatewayController {
public Map<String, Object> models(@RequestHeader(value = "Authorization", required = false) String authorization) {
Map<String, Object> key = requireKey(authorization);
guard.checkRate(UUID.fromString(String.valueOf(key.get("id"))), true);
List<Map<String, Object>> data = catalogService.listModels(false).stream()
.filter(model -> catalogService.keyCanInvoke(key, String.valueOf(model.get("id"))))
List<Map<String, Object>> visibleModels = GatewayModelIds.authorizedModels(catalogService, key);
List<Map<String, Object>> data = visibleModels.stream()
.map(model -> {
Map<String, Object> item = new LinkedHashMap<>();
item.put("id", model.get("id"));
String publicId = GatewayModelIds.publicId(model);
item.put("id", publicId);
item.put("name", model.get("publicName"));
item.put("object", "model");
item.put("owned_by", model.get("providerId"));
// Keep the OpenAI-compatible id as the exact catalog route UUID.
// These descriptive fields let clients show the logical model and
// source group without guessing that modelKey is a callable id.
item.put("moyi_route_id", model.get("id"));
item.put("model_key", model.get("modelKey"));
item.put("public_name", model.get("publicName"));
item.put("vendor_name", model.get("vendorName"));
@@ -79,9 +79,8 @@ public class GatewayController {
Map<String, Object> input, String idempotencyKey, HttpServletResponse servletResponse) {
long startedAt = System.currentTimeMillis();
String modelId = String.valueOf(input.getOrDefault("model", ""));
Map<String, Object> model = catalogService.activeModel(modelId);
if (model == null) throw new ApiException("MODEL_NOT_FOUND", "模型不存在或已下线;请使用当前 API Key 的 /v1/models 返回的渠道分组 ID", 404);
if (!catalogService.keyCanInvoke(key, modelId)) throw new ApiException("MODEL_FORBIDDEN", "当前 Key 无权调用该模型", 403);
Map<String, Object> model = resolveModel(key, modelId);
if (model == null) throw new ApiException("MODEL_NOT_FOUND", "模型不存在或已下线;请使用当前 API Key 的 /v1/models 返回的模型 ID", 404);
if ("async".equals(model.get("mode"))) throw new ApiException("ASYNC_MODEL", "该模型需要使用异步任务接口", 400);
String providerId=String.valueOf(model.get("providerId"));
boolean mock="provider-mock".equals(providerId);
@@ -96,7 +95,7 @@ public class GatewayController {
try {
catalogService.touchKey(key);
if(Boolean.TRUE.equals(request.body().get("stream"))) {
stream(model,request.body(),ticket,servletResponse,startedAt,mock);
stream(model,modelId,request.body(),ticket,servletResponse,startedAt,mock);
return null;
}
Map<String,Object> body=mock?mockResponse(modelId,input):provider.chat(providerId,String.valueOf(model.get("upstreamModel")),request.body());
@@ -118,8 +117,7 @@ public class GatewayController {
}
}
private void stream(Map<String,Object> model, Map<String,Object> input, ChatBillingService.Ticket ticket, HttpServletResponse response, long started, boolean mock) throws IOException {
String modelId=model.get("id").toString();
private void stream(Map<String,Object> model, String modelId, Map<String,Object> input, ChatBillingService.Ticket ticket, HttpServletResponse response, long started, boolean mock) throws IOException {
if(mock) {
var body=mockResponse(modelId,input);
prepareStream(response);
@@ -228,4 +226,13 @@ public class GatewayController {
}).reduce((left, right) -> left + "\n" + right).orElse("");
}
/**
* Resolve a caller supplied model identifier to a route allowed by this
* API key. Route UUIDs remain valid for existing clients; the readable IDs
* returned by /v1/models are preferred for new clients.
*/
Map<String, Object> resolveModel(Map<String, Object> key, String requested) {
return GatewayModelIds.resolve(catalogService, key, requested);
}
}