Merge pull request #9222 from weseek/support/tidy-up-promise-all

support: Remove unnecessary Promise.all

apps/app/src/server/service/openai/file-upload.ts

@@ -1,32 +0,0 @@
-import { Readable } from 'stream';
-
-import type { IPageHasId } from '@growi/core';
-import { toFile } from 'openai';
-
-import { configManager } from '~/server/service/config-manager';
-
-import { openaiClient } from './client';
-
-type PageToUpload = Omit<IPageHasId, 'revision'> & { revision: { body: string } };
-
-export const fileUpload = async(pages: PageToUpload[]): Promise<void> => {
-  const vectorStoreId = configManager.getConfig('crowi', 'app:openaiVectorStoreId');
-  if (vectorStoreId == null) {
-    return;
-  }
-
-  const filesPromise = pages
-    .filter(pages => pages.revision.body.length > 0)
-    .map(async(page) => {
-      const file = await toFile(Readable.from(page.revision.body), `${page._id}.md`);
-      return file;
-    });
-
-  if (filesPromise.length === 0) {
-    return;
-  }
-
-  const files = await Promise.all(filesPromise);
-
-  await openaiClient.beta.vectorStores.fileBatches.uploadAndPoll(vectorStoreId, { files });
-};

apps/app/src/server/service/openai/index.ts

@@ -1,3 +1,2 @@
 export * from './embeddings';
-export * from './file-upload';
 export * from './client';

apps/app/src/server/service/openai/openai.ts

@@ -1,3 +1,4 @@
+import assert from 'node:assert';
 import { Readable, Transform } from 'stream';
 
 import { PageGrant, isPopulated } from '@growi/core';
@@ -64,6 +65,7 @@ class OpenaiService implements IOpenaiService {
     const workers = pages.map(processUploadFile);
 
     // Wait for all processing to complete.
+    assert(workers.length <= BATCH_SIZE, 'workers.length must be less than or equal to BATCH_SIZE');
     const fileUploadResult = await Promise.allSettled(workers);
     fileUploadResult.forEach((result) => {
       if (result.status === 'rejected') {