Merge pull request #353 from dcSpark/nico/add_ws_port_to_conf_2

Fix Node Port (Try 2)
dcSpark · Jun 29, 2024 · 293523c · 293523c
2 parents 8c2dede + ee426a5
commit 293523c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...desktop/src-tauri/src/local_shinkai_node/process_handlers/shinkai_node_process_handler.rs b/...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
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, Clone)]
 pub struct ShinkaiNodeOptions {
     pub port: Option<String>,
-    pub ws_port: Option<String>,
+    pub node_ws_port: Option<String>,
     pub node_storage_path: Option<String>,
     pub unstructured_server_url: Option<String>,
     pub embeddings_server_url: Option<String>,