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

threadId -> threadRelationId

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

+ 2 - 2
apps/app/src/features/openai/client/services/thread.ts

@@ -1,5 +1,5 @@
 import { apiv3Delete } from '~/client/util/apiv3-client';
 
-export const deleteThread = async(aiAssistantId: string, threadId: string): Promise<void> => {
-  await apiv3Delete(`/openai/thread/${aiAssistantId}/${threadId}`);
+export const deleteThread = async(aiAssistantId: string, threadRelationId: string): Promise<void> => {
+  await apiv3Delete(`/openai/thread/${aiAssistantId}/${threadRelationId}`);
 };

+ 4 - 4
apps/app/src/features/openai/server/routes/delete-thread.ts

@@ -22,7 +22,7 @@ type DeleteThreadFactory = (crowi: Crowi) => RequestHandler[];
 
 type ReqParams = {
   aiAssistantId: string,
-  threadId: string,
+  threadRelationId: string,
 }
 
 type Req = Request<ReqParams, Response, undefined> & {
@@ -34,13 +34,13 @@ export const deleteThreadFactory: DeleteThreadFactory = (crowi) => {
 
   const validator: ValidationChain[] = [
     param('aiAssistantId').isMongoId().withMessage('threadId is required'),
-    param('threadId').isMongoId().withMessage('threadId is required'),
+    param('threadRelationId').isMongoId().withMessage('threadRelationId is required'),
   ];
 
   return [
     accessTokenParser, loginRequiredStrictly, certifyAiService, validator, apiV3FormValidator,
     async(req: Req, res: ApiV3Response) => {
-      const { aiAssistantId, threadId } = req.params;
+      const { aiAssistantId, threadRelationId } = req.params;
       const { user } = req;
 
       const openaiService = getOpenaiService();
@@ -54,7 +54,7 @@ export const deleteThreadFactory: DeleteThreadFactory = (crowi) => {
       }
 
       try {
-        const deletedThreadRelation = await openaiService.deleteThread(threadId);
+        const deletedThreadRelation = await openaiService.deleteThread(threadRelationId);
         return res.apiv3({ deletedThreadRelation });
       }
       catch (err) {

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

@@ -67,7 +67,7 @@ export interface IOpenaiService {
   ): Promise<ThreadRelationDocument>;
   getThreads(vectorStoreRelationId: string): Promise<ThreadRelationDocument[]>
   // getOrCreateVectorStoreForPublicScope(): Promise<VectorStoreDocument>;
-  deleteThread(threadId: string): Promise<ThreadRelationDocument>;
+  deleteThread(threadRelationId: string): Promise<ThreadRelationDocument>;
   deleteExpiredThreads(limit: number, apiCallInterval: number): Promise<void>; // for CronJob
   deleteObsolatedVectorStoreRelations(): Promise<void> // for CronJob
   getMessageData(
@@ -177,8 +177,8 @@ class OpenaiService implements IOpenaiService {
     return threadRelations;
   }
 
-  async deleteThread(threadId: string): Promise<ThreadRelationDocument> {
-    const threadRelation = await ThreadRelationModel.findById(threadId);
+  async deleteThread(threadRelationId: string): Promise<ThreadRelationDocument> {
+    const threadRelation = await ThreadRelationModel.findById(threadRelationId);
     if (threadRelation == null) {
       throw createError(404, 'ThreadRelation document does not exist');
     }