From 9b98de3efa2bb76940b67d3084671668737a5a44 Mon Sep 17 00:00:00 2001 From: WangLX <519407855@qq.com> Date: Tue, 29 Sep 2026 02:10:49 +0800 Subject: [PATCH] feat: complete docs navigation and media task metadata --- .../task/AsyncProviderClient.java | 7 ++++--- .../controlplane/task/AsyncTaskService.java | 21 +++++++++++++------ .../V31__tripo_image_input_metadata.sql | 15 +++++++++++++ prototype/src/views/UserConsole.vue | 13 +++++++++++- 4 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 control-plane-java/src/main/resources/db/migration/V31__tripo_image_input_metadata.sql 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 1fa15f9..4ea70d2 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 @@ -29,6 +29,7 @@ import org.springframework.stereotype.Service; /** Real async adapters for the providers currently represented in the catalog. */ @Service public class AsyncProviderClient { + private static final Duration UPSTREAM_REQUEST_TIMEOUT = Duration.ofSeconds(60); private final JdbcTemplate jdbc; private final SecretCipher cipher; private final ObjectMapper mapper; @@ -208,7 +209,7 @@ public class AsyncProviderClient { private Map requestAudio(String method, String url, String key, Map body, String message) { try { - HttpRequest.Builder builder = HttpRequest.newBuilder().uri(URI.create(url)).timeout(Duration.ofSeconds(30)) + HttpRequest.Builder builder = HttpRequest.newBuilder().uri(URI.create(url)).timeout(UPSTREAM_REQUEST_TIMEOUT) .header("Authorization", "Bearer " + key).header("Content-Type", "application/json"); HttpResponse response = client.send(builder.POST(HttpRequest.BodyPublishers.ofString(write(body))).build(), HttpResponse.BodyHandlers.ofByteArray()); if (response.statusCode() < 200 || response.statusCode() >= 300) { @@ -253,7 +254,7 @@ public class AsyncProviderClient { multipartFile(out, boundary, fileField, file.filename(), file.contentType(), file.bytes()); } out.write(("--" + boundary + "--\r\n").getBytes(java.nio.charset.StandardCharsets.UTF_8)); - HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).timeout(Duration.ofSeconds(30)) + HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).timeout(UPSTREAM_REQUEST_TIMEOUT) .header("Authorization", "Bearer " + key) .header("Content-Type", "multipart/form-data; boundary=" + boundary) .POST(HttpRequest.BodyPublishers.ofByteArray(out.toByteArray())).build(); @@ -335,7 +336,7 @@ public class AsyncProviderClient { private Map request(String method, String url, String key, Map body, String message) { try { - HttpRequest.Builder builder = HttpRequest.newBuilder().uri(URI.create(url)).timeout(Duration.ofSeconds(30)) + HttpRequest.Builder builder = HttpRequest.newBuilder().uri(URI.create(url)).timeout(UPSTREAM_REQUEST_TIMEOUT) .header("Authorization", "Bearer " + key).header("Content-Type", "application/json"); if ("POST".equals(method)) builder.POST(HttpRequest.BodyPublishers.ofString(write(body))); else builder.GET(); 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 b8f3586..74c8947 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 @@ -187,12 +187,8 @@ public class AsyncTaskService { String taskId = String.valueOf(task.get("id")); usage.updateTask(taskId, "running", null, null, null); try { - Map upstream = providerClient.submit( - String.valueOf(task.get("provider_id")), - String.valueOf(task.get("upstream_model")), - String.valueOf(task.get("task_type")), - taskInput(task) - ); + Map input = taskInput(task); + Map upstream = submitProviderTask(task, input); // Some OpenAI-compatible image/audio endpoints return the // generated media in the submit response rather than creating // a pollable job. Persist that result and settle the task in @@ -320,6 +316,19 @@ public class AsyncTaskService { return input; } + private Map submitProviderTask(Map task, Map input) { + String providerId = String.valueOf(task.get("provider_id")); + String model = String.valueOf(task.get("upstream_model")); + String type = String.valueOf(task.get("task_type")); + // Keep the legacy overload for rows created before V30. Apart from + // compatibility with existing integrations, this makes a queued + // prompt-only task indistinguishable from the original submit path. + if (input.size() == 1 && input.containsKey("prompt")) { + return providerClient.submit(providerId, model, type, String.valueOf(input.get("prompt"))); + } + return providerClient.submit(providerId, model, type, input); + } + private OffsetDateTime now() { return OffsetDateTime.now(ZoneOffset.UTC); } private String providerTaskId(Map response) { diff --git a/control-plane-java/src/main/resources/db/migration/V31__tripo_image_input_metadata.sql b/control-plane-java/src/main/resources/db/migration/V31__tripo_image_input_metadata.sql new file mode 100644 index 0000000..5597b74 --- /dev/null +++ b/control-plane-java/src/main/resources/db/migration/V31__tripo_image_input_metadata.sql @@ -0,0 +1,15 @@ +-- Tripo H-series routes accept either a text prompt or an image URL/file token. +-- Keep the catalog metadata aligned with the async adapter so clients can +-- expose the image input without guessing from the model type. +UPDATE model_definitions +SET input_types = '["text", "image"]'::jsonb, + updated_at = now() +WHERE model_key IN ('tripo-v3', 'tripo-h-v3-0', 'tripo-h-v2-5') + AND deleted_at IS NULL; + +UPDATE model_catalog +SET input_types = '["text", "image"]'::jsonb, + updated_at = now() +WHERE provider_id = 'provider-vast' + AND upstream_model IN ('v3.1-20260211', 'v3.0-20250812', 'v2.5-20250123') + AND deleted_at IS NULL; diff --git a/prototype/src/views/UserConsole.vue b/prototype/src/views/UserConsole.vue index 20b0207..a7aa1db 100644 --- a/prototype/src/views/UserConsole.vue +++ b/prototype/src/views/UserConsole.vue @@ -130,6 +130,17 @@ const projects = ref([]) const keyScopeType = ref<'personal' | 'project'>('personal') const selectedProjectId = ref('') const selectedApiKeyId = ref('') +function scrollDocs(target: string) { + const selectors: Record = { + 'docs-overview': '.docs-layout', + 'docs-auth': '.docs-path-card', + 'docs-chat': '.docs-detail-grid .docs-detail-card:nth-child(2)', + 'docs-reference': '.docs-reference-table', + 'docs-troubleshooting': '.docs-detail-grid .docs-detail-card:last-child', + 'docs-usage': '.docs-guide-extra', + } + document.querySelector(selectors[target] || target)?.scrollIntoView({ behavior: 'smooth', block: 'start' }) +} const activeDebugKeys = computed(() => keys.value.filter((key) => key.status === '正常')) const selectedDebugKey = computed(() => activeDebugKeys.value.find((key) => String(key.id) === selectedApiKeyId.value)) const debugKeyCanInvoke = computed(() => !!selectedDebugKey.value?.modelIds.includes(activeModel.value.id)) @@ -771,7 +782,7 @@ async function createProject() {