release: 0.1.4

depromeet · Jan 15, 2024 · b370f46 · b370f46
2 parents cc11517 + ec6f086
commit b370f46
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 123 deletions.
diff --git a/src/main/java/net/teumteum/user/infra/ChatCompletionResponse.java b/src/main/java/net/teumteum/user/infra/ChatCompletionResponse.java
@@ -0,0 +1,38 @@
+package net.teumteum.user.infra;
+
+import java.util.List;
+
+public record ChatCompletionResponse(
+    String id,
+    String object,
+    long created,
+    String model,
+    List<ChatCompletionResponse.Choice> choices,
+    ChatCompletionResponse.Usage usage,
+    String systemFingerprint
+) {
+
+    public record Choice(
+        int index,
+        Message message,
+        Object logprobs,
+        String finishReason
+    ) {
+
+    }
+
+    public record Message(
+        String role,
+        String content
+    ) {
+
+    }
+
+    public record Usage(
+        int promptTokens,
+        int completionTokens,
+        int totalTokens
+    ) {
+
+    }
+}
diff --git a/src/main/java/net/teumteum/user/infra/GptInterestQuestion.java b/src/main/java/net/teumteum/user/infra/GptInterestQuestion.java
@@ -43,13 +43,21 @@ public BalanceQuestionResponse getBalanceGame(List<User> users) {
             .header(HttpHeaders.AUTHORIZATION, "Bearer " + gptToken)
             .exchangeToMono(response -> {
                 if (response.statusCode().is2xxSuccessful()) {
-                    return response.bodyToMono(BalanceQuestionResponse.class);
+                    return response.bodyToMono(ChatCompletionResponse.class);
                 }
                 return response.createError();
             })
+            .map(response -> {
+                try {
+                    return objectMapper.readValue(response.choices().get(0).message().content(),
+                        BalanceQuestionResponse.class);
+                } catch (JsonProcessingException e) {
+                    throw new IllegalStateException(e);
+                }
+            })
             .retry(MAX_RETRY_COUNT)
             .subscribeOn(Schedulers.fromExecutor(executorService))
-            .block(Duration.ofSeconds(5));
+            .block(Duration.ofSeconds(20));
     }
 
     @Override
@@ -63,13 +71,21 @@ public StoryQuestionResponse getStoryGame(List<User> users) {
             .header(HttpHeaders.AUTHORIZATION, "Bearer " + gptToken)
             .exchangeToMono(response -> {
                 if (response.statusCode().is2xxSuccessful()) {
-                    return response.bodyToMono(StoryQuestionResponse.class);
+                    return response.bodyToMono(ChatCompletionResponse.class);
                 }
                 return response.createError();
             })
+            .map(response -> {
+                try {
+                    return objectMapper.readValue(response.choices().get(0).message().content(),
+                        StoryQuestionResponse.class);
+                } catch (JsonProcessingException e) {
+                    throw new IllegalStateException(e);
+                }
+            })
             .retry(MAX_RETRY_COUNT)
             .subscribeOn(Schedulers.fromExecutor(executorService))
-            .block(Duration.ofSeconds(5));
+            .block(Duration.ofSeconds(20));
     }
 
     private String parseInterests(List<User> users) {

diff --git a/src/test/java/net/teumteum/user/infra/GptInterestQuestionTest.java b/src/test/java/net/teumteum/user/infra/GptInterestQuestionTest.java