chore: drop model entity

janhq · Jun 10, 2024 · 044f0c1 · 044f0c1
1 parent 09b920e
commit 044f0c1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 84 deletions.
diff --git a/cortex-js/src/infrastructure/controllers/models.controller.ts b/cortex-js/src/infrastructure/controllers/models.controller.ts
@@ -12,7 +12,7 @@ import {
 import { ModelsUsecases } from '@/usecases/models/models.usecases';
 import { CreateModelDto } from '@/infrastructure/dtos/models/create-model.dto';
 import { UpdateModelDto } from '@/infrastructure/dtos/models/update-model.dto';
-import { ModelDto } from '@/infrastructure/dtos/models/model-successfully-created.dto';
+import { ModelDto } from '@/infrastructure/dtos/models/model.dto';
 import { ListModelsResponseDto } from '@/infrastructure/dtos/models/list-model-response.dto';
 import { DeleteModelResponseDto } from '@/infrastructure/dtos/models/delete-model.dto';
 import { DownloadModelResponseDto } from '@/infrastructure/dtos/models/download-model.dto';
@@ -120,7 +120,9 @@ export class ModelsController {
   })
   @Get()
   findAll() {
-    return this.modelsUsecases.findAll();
+    return this.modelsUsecases
+      .findAll()
+      .then((data) => data.map((e) => ({ id: e.model, ...e })));
   }
 
   @HttpCode(200)

diff --git a/cortex-js/src/infrastructure/database/database.module.ts b/cortex-js/src/infrastructure/database/database.module.ts
@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common';
 import { threadProviders } from './providers/thread.providers';
 import { sqliteDatabaseProviders } from './sqlite-database.providers';
-import { modelProviders } from './providers/model.providers';
 import { assistantProviders } from './providers/assistant.providers';
 import { messageProviders } from './providers/message.providers';
 import { FileManagerModule } from '@/file-manager/file-manager.module';
@@ -11,15 +10,9 @@ import { FileManagerModule } from '@/file-manager/file-manager.module';
   providers: [
     ...sqliteDatabaseProviders,
     ...threadProviders,
-    ...modelProviders,
-    ...assistantProviders,
-    ...messageProviders,
-  ],
-  exports: [
-    ...threadProviders,
-    ...modelProviders,
     ...assistantProviders,
     ...messageProviders,
   ],
+  exports: [...threadProviders, ...assistantProviders, ...messageProviders],
 })
 export class DatabaseModule {}
diff --git a/cortex-js/src/infrastructure/database/providers/model.providers.ts b/cortex-js/src/infrastructure/database/providers/model.providers.ts
diff --git a/cortex-js/src/infrastructure/dtos/models/list-model-response.dto.ts b/cortex-js/src/infrastructure/dtos/models/list-model-response.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { ModelDto } from './model-successfully-created.dto'; // Import the ModelDto class
+import { ModelDto } from './model.dto'; // Import the ModelDto class
 
 export class ListModelsResponseDto {
   @ApiProperty({ example: 'list', enum: ['list'] })

diff --git a/.../models/model-successfully-created.dto.ts → ...c/infrastructure/dtos/models/model.dto.ts b/.../models/model-successfully-created.dto.ts → ...c/infrastructure/dtos/models/model.dto.ts
@@ -3,6 +3,14 @@ import { ApiProperty } from '@nestjs/swagger';
 import { IsArray, IsBoolean, IsNumber, IsOptional } from 'class-validator';
 
 export class ModelDto implements Partial<Model> {
+  @ApiProperty({
+    example: 'llama3',
+    description:
+      'The model identifier, which can be referenced in the API endpoints.',
+  })
+  @IsOptional()
+  id: string;
+
   // Prompt Settings
   @ApiProperty({
     example: 'system\n{system_message}\nuser\n{prompt}\nassistant',

diff --git a/cortex-js/src/infrastructure/entities/model.entity.ts b/cortex-js/src/infrastructure/entities/model.entity.ts
diff --git a/cortex-js/src/usecases/models/models.usecases.ts b/cortex-js/src/usecases/models/models.usecases.ts
@@ -20,7 +20,6 @@ import { firstValueFrom } from 'rxjs';
 import { FileManagerService } from '@/file-manager/file-manager.service';
 import { AxiosError } from 'axios';
 import { ModelRepository } from '@/domain/repositories/model.interface';
-import { ModelDto } from '@/infrastructure/dtos/models/model-successfully-created.dto';
 import { ModelParameterParser } from '@/infrastructure/commanders/utils/model-parameter.parser';
 
 @Injectable()
@@ -81,7 +80,7 @@ export class ModelsUsecases {
 
   async startModel(
     modelId: string,
-    settings?: ModelDto,
+    settings?: ModelSettingParams,
   ): Promise<StartModelSuccessDto> {
     const model = await this.getModelOrThrow(modelId);
     const extensions = (await this.extensionRepository.findAll()) ?? [];