Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: switch between models get stuck at generating (#2698)

Browse Source
This commit is contained in:
Louis 2024-04-12 12:34:22 +07:00 committed by GitHub
parent d5946e68cd
commit fa9d8ab9a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/browser/extensions/engines/LocalOAIEngine.ts
View File

@ -53,11 +53,11 @@ export abstract class LocalOAIEngine extends OAIEngine {
/** /**
* Stops the model. * Stops the model.
*/ */
override async unloadModel(model?: Model): Promise<void> { override async unloadModel(model?: Model) {
if (model?.engine && model.engine?.toString() !== this.provider) return Promise.resolve() if (model?.engine && model.engine?.toString() !== this.provider) return Promise.resolve()
this.loadedModel = undefined this.loadedModel = undefined
return executeOnMain(this.nodeModule, this.unloadModelFunctionName).then(() => { await executeOnMain(this.nodeModule, this.unloadModelFunctionName).then(() => {
events.emit(ModelEvent.OnModelStopped, {}) events.emit(ModelEvent.OnModelStopped, {})
}) })
} }

2
extensions/inference-nitro-extension/src/index.ts
View File

@ -102,7 +102,7 @@ export default class JanInferenceNitroExtension extends LocalOAIEngine {
return super.loadModel(model) return super.loadModel(model)
} }
override async unloadModel(model?: Model) { override async unloadModel(model?: Model): Promise<void> {
if (model?.engine && model.engine !== this.provider) return if (model?.engine && model.engine !== this.provider) return
// stop the periocally health check // stop the periocally health check

6
extensions/inference-nitro-extension/src/node/index.ts
View File

@ -323,14 +323,14 @@ async function killSubprocess(): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
terminate(pid, function (err) { terminate(pid, function (err) {
if (err) { if (err) {
return killRequest() killRequest().then(resolve).catch(reject)
} else { } else {
return tcpPortUsed tcpPortUsed
.waitUntilFree(PORT, NITRO_PORT_FREE_CHECK_INTERVAL, 5000) .waitUntilFree(PORT, NITRO_PORT_FREE_CHECK_INTERVAL, 5000)
.then(() => resolve()) .then(() => resolve())
.then(() => log(`[NITRO]::Debug: Nitro process is terminated`)) .then(() => log(`[NITRO]::Debug: Nitro process is terminated`))
.catch(() => { .catch(() => {
killRequest() killRequest().then(resolve).catch(reject)
}) })
} }
}) })