Merge pull request #4052 from janhq/fix/customized-remote-model-json-should-be-available

fix: bump cortex.cpp to latest version - recursively scanning models folder should also include remote models
This commit is contained in:
Louis 2024-11-20 13:06:04 +07:00 committed by GitHub
commit a4d689e7c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 5 deletions

View File

@ -1 +1 @@
1.0.3-rc4
1.0.3-rc5

View File

@ -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,

View File

@ -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,
})
}

View File

@ -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)