fix:"规范音视频任务结果并按真实能力标识音频执行"
- 新增 AsyncTaskResponseNormalizer:解析 content/result/嵌套 data 回执与 {url} 对象,仅白名单媒体字段,裸字符串只接受 URL
- 视频/音频上游完成但无结果文件时标记 deliveryStatus=pending,结算一次、不重发不退款
- 目录与执行共用 AsyncMediaSupport.supportsSpeech;非 TTS 音频、专用渠道任务类型错配、非法语音参数在发送前拒绝
- 任务响应返回 taskType/completedAt,前端以持久任务类型优先,补音频 MIME、签名 URL 与未交付提示
- 新增 29 号 CPR 差距分析与优化方案文档,更新 24 号任务表 MED-01/02/03
验证:mvn -B -o clean verify 399 项通过(独立 PostgreSQL/Redis);前端构建与 27 项测试通过
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
ba5dbc195e
commit
2e53b1d9c8
15 files changed
+493
-83
No files matched your search
+9
-1
@@ -25,7 +25,15 @@ class CatalogServiceTest {
|
||||
assertTrue(CatalogService.asyncExecutorReady("provider-bytedance", "http", "video"));
|
||||
assertTrue(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "image"));
|
||||
assertTrue(CatalogService.asyncExecutorReady("relay-provider", "OPENAI-COMPATIBLE", "video"));
|
||||
assertTrue(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio"));
|
||||
// Audio readiness depends on the upstream endpoint, not on the model type alone.
|
||||
assertTrue(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio", "tts-1"));
|
||||
assertTrue(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio", "gpt-4o-mini-tts-2025-03-20"));
|
||||
assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio"));
|
||||
assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio", "whisper-1"));
|
||||
assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio", "gpt-4o-realtime-preview"));
|
||||
// Dedicated adapters only execute the task type they implement.
|
||||
assertFalse(CatalogService.asyncExecutorReady("provider-vast", "http", "video"));
|
||||
assertFalse(CatalogService.asyncExecutorReady("provider-bytedance", "http", "3d"));
|
||||
assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "3d"));
|
||||
assertFalse(CatalogService.asyncExecutorReady("relay-provider", "http", "video"));
|
||||
}
|
||||
|
||||
+47
@@ -340,6 +340,53 @@ class AsyncProviderClientTest {
|
||||
} finally { server.stop(0); }
|
||||
}
|
||||
|
||||
@Test void nonSpeechAudioAndInvalidSpeechInputNeverReachTheProvider() throws Exception {
|
||||
var calls = new java.util.concurrent.atomic.AtomicInteger();
|
||||
HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
|
||||
server.createContext("/", exchange -> { calls.incrementAndGet(); exchange.sendResponseHeaders(500, -1); exchange.close(); }); server.start();
|
||||
try {
|
||||
var client = relayClient(server);
|
||||
for (String model : java.util.List.of("whisper-1", "gpt-4o-realtime-preview", "suno-v4")) {
|
||||
assertEquals("ASYNC_PROVIDER_NOT_IMPLEMENTED", assertThrows(ApiException.class, () -> client.submit("relay", model, "audio", Map.of("prompt", "hi"))).getCode());
|
||||
}
|
||||
for (Map<String,Object> input : java.util.List.<Map<String,Object>>of(Map.of("prompt", ""), Map.of("prompt", "x".repeat(4097)),
|
||||
Map.of("prompt", "hi", "response_format", "pcm"), Map.of("prompt", "hi", "voice", 7),
|
||||
Map.of("prompt", "hi", "speed", "9"), Map.of("prompt", "hi", "stream_format", "sse"))) {
|
||||
assertEquals("INVALID_TASK_INPUT", assertThrows(ApiException.class, () -> client.submit("relay", "tts-1", "audio", input)).getCode());
|
||||
}
|
||||
assertEquals(0, calls.get());
|
||||
} finally { server.stop(0); }
|
||||
}
|
||||
|
||||
@Test void speechWithoutAudioContentTypeUsesTheRequestedFormat() throws Exception {
|
||||
HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
|
||||
server.createContext("/audio/speech", exchange -> {
|
||||
String body = new String(exchange.getRequestBody().readAllBytes(), StandardCharsets.UTF_8);
|
||||
assertTrue(body.contains("\"speed\":1.5"));
|
||||
exchange.getResponseHeaders().set("Content-Type", "application/octet-stream");
|
||||
byte[] audio = "fake-wav".getBytes(StandardCharsets.UTF_8);
|
||||
exchange.sendResponseHeaders(200, audio.length);
|
||||
try (var output = exchange.getResponseBody()) { output.write(audio); }
|
||||
});
|
||||
server.start();
|
||||
try {
|
||||
var result = relayClient(server).submit("relay", "gpt-4o-mini-tts", "audio", Map.of("prompt", "hi", "response_format", "wav", "speed", 1.5));
|
||||
assertEquals("audio/wav", ((Map<?,?>) result.get("_moyiInlineResult")).get("mimeType"));
|
||||
} finally { server.stop(0); }
|
||||
}
|
||||
|
||||
@Test void dedicatedAdaptersRejectMismatchedTaskTypesBeforeSending() {
|
||||
var client = clientFor("http://127.0.0.1:1");
|
||||
assertEquals("ASYNC_PROVIDER_NOT_IMPLEMENTED", assertThrows(ApiException.class, () -> client.submit("provider-vast", "tripo", "video", Map.of("prompt", "x"))).getCode());
|
||||
}
|
||||
|
||||
private AsyncProviderClient relayClient(HttpServer server) {
|
||||
var jdbc = mock(JdbcTemplate.class); var cipher = new SecretCipher("test-encryption");
|
||||
when(jdbc.queryForMap(any(String.class), eq("relay"))).thenReturn(Map.of("code", "relay", "protocol", "openai-compatible",
|
||||
"base_url", "http://127.0.0.1:" + server.getAddress().getPort(), "credential_ciphertext", cipher.encrypt("test-key")));
|
||||
return new AsyncProviderClient(jdbc, cipher, new ObjectMapper(), mock(Environment.class));
|
||||
}
|
||||
|
||||
private AsyncProviderClient clientFor(String baseUrl) {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
SecretCipher cipher = new SecretCipher("test-encryption");
|
||||
|
||||
+24
@@ -422,6 +422,30 @@ class AsyncTaskPostgresTest {
|
||||
assertEquals(new BigDecimal("8.56000000"), wallet("balance"));
|
||||
}
|
||||
|
||||
@Test void finishedVideoWithoutDeliveredFileIsChargedOnceAndMarkedUndelivered() {
|
||||
jdbc.update("UPDATE model_tasks SET task_type='video' WHERE id=?", taskId);
|
||||
when(provider.poll("provider-vast", "model-mock-3d", "v3.1-20260211", "upstream-task", null))
|
||||
.thenReturn(Map.of("id", "upstream-task", "status", "completed", "model", "sora-2"));
|
||||
poll(); poll();
|
||||
assertEquals("succeeded", status());
|
||||
assertEquals(new BigDecimal("8.56000000"), wallet("balance"));
|
||||
assertEquals(0, wallet("reserved_balance").signum());
|
||||
var view = tasks.getForKey(Map.of("id", keyId.toString()), taskId);
|
||||
assertEquals("video", view.get("taskType"));
|
||||
assertEquals("pending", ((Map<?,?>) view.get("result")).get("deliveryStatus"));
|
||||
verify(provider, never()).submit(anyString(), anyString(), anyString(), anyString(), anyMap());
|
||||
}
|
||||
|
||||
@Test void seedanceContentVideoUrlIsPersistedAsTheTaskResult() {
|
||||
jdbc.update("UPDATE model_tasks SET task_type='video' WHERE id=?", taskId);
|
||||
when(provider.poll("provider-vast", "model-mock-3d", "v3.1-20260211", "upstream-task", null))
|
||||
.thenReturn(Map.of("status", "succeeded", "content", Map.of("video_url", "https://example.test/v.mp4?sig=1")));
|
||||
poll();
|
||||
var result = (Map<?,?>) tasks.getForKey(Map.of("id", keyId.toString()), taskId).get("result");
|
||||
assertEquals("https://example.test/v.mp4?sig=1", result.get("videoUrl"));
|
||||
assertFalse(result.containsKey("deliveryStatus"));
|
||||
}
|
||||
|
||||
@Test void confirmedUpstreamFailureReleasesHoldImmediately() {
|
||||
when(provider.poll("provider-vast","model-mock-3d","v3.1-20260211","upstream-task",null)).thenReturn(Map.of("data",Map.of("status","failed")));
|
||||
poll();
|
||||
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.moyi.controlplane.task;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
class AsyncTaskResponseNormalizerTest {
|
||||
@Test void seedanceContentVideoUrlIsAResult() {
|
||||
var response = Map.<String,Object>of("id", "cgt-1", "status", "succeeded",
|
||||
"content", Map.of("video_url", "https://cdn.example.test/v.mp4?sig=1", "last_frame_url", "https://cdn.example.test/f.png"),
|
||||
"usage", Map.of("completion_tokens", 100));
|
||||
var result = AsyncTaskResponseNormalizer.result(response);
|
||||
assertEquals("https://cdn.example.test/v.mp4?sig=1", result.get("videoUrl"));
|
||||
assertEquals("https://cdn.example.test/v.mp4?sig=1", result.get("url"));
|
||||
assertEquals("https://cdn.example.test/f.png", result.get("previewUrl"));
|
||||
assertEquals("succeeded", AsyncTaskResponseNormalizer.status(response));
|
||||
}
|
||||
|
||||
@Test void nestedEnvelopesAndOpenAiVideoObjects() {
|
||||
var tripo = Map.<String,Object>of("code", 0, "data", Map.of("status", "success", "progress", 100, "credits_consumed", 30,
|
||||
"output", Map.of("model_url", "https://cdn.example.test/m.glb", "rendered_image_url", "https://cdn.example.test/p.png")));
|
||||
var result = AsyncTaskResponseNormalizer.result(tripo);
|
||||
assertEquals("https://cdn.example.test/m.glb", result.get("url"));
|
||||
assertEquals(30, result.get("creditsConsumed"));
|
||||
var openAi = Map.<String,Object>of("status", "completed", "video", Map.of("url", "https://cdn.example.test/o.mp4"));
|
||||
assertEquals("https://cdn.example.test/o.mp4", AsyncTaskResponseNormalizer.result(openAi).get("url"));
|
||||
var nestedUrl = Map.<String,Object>of("data", Map.of("status", "completed", "result", Map.of("video_url", Map.of("url", "https://cdn.example.test/n.mp4"))));
|
||||
assertEquals("https://cdn.example.test/n.mp4", AsyncTaskResponseNormalizer.result(nestedUrl).get("videoUrl"));
|
||||
}
|
||||
|
||||
@Test void metadataOnlyResponsesAreNotMedia() {
|
||||
// Task metadata, error text and a preview frame alone must not be presented as the result file.
|
||||
assertNull(AsyncTaskResponseNormalizer.result(Map.of("id", "video-1", "status", "completed", "model", "sora-2")));
|
||||
assertNull(AsyncTaskResponseNormalizer.result(Map.of("status", "completed", "content", List.of(Map.of("type", "text")))));
|
||||
assertNull(AsyncTaskResponseNormalizer.result(Map.of("status", "completed", "result", "generation finished")));
|
||||
assertNull(AsyncTaskResponseNormalizer.result(Map.of("status", "completed", "content", Map.of("last_frame_url", "https://cdn.example.test/f.png"))));
|
||||
var result = AsyncTaskResponseNormalizer.result(Map.of("output", Map.of("url", "https://cdn.example.test/a.mp3", "error", "secret detail")));
|
||||
assertFalse(result.containsKey("error"));
|
||||
}
|
||||
|
||||
@Test void progressIsBoundedAndSuccessIsComplete() {
|
||||
assertEquals(42, AsyncTaskResponseNormalizer.progress(Map.of("progress", "42%"), "running"));
|
||||
assertEquals(100, AsyncTaskResponseNormalizer.progress(Map.of("progress", 250), "running"));
|
||||
assertEquals(0, AsyncTaskResponseNormalizer.progress(Map.of("progress", "n/a"), "running"));
|
||||
assertEquals(0, AsyncTaskResponseNormalizer.progress(Map.of(), "running"));
|
||||
assertEquals(100, AsyncTaskResponseNormalizer.progress(Map.of("progress", 10), "succeeded"));
|
||||
assertEquals("failed", AsyncTaskResponseNormalizer.status(Map.of("data", Map.of("status", " FAILED "))));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user