Skip to content

refactor: refactor rust ast to place metadata in common struct #909

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

Merged
starpit merged 1 commit into from
Apr 13, 2025
Merged

refactor: refactor rust ast to place metadata in common struct #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions pdl-live-react/src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pdl-live-react/src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ rustpython-stdlib = { version = "0.4.0", features = ["zlib"] }
schemars = "0.8.22"
fs4 = "0.13.1"
derive_builder = "0.20.2"
iana-time-zone = "0.1.63"

[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
tauri-plugin-cli = "2"
Expand Down
262 changes: 149 additions & 113 deletions pdl-live-react/src-tauri/src/compile/beeai.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use serde_json::{Map, Value, from_reader, json, to_string};
use tempfile::Builder;

use crate::pdl::ast::{
ArrayBlockBuilder, Block::*, CallBlock, EvalsTo, Expr, FunctionBlock, ListOrString,
ArrayBlockBuilder, Block, Body::*, CallBlock, EvalsTo, Expr, FunctionBlock, ListOrString,
MessageBlock, MetadataBuilder, ModelBlockBuilder, ObjectBlock, PdlBaseType, PdlBlock,
PdlBlock::Advanced, PdlOptionalType, PdlParser, PdlType, PythonCodeBlock, RepeatBlock, Role,
TextBlock, TextBlockBuilder,
Expand Down Expand Up @@ -191,51 +191,67 @@ fn with_tools(
}

fn call_tools(model: &String, parameters: &HashMap<String, Value>) -> PdlBlock {
let repeat = Advanced(Text(TextBlock {
let repeat = Advanced(Block {
metadata: Some(
MetadataBuilder::default()
.description("Calling tool ${ tool.function.name }".to_string())
.build()
.unwrap(),
),
role: None,
parser: None,
text: vec![Advanced(Model(
ModelBlockBuilder::default()
.model(model.as_str())
.parameters(strip_nulls(parameters))
.input(Advanced(Array(
ArrayBlockBuilder::default()
.array(vec![Advanced(Message(MessageBlock {

body: Text(TextBlock {
role: None,
parser: None,
text: vec![Advanced(Block {
metadata: None,
body: Model(
ModelBlockBuilder::default()
.model(model.as_str())
.parameters(strip_nulls(parameters))
.input(Advanced(Block {
metadata: None,
role: Role::Tool,
defsite: None,
name: Some("${ tool.function.name }".to_string()),
tool_call_id: Some("${ tool.id }".to_string()),
content: Box::new(Advanced(Call(CallBlock {
metadata: Some(
MetadataBuilder::default()
.defs(json_loads(
&"args",
&"pdl__args",
&"${ tool.function.arguments }",
))
.build()
.unwrap(),
),
call: EvalsTo::Jinja(
"${ pdl__tools[tool.function.name] }".to_string(),
), // look up tool in tool_declarations def (see below)
args: Some("${ args }".into()), // invoke with arguments as specified by the model
}))),
}))])
body: Array(
ArrayBlockBuilder::default()
.array(vec![Advanced(Block {
metadata: None,
body: Message(MessageBlock {
role: Role::Tool,
defsite: None,
name: Some("${ tool.function.name }".to_string()),
tool_call_id: Some("${ tool.id }".to_string()),
content: Box::new(Advanced(Block {
metadata: Some(
MetadataBuilder::default()
.defs(json_loads(
&"args",
&"pdl__args",
&"${ tool.function.arguments }",
))
.build()
.unwrap(),
),

body: Call(CallBlock {
call: EvalsTo::Jinja(
"${ pdl__tools[tool.function.name] }"
.to_string(),
), // look up tool in tool_declarations def (see below)
args: Some("${ args }".into()), // invoke with arguments as specified by the model
pdl_trace: None,
}),
})),
}),
})])
.build()
.unwrap(),
),
}))
.build()
.unwrap(),
)))
.build()
.unwrap(),
))],
}));
),
})],
}),
});

let mut for_ = HashMap::new();
for_.insert(
Expand All @@ -249,11 +265,13 @@ fn call_tools(model: &String, parameters: &HashMap<String, Value>) -> PdlBlock {
);

// response.choices[0].message.tool_calls
Advanced(Repeat(RepeatBlock {
Advanced(Block {
metadata: None,
for_: for_,
repeat: Box::new(repeat),
}))
body: Repeat(RepeatBlock {
for_: for_,
repeat: Box::new(repeat),
}),
})
}

fn json_loads(
Expand All @@ -264,22 +282,25 @@ fn json_loads(
let mut m = indexmap::IndexMap::new();
m.insert(
outer_name.to_owned(),
Advanced(Text(
TextBlockBuilder::default()
.text(vec![PdlBlock::String(format!(
"{{\"{}\": {}}}",
inner_name, value
))])
.metadata(
MetadataBuilder::default()
.description(format!("Parsing json for {}={}", inner_name, value))
.build()
.unwrap(),
)
.parser(PdlParser::Json)
.build()
.unwrap(),
)),
Advanced(Block {
metadata: Some(
MetadataBuilder::default()
.description(format!("Parsing json for {}={}", inner_name, value))
.build()
.unwrap(),
),

body: Text(
TextBlockBuilder::default()
.text(vec![PdlBlock::String(format!(
"{{\"{}\": {}}}",
inner_name, value
))])
.parser(PdlParser::Json)
.build()
.unwrap(),
),
}),
);
m
}
Expand Down Expand Up @@ -428,12 +449,13 @@ pub fn compile(source_file_path: &str, debug: bool) -> Result<PdlBlock, Box<dyn
tool_name.clone(),
PdlBlock::Function(FunctionBlock {
function: schema,
return_: Box::new(Advanced(PythonCode(PythonCodeBlock {
// tool function definition
return_: Box::new(Advanced(Block {
metadata: None,
lang: "python".to_string(),
code: format!(
"
body: PythonCode(PythonCodeBlock {
// tool function definition
lang: "python".to_string(),
code: format!(
"
from {} import {}
import asyncio
async def invoke():
Expand All @@ -445,24 +467,25 @@ async def invoke():
{}
asyncio.run(invoke())
",
import_from,
import_fn,
if debug {
format!("print('Invoking tool {}')", tool_name)
} else {
"".to_string()
},
import_fn,
if debug {
format!(
"print(f'Response from tool {}: {{result}}')",
tool_name
)
} else {
"".to_string()
}
),
}))),
import_from,
import_fn,
if debug {
format!("print('Invoking tool {}')", tool_name)
} else {
"".to_string()
},
import_fn,
if debug {
format!(
"print(f'Response from tool {}: {{result}}')",
tool_name
)
} else {
"".to_string()
}
),
}),
})),
}),
)
})
Expand Down Expand Up @@ -491,27 +514,23 @@ asyncio.run(invoke())
let model = format!("{}/{}", provider, model);

if let Some(instructions) = instructions {
model_call.push(Advanced(Text(TextBlock {
role: Some(Role::System),
text: vec![PdlBlock::String(instructions)],
model_call.push(Advanced(Block {
metadata: Some(
MetadataBuilder::default()
.description("Model instructions".to_string())
.build()
.unwrap(),
),
parser: None,
})));
body: Text(TextBlock {
role: Some(Role::System),
text: vec![PdlBlock::String(instructions)],
parser: None,
}),
}));
}

let mut model_builder = ModelBlockBuilder::default();
model_builder
.metadata(
MetadataBuilder::default()
.description(description)
.build()
.unwrap(),
)
.model(model.clone())
.parameters(with_tools(&tools, &parameters.state.dict));

Expand All @@ -524,7 +543,15 @@ asyncio.run(invoke())
}
}

model_call.push(Advanced(Model(model_builder.build().unwrap())));
model_call.push(Advanced(Block {
metadata: Some(
MetadataBuilder::default()
.description(description)
.build()
.unwrap(),
),
body: Model(model_builder.build().unwrap()),
}));

if let Some(tools) = tools {
if tools.len() > 0 {
Expand All @@ -538,34 +565,38 @@ asyncio.run(invoke())
closure_name.clone(),
PdlBlock::Function(FunctionBlock {
function: HashMap::new(),
return_: Box::new(Advanced(Text(TextBlock {
return_: Box::new(Advanced(Block {
metadata: Some(
MetadataBuilder::default()
.description(format!("Model call {}", &model))
.build()
.unwrap(),
),
role: None,
parser: None,
text: model_call,
}))),
body: Text(TextBlock {
role: None,
parser: None,
text: model_call,
}),
})),
}),
);
Advanced(Text(TextBlock {
Advanced(Block {
metadata: Some(
MetadataBuilder::default()
.description("Model call wrapper".to_string())
.defs(defs)
.build()
.unwrap(),
),
role: None,
parser: None,
text: vec![Advanced(Call(CallBlock::new(format!(
"${{ {} }}",
closure_name
))))],
}))
body: Text(TextBlock {
role: None,
parser: None,
text: vec![Advanced(Block {
metadata: None,
body: Call(CallBlock::new(format!("${{ {} }}", closure_name))),
})],
}),
})
},
)
.collect::<Vec<_>>();
Expand All @@ -580,19 +611,24 @@ asyncio.run(invoke())
let mut defs = indexmap::IndexMap::new();
defs.insert(
"pdl__tools".to_string(),
Advanced(Object(ObjectBlock {
object: tool_declarations,
})),
Advanced(Block {
metadata: None,
body: Object(ObjectBlock {
object: tool_declarations,
}),
}),
);
metadata.defs(defs);
}

let pdl: PdlBlock = Advanced(Text(TextBlock {
let pdl: PdlBlock = Advanced(Block {
metadata: Some(metadata.build().unwrap()),
role: None,
parser: None,
text: body,
}));
body: Text(TextBlock {
role: None,
parser: None,
text: body,
}),
});

Ok(pdl)
}
Expand Down
Loading