Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- feature: execute from code files #69

Merged
merged 3 commits into from
Nov 25, 2024
Merged

- feature: execute from code files #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adc4e38
- feature: execute from code files
agallardol Nov 25, 2024
e31451e
- fix: wrong commits
agallardol Nov 25, 2024
03b8ef0
- improve: added test for multiple files
agallardol Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ jobs:
env:
CHROME_PATH: ${{ steps.setup-chrome.outputs.chrome-path }}
EMBEDDING_API_URL : ${{ vars.EMBEDDING_API_URL }}
CI_FORCE_DENO_IN_HOST: true
CI_FORCE_RUNNER_TYPE: host
run: |
npx nx run-many -t test --parallel=false --skip-nx-cache
14 changes: 11 additions & 3 deletions libs/shinkai-tools-runner/src/built_in_tools.test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
use std::collections::HashMap;

use serde_json::Value;

use crate::built_in_tools::{get_tool, get_tools};
use crate::{
built_in_tools::{get_tool, get_tools},
tools::code_files::CodeFiles,
};

#[tokio::test]
async fn get_tools_all_load() {
Expand All @@ -11,8 +16,11 @@ async fn get_tools_all_load() {
let tools = get_tools();
for (tool_name, tool_definition) in tools {
println!("creating tool instance for {}", tool_name);
let tool_instance =
crate::tools::tool::Tool::new(tool_definition.code.unwrap(), Value::Null, None);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool_instance = crate::tools::tool::Tool::new(code_files, Value::Null, None);
println!("fetching definition for {}", tool_name);
let defintion = tool_instance.definition().await;
println!(
Expand Down
136 changes: 89 additions & 47 deletions libs/shinkai-tools-runner/src/lib.test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
use std::collections::HashMap;
use std::env;
use std::time::Duration;

use serde_json::json;

use crate::built_in_tools::get_tool;
use crate::tools::code_files::CodeFiles;
use crate::tools::tool::Tool;

#[tokio::test]
Expand All @@ -13,11 +15,11 @@ async fn shinkai_tool_echo() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-echo").unwrap();
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
serde_json::Value::Null,
None,
);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let run_result = tool
.run(None, serde_json::json!({ "message": "valparaíso" }), None)
.await
Expand All @@ -32,8 +34,12 @@ async fn shinkai_tool_weather_by_city() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-weather-by-city").unwrap();
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
code_files,
serde_json::json!({ "apiKey": "63d35ff6068c3103ccd1227526935675" }),
None,
);
Expand All @@ -54,7 +60,11 @@ async fn shinkai_tool_inline() {
return { message: `Hello, ${params.name}!` };
}
"#;
let tool = Tool::new(js_code.to_string(), serde_json::Value::Null, None);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), js_code.to_string())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let run_result = tool
.run(None, serde_json::json!({ "name": "world" }), None)
.await
Expand All @@ -73,7 +83,11 @@ async fn shinkai_tool_inline_non_json_return() {
return 5;
}
"#;
let tool = Tool::new(js_code.to_string(), serde_json::Value::Null, None);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), js_code.to_string())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let run_result = tool.run(None, serde_json::json!({}), None).await.unwrap();
assert_eq!(run_result.data, 5);
}
Expand All @@ -85,11 +99,11 @@ async fn shinkai_tool_web3_eth_balance() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-web3-eth-balance").unwrap();
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
serde_json::Value::Null,
None,
);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let run_result = tool
.run(
None,
Expand All @@ -108,11 +122,11 @@ async fn shinkai_tool_web3_eth_uniswap() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-web3-eth-uniswap").unwrap();
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
serde_json::Value::Null,
None,
);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let run_result = tool
.run(
None,
Expand All @@ -137,11 +151,11 @@ async fn shinkai_tool_download_page() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-download-pages").unwrap();
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
serde_json::Value::Null,
None,
);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let run_result = tool
.run(
None,
Expand Down Expand Up @@ -177,7 +191,11 @@ async fn max_execution_time() {
return { data: true };
}
"#;
let tool = Tool::new(js_code.to_string(), serde_json::Value::Null, None);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), js_code.to_string())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let run_result = tool
.run(
None,
Expand All @@ -202,11 +220,14 @@ async fn shinkai_tool_download_page_stack_overflow() {
tokio::runtime::Runtime::new().expect("Failed to create Tokio runtime");
managed_runtime.block_on(async {
let tool_definition = get_tool("shinkai-tool-download-pages").unwrap();
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
serde_json::Value::Null,
None,
);
let code_files = CodeFiles {
files: HashMap::from([(
"main.ts".to_string(),
tool_definition.code.clone().unwrap(),
)]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
tool.run(
None,
serde_json::json!({
Expand All @@ -231,11 +252,11 @@ async fn shinkai_tool_leiden() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-leiden").unwrap();
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
serde_json::Value::Null,
None,
);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let edges = vec![
(2, 1, 1),
(3, 1, 1),
Expand Down Expand Up @@ -339,11 +360,11 @@ async fn shinkai_tool_duckduckgo_search() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-duckduckgo-search").unwrap();
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
serde_json::Value::Null,
None,
);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, serde_json::Value::Null, None);
let run_result = tool
.run(
None,
Expand All @@ -370,8 +391,12 @@ async fn shinkai_tool_playwright_example() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-playwright-example").unwrap();
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
code_files,
serde_json::json!({ "chromePath": std::env::var("CHROME_PATH").ok().unwrap_or("".to_string()) }),
None,
);
Expand Down Expand Up @@ -401,8 +426,12 @@ async fn shinkai_tool_defillama_lending_tvl_rankings() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-defillama-tvl-rankings").unwrap();
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
code_files,
serde_json::json!({ "chromePath": std::env::var("CHROME_PATH").ok().unwrap_or("".to_string()) }),
None,
);
Expand All @@ -421,21 +450,26 @@ async fn shinkai_tool_defillama_lending_tvl_rankings() {
assert_eq!(run_result.unwrap().data["rowsCount"], 43);
}

// TODO: enable this test again when fix the tool
// // TODO: enable this test again when fix the tool
// #[tokio::test]
// async fn shinkai_tool_aave_loan_requester() {
// let _ = env_logger::builder()
// .filter_level(log::LevelFilter::Info)
// .is_test(true)
// .try_init();
// let tool_definition = get_tool("shinkai-tool-aave-loan-requester").unwrap();
// let code_files = CodeFiles {
// files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
// entrypoint: "main.ts".to_string(),
// };
// let tool = Tool::new(
// tool_definition.code.clone().unwrap(),
// code_files,
// serde_json::json!({ "chromePath": std::env::var("CHROME_PATH").ok().unwrap_or("".to_string()) }),
// None,
// );
// let run_result = tool
// .run(
// None,
// serde_json::json!({ "inputValue": "0.005", "assetSymbol": "ETH" }),
// None,
// )
Expand All @@ -459,7 +493,11 @@ async fn shinkai_tool_youtube_summary() {
serde_json::json!({ "apiUrl": "http://127.0.0.1:11434", "lang": "en" })
};

let tool = Tool::new(tool_definition.code.clone().unwrap(), configurations, None);
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(code_files, configurations, None);
let run_result = tool
.run(
None,
Expand All @@ -481,14 +519,18 @@ async fn shinkai_tool_json_to_md() {
.is_test(true)
.try_init();
let tool_definition = get_tool("shinkai-tool-json-to-md").unwrap();
let code_files = CodeFiles {
files: HashMap::from([("main.ts".to_string(), tool_definition.code.clone().unwrap())]),
entrypoint: "main.ts".to_string(),
};
let tool = Tool::new(
tool_definition.code.clone().unwrap(),
json!({
code_files,
serde_json::json!({
"only_system": false
}),
None,
);
let message = json!({
let message = serde_json::json!({
"relevantSentencesFromText": [
{
"citation_id": 5,
Expand Down
7 changes: 7 additions & 0 deletions libs/shinkai-tools-runner/src/tools/code_files.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
use std::collections::HashMap;

#[derive(Default, Clone)]
pub struct CodeFiles {
pub files: HashMap<String, String>,
pub entrypoint: String,
}
Loading
Loading