feat: upload and download file use openaiservice

Author: muverystrong

api/src/main/java/com/ke/bella/batch/configuration/BellaAutoConf.java

@@ -54,9 +54,13 @@ public class BellaAutoConf {
     @Resource
     private BatchService bs;
 
+    @Autowired
+    @Lazy
+    private OpenAiService openAiService;
+
     @PostConstruct
     public void postConstruct() {
-        OpenapiUtils.initialize(openapiClient, openAiServiceFactory);
+        OpenapiUtils.initialize(openapiClient, openAiServiceFactory, openAiService);
         Long id = instanceRepo.register(BellaServerContextHolder.getIp(), BellaServerContextHolder.getPort());
         IDGenerator.setInstanceId(id);
     }

api/src/main/java/com/ke/bella/batch/utils/OpenapiUtils.java

@@ -9,6 +9,7 @@
 import com.ke.bella.openapi.protocol.route.RouteResult;
 import com.ke.bella.openapi.server.OpenAiServiceFactory;
 import com.ke.bella.queue.QueueMode;
+import com.theokanning.openai.service.OpenAiService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
@@ -33,19 +34,24 @@ public class OpenapiUtils {
 
     static OpenAiServiceFactory openAiServiceFactory;
 
+    static OpenAiService openAiService;
+
     private static final Cache<String, String> QUEUE_CACHE = CacheBuilder.newBuilder()
             .expireAfterWrite(10, TimeUnit.MINUTES).maximumSize(1000).build();
 
     private static final Cache<String, Optional<Channel>> CHANNEL_CACHE = CacheBuilder.newBuilder()
             .expireAfterWrite(10, TimeUnit.MINUTES).maximumSize(1000).build();
 
-    public synchronized static void initialize(OpenapiClient openApiClient, OpenAiServiceFactory openAiServiceFactory) {
+    public synchronized static void initialize(OpenapiClient openApiClient, OpenAiServiceFactory openAiServiceFactory, OpenAiService openAiService) {
         if(OpenapiUtils.openApiClient == null) {
             OpenapiUtils.openApiClient = openApiClient;
         }
         if(OpenapiUtils.openAiServiceFactory == null) {
             OpenapiUtils.openAiServiceFactory = openAiServiceFactory;
         }
+        if(OpenapiUtils.openAiService == null) {
+            OpenapiUtils.openAiService = openAiService;
+        }
     }
 
     public static OpenapiClient getInstance() {
@@ -90,8 +96,7 @@ public static Channel getChannelByQueue(String queueName) {
 
     public static String saveStringAsFile(String data) {
         String fileName = UUID.randomUUID() + ".txt";
-        return openAiServiceFactory.create(Configs.OPENAPI_CONSOLE_KEY)
-                .uploadFile(Configs.FILE_API_PURPOSE, data.getBytes(), fileName).getId();
+        return openAiService.uploadFile(Configs.FILE_API_PURPOSE, data.getBytes(), fileName).getId();
     }
 
     public static String fetchStringFromFile(String fileId) {
@@ -100,7 +105,7 @@ public static String fetchStringFromFile(String fileId) {
         }
         byte[] fileContent;
         try {
-            fileContent = openAiServiceFactory.create(Configs.OPENAPI_CONSOLE_KEY).retrieveFileContent(fileId).bytes();
+            fileContent = openAiService.retrieveFileContent(fileId).bytes();
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
@@ -110,7 +115,7 @@ public static String fetchStringFromFile(String fileId) {
     @SneakyThrows
     public static void download(String fileId, Path path) {
         try {
-            openAiServiceFactory.create().retrieveFileContentAndSave(fileId, path);
+            openAiService.retrieveFileContentAndSave(fileId, path);
         } catch (IOException e) {
             log.error("Failed to download file after all retry attempts: {} to {}", fileId, path, e);
             throw new IllegalStateException("Failed to download file: " + fileId, e);

api/src/test/java/com/ke/bella/batch/utils/OpenapiUtilsTest.java

@@ -53,9 +53,10 @@ public void setUp() {
         // Clear any previous static state
         ReflectionTestUtils.setField(OpenapiUtils.class, "openApiClient", null);
         ReflectionTestUtils.setField(OpenapiUtils.class, "openAiServiceFactory", null);
+        ReflectionTestUtils.setField(OpenapiUtils.class, "openAiService", null);
 
-        // Initialize OpenapiUtils
-        OpenapiUtils.initialize(mockOpenapiClient, mockOpenAiServiceFactory);
+        // Initialize OpenapiUtils with all three parameters
+        OpenapiUtils.initialize(mockOpenapiClient, mockOpenAiServiceFactory, mockOpenAiService);
 
         // Set up BellaContext
         BellaContext.setApikey(ApikeyInfo.builder().apikey(TEST_APIKEY).build());
@@ -131,14 +132,12 @@ public void testSaveStringAsFile_Success() {
         String expectedFileId = "file-123";
 
         when(mockFile.getId()).thenReturn(expectedFileId);
-        when(mockOpenAiServiceFactory.create(TEST_CONSOLE_KEY)).thenReturn(mockOpenAiService);
         when(mockOpenAiService.uploadFile(eq(Configs.FILE_API_PURPOSE), any(byte[].class), anyString()))
                 .thenReturn(mockFile);
 
         String result = OpenapiUtils.saveStringAsFile(testData);
 
         assertEquals(expectedFileId, result);
-        verify(mockOpenAiServiceFactory).create(TEST_CONSOLE_KEY);
         verify(mockOpenAiService).uploadFile(eq(Configs.FILE_API_PURPOSE),
                 eq(testData.getBytes()), anyString());
     }
@@ -152,7 +151,6 @@ public void testFetchStringFromFile_Success() throws IOException {
         okhttp3.ResponseBody mockResponseBody = mock(okhttp3.ResponseBody.class);
         when(mockResponseBody.bytes()).thenReturn(contentBytes);
 
-        when(mockOpenAiServiceFactory.create(TEST_CONSOLE_KEY)).thenReturn(mockOpenAiService);
         when(mockOpenAiService.retrieveFileContent(fileId)).thenReturn(mockResponseBody);
 
         String result = OpenapiUtils.fetchStringFromFile(fileId);
@@ -179,7 +177,6 @@ public void testFetchStringFromFile_IOException() throws IOException {
         okhttp3.ResponseBody mockResponseBody = mock(okhttp3.ResponseBody.class);
         when(mockResponseBody.bytes()).thenThrow(new IOException("Network error"));
 
-        when(mockOpenAiServiceFactory.create(TEST_CONSOLE_KEY)).thenReturn(mockOpenAiService);
         when(mockOpenAiService.retrieveFileContent(fileId)).thenReturn(mockResponseBody);
 
         OpenapiUtils.fetchStringFromFile(fileId);
@@ -190,8 +187,6 @@ public void testDownload_Success() throws IOException {
         String fileId = "file-123";
         Path testPath = Paths.get("/tmp/test-file.txt");
 
-        when(mockOpenAiServiceFactory.create()).thenReturn(mockOpenAiService);
-
         OpenapiUtils.download(fileId, testPath);
 
         verify(mockOpenAiService).retrieveFileContentAndSave(fileId, testPath);
@@ -202,7 +197,6 @@ public void testDownload_IOException() throws IOException {
         String fileId = "file-123";
         Path testPath = Paths.get("/tmp/test-file.txt");
 
-        when(mockOpenAiServiceFactory.create()).thenReturn(mockOpenAiService);
         doThrow(new IOException("Download failed")).when(mockOpenAiService)
                 .retrieveFileContentAndSave(fileId, testPath);