improvements to graph layout, execution, wip on repl evalulation

ThousandBirdsInc · Oct 3, 2024 · 943e1ac · 943e1ac
1 parent 0086d78
commit 943e1ac
Show file tree

Hide file tree

Showing 67 changed files with 2,247 additions and 1,130 deletions.
diff --git a/README.md b/README.md
@@ -13,12 +13,12 @@
 <a href="https://github.com/ThousandBirdsInc/chidori/commits"><img alt="Current Build Status" src="https://img.shields.io/github/actions/workflow/status/ThousandBirdsInc/chidori/push.yml" /></a>
 <a href="https://github.com/ThousandBirdsInc/chidori/commits"><img alt="GitHub Last Commit" src="https://img.shields.io/github/last-commit/ThousandBirdsInc/chidori" /></a>
 <a href="https://crates.io/crates/chidori"><img alt="Cargo.io download" src="https://img.shields.io/crates/v/chidori" /></a>
-<a href="https://github.com/ThousandBirdsInc/chidori/blob/main/LICENSE"><img alt="Github License" src="https://img.shields.io/badge/License-MIT-green.svg" /></a>
+<a href="https://github.com/ThousandBirdsInc/chidori/blob/main/LICENSE"><img alt="GitHub License" src="https://img.shields.io/badge/License-MIT-green.svg" /></a>
 </p>
 <br />
 </div>
 
-Star us on Github! Join us on [Discord](https://discord.gg/CJwKsPSgew).
+Star us on GitHub! Join us on [Discord](https://discord.gg/CJwKsPSgew).
 
 ## Contents
 - [📖 Chidori V2](#-chidori-v2)

diff --git a/litellm_config.yaml b/litellm_config.yaml
@@ -1,13 +1,38 @@
 model_list:
+  - model_name: o1-preview
+    litellm_params:
+      model: openai/o1-preview
+      api_key: os.environ/OPENAI_API_KEY
+  - model_name: o1-mini
+    litellm_params:
+      model: openai/o1-mini
+      api_key: os.environ/OPENAI_API_KEY
+  - model_name: gpt-4o
+    litellm_params:
+      model: openai/gpt-4o
+      api_key: os.environ/OPENAI_API_KEY
+  - model_name: gpt-4o-mini
+    litellm_params:
+      model: openai/gpt-4o-mini
+      api_key: os.environ/OPENAI_API_KEY
+  - model_name: gpt-4-turbo
+    litellm_params:
+      model: openai/gpt-4-turbo
+      api_key: os.environ/OPENAI_API_KEY
   - model_name: gpt-3.5-turbo
     litellm_params:
-      model: openai/gpt-3.5-turbo                          # The `openai/` prefix will call openai.chat.completions.create
+      model: openai/gpt-3.5-turbo
       api_key: os.environ/OPENAI_API_KEY
   - model_name: gpt-3.5-turbo-instruct
     litellm_params:
-      model: text-completion-openai/gpt-3.5-turbo-instruct # The `text-completion-openai/` prefix will call openai.completions.create
+      model: text-completion-openai/gpt-3.5-turbo-instruct
       api_key: os.environ/OPENAI_API_KEY
   - model_name: text-embedding-3-small
     litellm_params:
       model: openai/text-embedding-3-small
       api_key: os.environ/OPENAI_API_KEY
+  - model_name: claude-3.5
+    litellm_params:
+      model: anthropic/claude-3-5-sonnet-20240620
+      api_key: os.environ/ANTHROPIC_API_KEY
+
diff --git a/toolchain/Cargo.lock b/toolchain/Cargo.lock
diff --git a/toolchain/chidori-core/examples/core10_concurrency/main.rs b/toolchain/chidori-core/examples/core10_concurrency/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core11_hono/core.md b/toolchain/chidori-core/examples/core11_hono/core.md
@@ -1,11 +1,20 @@
 # Demonstrating running a hono web service to produce a user facing interface
 
+
+```python
+def testingFunC(x):
+    return x + "Hello"
+```
+
 ```javascript
 import { Hono } from 'https://deno.land/x/hono/mod.ts';
 import { serve } from 'https://deno.land/[email protected]/http/server.ts';
 
+
 const app = new Hono();
 
+
+
 app.get('/', (c) => {
   const form = `
     <h1>Welcome to Trip Planner Crew</h1>
@@ -24,11 +33,13 @@ app.get('/', (c) => {
   return c.html(form);
 });
 
-app.post('/submit', (c) => {
-  const { origin, cities, date_range, interests } = c.req.body;
+app.post('/submit', async (c) => {
+  const body = await c.req.parseBody();
+  const { origin, cities, date_range, interests } = body;
+  const xx = await testingFunC(origin);
   const response = `
     <h2>Trip Details</h2>
-    <p><strong>Origin:</strong> ${origin}</p>
+    <p><strong>Origin:</strong> ${xx}</p>
     <p><strong>Cities:</strong> ${cities}</p>
     <p><strong>Date Range:</strong> ${date_range}</p>
     <p><strong>Interests:</strong> ${interests}</p>

diff --git a/toolchain/chidori-core/examples/core11_hono/main.rs b/toolchain/chidori-core/examples/core11_hono/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core12_dependency_management/main.rs b/toolchain/chidori-core/examples/core12_dependency_management/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core1_simple_math/main.rs b/toolchain/chidori-core/examples/core1_simple_math/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core2_marshalling/main.rs b/toolchain/chidori-core/examples/core2_marshalling/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core3_function_invocations/main.rs b/toolchain/chidori-core/examples/core3_function_invocations/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core4_async_function_invocations/main.rs b/toolchain/chidori-core/examples/core4_async_function_invocations/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core5_prompts_invoked_as_functions/main.rs b/toolchain/chidori-core/examples/core5_prompts_invoked_as_functions/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core6_prompts_leveraging_function_calling/main.rs b/toolchain/chidori-core/examples/core6_prompts_leveraging_function_calling/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core7_rag_stateful_memory_cells/main.rs b/toolchain/chidori-core/examples/core7_rag_stateful_memory_cells/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core8_prompt_code_generation_and_execution/main.rs b/toolchain/chidori-core/examples/core8_prompt_code_generation_and_execution/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/core9_multi_agent_simulation/core.md b/toolchain/chidori-core/examples/core9_multi_agent_simulation/core.md
@@ -126,7 +126,7 @@ Backstory: Specialist in travel planning an logistics with decades of experience
 
 ```javascript
 const { Hono } = require('hono');
-const bodyParser = require('body-parser');
+import * as bodyParser from "https://deno.land/x/[email protected]/mod.ts";
 
 const app = new Hono();
 

diff --git a/toolchain/chidori-core/examples/core9_multi_agent_simulation/main.rs b/toolchain/chidori-core/examples/core9_multi_agent_simulation/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);

diff --git a/toolchain/chidori-core/examples/demo1_business_analyst/main.rs b/toolchain/chidori-core/examples/demo1_business_analyst/main.rs
@@ -1,5 +1,5 @@
 use std::path::Path;
-use chidori_core::sdk::entry::{Chidori};
+use chidori_core::sdk::chidori::Chidori;
 fn main() {
     let current_file = env!("CARGO_MANIFEST_DIR");
     let current_file_path = Path::new(current_file);