fix:"统一媒体结果校验并补齐交付状态"
This commit is contained in:
1 parent
bb3baed095
commit
5d6253cbf1
14 files changed
+510
-106
No files matched your search
+54
@@ -0,0 +1,54 @@
|
||||
package com.moyi.controlplane.provider.media;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import java.util.Map;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.ValueSource;
|
||||
|
||||
class MediaAssetNormalizerTest {
|
||||
@Test void imageSignaturesSupplyMissingMimeWithoutGuessingArbitraryBase64() {
|
||||
assertEquals("image/png", MediaAssetNormalizer.normalize(Map.of("b64_json", "iVBORw0KGgo="), "image").get("mimeType"));
|
||||
assertEquals("image/jpeg", MediaAssetNormalizer.normalize(Map.of("base64", "/9j/4AAQSkZJRg=="), "image").get("mimeType"));
|
||||
assertNull(MediaAssetNormalizer.normalize(Map.of("base64", "bm90IGFuIGltYWdl"), "image"));
|
||||
assertNull(MediaAssetNormalizer.normalize(Map.of("base64", "%%%", "format", "png"), "image"));
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@ValueSource(strings={"javascript:alert(1)", "file:///etc/passwd", "https://user:password@cdn.example.test/a.mp4",
|
||||
"data:image/svg+xml;base64,PHN2Zz48L3N2Zz4=", "data:text/html;base64,PGh0bWw+", "https:missing-host",
|
||||
"https://cdn.example.test/\\result", "generation complete"})
|
||||
void invalidReferencesAreNotDeliveredFiles(String value) {
|
||||
assertNull(MediaAssetNormalizer.normalize(Map.of("url", value), null));
|
||||
assertNull(MediaAssetNormalizer.normalize(value, null));
|
||||
}
|
||||
|
||||
@Test void primaryMediaMustBelongToTheTaskRatherThanItsThumbnail() {
|
||||
assertNull(MediaAssetNormalizer.normalize(Map.of("image_url", "https://cdn.example.test/frame.png"), "video"));
|
||||
assertNull(MediaAssetNormalizer.normalize(Map.of("url", "data:image/png;base64,iVBORw0KGgo="), "video"));
|
||||
assertNull(MediaAssetNormalizer.normalize(Map.of("url", "https://cdn.example.test/file", "mimeType", "image/png"), "video"));
|
||||
assertNull(MediaAssetNormalizer.normalize(Map.of("url", "https://cdn.example.test/frame.png?sig=1"), "video"));
|
||||
assertNull(MediaAssetNormalizer.normalize(Map.of("video_url", "https://cdn.example.test/frame.png"), "video"));
|
||||
var video = MediaAssetNormalizer.normalize(Map.of("video", Map.of("url", "https://cdn.example.test/file?sig=ok"),
|
||||
"last_frame_url", "https://cdn.example.test/frame.png"), "video");
|
||||
assertEquals("https://cdn.example.test/file?sig=ok", video.get("url"));
|
||||
assertEquals("https://cdn.example.test/frame.png", video.get("previewUrl"));
|
||||
}
|
||||
|
||||
@Test void metadataIsWhitelistedAndNestedAudioRetainsItsMime() {
|
||||
var result = MediaAssetNormalizer.normalize(Map.of("audio_url", Map.of("base64", "ZmFrZQ==", "format", "opus"),
|
||||
"credentials", "secret", "error", "private detail", "usage", Map.of("output_tokens", 12), "credits_consumed", 2), "audio");
|
||||
assertEquals("data:audio/ogg;base64,ZmFrZQ==", result.get("url"));
|
||||
assertEquals(Map.of("output_tokens", 12), result.get("usage"));
|
||||
assertEquals(2, result.get("creditsConsumed"));
|
||||
assertFalse(result.containsKey("credentials"));
|
||||
assertFalse(result.containsKey("error"));
|
||||
}
|
||||
|
||||
@Test void nestedReferencesAreDepthBounded() {
|
||||
Map<String,Object> nested = Map.of("url", "https://cdn.example.test/result.mp4");
|
||||
for (int i = 0; i < 20; i++) nested = Map.of("url", nested);
|
||||
assertNull(MediaAssetNormalizer.normalize(nested, "video"));
|
||||
}
|
||||
}
|
||||
+25
-1
@@ -32,7 +32,7 @@ class AsyncProviderClientTest {
|
||||
path.set(exchange.getRequestURI().getPath());
|
||||
String body=path.get().contains("generateContent")
|
||||
? "{\"candidates\":[{\"content\":{\"parts\":[{\"inlineData\":{\"mimeType\":\"image/png\",\"data\":\"cG5n\"}}]}}],\"usageMetadata\":{\"promptTokenCount\":20,\"candidatesTokenCount\":100}}"
|
||||
: "{\"data\":[{\"b64_json\":\"cG5n\"}],\"usage\":{\"input_tokens\":10,\"output_tokens\":50}}";
|
||||
: "{\"data\":[{\"b64_json\":\"iVBORw0KGgo=\",\"revised_prompt\":\"private prompt\",\"credentials\":\"private detail\"}],\"usage\":{\"input_tokens\":10,\"output_tokens\":50}}";
|
||||
byte[] bytes=body.getBytes(StandardCharsets.UTF_8); exchange.sendResponseHeaders(200,bytes.length);
|
||||
try(var out=exchange.getResponseBody()){out.write(bytes);}
|
||||
});
|
||||
@@ -43,6 +43,10 @@ class AsyncProviderClientTest {
|
||||
var client=new AsyncProviderClient(jdbc,cipher,new ObjectMapper(),mock(Environment.class));
|
||||
var image=(Map<?,?>)client.submit("relay","gpt-image-2","image",Map.of("prompt","cat")).get("_moyiInlineResult");
|
||||
assertEquals("/v1/images/generations",path.get()); assertTrue(image.containsKey("usage"));
|
||||
assertEquals("image/png",image.get("mimeType"));
|
||||
assertEquals("iVBORw0KGgo=",image.get("base64"));
|
||||
org.junit.jupiter.api.Assertions.assertFalse(image.containsKey("revised_prompt"));
|
||||
org.junit.jupiter.api.Assertions.assertFalse(image.containsKey("credentials"));
|
||||
var gemini=(Map<?,?>)client.submit("relay","gemini-3-pro-image-preview","image",Map.of("prompt","cat")).get("_moyiInlineResult");
|
||||
assertEquals("/v1beta/models/gemini-3-pro-image-preview:generateContent",path.get());
|
||||
assertEquals("cG5n",gemini.get("base64")); assertTrue(gemini.containsKey("usageMetadata"));
|
||||
@@ -380,6 +384,26 @@ class AsyncProviderClientTest {
|
||||
assertEquals("ASYNC_PROVIDER_NOT_IMPLEMENTED", assertThrows(ApiException.class, () -> client.submit("provider-vast", "tripo", "video", Map.of("prompt", "x"))).getCode());
|
||||
}
|
||||
|
||||
@Test void inlineImageObjectsAndInvalidAssetsUseTheSameBoundaryAsPolling() throws Exception {
|
||||
HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
|
||||
var response = new AtomicReference<>("{\"data\":{\"image_url\":{\"url\":\"https://cdn.example.test/result.png?sig=1\"}},\"usage\":{\"output_tokens\":5}}");
|
||||
server.createContext("/images/generations", exchange -> {
|
||||
exchange.getRequestBody().readAllBytes();
|
||||
byte[] bytes = response.get().getBytes(StandardCharsets.UTF_8);
|
||||
exchange.sendResponseHeaders(200, bytes.length);
|
||||
try (var output = exchange.getResponseBody()) { output.write(bytes); }
|
||||
});
|
||||
server.start();
|
||||
try {
|
||||
var client = relayClient(server);
|
||||
var result = (Map<?,?>) client.submit("relay", "gpt-image-2", "image", Map.of("prompt", "synthetic")).get("_moyiInlineResult");
|
||||
assertEquals("https://cdn.example.test/result.png?sig=1", result.get("url"));
|
||||
assertEquals(Map.of("output_tokens", 5), result.get("usage"));
|
||||
response.set("{\"data\":[{\"url\":\"javascript:alert(1)\"}]}");
|
||||
org.junit.jupiter.api.Assertions.assertFalse(client.submit("relay", "gpt-image-2", "image", Map.of("prompt", "synthetic")).containsKey("_moyiInlineResult"));
|
||||
} finally { server.stop(0); }
|
||||
}
|
||||
|
||||
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",
|
||||
|
||||
+34
@@ -446,6 +446,40 @@ class AsyncTaskPostgresTest {
|
||||
assertFalse(result.containsKey("deliveryStatus"));
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@ValueSource(strings={"image", "video", "audio", "3d"})
|
||||
void invalidCompletedMediaIsPendingWithoutRefundOrRegeneration(String type) {
|
||||
jdbc.update("UPDATE model_tasks SET task_type=? WHERE id=?", type, taskId);
|
||||
when(provider.poll("provider-vast", "model-mock-3d", "v3.1-20260211", "upstream-task", null))
|
||||
.thenReturn(Map.of("status", "succeeded", "result", Map.of("url", "javascript:alert(1)", "error", "private detail")));
|
||||
poll(); poll();
|
||||
assertEquals("succeeded", status());
|
||||
assertEquals(new BigDecimal("8.56000000"), wallet("balance"));
|
||||
assertEquals(0, wallet("reserved_balance").signum());
|
||||
assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM wallet_entries WHERE user_id=?", Integer.class, userId));
|
||||
var result = (Map<?,?>) tasks.getForKey(Map.of("id", keyId.toString()), taskId).get("result");
|
||||
assertEquals("pending", result.get("deliveryStatus"));
|
||||
assertFalse(result.containsKey("url"));
|
||||
assertFalse(result.containsKey("error"));
|
||||
verify(provider, never()).submit(anyString(), anyString(), anyString(), anyString(), anyMap());
|
||||
verify(provider, never()).submit(anyString(), anyString(), anyString(), anyString(), anyString());
|
||||
}
|
||||
|
||||
@Test void inlineSuccessWithTheWrongMediaKindIsPendingAndSettlesOnlyOnce() {
|
||||
jdbc.update("UPDATE model_tasks SET task_type='image',status='queued',provider_task_id=NULL WHERE id=?", taskId);
|
||||
when(provider.submit(anyString(), anyString(), anyString(), eq("image"), anyString()))
|
||||
.thenReturn(Map.of("_moyiInlineResult", Map.of("video_url", "https://cdn.example.test/not-an-image.mp4", "error", "private detail")));
|
||||
tasks.completeMockTasks(); tasks.completeMockTasks();
|
||||
assertEquals("succeeded", status());
|
||||
assertEquals(new BigDecimal("8.56000000"), wallet("balance"));
|
||||
assertEquals(0, wallet("reserved_balance").signum());
|
||||
assertEquals(1, jdbc.queryForObject("SELECT count(*) FROM wallet_entries WHERE user_id=?", Integer.class, userId));
|
||||
var result = (Map<?,?>) tasks.getForKey(Map.of("id", keyId.toString()), taskId).get("result");
|
||||
assertEquals("pending", result.get("deliveryStatus"));
|
||||
assertFalse(result.containsKey("videoUrl"));
|
||||
verify(provider, times(1)).submit(anyString(), anyString(), anyString(), eq("image"), anyString());
|
||||
}
|
||||
|
||||
@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();
|
||||
|
||||
+31
@@ -50,4 +50,35 @@ class AsyncTaskResponseNormalizerTest {
|
||||
assertEquals(100, AsyncTaskResponseNormalizer.progress(Map.of("progress", 10), "succeeded"));
|
||||
assertEquals("failed", AsyncTaskResponseNormalizer.status(Map.of("data", Map.of("status", " FAILED "))));
|
||||
}
|
||||
|
||||
@Test void boundedListsAndEnvelopesRetainUsageWithoutTaskMetadata() {
|
||||
var usage = Map.of("input_tokens", 10, "output_tokens", 20);
|
||||
var response = Map.<String,Object>of("data", Map.of("result", List.of(Map.of("type", "text"),
|
||||
Map.of("audio_url", Map.of("url", "https://cdn.example.test/a.opus"), "credentials", "private")), "usage", usage));
|
||||
var result = AsyncTaskResponseNormalizer.result(response, "audio");
|
||||
assertEquals("https://cdn.example.test/a.opus", result.get("url"));
|
||||
assertEquals(usage, result.get("usage"));
|
||||
assertFalse(result.containsKey("credentials"));
|
||||
var outerUsage = Map.of("input_tokens", 30);
|
||||
var withOuter = new java.util.LinkedHashMap<>(response);
|
||||
withOuter.put("usage", outerUsage);
|
||||
assertEquals(outerUsage, AsyncTaskResponseNormalizer.result(withOuter, "audio").get("usage"));
|
||||
}
|
||||
|
||||
@Test void completedResultsWithoutPrimaryFilesAreExplicitlyPendingForAllMediaKinds() {
|
||||
for (String kind : List.of("image", "video", "audio", "3d")) {
|
||||
var result = AsyncTaskResponseNormalizer.completedResult(Map.of("status", "completed", "url", "not a file",
|
||||
"usage", Map.of("output_tokens", 25)), kind);
|
||||
assertEquals("pending", result.get("deliveryStatus"));
|
||||
assertEquals("TASK_RESULT_UNAVAILABLE", result.get("deliveryCode"));
|
||||
assertEquals(Map.of("output_tokens", 25), result.get("usage"));
|
||||
assertFalse(result.containsKey("url"));
|
||||
}
|
||||
}
|
||||
|
||||
@Test void excessiveResultDepthCannotBypassTheEnvelopeBoundary() {
|
||||
Map<String,Object> response = Map.of("url", "https://cdn.example.test/a.mp4");
|
||||
for (int i = 0; i < 20; i++) response = Map.of("result", response);
|
||||
assertNull(AsyncTaskResponseNormalizer.result(response, "video"));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user