Add common method deserializeDataInResponseAsList

StefanBratanov · Jan 5, 2024 · dd94b70 · dd94b70
1 parent 6625886
commit dd94b70
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/src/main/java/io/github/stefanbratanov/chatjpt/FilesClient.java b/src/main/java/io/github/stefanbratanov/chatjpt/FilesClient.java
@@ -1,10 +1,6 @@
 package io.github.stefanbratanov.chatjpt;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -62,12 +58,7 @@ public List<File> listFiles() {
     HttpRequest httpRequest =
         newHttpRequestBuilder().uri(baseUrl.resolve(Endpoint.FILES.getPath())).GET().build();
     HttpResponse<byte[]> httpResponse = sendHttpRequest(httpRequest);
-    try {
-      JsonNode models = objectMapper.readTree(httpResponse.body());
-      return objectMapper.readValue(models.get("data").toString(), new TypeReference<>() {});
-    } catch (IOException ex) {
-      throw new UncheckedIOException(ex);
-    }
+    return deserializeDataInResponseAsList(httpResponse.body(), File.class);
   }
 
   /**

diff --git a/src/main/java/io/github/stefanbratanov/chatjpt/ModelsClient.java b/src/main/java/io/github/stefanbratanov/chatjpt/ModelsClient.java
@@ -1,10 +1,6 @@
 package io.github.stefanbratanov.chatjpt;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -37,12 +33,7 @@ public List<Model> listModels() {
     HttpRequest httpRequest =
         newHttpRequestBuilder().uri(baseUrl.resolve(Endpoint.MODELS.getPath())).GET().build();
     HttpResponse<byte[]> httpResponse = sendHttpRequest(httpRequest);
-    try {
-      JsonNode models = objectMapper.readTree(httpResponse.body());
-      return objectMapper.readValue(models.get("data").toString(), new TypeReference<>() {});
-    } catch (IOException ex) {
-      throw new UncheckedIOException(ex);
-    }
+    return deserializeDataInResponseAsList(httpResponse.body(), Model.class);
   }
 
   /**

diff --git a/src/main/java/io/github/stefanbratanov/chatjpt/OpenAIClient.java b/src/main/java/io/github/stefanbratanov/chatjpt/OpenAIClient.java
@@ -110,6 +110,17 @@ <T> T deserializeResponse(byte[] response, Class<T> responseClass) {
     }
   }
 
+  <T> List<T> deserializeDataInResponseAsList(byte[] response, Class<T> elementType) {
+    try {
+      JsonNode responseNode = objectMapper.readTree(response);
+      return objectMapper.readValue(
+          responseNode.get("data").traverse(),
+          objectMapper.getTypeFactory().constructCollectionType(List.class, elementType));
+    } catch (IOException ex) {
+      throw new UncheckedIOException(ex);
+    }
+  }
+
   JsonNode deserializeResponseAsTree(byte[] response) {
     try {
       return objectMapper.readTree(response);