fix: model path backward compatible (janhq#2018)

luoweihoo · Feb 14, 2024 · f0fd2c5 · f0fd2c5
1 parent f2e3187
commit f0fd2c5
Show file tree

Hide file tree

Showing 12 changed files with 185 additions and 209 deletions.
diff --git a/core/.prettierignore → .prettierignore b/core/.prettierignore → .prettierignore
diff --git a/core/.prettierrc → .prettierrc b/core/.prettierrc → .prettierrc
diff --git a/core/src/node/api/processors/download.ts b/core/src/node/api/processors/download.ts
@@ -58,6 +58,7 @@ export class Downloader implements Processor {
         const currentDownloadState = DownloadManager.instance.downloadProgressMap[modelId]
         const downloadState: DownloadState = {
           ...currentDownloadState,
+          error: error.message,
           downloadState: 'error',
         }
         if (currentDownloadState) {

diff --git a/electron/.prettierrc b/electron/.prettierrc
diff --git a/extensions/conversational-extension/.prettierrc b/extensions/conversational-extension/.prettierrc
diff --git a/extensions/inference-nitro-extension/src/index.ts b/extensions/inference-nitro-extension/src/index.ts
@@ -26,6 +26,7 @@ import {
   ModelEvent,
   InferenceEvent,
   ModelSettingParams,
+  getJanDataFolderPath,
 } from "@janhq/core";
 import { requestInference } from "./helpers/sse";
 import { ulid } from "ulid";
@@ -146,11 +147,14 @@ export default class JanInferenceNitroExtension extends InferenceExtension {
   private async onModelInit(model: Model) {
     if (model.engine !== InferenceEngine.nitro) return;
 
-    const modelFullPath = await joinPath(["models", model.id]);
-
+    const modelFolder = await joinPath([
+      await getJanDataFolderPath(),
+      "models",
+      model.id,
+    ]);
     this._currentModel = model;
     const nitroInitResult = await executeOnMain(NODE, "runModel", {
-      modelFullPath,
+      modelFolder,
       model,
     });