From 01e4736cf2268207dd093a0266224d2b60cd76f6 Mon Sep 17 00:00:00 2001 From: Louis Date: Fri, 26 Jul 2024 10:51:32 +0700 Subject: [PATCH] chore: unsupported platform engine status --- .../src/domain/abstracts/engine.abstract.ts | 1 + .../extensions/extension.repository.ts | 38 +++++++++++-------- .../file-manager/file-manager.service.ts | 6 +-- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/cortex-js/src/domain/abstracts/engine.abstract.ts b/cortex-js/src/domain/abstracts/engine.abstract.ts index b82610a99..fbd457e0d 100644 --- a/cortex-js/src/domain/abstracts/engine.abstract.ts +++ b/cortex-js/src/domain/abstracts/engine.abstract.ts @@ -7,6 +7,7 @@ export enum EngineStatus { READY = 'READY', MISSING_CONFIGURATION = 'MISSING_CONFIGURATION', NOT_INITIALIZED = 'NOT_INITIALIZED', + NOT_SUPPORTED = 'NOT_SUPPORTED', ERROR = 'ERROR', } diff --git a/cortex-js/src/infrastructure/repositories/extensions/extension.repository.ts b/cortex-js/src/infrastructure/repositories/extensions/extension.repository.ts index 7a5aa4a26..c71d344d5 100644 --- a/cortex-js/src/infrastructure/repositories/extensions/extension.repository.ts +++ b/cortex-js/src/infrastructure/repositories/extensions/extension.repository.ts @@ -64,27 +64,33 @@ export class ExtensionRepositoryImpl implements ExtensionRepository { this.httpService, this.fileManagerService, ); - onnxEngine.status = existsSync( - join( - await this.fileManagerService.getCortexCppEnginePath(), - Engines.onnx, - ), - ) - ? EngineStatus.READY - : EngineStatus.NOT_INITIALIZED; + onnxEngine.status = + existsSync( + join( + await this.fileManagerService.getCortexCppEnginePath(), + Engines.onnx, + ), + ) && process.platform === 'win32' + ? EngineStatus.READY + : process.platform !== 'win32' + ? EngineStatus.NOT_SUPPORTED + : EngineStatus.NOT_INITIALIZED; const tensorrtLLMEngine = new TensorrtLLMProvider( this.httpService, this.fileManagerService, ); - tensorrtLLMEngine.status = existsSync( - join( - await this.fileManagerService.getCortexCppEnginePath(), - Engines.tensorrtLLM, - ), - ) - ? EngineStatus.READY - : EngineStatus.NOT_INITIALIZED; + tensorrtLLMEngine.status = + existsSync( + join( + await this.fileManagerService.getCortexCppEnginePath(), + Engines.tensorrtLLM, + ), + ) && process.platform !== 'darwin' + ? EngineStatus.READY + : process.platform === 'darwin' + ? EngineStatus.NOT_SUPPORTED + : EngineStatus.NOT_INITIALIZED; await llamaCPPEngine.onLoad(); await onnxEngine.onLoad(); diff --git a/cortex-js/src/infrastructure/services/file-manager/file-manager.service.ts b/cortex-js/src/infrastructure/services/file-manager/file-manager.service.ts index 856a80d30..da7a76900 100644 --- a/cortex-js/src/infrastructure/services/file-manager/file-manager.service.ts +++ b/cortex-js/src/infrastructure/services/file-manager/file-manager.service.ts @@ -335,11 +335,11 @@ export class FileManagerService { try { const content = readFileSync(configPath, 'utf8'); - config = yaml.load(content) as Config; + config = (yaml.load(content) as Config) ?? this.defaultConfig(); } catch {} return { - host: config.apiServerHost ?? 'localhost', - port: config.apiServerPort ?? 1337, + host: this.defaultConfig().apiServerHost ?? 'localhost', + port: this.defaultConfig().apiServerPort ?? 1337, }; } }