feat(frontend): apply nlp language updates

Hexastack · Sep 23, 2024 · fa055fa · fa055fa
1 parent c304992
commit fa055fa
Show file tree

Hide file tree

Showing 12 changed files with 221 additions and 98 deletions.
diff --git a/api/src/chat/repositories/message.repository.ts b/api/src/chat/repositories/message.repository.ts
@@ -82,6 +82,7 @@ export class MessageRepository extends BaseRepository<
           text: _doc.message.text,
           type: NlpSampleState.inbox,
           trained: false,
+          // @TODO : We need to define the language in the message entity
           language: defaultLang.id,
         };
         try {

diff --git a/api/src/i18n/services/language.service.ts b/api/src/i18n/services/language.service.ts
@@ -56,4 +56,14 @@ export class LanguageService extends BaseService<Language> {
   async getDefaultLanguage() {
     return await this.findOne({ default: true });
   }
+
+  /**
+   * Retrieves the language by code.
+   *
+   * @returns A promise that resolves to the `Language` object.
+   */
+  @Cacheable(DEFAULT_LANGUAGE_CACHE_KEY)
+  async getLanguageByCode(code: string) {
+    return await this.findOne({ code });
+  }
 }
diff --git a/api/src/nlp/controllers/nlp-sample.controller.spec.ts b/api/src/nlp/controllers/nlp-sample.controller.spec.ts
@@ -199,7 +199,7 @@ describe('NlpSampleController', () => {
         trained: true,
         type: NlpSampleState.test,
         entities: [],
-        language: enLang.id,
+        language: 'en',
       };
       const result = await nlpSampleController.create(nlSample);
       expect(result).toEqualPayload({
@@ -279,7 +279,7 @@ describe('NlpSampleController', () => {
             value: 'update',
           },
         ],
-        language: frLang.id,
+        language: 'fr',
       });
       const updatedSample = {
         text: 'updated',
@@ -302,15 +302,12 @@ describe('NlpSampleController', () => {
     });
 
     it('should throw exception when nlp sample id not found', async () => {
-      const frLang = await languageService.findOne({
-        code: 'fr',
-      });
       await expect(
         nlpSampleController.updateOne(byeJhonSampleId, {
           text: 'updated',
           trained: true,
           type: NlpSampleState.test,
-          language: frLang.id,
+          language: 'fr',
         }),
       ).rejects.toThrow(NotFoundException);
     });

diff --git a/api/src/nlp/controllers/nlp-sample.controller.ts b/api/src/nlp/controllers/nlp-sample.controller.ts
@@ -122,21 +122,24 @@ export class NlpSampleController extends BaseController<
   @CsrfCheck(true)
   @Post()
   async create(
-    @Body() { entities: nlpEntities, ...createNlpSampleDto }: NlpSampleDto,
+    @Body()
+    {
+      entities: nlpEntities,
+      language: languageCode,
+      ...createNlpSampleDto
+    }: NlpSampleDto,
   ): Promise<NlpSampleFull> {
-    const nlpSample = await this.nlpSampleService.create(
-      createNlpSampleDto as NlpSampleCreateDto,
-    );
+    const language = await this.languageService.getLanguageByCode(languageCode);
+    const nlpSample = await this.nlpSampleService.create({
+      ...createNlpSampleDto,
+      language: language.id,
+    });
 
     const entities = await this.nlpSampleEntityService.storeSampleEntities(
       nlpSample,
       nlpEntities,
     );
 
-    const language = await this.languageService.findOne(
-      createNlpSampleDto.language,
-    );
-
     return {
       ...nlpSample,
       entities,
@@ -250,7 +253,11 @@ export class NlpSampleController extends BaseController<
   async findPage(
     @Query(PageQueryPipe) pageQuery: PageQueryDto<NlpSample>,
     @Query(PopulatePipe) populate: string[],
-    @Query(new SearchFilterPipe<NlpSample>({ allowedFields: ['text', 'type'] }))
+    @Query(
+      new SearchFilterPipe<NlpSample>({
+        allowedFields: ['text', 'type', 'language'],
+      }),
+    )
     filters: TFilterQuery<NlpSample>,
   ) {
     return this.canPopulate(populate)
@@ -270,11 +277,12 @@ export class NlpSampleController extends BaseController<
   @Patch(':id')
   async updateOne(
     @Param('id') id: string,
-    @Body() updateNlpSampleDto: NlpSampleDto,
+    @Body() { entities, language: languageCode, ...sampleAttrs }: NlpSampleDto,
   ): Promise<NlpSampleFull> {
-    const { entities, ...sampleAttrs } = updateNlpSampleDto;
+    const language = await this.languageService.getLanguageByCode(languageCode);
     const sample = await this.nlpSampleService.updateOne(id, {
       ...sampleAttrs,
+      language: language.id,
       trained: false,
     });
 
@@ -288,8 +296,6 @@ export class NlpSampleController extends BaseController<
     const updatedSampleEntities =
       await this.nlpSampleEntityService.storeSampleEntities(sample, entities);
 
-    const language = await this.languageService.findOne(sampleAttrs.language);
-
     return {
       ...sample,
       language,

diff --git a/api/src/nlp/dto/nlp-sample.dto.ts b/api/src/nlp/dto/nlp-sample.dto.ts
@@ -43,7 +43,7 @@ export class NlpSampleCreateDto {
   @IsOptional()
   type?: NlpSampleState;
 
-  @ApiProperty({ description: 'NLP sample language', type: String })
+  @ApiProperty({ description: 'NLP sample language id', type: String })
   @IsString()
   @IsNotEmpty()
   @IsObjectId({ message: 'Language must be a valid ObjectId' })
@@ -56,6 +56,11 @@ export class NlpSampleDto extends NlpSampleCreateDto {
   })
   @IsOptional()
   entities?: NlpSampleEntityValue[];
+
+  @ApiProperty({ description: 'NLP sample language code', type: String })
+  @IsString()
+  @IsNotEmpty()
+  language: string;
 }
 
 export class NlpSampleUpdateDto extends PartialType(NlpSampleCreateDto) {}
diff --git a/frontend/src/components/nlp/NlpSampleDialog.tsx b/frontend/src/components/nlp/NlpSampleDialog.tsx
@@ -17,14 +17,14 @@ import { DialogControlProps } from "@/hooks/useDialog";
 import { useToast } from "@/hooks/useToast";
 import { EntityType } from "@/services/types";
 import {
+  INlpDatasetSample,
   INlpDatasetSampleAttributes,
   INlpSampleFormAttributes,
-  INlpSampleFull,
 } from "@/types/nlp-sample.types";
 
 import NlpDatasetSample from "./components/NlpTrainForm";
 
-export type NlpSampleDialogProps = DialogControlProps<INlpSampleFull>;
+export type NlpSampleDialogProps = DialogControlProps<INlpDatasetSample>;
 export const NlpSampleDialog: FC<NlpSampleDialogProps> = ({
   open,
   data: sample,
@@ -44,15 +44,16 @@ export const NlpSampleDialog: FC<NlpSampleDialogProps> = ({
       toast.success(t("message.success_save"));
     },
   });
-  const onSubmitForm = (params: INlpSampleFormAttributes) => {
+  const onSubmitForm = (form: INlpSampleFormAttributes) => {
     if (sample?.id) {
       updateSample(
         {
           id: sample.id,
           params: {
-            text: params.text,
-            type: params.type,
-            entities: [...params.keywordEntities, ...params.traitEntities],
+            text: form.text,
+            type: form.type,
+            entities: [...form.keywordEntities, ...form.traitEntities],
+            language: form.language,
           },
         },
         {