restart server when llm file change

Author: yujonglee

Cargo.lock

@@ -54,7 +54,7 @@ tauri-plugin-autostart = "2"
 tauri-plugin-clipboard-manager = { workspace = true }
 tauri-plugin-deep-link = { workspace = true }
 tauri-plugin-dialog = { workspace = true }
-tauri-plugin-fs = "2"
+tauri-plugin-fs = { workspace = true, features = ["watch"] }
 tauri-plugin-global-shortcut = "2"
 tauri-plugin-http = { workspace = true }
 tauri-plugin-os = "2"

apps/desktop/src-tauri/Cargo.toml

@@ -64,6 +64,13 @@
       "identifier": "fs:allow-exists",
       "allow": [{ "path": "/Applications/*" }]
     },
+    {
+      "identifier": "fs:allow-watch",
+      "allow": [
+        { "path": "$APPDATA/*" },
+        { "path": "$APPDATA/**" }
+      ]
+    },
     {
       "identifier": "fs:allow-write-file",
       "allow": [

apps/desktop/src-tauri/capabilities/default.json

@@ -1,5 +1,8 @@
+import { commands as localLlmCommands } from "@hypr/plugin-local-llm";
 import { createFileRoute, Outlet, useRouter } from "@tanstack/react-router";
+import { appDataDir, join } from "@tauri-apps/api/path";
 import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { watch } from "@tauri-apps/plugin-fs";
 import { useEffect, useState } from "react";
 
 import { IndividualizationModal } from "@/components/individualization-modal";
@@ -54,6 +57,7 @@ function Component() {
           <LeftSidebarProvider>
             <RightPanelProvider>
               <AudioPermissions />
+              <RestartLlmServer />
               <MainWindowStateEventSupport />
               <SettingsProvider>
                 <NewNoteProvider>
@@ -105,6 +109,31 @@ function Component() {
   );
 }
 
+function RestartLlmServer() {
+  const watchLlm = async () => {
+    const path = await appDataDir();
+    const llmPath = await join(path, "llm.gguf");
+
+    return watch(llmPath, (_event) => {
+      localLlmCommands.restartServer();
+    }, { delayMs: 1000 });
+  };
+
+  useEffect(() => {
+    let unwatch: () => void;
+
+    watchLlm().then((f) => {
+      unwatch = f;
+    });
+
+    return () => {
+      unwatch?.();
+    };
+  }, []);
+
+  return null;
+}
+
 function AudioPermissions() {
   useEffect(() => {
     listenerCommands.checkMicrophoneAccess().then((isGranted) => {

apps/desktop/src/routes/app.tsx

@@ -27,6 +27,9 @@ async startServer() : Promise<string> {
 },
 async stopServer() : Promise<null> {
     return await TAURI_INVOKE("plugin:local-llm|stop_server");
+},
+async restartServer() : Promise<string> {
+    return await TAURI_INVOKE("plugin:local-llm|restart_server");
 }
 }
 

plugins/local-llm/js/bindings.gen.ts

@@ -50,3 +50,10 @@ pub async fn start_server<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result
 pub async fn stop_server<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result<(), String> {
     app.stop_server().await.map_err(|e| e.to_string())
 }
+
+#[tauri::command]
+#[specta::specta]
+pub async fn restart_server<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result<String, String> {
+    app.stop_server().await.map_err(|e| e.to_string())?;
+    app.start_server().await.map_err(|e| e.to_string())
+}

plugins/local-llm/src/commands.rs

@@ -48,6 +48,7 @@ fn make_specta_builder<R: tauri::Runtime>() -> tauri_specta::Builder<R> {
             commands::download_model::<Wry>,
             commands::start_server::<Wry>,
             commands::stop_server::<Wry>,
+            commands::restart_server::<Wry>,
         ])
         .error_handling(tauri_specta::ErrorHandlingMode::Throw)
 }
@@ -58,9 +59,12 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new(PLUGIN_NAME)
         .invoke_handler(specta_builder.invoke_handler())
         .setup(|app, _api| {
-            let model_path = app.path().app_data_dir().unwrap().join("llm.gguf");
-            let state: SharedState = Arc::new(Mutex::new(State::new(model_path)));
-            app.manage(state);
+            {
+                let model_path = app.path().app_data_dir().unwrap().join("llm.gguf");
+                let state: SharedState = Arc::new(Mutex::new(State::new(model_path)));
+                app.manage(state);
+            }
+
             Ok(())
         })
         .build()

plugins/local-llm/src/lib.rs

@@ -22,20 +22,23 @@ async isModelDownloading(model: SupportedModel) : Promise<boolean> {
 async downloadModel(model: SupportedModel, channel: TAURI_CHANNEL<number>) : Promise<null> {
     return await TAURI_INVOKE("plugin:local-stt|download_model", { model, channel });
 },
-async startServer() : Promise<string> {
-    return await TAURI_INVOKE("plugin:local-stt|start_server");
-},
-async stopServer() : Promise<null> {
-    return await TAURI_INVOKE("plugin:local-stt|stop_server");
+async listSupportedModels() : Promise<SupportedModel[]> {
+    return await TAURI_INVOKE("plugin:local-stt|list_supported_models");
 },
 async getCurrentModel() : Promise<SupportedModel> {
     return await TAURI_INVOKE("plugin:local-stt|get_current_model");
 },
 async setCurrentModel(model: SupportedModel) : Promise<null> {
     return await TAURI_INVOKE("plugin:local-stt|set_current_model", { model });
 },
-async listSupportedModels() : Promise<SupportedModel[]> {
-    return await TAURI_INVOKE("plugin:local-stt|list_supported_models");
+async startServer() : Promise<string> {
+    return await TAURI_INVOKE("plugin:local-stt|start_server");
+},
+async stopServer() : Promise<null> {
+    return await TAURI_INVOKE("plugin:local-stt|stop_server");
+},
+async restartServer() : Promise<string> {
+    return await TAURI_INVOKE("plugin:local-stt|restart_server");
 }
 }
 

plugins/local-stt/js/bindings.gen.ts

@@ -54,18 +54,6 @@ pub async fn download_model<R: tauri::Runtime>(
         .map_err(|e| e.to_string())
 }
 
-#[tauri::command]
-#[specta::specta]
-pub async fn start_server<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result<String, String> {
-    app.start_server().await.map_err(|e| e.to_string())
-}
-
-#[tauri::command]
-#[specta::specta]
-pub async fn stop_server<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result<(), String> {
-    app.stop_server().await.map_err(|e| e.to_string())
-}
-
 #[tauri::command]
 #[specta::specta]
 pub fn get_current_model<R: tauri::Runtime>(
@@ -82,3 +70,22 @@ pub fn set_current_model<R: tauri::Runtime>(
 ) -> Result<(), String> {
     app.set_current_model(model).map_err(|e| e.to_string())
 }
+
+#[tauri::command]
+#[specta::specta]
+pub async fn start_server<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result<String, String> {
+    app.start_server().await.map_err(|e| e.to_string())
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn stop_server<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result<(), String> {
+    app.stop_server().await.map_err(|e| e.to_string())
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn restart_server<R: tauri::Runtime>(app: tauri::AppHandle<R>) -> Result<String, String> {
+    app.stop_server().await.map_err(|e| e.to_string())?;
+    app.start_server().await.map_err(|e| e.to_string())
+}

plugins/local-stt/src/commands.rs

@@ -38,11 +38,12 @@ fn make_specta_builder<R: tauri::Runtime>() -> tauri_specta::Builder<R> {
             commands::is_model_downloaded::<Wry>,
             commands::is_model_downloading::<Wry>,
             commands::download_model::<Wry>,
-            commands::start_server::<Wry>,
-            commands::stop_server::<Wry>,
+            commands::list_supported_models,
             commands::get_current_model::<Wry>,
             commands::set_current_model::<Wry>,
-            commands::list_supported_models,
+            commands::start_server::<Wry>,
+            commands::stop_server::<Wry>,
+            commands::restart_server::<Wry>,
         ])
         .events(tauri_specta::collect_events![
             events::RecordedProcessingEvent