From ee426a5308a266028c744eb672d1aab3a684b611 Mon Sep 17 00:00:00 2001 From: Nico Arqueros <1622112+nicarq@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:11:23 -0500 Subject: [PATCH] potential fix --- .../process_handlers/shinkai_node_process_handler.rs | 4 ++-- .../src-tauri/src/local_shinkai_node/shinkai_node_options.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/shinkai-desktop/src-tauri/src/local_shinkai_node/process_handlers/shinkai_node_process_handler.rs b/apps/shinkai-desktop/src-tauri/src/local_shinkai_node/process_handlers/shinkai_node_process_handler.rs index 3eb89599b..bfb95fca9 100644 --- a/apps/shinkai-desktop/src-tauri/src/local_shinkai_node/process_handlers/shinkai_node_process_handler.rs +++ b/apps/shinkai-desktop/src-tauri/src/local_shinkai_node/process_handlers/shinkai_node_process_handler.rs @@ -52,7 +52,7 @@ impl ShinkaiNodeProcessHandler { let initial_agent_models = format!("ollama:{}", initial_model); let options = ShinkaiNodeOptions { port: Some("9550".to_string()), - ws_port: Some("9551".to_string()), + node_ws_port: Some("9551".to_string()), node_storage_path: Some(default_node_storage_path), unstructured_server_url: Some("https://public.shinkai.com/x-un".to_string()), embeddings_server_url: Some("http://127.0.0.1:11435".to_string()), @@ -111,7 +111,7 @@ impl ShinkaiNodeProcessHandler { let base_options = self.options.clone(); let merged_options = ShinkaiNodeOptions { port: Some(options.port.unwrap_or_else(|| base_options.port.unwrap())), - ws_port: Some(options.ws_port.unwrap_or_else(|| base_options.ws_port.unwrap())), + node_ws_port: Some(options.node_ws_port.unwrap_or_else(|| base_options.node_ws_port.unwrap())), node_storage_path: Some( options .node_storage_path diff --git a/apps/shinkai-desktop/src-tauri/src/local_shinkai_node/shinkai_node_options.rs b/apps/shinkai-desktop/src-tauri/src/local_shinkai_node/shinkai_node_options.rs index 9c09872a0..6a0edaed7 100644 --- a/apps/shinkai-desktop/src-tauri/src/local_shinkai_node/shinkai_node_options.rs +++ b/apps/shinkai-desktop/src-tauri/src/local_shinkai_node/shinkai_node_options.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Clone)] pub struct ShinkaiNodeOptions { pub port: Option, - pub ws_port: Option, + pub node_ws_port: Option, pub node_storage_path: Option, pub unstructured_server_url: Option, pub embeddings_server_url: Option,