From 3ea2d9c0ae73e0b50b8364c2d9a6e6abeb971c97 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Wed, 20 Nov 2024 12:33:42 +0700
Subject: [PATCH 1/2] fix: bump cortex.cpp to latest version - recursively
 scanning models folder should also include remote models

---
 extensions/inference-cortex-extension/bin/version.txt  | 2 +-
 extensions/inference-openrouter-extension/src/index.ts | 2 +-
 extensions/model-extension/src/index.ts                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/inference-cortex-extension/bin/version.txt b/extensions/inference-cortex-extension/bin/version.txt
index 32ee492e0..52da54083 100644
--- a/extensions/inference-cortex-extension/bin/version.txt
+++ b/extensions/inference-cortex-extension/bin/version.txt
@@ -1 +1 @@
-1.0.3-rc4
\ No newline at end of file
+1.0.3-rc5
\ No newline at end of file
diff --git a/extensions/inference-openrouter-extension/src/index.ts b/extensions/inference-openrouter-extension/src/index.ts
index 75d1188a8..1b2cd014d 100644
--- a/extensions/inference-openrouter-extension/src/index.ts
+++ b/extensions/inference-openrouter-extension/src/index.ts
@@ -83,6 +83,6 @@ export default class JanInferenceOpenRouterExtension extends RemoteOAIEngine {
 
   transformPayload = (payload: PayloadType) => ({
     ...payload,
-    model: this.model,
+    model: payload.model !== 'open-router-auto' ? payload.model : this.model,
   })
 }
diff --git a/extensions/model-extension/src/index.ts b/extensions/model-extension/src/index.ts
index 4ebc56d54..c63510c37 100644
--- a/extensions/model-extension/src/index.ts
+++ b/extensions/model-extension/src/index.ts
@@ -145,7 +145,7 @@ export default class JanModelExtension extends ModelExtension {
      */
     if (!toImportModels.length)
       return fetchedModels.concat(
-        legacyModels.filter((e) => e.settings?.vision_model)
+        legacyModels.filter((e) => !fetchedModels.some((x) => x.id === e.id))
       )
 
     console.log('To import models:', toImportModels.length)

From 239e5f52e86488a536979f67c8f1ffec46148664 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Wed, 20 Nov 2024 12:43:10 +0700
Subject: [PATCH 2/2] fix: force vision models to run with legacy settings

---
 extensions/inference-cortex-extension/src/index.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extensions/inference-cortex-extension/src/index.ts b/extensions/inference-cortex-extension/src/index.ts
index 174ce7923..23054942e 100644
--- a/extensions/inference-cortex-extension/src/index.ts
+++ b/extensions/inference-cortex-extension/src/index.ts
@@ -95,7 +95,7 @@ export default class JanInferenceCortexExtension extends LocalOAIEngine {
     model: Model & { file_path?: string }
   ): Promise<void> {
     if (
-      model.engine === InferenceEngine.nitro &&
+      (model.engine === InferenceEngine.nitro || model.settings.vision_model) &&
       model.settings.llama_model_path
     ) {
       // Legacy chat model support
@@ -111,7 +111,10 @@ export default class JanInferenceCortexExtension extends LocalOAIEngine {
       model.settings = settings
     }
 
-    if (model.engine === InferenceEngine.nitro && model.settings.mmproj) {
+    if (
+      (model.engine === InferenceEngine.nitro || model.settings.vision_model) &&
+      model.settings.mmproj
+    ) {
       // Legacy clip vision model support
       model.settings = {
         ...model.settings,