Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: app does not gracefully stop a model #2593

Merged
merged 1 commit into from
Apr 3, 2024
Merged

fix: app does not gracefully stop a model #2593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export const stopServer = async () => {
// Log server stop
if (isVerbose) logServer(`Debug: Server stopped`)
// Stop the server
await server.close()
await server?.close()
} catch (e) {
// Log any errors
if (isVerbose) logServer(`Error: ${e}`)
Expand Down
5 changes: 3 additions & 2 deletions web/hooks/useActiveModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ export function useActiveModel() {
}

const stopModel = useCallback(async () => {
if (!activeModel) return
if (!activeModel || (stateModel.state === 'stop' && stateModel.loading))
return

setStateModel({ state: 'stop', loading: true, model: activeModel.id })
const engine = EngineManager.instance().get(activeModel.engine)
Expand All @@ -126,7 +127,7 @@ export function useActiveModel() {
setActiveModel(undefined)
setStateModel({ state: 'start', loading: false, model: '' })
})
}, [activeModel, setActiveModel, setStateModel])
}, [activeModel, stateModel, setActiveModel, setStateModel])

return { activeModel, startModel, stopModel, stateModel }
}
Loading