refactor: cortex cli as client - communicate with API server via cortexjs (#906)

Co-authored-by: marknguyen1302 <nguyenvu1302.work@gmail.com>

Author: louis-jan

cortex-js/package.json

@@ -55,7 +55,7 @@
     "class-validator": "^0.14.1",
     "cli-progress": "^3.12.0",
     "cortex-cpp": "0.4.34",
-    "cortexso-node": "^0.0.4",
+    "@cortexso/cortex.js": "^0.1.1",
     "cpu-instructions": "^0.0.11",
     "decompress": "^4.2.1",
     "js-yaml": "^4.1.0",

cortex-js/src/command.module.ts

@@ -1,10 +1,7 @@
 import { Module } from '@nestjs/common';
-import { ModelsModule } from './usecases/models/models.module';
-import { DatabaseModule } from './infrastructure/database/database.module';
 import { ConfigModule } from '@nestjs/config';
 import { CortexModule } from './usecases/cortex/cortex.module';
 import { ModelsCommand } from './infrastructure/commanders/models.command';
-import { ExtensionModule } from './infrastructure/repositories/extensions/extension.module';
 import { HttpModule } from '@nestjs/axios';
 import { InitRunModeQuestions } from './infrastructure/commanders/questions/init.questions';
 import { ModelListCommand } from './infrastructure/commanders/models/model-list.command';
@@ -15,26 +12,18 @@ import { ModelStartCommand } from './infrastructure/commanders/models/model-star
 import { ModelStopCommand } from './infrastructure/commanders/models/model-stop.command';
 import { ModelGetCommand } from './infrastructure/commanders/models/model-get.command';
 import { ModelRemoveCommand } from './infrastructure/commanders/models/model-remove.command';
-import { RunCommand } from './infrastructure/commanders/shortcuts/run.command';
+import { RunCommand } from './infrastructure/commanders/run.command';
 import { ModelUpdateCommand } from './infrastructure/commanders/models/model-update.command';
-import { AssistantsModule } from './usecases/assistants/assistants.module';
-import { MessagesModule } from './usecases/messages/messages.module';
 import { FileManagerModule } from './infrastructure/services/file-manager/file-manager.module';
 import { PSCommand } from './infrastructure/commanders/ps.command';
 import { PresetCommand } from './infrastructure/commanders/presets.command';
 import { TelemetryModule } from './usecases/telemetry/telemetry.module';
 import { TelemetryCommand } from './infrastructure/commanders/telemetry.command';
 import { EmbeddingCommand } from './infrastructure/commanders/embeddings.command';
 import { BenchmarkCommand } from './infrastructure/commanders/benchmark.command';
-import { EventEmitterModule } from '@nestjs/event-emitter';
-import { DownloadManagerModule } from './infrastructure/services/download-manager/download-manager.module';
-import { ServeStopCommand } from './infrastructure/commanders/sub-commands/serve-stop.command';
+import { ServeStopCommand } from './infrastructure/commanders/serve-stop.command';
 import { ContextModule } from './infrastructure/services/context/context.module';
-import { CliUsecasesModule } from './infrastructure/commanders/usecases/cli.usecases.module';
-import { ExtensionsModule } from './extensions/extensions.module';
 import { EnginesCommand } from './infrastructure/commanders/engines.command';
-import { ConfigsModule } from './usecases/configs/configs.module';
-import { EnginesModule } from './usecases/engines/engines.module';
 import { EnginesListCommand } from './infrastructure/commanders/engines/engines-list.command';
 import { EnginesGetCommand } from './infrastructure/commanders/engines/engines-get.command';
 import { EnginesInitCommand } from './infrastructure/commanders/engines/engines-init.command';
@@ -47,22 +36,11 @@ import { EnginesSetCommand } from './infrastructure/commanders/engines/engines-s
       envFilePath:
         process.env.NODE_ENV !== 'production' ? '.env.development' : '.env',
     }),
-    EventEmitterModule.forRoot(),
-    DatabaseModule,
-    ModelsModule,
     CortexModule,
-    ExtensionModule,
     HttpModule,
-    CliUsecasesModule,
-    AssistantsModule,
-    MessagesModule,
     FileManagerModule,
     TelemetryModule,
     ContextModule,
-    DownloadManagerModule,
-    ExtensionsModule,
-    ConfigsModule,
-    EnginesModule,
   ],
   providers: [
     CortexCommand,

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

@@ -1,10 +1,12 @@
-import { Assistant as OpenAiAssistant } from 'cortexso-node/resources/beta/assistants';
-import { AssistantResponseFormatOption as OpenAIAssistantResponseFormatOption } from 'cortexso-node/resources/beta/threads/threads';
+import { Cortex } from '@cortexso/cortex.js';
+// TODO: Why we need to alias these?
 
-export interface Assistant extends OpenAiAssistant {
+export interface Assistant extends Cortex.Beta.Assistant {
   avatar?: string;
 }
 
-export type AssistantResponseFormatOption = OpenAIAssistantResponseFormatOption;
+export type AssistantResponseFormatOption =
+  Cortex.Beta.Threads.AssistantResponseFormatOption;
 
-export interface AssistantToolResources extends OpenAiAssistant.ToolResources {}
+export interface AssistantToolResources
+  extends Cortex.Beta.Assistant.ToolResources {}

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

@@ -24,6 +24,11 @@ export class DownloadState {
    */
   error?: string;
 
+  /**
+   * The progress of the download. It is a number between 0 and 100.
+   */
+  progress: number;
+
   /**
    * The actual downloads. [DownloadState] is just a group to supporting for download multiple files.
    */
@@ -53,6 +58,8 @@ export class DownloadItem {
     transferred: number;
   };
 
+  progress: number;
+
   checksum?: string;
 
   status: DownloadStatus;
@@ -69,5 +76,5 @@ export interface DownloadStateEvent {
 export enum DownloadType {
   Model = 'model',
   Miscelanous = 'miscelanous',
-  Engine = 'engine'
+  Engine = 'engine',
 }

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

@@ -1,16 +1,13 @@
-import {
-  Message as OpenAiMessage,
-  MessageContent as OpenAiMessageContent,
-  TextContentBlock as OpenAiTextContentBlock,
-} from 'cortexso-node/resources/beta/threads/messages';
+import { Cortex } from '@cortexso/cortex.js';
 
-export interface Message extends OpenAiMessage {}
+export interface Message extends Cortex.Beta.Threads.Message {}
 
-export type MessageContent = OpenAiMessageContent;
+export type MessageContent = Cortex.Beta.Threads.MessageContent;
 
-export type TextContentBlock = OpenAiTextContentBlock;
+export type TextContentBlock = Cortex.Beta.Threads.TextContentBlock;
 
 export interface MessageIncompleteDetails
-  extends OpenAiMessage.IncompleteDetails {}
+  extends Cortex.Beta.Threads.Message.IncompleteDetails {}
 
-export interface MessageAttachment extends OpenAiMessage.Attachment {}
+export interface MessageAttachment
+  extends Cortex.Beta.Threads.Message.Attachment {}

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

@@ -1,7 +1,7 @@
-import { Model as OpenAiModel } from 'cortexso-node/resources/models';
+import { Cortex } from '@cortexso/cortex.js';
 
 export interface Model
-  extends OpenAiModel,
+  extends Cortex.Model,
     ModelSettingParams,
     ModelRuntimeParams {
   /**

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

@@ -1,9 +1,10 @@
-import { Thread as OpenAiThread } from 'cortexso-node/resources/beta/threads/threads';
 import { Assistant } from './assistant.interface';
+import { Cortex } from '@cortexso/cortex.js';
 
-export interface ThreadToolResources extends OpenAiThread.ToolResources {}
+export interface ThreadToolResources
+  extends Cortex.Beta.Threads.Thread.ToolResources {}
 
-export interface Thread extends OpenAiThread {
+export interface Thread extends Cortex.Beta.Threads.Thread {
   title: string;
 
   assistants: Assistant[];

cortex-js/src/domain/repositories/telemetry.interface.ts

@@ -44,7 +44,7 @@ export abstract class TelemetryRepository {
     hardware: BenchmarkHardware;
     results: any;
     metrics: any;
-    model: ModelStat;
+    model: any;
     sessionId: string;
   }): Promise<void>;
 }

cortex-js/src/infrastructure/commanders/base.command.ts

@@ -1,12 +1,32 @@
 import { CommandRunner } from 'nest-commander';
 import { Injectable } from '@nestjs/common';
 import { CortexUsecases } from '@/usecases/cortex/cortex.usecases';
+import Cortex from '@cortexso/cortex.js';
 import ora from 'ora';
+import { FileManagerService } from '../services/file-manager/file-manager.service';
+import { cortexNamespace, cortexServerAPI } from '../constants/cortex';
 
 @Injectable()
 export abstract class BaseCommand extends CommandRunner {
+  // Cortex client instance to communicate with cortex API server
+  cortex: Cortex;
+  serverConfigs: { host: string; port: number };
+
   constructor(readonly cortexUseCases: CortexUsecases) {
     super();
+    // No need to inject services, since there is no nested dependencies
+    const fileManagerService: FileManagerService = new FileManagerService();
+    this.serverConfigs = fileManagerService.getServerConfig();
+
+    // Instantiate cortex client, it will be use throughout the command
+    this.cortex = new Cortex({
+      apiKey: cortexNamespace,
+      baseURL: cortexServerAPI(
+        this.serverConfigs.host,
+        this.serverConfigs.port,
+      ),
+      timeout: 20 * 1000,
+    });
   }
   protected abstract runCommand(
     passedParam: string[],