fix: scope provider model keys and pin async credentials
This commit is contained in:
1 parent
58dc904c98
commit
558c0dcdd5
8 files changed
+166
-55
No files matched your search
+83
-34
@@ -13,6 +13,9 @@ import java.net.http.HttpResponse;
|
||||
import java.time.Duration;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.Base64;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
@@ -68,7 +71,8 @@ public class AsyncProviderClient {
|
||||
else if (!prompt.isBlank()) body.put("prompt", prompt);
|
||||
body.put("texture", true);
|
||||
body.put("pbr", true);
|
||||
return request("POST", tripoBase(provider.baseUrl()) + (media == null ? "/generation/text-to-model" : "/generation/image-to-model"), provider.nextApiKey(routeId, upstreamModel, environment, keyCursors), body, "上游 3D 任务创建失败");
|
||||
String apiKey = provider.nextApiKey(routeId, upstreamModel, environment, keyCursors);
|
||||
return withKeyFingerprint(request("POST", tripoBase(provider.baseUrl()) + (media == null ? "/generation/text-to-model" : "/generation/image-to-model"), apiKey, body, "上游 3D 任务创建失败"), apiKey);
|
||||
}
|
||||
if (code.contains("byte") || code.contains("seedance") || provider.baseUrl().contains("volces.com")) {
|
||||
List<Map<String,Object>> content = new ArrayList<>();
|
||||
@@ -79,7 +83,8 @@ public class AsyncProviderClient {
|
||||
content.add(Map.of("type", "image_url", "image_url", Map.of("url", media)));
|
||||
}
|
||||
Map<String,Object> body = Map.of("model", upstreamModel, "content", content);
|
||||
return request("POST", trim(provider.baseUrl()) + "/contents/generations/tasks", provider.nextApiKey(routeId, upstreamModel, environment, keyCursors), body, "上游视频任务创建失败");
|
||||
String apiKey = provider.nextApiKey(routeId, upstreamModel, environment, keyCursors);
|
||||
return withKeyFingerprint(request("POST", trim(provider.baseUrl()) + "/contents/generations/tasks", apiKey, body, "上游视频任务创建失败"), apiKey);
|
||||
}
|
||||
if ("openai-compatible".equalsIgnoreCase(provider.protocol())) {
|
||||
return submitOpenAiCompatible(provider, routeId, upstreamModel, taskType, input);
|
||||
@@ -96,14 +101,18 @@ public class AsyncProviderClient {
|
||||
}
|
||||
|
||||
public Map<String,Object> poll(String providerId, String routeId, String upstreamModel, String providerTaskId) {
|
||||
return poll(providerId, routeId, upstreamModel, providerTaskId, null);
|
||||
}
|
||||
|
||||
public Map<String,Object> poll(String providerId, String routeId, String upstreamModel, String providerTaskId, String keyFingerprint) {
|
||||
Provider provider = provider(providerId, routeId, upstreamModel);
|
||||
String code = provider.code().toLowerCase(java.util.Locale.ROOT);
|
||||
String url;
|
||||
String apiKey = provider.nextApiKey(routeId, upstreamModel, environment, keyCursors);
|
||||
String apiKey = provider.keyForFingerprint(routeId, upstreamModel, environment, keyCursors, keyFingerprint);
|
||||
if (isTripo(provider.code(), provider.baseUrl())) url = tripoBase(provider.baseUrl()) + "/tasks/" + encode(providerTaskId);
|
||||
else if (code.contains("byte") || code.contains("seedance") || provider.baseUrl().contains("volces.com")) url = trim(provider.baseUrl()) + "/contents/generations/tasks/" + encode(providerTaskId);
|
||||
else if ("openai-compatible".equalsIgnoreCase(provider.protocol())) {
|
||||
return pollOpenAiCompatible(provider, routeId, upstreamModel, providerTaskId);
|
||||
return pollOpenAiCompatible(provider, routeId, upstreamModel, providerTaskId, keyFingerprint);
|
||||
}
|
||||
else throw new ApiException("ASYNC_PROVIDER_NOT_IMPLEMENTED", "该异步渠道没有可用的执行器", 501);
|
||||
return request("GET", url, apiKey, null, "上游异步任务查询失败");
|
||||
@@ -128,12 +137,13 @@ public class AsyncProviderClient {
|
||||
// choose its documented default and normalize either shape.
|
||||
copyParameter(input, body, "response_format");
|
||||
copyParameter(input, body, "size");
|
||||
String apiKey = provider.nextApiKey(routeId, model, environment, keyCursors);
|
||||
Map<String,Object> response = media == null
|
||||
? request("POST", base + "/images/generations", provider.nextApiKey(routeId, model, environment, keyCursors), body, "上游图片任务创建失败")
|
||||
: requestMultipart("POST", base + "/images/edits", provider.nextApiKey(routeId, model, environment, keyCursors), body, "image", media, "上游图片任务创建失败");
|
||||
? request("POST", base + "/images/generations", apiKey, body, "上游图片任务创建失败")
|
||||
: requestMultipart("POST", base + "/images/edits", apiKey, body, "image", media, "上游图片任务创建失败");
|
||||
Map<String,Object> result = compatibleResult(response);
|
||||
if (result != null) return Map.of("_moyiInlineResult", result);
|
||||
return response;
|
||||
if (result != null) return Map.of("_moyiInlineResult", result, "_moyiUpstreamKeyFingerprint", keyFingerprint(apiKey));
|
||||
return withKeyFingerprint(response, apiKey);
|
||||
}
|
||||
if ("video".equalsIgnoreCase(taskType)) {
|
||||
Map<String,Object> body = new LinkedHashMap<>();
|
||||
@@ -144,14 +154,14 @@ public class AsyncProviderClient {
|
||||
// official API and by relays that proxy it faithfully.
|
||||
String apiKey = provider.nextApiKey(routeId, model, environment, keyCursors);
|
||||
try {
|
||||
return requestMultipart("POST", base + "/videos", apiKey, body,
|
||||
media == null ? null : "input_reference", media, "上游视频任务创建失败");
|
||||
return withKeyFingerprint(requestMultipart("POST", base + "/videos", apiKey, body,
|
||||
media == null ? null : "input_reference", media, "上游视频任务创建失败"), apiKey);
|
||||
} catch (ApiException first) {
|
||||
// A few older relays retained /videos/generations. Retry only
|
||||
// on a route miss; authentication/credit errors are returned.
|
||||
if (!isNotFound(first)) throw first;
|
||||
return requestMultipart("POST", base + "/videos/generations", apiKey, body,
|
||||
media == null ? null : "input_reference", media, "上游视频任务创建失败");
|
||||
return withKeyFingerprint(requestMultipart("POST", base + "/videos/generations", apiKey, body,
|
||||
media == null ? null : "input_reference", media, "上游视频任务创建失败"), apiKey);
|
||||
}
|
||||
}
|
||||
if ("audio".equalsIgnoreCase(taskType)) {
|
||||
@@ -164,7 +174,8 @@ public class AsyncProviderClient {
|
||||
body.put("voice", input.getOrDefault("voice", "alloy"));
|
||||
body.put("response_format", input.getOrDefault("response_format", "mp3"));
|
||||
copyParameter(input, body, "speed");
|
||||
return Map.of("_moyiInlineResult", requestAudio("POST", base + "/audio/speech", provider.nextApiKey(routeId, model, environment, keyCursors), body, "上游语音任务创建失败"));
|
||||
String apiKey = provider.nextApiKey(routeId, model, environment, keyCursors);
|
||||
return Map.of("_moyiInlineResult", requestAudio("POST", base + "/audio/speech", apiKey, body, "上游语音任务创建失败"), "_moyiUpstreamKeyFingerprint", keyFingerprint(apiKey));
|
||||
}
|
||||
throw new ApiException("ASYNC_PROVIDER_NOT_IMPLEMENTED", "该异步渠道的媒体接口尚未配置", 501);
|
||||
}
|
||||
@@ -188,9 +199,9 @@ public class AsyncProviderClient {
|
||||
return value;
|
||||
}
|
||||
|
||||
private Map<String,Object> pollOpenAiCompatible(Provider provider, String routeId, String upstreamModel, String providerTaskId) {
|
||||
private Map<String,Object> pollOpenAiCompatible(Provider provider, String routeId, String upstreamModel, String providerTaskId, String keyFingerprint) {
|
||||
String base = trim(provider.baseUrl());
|
||||
String apiKey = provider.nextApiKey(routeId, upstreamModel, environment, keyCursors);
|
||||
String apiKey = provider.keyForFingerprint(routeId, upstreamModel, environment, keyCursors, keyFingerprint);
|
||||
try {
|
||||
return request("GET", base + "/videos/" + encode(providerTaskId), apiKey, null, "上游异步任务查询失败");
|
||||
} catch (ApiException first) {
|
||||
@@ -423,47 +434,85 @@ public class AsyncProviderClient {
|
||||
}
|
||||
|
||||
private List<String> routeKeys(String providerCode, String providerId, String routeId, String upstreamModel) {
|
||||
for (String prefix : List.of("MOYI_UPSTREAM_API_KEYS_ROUTE_", "MOYI_UPSTREAM_API_KEYS_MODEL_")) {
|
||||
if (prefix.startsWith("MOYI_UPSTREAM_API_KEYS_ROUTE_") && (routeId == null || routeId.isBlank())) continue;
|
||||
String alias = prefix.endsWith("MODEL_") ? upstreamModel : routeId;
|
||||
if (alias == null || alias.isBlank()) continue;
|
||||
String configured = environment.getProperty(prefix + normalize(alias));
|
||||
if (configured == null || configured.isBlank()) continue;
|
||||
List<String> keys = new ArrayList<>();
|
||||
for (String key : configured.split("\\|")) if (!key.isBlank()) keys.add(key.trim());
|
||||
if (!keys.isEmpty()) return keys.stream().distinct().toList();
|
||||
if (routeId != null && !routeId.isBlank()) {
|
||||
String configured = environment.getProperty("MOYI_UPSTREAM_API_KEYS_ROUTE_" + normalize(routeId));
|
||||
if (configured != null && !configured.isBlank()) return parseKeys(configured);
|
||||
}
|
||||
if (upstreamModel != null && !upstreamModel.isBlank()) {
|
||||
String scopedName = "MOYI_UPSTREAM_API_KEYS_MODEL_" + normalize(providerCode) + "_" + normalize(upstreamModel);
|
||||
String configured = environment.getProperty(scopedName);
|
||||
if (configured != null && !configured.isBlank()) return parseKeys(configured);
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private List<String> parseKeys(String configured) {
|
||||
List<String> keys = new ArrayList<>();
|
||||
for (String key : configured.split("\\|")) if (!key.isBlank()) keys.add(key.trim());
|
||||
return keys.stream().distinct().toList();
|
||||
}
|
||||
|
||||
private String normalize(String value) { return String.valueOf(value == null ? "" : value).toUpperCase(java.util.Locale.ROOT).replaceAll("[^A-Z0-9]", "_"); }
|
||||
private Map<String,Object> withKeyFingerprint(Map<String,Object> response, String apiKey) {
|
||||
Map<String,Object> copy = new LinkedHashMap<>();
|
||||
if (response != null) copy.putAll(response);
|
||||
copy.put("_moyiUpstreamKeyFingerprint", keyFingerprint(apiKey));
|
||||
return copy;
|
||||
}
|
||||
|
||||
private static String keyFingerprint(String apiKey) {
|
||||
if (apiKey == null || apiKey.isBlank()) throw new ApiException("UPSTREAM_KEY_NOT_AVAILABLE", "异步任务未选择可轮询的上游凭据", 503);
|
||||
try {
|
||||
byte[] digest = MessageDigest.getInstance("SHA-256").digest(apiKey.getBytes(StandardCharsets.UTF_8));
|
||||
StringBuilder result = new StringBuilder(digest.length * 2);
|
||||
for (byte value : digest) result.append(String.format(java.util.Locale.ROOT, "%02x", value));
|
||||
return result.toString();
|
||||
} catch (NoSuchAlgorithmException exception) {
|
||||
throw new IllegalStateException("SHA-256 is required by the Java runtime", exception);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isTripo(String code, String baseUrl) {
|
||||
String normalizedCode = code == null ? "" : code.toLowerCase(java.util.Locale.ROOT);
|
||||
String normalizedUrl = baseUrl == null ? "" : baseUrl.toLowerCase(java.util.Locale.ROOT);
|
||||
return normalizedCode.contains("tripo") || normalizedUrl.contains("tripo3d");
|
||||
}
|
||||
private record Provider(String code, String protocol, String baseUrl, List<String> apiKeys, AtomicInteger cursor) {
|
||||
private String nextApiKey() { return apiKeys.get(Math.floorMod(cursor.getAndIncrement(), apiKeys.size())); }
|
||||
private String nextApiKey() {
|
||||
if (apiKeys.isEmpty()) throw new ApiException("UPSTREAM_KEY_NOT_AVAILABLE", "异步渠道没有可用的上游凭据", 503);
|
||||
return apiKeys.get(Math.floorMod(cursor.getAndIncrement(), apiKeys.size()));
|
||||
}
|
||||
private String nextApiKey(String routeId, String upstreamModel, Environment environment, ConcurrentMap<String, AtomicInteger> cursors) {
|
||||
List<String> routeKeys = routeKeys(routeId, upstreamModel, environment);
|
||||
if (routeKeys.isEmpty()) return nextApiKey();
|
||||
AtomicInteger routeCursor = cursors.computeIfAbsent("route:" + (routeId == null ? upstreamModel : routeId), ignored -> new AtomicInteger());
|
||||
return routeKeys.get(Math.floorMod(routeCursor.getAndIncrement(), routeKeys.size()));
|
||||
}
|
||||
private String keyForFingerprint(String routeId, String upstreamModel, Environment environment,
|
||||
ConcurrentMap<String, AtomicInteger> cursors, String fingerprint) {
|
||||
if (fingerprint == null || fingerprint.isBlank()) return nextApiKey(routeId, upstreamModel, environment, cursors);
|
||||
List<String> candidates = routeKeys(routeId, upstreamModel, environment);
|
||||
if (candidates.isEmpty()) candidates = apiKeys;
|
||||
for (String candidate : candidates) if (fingerprint.equals(keyFingerprint(candidate))) return candidate;
|
||||
throw new ApiException("UPSTREAM_KEY_NOT_AVAILABLE", "创建任务时使用的上游凭据已从服务器配置中移除,无法安全轮询", 503);
|
||||
}
|
||||
private List<String> routeKeys(String routeId, String upstreamModel, Environment environment) {
|
||||
if (environment == null) return List.of();
|
||||
for (String prefix : List.of("MOYI_UPSTREAM_API_KEYS_ROUTE_", "MOYI_UPSTREAM_API_KEYS_MODEL_")) {
|
||||
if (prefix.startsWith("MOYI_UPSTREAM_API_KEYS_ROUTE_") && (routeId == null || routeId.isBlank())) continue;
|
||||
String selector = prefix.endsWith("MODEL_") ? upstreamModel : routeId;
|
||||
if (selector == null || selector.isBlank()) continue;
|
||||
String value = environment.getProperty(prefix + normalize(selector));
|
||||
if (value == null || value.isBlank()) continue;
|
||||
List<String> keys = new ArrayList<>();
|
||||
for (String key : value.split("\\|")) if (!key.isBlank()) keys.add(key.trim());
|
||||
if (!keys.isEmpty()) return keys.stream().distinct().toList();
|
||||
if (routeId != null && !routeId.isBlank()) {
|
||||
String value = environment.getProperty("MOYI_UPSTREAM_API_KEYS_ROUTE_" + normalize(routeId));
|
||||
if (value != null && !value.isBlank()) return parseKeys(value);
|
||||
}
|
||||
if (upstreamModel != null && !upstreamModel.isBlank()) {
|
||||
String value = environment.getProperty("MOYI_UPSTREAM_API_KEYS_MODEL_" + normalize(code()) + "_" + normalize(upstreamModel));
|
||||
if (value != null && !value.isBlank()) return parseKeys(value);
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
private static List<String> parseKeys(String value) {
|
||||
List<String> keys = new ArrayList<>();
|
||||
for (String key : value.split("\\|")) if (!key.isBlank()) keys.add(key.trim());
|
||||
return keys.stream().distinct().toList();
|
||||
}
|
||||
private static String normalize(String value) { return String.valueOf(value == null ? "" : value).toUpperCase(java.util.Locale.ROOT).replaceAll("[^A-Z0-9]", "_"); }
|
||||
}
|
||||
}
|
||||
@@ -180,7 +180,7 @@ public class AsyncTaskService {
|
||||
"{\"format\":\"mp4\",\"url\":\"https://mock.moyi.ai/tasks/result.mp4\"}", now(), now()
|
||||
);
|
||||
taskIds.forEach(taskId -> usage.updateTask(taskId, "succeeded", Map.of("format", "result", "url", "https://mock.moyi.ai/tasks/" + taskId + "/result"), null, null));
|
||||
List<Map<String,Object>> pending = jdbc.queryForList("SELECT t.id, t.model_id, t.provider_task_id, t.provider_deadline_at, t.created_at, m.provider_id, m.upstream_model FROM model_tasks t JOIN model_catalog m ON m.id=t.model_id WHERE t.status IN ('queued','running') AND t.provider_task_id <> 'mock' AND (t.updated_at < now() - INTERVAL '5 seconds' OR t.provider_deadline_at <= now()) ORDER BY t.updated_at LIMIT 50");
|
||||
List<Map<String,Object>> pending = jdbc.queryForList("SELECT t.id, t.model_id, t.provider_task_id, t.provider_key_fingerprint, t.provider_deadline_at, t.created_at, m.provider_id, m.upstream_model FROM model_tasks t JOIN model_catalog m ON m.id=t.model_id WHERE t.status IN ('queued','running') AND t.provider_task_id <> 'mock' AND (t.updated_at < now() - INTERVAL '5 seconds' OR t.provider_deadline_at <= now()) ORDER BY t.updated_at LIMIT 50");
|
||||
for (Map<String,Object> row : pending) pollProviderTask(row);
|
||||
dispatchQueuedTasks();
|
||||
}
|
||||
@@ -217,7 +217,7 @@ public class AsyncTaskService {
|
||||
continue;
|
||||
}
|
||||
OffsetDateTime submittedAt = now();
|
||||
jdbc.update("UPDATE model_tasks SET provider_task_id=?, provider_deadline_at=?, updated_at=? WHERE id=? AND status='running'", providerTaskId(upstream), submittedAt.plus(java.time.Duration.ofMillis(providerTimeoutMs)), submittedAt, taskId);
|
||||
jdbc.update("UPDATE model_tasks SET provider_task_id=?, provider_key_fingerprint=?, provider_deadline_at=?, updated_at=? WHERE id=? AND status='running'", providerTaskId(upstream), upstream.get("_moyiUpstreamKeyFingerprint"), submittedAt.plus(java.time.Duration.ofMillis(providerTimeoutMs)), submittedAt, taskId);
|
||||
} catch (RuntimeException exception) {
|
||||
String code = exception instanceof ApiException error ? error.getCode() : "UPSTREAM_TASK_SUBMIT_FAILED";
|
||||
String message = exception instanceof ApiException error ? error.getMessage() : "上游异步任务创建失败";
|
||||
@@ -381,8 +381,12 @@ public class AsyncTaskService {
|
||||
}
|
||||
Map<String,Object> response;
|
||||
try {
|
||||
response = providerClient.poll(String.valueOf(row.get("provider_id")), String.valueOf(row.get("model_id")), String.valueOf(row.get("upstream_model")), String.valueOf(row.get("provider_task_id")));
|
||||
response = providerClient.poll(String.valueOf(row.get("provider_id")), String.valueOf(row.get("model_id")), String.valueOf(row.get("upstream_model")), String.valueOf(row.get("provider_task_id")), row.get("provider_key_fingerprint") == null ? null : String.valueOf(row.get("provider_key_fingerprint")));
|
||||
} catch (RuntimeException exception) {
|
||||
if (exception instanceof ApiException error && "UPSTREAM_KEY_NOT_AVAILABLE".equals(error.getCode())) {
|
||||
failTask(taskId, error.getCode(), error.getMessage());
|
||||
return;
|
||||
}
|
||||
// Even a permanent authentication/configuration error only proves
|
||||
// that polling failed, not that an already accepted job stopped.
|
||||
// Keep its hold and retry until the persisted deadline.
|
||||
|
||||
Reference in new issue
Block a user