diff --git a/extensions/inference-cortex-extension/src/node/index.ts b/extensions/inference-cortex-extension/src/node/index.ts index 08d83ad72..420c84b6e 100644 --- a/extensions/inference-cortex-extension/src/node/index.ts +++ b/extensions/inference-cortex-extension/src/node/index.ts @@ -71,18 +71,6 @@ function dispose() { watchdog?.terminate() } -function addEnvPaths(dest: string) { - // Add engine path to the PATH and LD_LIBRARY_PATH - if (process.platform === 'win32') { - process.env.PATH = (process.env.PATH || '').concat(path.delimiter, dest) - } else { - process.env.LD_LIBRARY_PATH = (process.env.LD_LIBRARY_PATH || '').concat( - path.delimiter, - dest - ) - } -} - /** * Cortex process info */ diff --git a/web/screens/Settings/Engines/LocalEngineSettings.tsx b/web/screens/Settings/Engines/LocalEngineSettings.tsx index d62e2a672..4f6212783 100644 --- a/web/screens/Settings/Engines/LocalEngineSettings.tsx +++ b/web/screens/Settings/Engines/LocalEngineSettings.tsx @@ -26,6 +26,7 @@ import { formatDownloadPercentage } from '@/utils/converter' import ExtensionSetting from '../ExtensionSetting' import DeleteEngineVariant from './DeleteEngineVariant' +import { useActiveModel } from '@/hooks/useActiveModel' const os = () => { switch (PLATFORM) { case 'win32': @@ -52,6 +53,7 @@ const LocalEngineSettings = ({ engine }: { engine: InferenceEngine }) => { const [installingEngines, setInstallingEngines] = useState< Map >(new Map()) + const { stopModel } = useActiveModel() const isEngineUpdated = latestReleasedEngine && @@ -104,6 +106,7 @@ const LocalEngineSettings = ({ engine }: { engine: InferenceEngine }) => { const handleEngineUpdate = useCallback( (event: { id: string; type: DownloadEvent; percent: number }) => { + stopModel() mutateInstalledEngines() mutateDefaultEngineVariant() // Backward compatible support - cortex.cpp returns full variant file name @@ -138,6 +141,7 @@ const LocalEngineSettings = ({ engine }: { engine: InferenceEngine }) => { }) }, [ + stopModel, mutateDefaultEngineVariant, mutateInstalledEngines, setInstallingEngines, @@ -153,6 +157,7 @@ const LocalEngineSettings = ({ engine }: { engine: InferenceEngine }) => { }, [handleEngineUpdate]) const handleChangeVariant = (e: string) => { + stopModel() setSelectedVariants(e) setDefaultEngineVariant(engine, { variant: e,