Fix verified image pricing and settle async image usage
This commit is contained in:
1 parent
4c4f5ad68d
commit
8a13ef9c02
22 files changed
+506
-40
No files matched your search
+23
@@ -24,6 +24,29 @@ import org.springframework.mock.env.MockEnvironment;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
|
||||
class AsyncProviderClientTest {
|
||||
@Test void imagesPreserveUsageAndGeminiUsesItsNativeEndpoint() throws Exception {
|
||||
HttpServer server=HttpServer.create(new InetSocketAddress("127.0.0.1",0),0);
|
||||
var path=new AtomicReference<String>();
|
||||
server.createContext("/",exchange->{
|
||||
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}}";
|
||||
byte[] bytes=body.getBytes(StandardCharsets.UTF_8); exchange.sendResponseHeaders(200,bytes.length);
|
||||
try(var out=exchange.getResponseBody()){out.write(bytes);}
|
||||
});
|
||||
server.start();
|
||||
try {
|
||||
var jdbc=mock(JdbcTemplate.class); var cipher=new SecretCipher("test-encryption");
|
||||
when(jdbc.queryForMap(any(String.class),eq("relay"))).thenReturn(Map.of("code","apipro","protocol","openai-compatible","base_url","http://127.0.0.1:"+server.getAddress().getPort()+"/v1","credential_ciphertext",cipher.encrypt("test-key")));
|
||||
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"));
|
||||
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"));
|
||||
} finally { server.stop(0); }
|
||||
}
|
||||
@Test
|
||||
void upstreamErrorDoesNotExposeProviderMessage() throws Exception {
|
||||
HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
|
||||
|
||||
Reference in new issue
Block a user