Преглед изворни кода

Implement logic to delete AiAssistant and related VectorStore

Shun Miyazawa пре 1 година
родитељ
комит
b77802823d

+ 14 - 3
apps/app/src/features/openai/server/routes/delete-ai-assistant.ts

@@ -1,9 +1,12 @@
 import { type IUserHasId } from '@growi/core';
 import { type IUserHasId } from '@growi/core';
 import { ErrorV3 } from '@growi/core/dist/models';
 import { ErrorV3 } from '@growi/core/dist/models';
 import type { Request, RequestHandler } from 'express';
 import type { Request, RequestHandler } from 'express';
+import { type ValidationChain, param } from 'express-validator';
+
 
 
 import type Crowi from '~/server/crowi';
 import type Crowi from '~/server/crowi';
 import { accessTokenParser } from '~/server/middlewares/access-token-parser';
 import { accessTokenParser } from '~/server/middlewares/access-token-parser';
+import { apiV3FormValidator } from '~/server/middlewares/apiv3-form-validator';
 import type { ApiV3Response } from '~/server/routes/apiv3/interfaces/apiv3-response';
 import type { ApiV3Response } from '~/server/routes/apiv3/interfaces/apiv3-response';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 
 
@@ -16,7 +19,7 @@ const logger = loggerFactory('growi:routes:apiv3:openai:delete-ai-assistants');
 
 
 type DeleteAiAssistantsFactory = (crowi: Crowi) => RequestHandler[];
 type DeleteAiAssistantsFactory = (crowi: Crowi) => RequestHandler[];
 
 
-type Req = Request<undefined, Response, undefined> & {
+type Req = Request<{id: string}, Response, undefined> & {
   user: IUserHasId,
   user: IUserHasId,
 }
 }
 
 
@@ -24,11 +27,19 @@ export const deleteAiAssistantsFactory: DeleteAiAssistantsFactory = (crowi) => {
 
 
   const loginRequiredStrictly = require('~/server/middlewares/login-required')(crowi);
   const loginRequiredStrictly = require('~/server/middlewares/login-required')(crowi);
 
 
+  const validator: ValidationChain[] = [
+    param('id').isMongoId().withMessage('pluginId is required'),
+  ];
+
   return [
   return [
-    accessTokenParser, loginRequiredStrictly, certifyAiService,
+    accessTokenParser, loginRequiredStrictly, certifyAiService, validator, apiV3FormValidator,
     async(req: Req, res: ApiV3Response) => {
     async(req: Req, res: ApiV3Response) => {
+      const { id } = req.params;
+
       try {
       try {
-        return res.apiv3({ });
+        const openaiService = getOpenaiService();
+        const deletedAiAssistant = await openaiService?.deleteAiAssistant(id);
+        return res.apiv3({ deletedAiAssistant });
       }
       }
       catch (err) {
       catch (err) {
         logger.error(err);
         logger.error(err);

+ 1 - 1
apps/app/src/features/openai/server/routes/index.ts

@@ -40,7 +40,7 @@ export const factory = (crowi: Crowi): express.Router => {
     });
     });
 
 
     import('./delete-ai-assistant').then(({ deleteAiAssistantsFactory }) => {
     import('./delete-ai-assistant').then(({ deleteAiAssistantsFactory }) => {
-      router.delete('/ai-assistant', deleteAiAssistantsFactory(crowi));
+      router.delete('/ai-assistant/:id', deleteAiAssistantsFactory(crowi));
     });
     });
   }
   }
 
 

+ 35 - 16
apps/app/src/features/openai/server/services/openai.ts

@@ -3,7 +3,7 @@ import { Readable, Transform } from 'stream';
 import { pipeline } from 'stream/promises';
 import { pipeline } from 'stream/promises';
 
 
 import {
 import {
-  PageGrant, getIdForRef, isPopulated, type IUserHasId,
+  PageGrant, getIdForRef, getIdStringForRef, isPopulated, type IUserHasId,
 } from '@growi/core';
 } from '@growi/core';
 import { isGrobPatternPath } from '@growi/core/dist/utils/page-path-utils';
 import { isGrobPatternPath } from '@growi/core/dist/utils/page-path-utils';
 import escapeStringRegexp from 'escape-string-regexp';
 import escapeStringRegexp from 'escape-string-regexp';
@@ -69,6 +69,7 @@ export interface IOpenaiService {
   // rebuildVectorStore(page: HydratedDocument<PageDocument>): Promise<void>;
   // rebuildVectorStore(page: HydratedDocument<PageDocument>): Promise<void>;
   createAiAssistant(data: Omit<AiAssistant, 'vectorStore'>): Promise<AiAssistantDocument>;
   createAiAssistant(data: Omit<AiAssistant, 'vectorStore'>): Promise<AiAssistantDocument>;
   getAccessibleAiAssistants(user: IUserHasId): Promise<AccessibleAiAssistants>
   getAccessibleAiAssistants(user: IUserHasId): Promise<AccessibleAiAssistants>
+  deleteAiAssistant(aiAssistantId: string): Promise<AiAssistantDocument>
 }
 }
 class OpenaiService implements IOpenaiService {
 class OpenaiService implements IOpenaiService {
 
 
@@ -205,22 +206,21 @@ class OpenaiService implements IOpenaiService {
     return uploadedFile;
     return uploadedFile;
   }
   }
 
 
-  // TODO: https://redmine.weseek.co.jp/issues/160333
-  // private async deleteVectorStore(vectorStoreScopeType: VectorStoreScopeType): Promise<void> {
-  //   const vectorStoreDocument: VectorStoreDocument | null = await VectorStoreModel.findOne({ scopeType: vectorStoreScopeType, isDeleted: false });
-  //   if (vectorStoreDocument == null) {
-  //     return;
-  //   }
+  private async deleteVectorStore(vectorStoreRelationId: string): Promise<void> {
+    const vectorStoreDocument: VectorStoreDocument | null = await VectorStoreModel.findOne({ _id: vectorStoreRelationId, isDeleted: false });
+    if (vectorStoreDocument == null) {
+      return;
+    }
 
 
-  //   try {
-  //     await this.client.deleteVectorStore(vectorStoreDocument.vectorStoreId);
-  //     await vectorStoreDocument.markAsDeleted();
-  //   }
-  //   catch (err) {
-  //     await oepnaiApiErrorHandler(err, { notFoundError: vectorStoreDocument.markAsDeleted });
-  //     throw new Error(err);
-  //   }
-  // }
+    try {
+      await this.client.deleteVectorStore(vectorStoreDocument.vectorStoreId);
+      await vectorStoreDocument.markAsDeleted();
+    }
+    catch (err) {
+      await oepnaiApiErrorHandler(err, { notFoundError: vectorStoreDocument.markAsDeleted });
+      throw new Error(err);
+    }
+  }
 
 
   async createVectorStoreFile(vectorStoreRelation: VectorStoreDocument, pages: Array<HydratedDocument<PageDocument>>): Promise<void> {
   async createVectorStoreFile(vectorStoreRelation: VectorStoreDocument, pages: Array<HydratedDocument<PageDocument>>): Promise<void> {
     // const vectorStore = await this.getOrCreateVectorStoreForPublicScope();
     // const vectorStore = await this.getOrCreateVectorStoreForPublicScope();
@@ -605,6 +605,25 @@ class OpenaiService implements IOpenaiService {
     };
     };
   }
   }
 
 
+  async deleteAiAssistant(aiAssistantId: string): Promise<AiAssistantDocument> {
+    const aiAssistant = await AiAssistantModel.findOne({ _id: aiAssistantId });
+
+    if (aiAssistant == null) {
+      throw new Error('AiAssistant document is not exists');
+    }
+
+    try {
+      const vectorStoreRelationId = getIdStringForRef(aiAssistant.vectorStore);
+      await this.deleteVectorStore(vectorStoreRelationId);
+    }
+    catch (err) {
+      throw new Error(err);
+    }
+
+    const deletedAiAssistant = await aiAssistant.remove();
+    return deletedAiAssistant;
+  }
+
 }
 }
 
 
 let instance: OpenaiService;
 let instance: OpenaiService;