fix: preserve model key for async polling
This commit is contained in:
1 parent
0876dfe08e
commit
58dc904c98
2 files changed
+11
-7
No files matched your search
+9
-5
@@ -92,14 +92,18 @@ public class AsyncProviderClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Map<String,Object> poll(String providerId, String routeId, String providerTaskId) {
|
public Map<String,Object> poll(String providerId, String routeId, String providerTaskId) {
|
||||||
Provider provider = provider(providerId, routeId, null);
|
return poll(providerId, routeId, null, providerTaskId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String,Object> 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 code = provider.code().toLowerCase(java.util.Locale.ROOT);
|
||||||
String url;
|
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);
|
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 (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())) {
|
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);
|
else throw new ApiException("ASYNC_PROVIDER_NOT_IMPLEMENTED", "该异步渠道没有可用的执行器", 501);
|
||||||
return request("GET", url, apiKey, null, "上游异步任务查询失败");
|
return request("GET", url, apiKey, null, "上游异步任务查询失败");
|
||||||
@@ -184,9 +188,9 @@ public class AsyncProviderClient {
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String,Object> pollOpenAiCompatible(Provider provider, String routeId, String providerTaskId) {
|
private Map<String,Object> pollOpenAiCompatible(Provider provider, String routeId, String upstreamModel, String providerTaskId) {
|
||||||
String base = trim(provider.baseUrl());
|
String base = trim(provider.baseUrl());
|
||||||
String apiKey = provider.nextApiKey(routeId, null, environment, keyCursors);
|
String apiKey = provider.nextApiKey(routeId, upstreamModel, environment, keyCursors);
|
||||||
try {
|
try {
|
||||||
return request("GET", base + "/videos/" + encode(providerTaskId), apiKey, null, "上游异步任务查询失败");
|
return request("GET", base + "/videos/" + encode(providerTaskId), apiKey, null, "上游异步任务查询失败");
|
||||||
} catch (ApiException first) {
|
} catch (ApiException first) {
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ public class AsyncTaskService {
|
|||||||
"{\"format\":\"mp4\",\"url\":\"https://mock.moyi.ai/tasks/result.mp4\"}", now(), now()
|
"{\"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));
|
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 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_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);
|
for (Map<String,Object> row : pending) pollProviderTask(row);
|
||||||
dispatchQueuedTasks();
|
dispatchQueuedTasks();
|
||||||
}
|
}
|
||||||
@@ -381,7 +381,7 @@ public class AsyncTaskService {
|
|||||||
}
|
}
|
||||||
Map<String,Object> response;
|
Map<String,Object> response;
|
||||||
try {
|
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) {
|
} catch (RuntimeException exception) {
|
||||||
// Even a permanent authentication/configuration error only proves
|
// Even a permanent authentication/configuration error only proves
|
||||||
// that polling failed, not that an already accepted job stopped.
|
// that polling failed, not that an already accepted job stopped.
|
||||||
|
|||||||
Reference in new issue
Block a user