diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java index 3c8b59b..70fa393 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java @@ -92,14 +92,18 @@ public class AsyncProviderClient { } public Map poll(String providerId, String routeId, String providerTaskId) { - Provider provider = provider(providerId, routeId, null); + return poll(providerId, routeId, null, providerTaskId); + } + + public Map poll(String providerId, String routeId, String upstreamModel, String providerTaskId) { + Provider provider = provider(providerId, routeId, upstreamModel); String code = provider.code().toLowerCase(java.util.Locale.ROOT); String url; - String apiKey = provider.nextApiKey(routeId, null, environment, keyCursors); + String apiKey = provider.nextApiKey(routeId, upstreamModel, environment, keyCursors); 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, providerTaskId); + return pollOpenAiCompatible(provider, routeId, upstreamModel, providerTaskId); } else throw new ApiException("ASYNC_PROVIDER_NOT_IMPLEMENTED", "该异步渠道没有可用的执行器", 501); return request("GET", url, apiKey, null, "上游异步任务查询失败"); @@ -184,9 +188,9 @@ public class AsyncProviderClient { return value; } - private Map pollOpenAiCompatible(Provider provider, String routeId, String providerTaskId) { + private Map pollOpenAiCompatible(Provider provider, String routeId, String upstreamModel, String providerTaskId) { String base = trim(provider.baseUrl()); - String apiKey = provider.nextApiKey(routeId, null, environment, keyCursors); + String apiKey = provider.nextApiKey(routeId, upstreamModel, environment, keyCursors); try { return request("GET", base + "/videos/" + encode(providerTaskId), apiKey, null, "上游异步任务查询失败"); } catch (ApiException first) { diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java index 45034e4..5e99ae1 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java @@ -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> pending = jdbc.queryForList("SELECT t.id, t.model_id, t.provider_task_id, t.provider_deadline_at, t.created_at, m.provider_id 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> 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"); for (Map row : pending) pollProviderTask(row); dispatchQueuedTasks(); } @@ -381,7 +381,7 @@ public class AsyncTaskService { } Map response; try { - response = providerClient.poll(String.valueOf(row.get("provider_id")), String.valueOf(row.get("model_id")), 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"))); } catch (RuntimeException exception) { // Even a permanent authentication/configuration error only proves // that polling failed, not that an already accepted job stopped.