Merge remote-tracking branch 'origin' into feature/oauth

dcSpark · Dec 18, 2024 · be38863 · be38863
2 parents d445939 + 2276be9
commit be38863
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.9.2"
+version = "0.9.3"
 edition = "2021"
 authors = ["Nico Arqueros <[email protected]>"]
 
@@ -57,4 +57,4 @@ uuid = { version = "1.6.1" }
 rand = "=0.8.5"
 chrono-tz = "0.5"
 hex = "=0.4.3"
-env_logger = "0.11.5"
+env_logger = "0.11.5"
diff --git a/shinkai-bin/shinkai-node/src/network/v2_api/api_v2_commands_tools.rs b/shinkai-bin/shinkai-node/src/network/v2_api/api_v2_commands_tools.rs
@@ -516,7 +516,7 @@ impl Node {
         let mut perm_file_path = PathBuf::from(storage_path.clone());
         perm_file_path.push(".tools_storage");
         perm_file_path.push("tools");
-        perm_file_path.push(shinkai_tool.tool_router_key());
+        perm_file_path.push(shinkai_tool.tool_router_key_path());
         if let Err(err) = std::fs::create_dir_all(&perm_file_path) {
             let api_error = APIError {
                 code: StatusCode::INTERNAL_SERVER_ERROR.as_u16(),
@@ -1543,7 +1543,7 @@ impl Node {
                 let assets = PathBuf::from(&node_env.node_storage_path.unwrap_or_default())
                     .join(".tools_storage")
                     .join("tools")
-                    .join(tool.tool_router_key());
+                    .join(tool.tool_router_key_path());
                 if assets.exists() {
                     for entry in std::fs::read_dir(assets).unwrap() {
                         let entry = entry.unwrap();
@@ -1726,7 +1726,7 @@ impl Node {
                     let mut file_path = PathBuf::from(&node_env.node_storage_path.clone().unwrap_or_default())
                         .join(".tools_storage")
                         .join("tools")
-                        .join(tool.tool_router_key());
+                        .join(tool.tool_router_key_path());
                     if !file_path.exists() {
                         let s = std::fs::create_dir_all(&file_path);
                         if s.is_err() {

diff --git a/shinkai-libs/shinkai-tools-primitives/src/tools/deno_tools.rs b/shinkai-libs/shinkai-tools-primitives/src/tools/deno_tools.rs
@@ -5,6 +5,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use std::{env, thread};
 
 use super::parameters::Parameters;
+use super::shinkai_tool::ShinkaiTool;
 use super::tool_config::{OAuth, ToolConfig};
 use super::tool_output_arg::ToolOutputArg;
 use super::tool_playground::{SqlQuery, SqlTable};
@@ -81,7 +82,7 @@ impl DenoTool {
                 let path = PathBuf::from(&node_storage_path)
                     .join(".tools_storage")
                     .join("tools")
-                    .join(tool_router_key);
+                    .join(ShinkaiTool::convert_to_path(&tool_router_key));
                 self.assets
                     .clone()
                     .unwrap_or(vec![])

diff --git a/shinkai-libs/shinkai-tools-primitives/src/tools/python_tools.rs b/shinkai-libs/shinkai-tools-primitives/src/tools/python_tools.rs
@@ -17,6 +17,7 @@ use tokio::runtime::Runtime;
 use super::deno_tools::ToolResult;
 use super::parameters::Parameters;
 use super::shared_execution::update_result_with_modified_files;
+use super::shinkai_tool::ShinkaiTool;
 use super::tool_config::{OAuth, ToolConfig};
 use super::tool_output_arg::ToolOutputArg;
 use super::tool_playground::{SqlQuery, SqlTable};
@@ -80,7 +81,7 @@ impl PythonTool {
                 let path = PathBuf::from(&node_storage_path)
                     .join(".tools_storage")
                     .join("tools")
-                    .join(tool_router_key);
+                    .join(ShinkaiTool::convert_to_path(&tool_router_key));
                 self.assets
                     .clone()
                     .unwrap_or(vec![])
@@ -261,7 +262,14 @@ impl PythonTool {
                     if result.is_err() {
                         return result;
                     }
-                    update_result_with_modified_files(result.unwrap(), start_time, &home_path, &logs_path, &node_name, &app_id)
+                    update_result_with_modified_files(
+                        result.unwrap(),
+                        start_time,
+                        &home_path,
+                        &logs_path,
+                        &node_name,
+                        &app_id,
+                    )
                 })
             })
             .unwrap()

diff --git a/shinkai-libs/shinkai-tools-primitives/src/tools/shinkai_tool.rs b/shinkai-libs/shinkai-tools-primitives/src/tools/shinkai_tool.rs
@@ -71,6 +71,26 @@ impl ShinkaiTool {
         }
     }
 
+    // Return a folder-safe version of the tool_router_key
+    pub fn tool_router_key_path(&self) -> String {
+        let path = self.tool_router_key();
+        Self::convert_to_path(&path)
+    }
+
+    pub fn convert_to_path(tool_router_key: &str) -> String {
+        tool_router_key
+            .chars()
+            .map(|c| {
+                if c.is_ascii_alphanumeric() || c == '-' || c == '_' {
+                    c
+                } else {
+                    '_'
+                }
+            })
+            .collect::<String>()
+            .to_lowercase()
+    }
+
     /// The key that this tool will be stored under in the tool router
     pub fn tool_router_key(&self) -> String {
         match self {