wip

Author: ja-openai

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

@@ -13,13 +13,9 @@
 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;

webapp/src/main/java/com/box/l10n/mojito/AsyncConfig.java

@@ -42,4 +42,15 @@ public AsyncTaskExecutor getPollableTaskExecutor() {
 
     return new DelegatingSecurityContextAsyncTaskExecutor(threadPoolTaskExecutor);
   }
+
+  @Bean(name = "aiTranslateWSExecutor")
+  public AsyncTaskExecutor getAiTranslateWSExecutor() {
+    ThreadPoolTaskExecutor threadPoolTaskExecutor = new ThreadPoolTaskExecutor();
+    threadPoolTaskExecutor.setBeanName("aiTranslateWSExecutor");
+    threadPoolTaskExecutor.setCorePoolSize(5);
+    threadPoolTaskExecutor.setMaxPoolSize(30);
+    threadPoolTaskExecutor.initialize();
+
+    return new DelegatingSecurityContextAsyncTaskExecutor(threadPoolTaskExecutor);
+  }
 }

webapp/src/main/java/com/box/l10n/mojito/rest/textunit/AiReviewConfig.java renamed to webapp/src/main/java/com/box/l10n/mojito/rest/textunit/AiReviewConfigurationProperties.java

@@ -5,7 +5,7 @@
 
 @Component
 @ConfigurationProperties("l10n.ai-review")
-public class AiReviewConfig {
+public class AiReviewConfigurationProperties {
   String openaiClientToken;
 
   public String getOpenaiClientToken() {

webapp/src/main/java/com/box/l10n/mojito/rest/textunit/AiReviewWS.java

@@ -28,11 +28,13 @@ public class AiReviewWS {
 
   TextUnitSearcher textUnitSearcher;
 
-  AiReviewConfig aiReviewConfig;
+  AiReviewConfigurationProperties aiReviewConfigurationProperties;
 
-  public AiReviewWS(TextUnitSearcher textUnitSearcher, AiReviewConfig aiReviewConfig) {
+  public AiReviewWS(
+      TextUnitSearcher textUnitSearcher,
+      AiReviewConfigurationProperties aiReviewConfigurationProperties) {
     this.textUnitSearcher = textUnitSearcher;
-    this.aiReviewConfig = aiReviewConfig;
+    this.aiReviewConfigurationProperties = aiReviewConfigurationProperties;
   }
 
   @RequestMapping(method = RequestMethod.GET, value = "/api/proto-ai-review")
@@ -80,7 +82,9 @@ public ProtoAiReviewResponse getTextUnitsWithGet(ProtoAiReviewRequest protoAiRev
     logger.info(objectMapper.writeValueAsStringUnchecked(chatCompletionsRequest));
 
     OpenAIClient openAIClient =
-        OpenAIClient.builder().apiKey(aiReviewConfig.getOpenaiClientToken()).build();
+        OpenAIClient.builder()
+            .apiKey(aiReviewConfigurationProperties.getOpenaiClientToken())
+            .build();
 
     OpenAIClient.ChatCompletionsResponse chatCompletionsResponse =
         openAIClient.getChatCompletions(chatCompletionsRequest).join();

webapp/src/main/java/com/box/l10n/mojito/rest/textunit/AiTranslateConfig.java

@@ -1,18 +1,33 @@
 package com.box.l10n.mojito.rest.textunit;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
+import com.box.l10n.mojito.json.ObjectMapper;
+import com.box.l10n.mojito.openai.OpenAIClient;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
-@Component
-@ConfigurationProperties("l10n.ai-translate")
+@Configuration
 public class AiTranslateConfig {
-  String openaiClientToken;
 
-  public String getOpenaiClientToken() {
-    return openaiClientToken;
+  AiTranslateConfigurationProperties aiTranslateConfigurationProperties;
+
+  public AiTranslateConfig(AiTranslateConfigurationProperties aiTranslateConfigurationProperties) {
+    this.aiTranslateConfigurationProperties = aiTranslateConfigurationProperties;
+  }
+
+  @Bean
+  @Qualifier("AiTranslateWS")
+  OpenAIClient openAIClient() {
+    return new OpenAIClient.Builder()
+        .apiKey(aiTranslateConfigurationProperties.getOpenaiClientToken())
+        .build();
   }
 
-  public void setOpenaiClientToken(String openaiClientToken) {
-    this.openaiClientToken = openaiClientToken;
+  @Bean
+  @Qualifier("AiTranslateWS")
+  ObjectMapper objectMapper() {
+    ObjectMapper objectMapper = new ObjectMapper();
+    AiTranslateWS.configureObjectMapper(objectMapper);
+    return objectMapper;
   }
 }

webapp/src/main/java/com/box/l10n/mojito/rest/textunit/AiTranslateConfigurationProperties.java

@@ -0,0 +1,18 @@
+package com.box.l10n.mojito.rest.textunit;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties("l10n.ai-translate")
+public class AiTranslateConfigurationProperties {
+  String openaiClientToken;
+
+  public String getOpenaiClientToken() {
+    return openaiClientToken;
+  }
+
+  public void setOpenaiClientToken(String openaiClientToken) {
+    this.openaiClientToken = openaiClientToken;
+  }
+}