Merge pull request #1114 from dcSpark/nico/fix_tests_rust

Nico/fix tests rust

Author: nicarq

shinkai-bin/shinkai-node/src/network/v2_api/api_v2_commands.rs

@@ -2011,18 +2011,26 @@ impl Node {
         }
 
         // Get the internal_comms preference from the database
-        match db.get_preference::<ShinkaiInternalComms>("internal_comms") {
-            Ok(Some(internal_comms)) => {
-                let _ = res.send(Ok(internal_comms.internal_has_sync_default_tools)).await;
-            }
-            Ok(None) => {
-                let _ = res.send(Ok(false)).await;
-            }
+        let internal_comms_synced = match db.get_preference::<ShinkaiInternalComms>("internal_comms") {
+            Ok(Some(internal_comms)) => internal_comms.internal_has_sync_default_tools,
+            Ok(None) => false,
             Err(e) => {
                 eprintln!("Error getting internal_comms preference: {}", e);
-                let _ = res.send(Ok(false)).await;
+                false
             }
-        }
+        };
+
+        // Check if Rust tools are installed
+        let rust_tools_installed = match db.has_rust_tools() {
+            Ok(installed) => installed,
+            Err(e) => {
+                eprintln!("Error checking Rust tools: {}", e);
+                false
+            }
+        };
+
+        // Both conditions must be true
+        let _ = res.send(Ok(internal_comms_synced && rust_tools_installed)).await;
         Ok(())
     }
 

shinkai-bin/shinkai-node/src/tools/tool_execution/execution_custom.rs

@@ -37,6 +37,9 @@ pub async fn try_to_execute_rust_tool(
 ) -> Result<Value, ToolError> {
     println!("[executing_rust_tool] {}", tool_router_key);
 
+    // Note(Important): if you update the # of tools, you need to update the # of tools in fn has_rust_tools(&self) ->
+    // Result<bool, SqliteManagerError> { ... } in shinkai_sqlite/src/shinkai_tool_manager.rs
+
     let result = match tool_router_key {
         // TODO Keep in sync with definitions_custom.rs
         s if s == "local:::__official_shinkai:::shinkai_llm_map_reduce_processor" => {

shinkai-bin/shinkai-node/tests/it/tool_config_override_test.rs

@@ -44,7 +44,7 @@ fn test_tool_execution_with_config_override() {
     std::env::set_var("WELCOME_MESSAGE", "false");
     let api_key_bearer = std::env::var("API_V2_KEY").unwrap_or_else(|_| "my_api_v2_key".to_string());
     std::env::set_var("API_V2_KEY", api_key_bearer.clone());
-    std::env::set_var("NODE_API_PORT", "9550");
+    std::env::set_var("NODE_API_PORT", "9570");
     std::env::set_var("SKIP_IMPORT_FROM_DIRECTORY", "true");
     std::env::set_var("IS_TESTING", "1");
     let node1_db_path = format!("db_tests/{}", hash_signature_public_key(&unsafe_deterministic_signature_keypair(0).1));
@@ -147,10 +147,10 @@ fn test_tool_execution_with_config_override() {
         .await;
 
         // Create node1 and node2
-        assert!(port_is_available(9550), "Port 9550 is not available");
+        assert!(port_is_available(9570), "Port 9570 is not available");
         assert!(port_is_available(9560), "Port 9560 is not available");
         // Setup API Server task
-        let api_listen_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 9550);
+        let api_listen_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 9570);
         let api_https_listen_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 9560);
 
         let node1_commands_sender_clone = node1_commands_sender.clone();

shinkai-libs/shinkai-sqlite/src/shinkai_tool_manager.rs

@@ -704,7 +704,7 @@ impl SqliteManager {
                 SqliteManagerError::DatabaseError(e)
             })?;
 
-        Ok(count >= 4)
+        Ok(count >= 7)
     }
 
     // Update the FTS table when inserting or updating a tool