wip

Author: ja-openai

common/src/main/java/com/box/l10n/mojito/openai/OpenAIClient.java

@@ -145,7 +145,7 @@ public CompletableFuture<ChatCompletionsResponse> getChatCompletions(
                           httpResponse.body(), ChatCompletionsResponse.class);
                     } catch (JsonProcessingException e) {
                       throw new OpenAIClientResponseException(
-                        "Can't deserialize ChatCompletionsResponse", e, httpResponse);
+                          "Can't deserialize ChatCompletionsResponse", e, httpResponse);
                     }
                   }
                 });
@@ -183,7 +183,7 @@ public CompletableFuture<Stream<ChatCompletionsStreamResponse>> streamChatComple
                 httpResponse -> {
                   if (httpResponse.statusCode() != 200) {
                     throw new OpenAIClientResponseException(
-                      "ChatCompletion stream failed", httpResponse);
+                        "ChatCompletion stream failed", httpResponse);
                   }
                   return httpResponse
                       .body()
@@ -193,9 +193,9 @@ public CompletableFuture<Stream<ChatCompletionsStreamResponse>> streamChatComple
                           body -> {
                             if (!body.startsWith("data: ")) {
                               throw new OpenAIClientResponseException(
-                                "Only support \"data\" lines in stream are supported, got: \"%s\""
-                                  .formatted(body),
-                                httpResponse);
+                                  "Only support \"data\" lines in stream are supported, got: \"%s\""
+                                      .formatted(body),
+                                  httpResponse);
                             }
 
                             String jsonPart = body.substring(5);
@@ -204,9 +204,9 @@ public CompletableFuture<Stream<ChatCompletionsStreamResponse>> streamChatComple
                                   jsonPart, ChatCompletionsStreamResponse.class);
                             } catch (JsonProcessingException e) {
                               throw new OpenAIClientResponseException(
-                                "Can't deserialize ChatCompletionsStreamResponse",
-                                e,
-                                httpResponse);
+                                  "Can't deserialize ChatCompletionsStreamResponse",
+                                  e,
+                                  httpResponse);
                             }
                           });
                 });
@@ -552,7 +552,7 @@ public CompletableFuture<EmbeddingResponse> getEmbedding(EmbeddingRequest embedd
                     return objectMapper.readValue(httpResponse.body(), EmbeddingResponse.class);
                   } catch (JsonProcessingException e) {
                     throw new OpenAIClientResponseException(
-                      "Can't deserialize EmbeddingResponse", e, httpResponse);
+                        "Can't deserialize EmbeddingResponse", e, httpResponse);
                   }
                 });
 
@@ -630,7 +630,6 @@ public UploadFileResponse uploadFile(UploadFileRequest uploadFileRequest) {
     HttpResponse<String> response;
     try {
       response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-      System.out.printf("response: %s%n", response.body());
     } catch (IOException | InterruptedException e) {
       throw new RuntimeException(e);
     }
@@ -713,15 +712,24 @@ public record UploadFileResponse(
       String status,
       @JsonProperty("status_details") String statusDetails) {}
 
-  public record BatchFileLine(
+  public record RequestBatchFileLine(
       @JsonProperty("custom_id") String customId, String method, String url, Object body) {
 
-    public static BatchFileLine forChatCompletion(
+    public static RequestBatchFileLine forChatCompletion(
         String customId, ChatCompletionsRequest chatCompletionsRequest) {
-      return new BatchFileLine(customId, "POST", "/v1/chat/completions", chatCompletionsRequest);
+      return new RequestBatchFileLine(
+          customId, "POST", "/v1/chat/completions", chatCompletionsRequest);
     }
   }
 
+  public record ChatCompletionResponseBatchFileLine(
+      String id, @JsonProperty("custom_id") String customId, Response response) {
+    public record Response(
+        @JsonProperty("status_code") int statusCode,
+        @JsonProperty("request_id") String requestId,
+        @JsonProperty("body") ChatCompletionsResponse chatCompletionsResponse) {}
+  }
+
   public DownloadFileContentResponse downloadFileContent(
       DownloadFileContentRequest downloadFileContentRequest) {
     HttpResponse<String> response;
@@ -799,12 +807,14 @@ public CreateBatchResponse createBatch(CreateBatchRequest createBatchRequest) {
   public record CreateBatchRequest(
       @JsonProperty("input_file_id") String inputFileId,
       String endpoint,
-      @JsonProperty("completion_window") String completionWindow) {
+      @JsonProperty("completion_window") String completionWindow,
+      Map<String, String> metadata) {
 
-    public static final String    ENDPOINT = "/v1/batches";
+    public static final String ENDPOINT = "/v1/batches";
 
-    public static CreateBatchRequest forChatCompletion(String fileId) {
-      return new CreateBatchRequest(fileId, "/v1/chat/completions", "24h");
+    public static CreateBatchRequest forChatCompletion(
+        String fileId, Map<String, String> metadata) {
+      return new CreateBatchRequest(fileId, "/v1/chat/completions", "24h", metadata);
     }
   }
 
@@ -825,7 +835,7 @@ public record CreateBatchResponse(
       @JsonProperty("failed_at") Long failedAt,
       @JsonProperty("expired_at") Long expiredAt,
       @JsonProperty("request_counts") RequestCounts requestCounts,
-      Object metadata) {
+      Map<String, String> metadata) {
     record RequestCounts(int total, int completed, int failed) {}
   }
 
@@ -882,7 +892,7 @@ public record RetrieveBatchResponse(
       @JsonProperty("failed_at") Long failedAt,
       @JsonProperty("expired_at") Long expiredAt,
       @JsonProperty("request_counts") RequestCounts requestCounts,
-      Object metadata) {
+      Map<String, String> metadata) {
     record RequestCounts(int total, int completed, int failed) {}
   }
 
@@ -898,7 +908,8 @@ public OpenAIClientResponseException(String message, HttpResponse<?> httpRespons
       this.httpResponse = Objects.requireNonNull(httpResponse);
     }
 
-    public OpenAIClientResponseException(String message, Exception e, HttpResponse<?> httpResponse) {
+    public OpenAIClientResponseException(
+        String message, Exception e, HttpResponse<?> httpResponse) {
       super(message, e);
       this.httpResponse = Objects.requireNonNull(httpResponse);
     }

common/src/test/java/com/box/l10n/mojito/openai/OpenAIClientTest.java

@@ -13,9 +13,13 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.box.l10n.mojito.json.ObjectMapper;
 import com.box.l10n.mojito.openai.OpenAIClient.ChatCompletionsResponse;
 import com.box.l10n.mojito.openai.OpenAIClient.UploadFileRequest;
 import com.box.l10n.mojito.openai.OpenAIClient.UploadFileResponse;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;