fix: cannot reset data while starting model

janhq · Apr 11, 2024 · bddfab0 · bddfab0
1 parent 0d31f9e
commit bddfab0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 30 deletions.
diff --git a/web/hooks/useActiveModel.ts b/web/hooks/useActiveModel.ts
@@ -126,33 +126,27 @@ export function useActiveModel() {
       })
   }
 
-  const stopModel = useCallback(
-    async (model?: Model) => {
-      const stoppingModel = activeModel || model
-      if (
-        !stoppingModel ||
-        (!model && stateModel.state === 'stop' && stateModel.loading)
-      )
-        return
-
-      setStateModel({ state: 'stop', loading: true, model: stoppingModel })
-      const engine = EngineManager.instance().get(stoppingModel.engine)
-      return engine
-        ?.unloadModel(stoppingModel)
-        .catch()
-        .then(() => {
-          setActiveModel(undefined)
-          setStateModel({ state: 'start', loading: false, model: undefined })
-          loadModelController?.abort()
-        })
-    },
-    [activeModel, setActiveModel, setStateModel, stateModel]
-  )
+  const stopModel = useCallback(async () => {
+    const stoppingModel = activeModel || stateModel.model
+    if (!stoppingModel || (stateModel.state === 'stop' && stateModel.loading))
+      return
+
+    setStateModel({ state: 'stop', loading: true, model: stoppingModel })
+    const engine = EngineManager.instance().get(stoppingModel.engine)
+    return engine
+      ?.unloadModel(stoppingModel)
+      .catch()
+      .then(() => {
+        setActiveModel(undefined)
+        setStateModel({ state: 'start', loading: false, model: undefined })
+        loadModelController?.abort()
+      })
+  }, [activeModel, setActiveModel, setStateModel, stateModel])
 
   const stopInference = useCallback(async () => {
     // Loading model
     if (stateModel.loading) {
-      stopModel(stateModel.model)
+      stopModel()
       return
     }
     if (!activeModel) return

diff --git a/web/hooks/useFactoryReset.ts b/web/hooks/useFactoryReset.ts
@@ -19,7 +19,7 @@ export const factoryResetStateAtom = atom(FactoryResetState.Idle)
 
 export default function useFactoryReset() {
   const defaultJanDataFolder = useAtomValue(defaultJanDataFolderAtom)
-  const { activeModel, stopModel } = useActiveModel()
+  const { stopModel } = useActiveModel()
   const setFactoryResetState = useSetAtom(factoryResetStateAtom)
 
   const resetAll = useCallback(
@@ -44,11 +44,9 @@ export default function useFactoryReset() {
         await window.core?.api?.updateAppConfiguration(configuration)
       }
 
-      if (activeModel) {
-        setFactoryResetState(FactoryResetState.StoppingModel)
-        await stopModel()
-        await new Promise((resolve) => setTimeout(resolve, 4000))
-      }
+      setFactoryResetState(FactoryResetState.StoppingModel)
+      await stopModel()
+      await new Promise((resolve) => setTimeout(resolve, 4000))
 
       setFactoryResetState(FactoryResetState.DeletingData)
       await fs.rm(janDataFolderPath)
@@ -59,7 +57,7 @@ export default function useFactoryReset() {
 
       await window.core?.api?.relaunch()
     },
-    [defaultJanDataFolder, activeModel, stopModel, setFactoryResetState]
+    [defaultJanDataFolder, stopModel, setFactoryResetState]
   )
 
   return {