update

Author: namchuai

cortex-js/src/domain/models/model.interface.ts

@@ -1,25 +1,5 @@
 import { Model as OpenAiModel } from 'openai/resources/models';
 
-export const LocalEngines = [
-  'cortex.llamacpp',
-  'cortex.onnx',
-  'cortex.tensorrt',
-] as const;
-
-export const RemoteEngines = [
-  'anthropic',
-  'mistral',
-  'martian',
-  'openrouter',
-  'openai',
-  'groq',
-  'triton_trtllm',
-  'cohere',
-] as const;
-
-export const LlmEngines = [...LocalEngines, ...RemoteEngines] as const;
-export type LlmEngine = (typeof LlmEngines)[number];
-
 export interface Model
   extends OpenAiModel,
     ModelSettingParams,
@@ -86,7 +66,7 @@ export interface ModelSettingParams {
   /**
    * The model engine.
    */
-  engine?: LlmEngine;
+  engine?: string;
 
   /**
    * The prompt to use for internal configuration

cortex-js/src/infrastructure/commanders/types/model-stat.interface.ts

@@ -1,8 +1,6 @@
-import { LlmEngine } from '@/domain/models/model.interface';
-
 export interface ModelStat {
   modelId: string;
-  engine?: LlmEngine;
+  engine?: string;
   duration?: string;
   status: string;
   vram?: string;

cortex-js/src/infrastructure/dtos/models/create-model.dto.ts

@@ -6,7 +6,7 @@ import {
   IsString,
   Min,
 } from 'class-validator';
-import { LlmEngine, Model } from '@/domain/models/model.interface';
+import { Model } from '@/domain/models/model.interface';
 import { ModelArtifactDto } from './model-artifact.dto';
 import { ApiProperty, getSchemaPath } from '@nestjs/swagger';
 
@@ -135,7 +135,7 @@ export class CreateModelDto implements Partial<Model> {
   })
   @IsOptional()
   @IsString()
-  engine?: LlmEngine;
+  engine?: string;
 
   @ApiProperty({
     description: 'The owner of the model.',

cortex-js/src/infrastructure/dtos/models/model-settings.dto.ts

@@ -1,4 +1,4 @@
-import { LlmEngine, ModelSettingParams } from '@/domain/models/model.interface';
+import { ModelSettingParams } from '@/domain/models/model.interface';
 import { ApiProperty } from '@nestjs/swagger';
 import {
   IsArray,
@@ -138,5 +138,5 @@ export class ModelSettingsDto implements ModelSettingParams {
     description: 'The engine to use.',
   })
   @IsOptional()
-  engine?: LlmEngine;
+  engine?: string;
 }

cortex-js/src/infrastructure/dtos/models/model.dto.ts

@@ -1,4 +1,4 @@
-import { LlmEngine, Model } from '@/domain/models/model.interface';
+import { Model } from '@/domain/models/model.interface';
 import { ApiProperty } from '@nestjs/swagger';
 import {
   IsArray,
@@ -198,5 +198,5 @@ export class ModelDto implements Partial<Model> {
     example: 'cortex.llamacpp',
   })
   @IsOptional()
-  engine?: LlmEngine;
+  engine?: string;
 }

cortex-js/src/usecases/models/models.usecases.ts

@@ -38,7 +38,7 @@ import {
 import { DownloadType } from '@/domain/models/download.interface';
 import { DownloadManagerService } from '@/download-manager/download-manager.service';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { ModelId, ModelStatus } from '@/domain/models/model.event';
+import { ModelEvent, ModelId, ModelStatus } from '@/domain/models/model.event';
 
 @Injectable()
 export class ModelsUsecases {
@@ -170,10 +170,12 @@ export class ModelsUsecases {
       status: 'starting',
       metadata: {},
     };
-    this.eventEmitter.emit('model.event', {
-      id: modelId,
-      action: 'starting',
-    });
+    const modelEvent: ModelEvent = {
+      model: modelId,
+      event: 'starting',
+      metadata: {},
+    };
+    this.eventEmitter.emit('model.event', modelEvent);
 
     const parser = new ModelParameterParser();
     const loadModelSettings: ModelSettingParams = {
@@ -200,11 +202,12 @@ export class ModelsUsecases {
           status: 'started',
           metadata: {},
         };
-
-        this.eventEmitter.emit('model.event', {
-          id: modelId,
-          action: 'started',
-        });
+        const modelEvent: ModelEvent = {
+          model: modelId,
+          event: 'started',
+          metadata: {},
+        };
+        this.eventEmitter.emit('model.event', modelEvent);
       })
       .then(() => ({
         message: 'Model loaded successfully',
@@ -213,11 +216,12 @@ export class ModelsUsecases {
       .catch(async (e) => {
         // remove the model from this.activeModelStatus.
         delete this.activeModelStatuses[modelId];
-
-        this.eventEmitter.emit('model.event', {
-          id: modelId,
-          action: 'starting-failed',
-        });
+        const modelEvent: ModelEvent = {
+          model: modelId,
+          event: 'starting-failed',
+          metadata: {},
+        };
+        this.eventEmitter.emit('model.event', modelEvent);
         console.error('Starting model failed', e.code, e.message, e.stack);
         if (e.code === AxiosError.ERR_BAD_REQUEST) {
           return {
@@ -255,30 +259,35 @@ export class ModelsUsecases {
       status: 'stopping',
       metadata: {},
     };
-    this.eventEmitter.emit('model.event', {
-      id: modelId,
-      action: 'stopping',
-    });
+    const modelEvent: ModelEvent = {
+      model: modelId,
+      event: 'stopping',
+      metadata: {},
+    };
+    this.eventEmitter.emit('model.event', modelEvent);
 
     return engine
       .unloadModel(modelId)
       .then(() => {
         delete this.activeModelStatuses[modelId];
-
-        this.eventEmitter.emit('model.event', {
-          id: modelId,
-          action: 'stopped',
-        });
+        const modelEvent: ModelEvent = {
+          model: modelId,
+          event: 'stopped',
+          metadata: {},
+        };
+        this.eventEmitter.emit('model.event', modelEvent);
       })
       .then(() => ({
         message: 'Model is stopped',
         modelId,
       }))
       .catch(async (e) => {
-        this.eventEmitter.emit('model.event', {
-          id: modelId,
-          action: 'stopping-failed',
-        });
+        const modelEvent: ModelEvent = {
+          model: modelId,
+          event: 'stopping-failed',
+          metadata: {},
+        };
+        this.eventEmitter.emit('model.event', modelEvent);
         await this.telemetryUseCases.createCrashReport(
           e,
           TelemetrySource.CORTEX_CPP,