alex/g3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tool call cosmetic cleanup

Browse Source
This commit is contained in:
Dhanji Prasanna
2025-09-27 20:40:06 +10:00
parent e2354b0679
commit f3cf9b688e
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/g3-core/src/lib.rs
View File

@@ -1493,6 +1493,8 @@ fn filter_json_tool_calls(content: &str) -> String {
r#"{ "tool":"#, r#"{ "tool":"#,
r#"{"tool" :"#, r#"{"tool" :"#,
r#"{ "tool" :"#, r#"{ "tool" :"#,
r#"{"tool": "#, // Added pattern with space after colon
r#"{ "tool": "#, // Added pattern with spaces
]; ];
// Check if any pattern is found in the content // Check if any pattern is found in the content
@@ -1500,23 +1502,30 @@ fn filter_json_tool_calls(content: &str) -> String {
if has_tool_call_pattern { if has_tool_call_pattern {
// If we detect a JSON tool call pattern anywhere in the content, // If we detect a JSON tool call pattern anywhere in the content,
// replace the entire content with the indicator // suppress it completely
"<<tool call detected>>".to_string() "".to_string()
} else { } else {
// Check for partial JSON patterns that might be split across chunks // Check for partial JSON patterns that might be split across chunks
let trimmed = content.trim(); let trimmed = content.trim();
// Check for partial patterns that might indicate the start of a JSON tool call // More comprehensive pattern matching for partial tool calls
if trimmed.starts_with(r#"{"tool"#) if trimmed.starts_with(r#"{"tool"#)
|| trimmed.starts_with(r#"{ "tool"#) || trimmed.starts_with(r#"{ "tool"#)
|| trimmed.starts_with(r#"{"#) && (trimmed.contains("tool") || trimmed.contains("args")) || trimmed.starts_with(r#"{"#) && (trimmed.contains("tool") || trimmed.contains("args"))
|| trimmed.contains(r#""tool":"#) || trimmed.contains(r#""tool":"#)
|| trimmed.contains(r#""tool": "#)
|| trimmed.contains(r#""args":"#) || trimmed.contains(r#""args":"#)
|| trimmed.contains(r#""args": "#)
|| trimmed.contains(r#"file_path"#) || trimmed.contains(r#"file_path"#)
|| trimmed.contains(r#"command"#) || trimmed.contains(r#"command"#)
|| trimmed.contains(r#"content"#) && trimmed.contains(r#"""#) // Likely JSON string
|| trimmed.contains(r#"summary"#) && trimmed.contains(r#"""#) // Likely JSON string
|| (trimmed.starts_with('{') || (trimmed.starts_with('{')
&& trimmed.len() < 50 && trimmed.len() < 100 // Increased threshold
&& (trimmed.contains("tool") || trimmed.contains("args"))) && (trimmed.contains("tool") || trimmed.contains("args") || trimmed.contains(r#"""#)))
// Catch malformed tool calls like: {"tool": "write_file", "path
|| (trimmed.contains(r#""tool":"#) || trimmed.contains(r#""tool": "#))
|| (trimmed.starts_with(r#"{"#) && trimmed.contains(r#"", ""#)) // JSON with quoted comma pattern
{ {
// This looks like part of a JSON tool call, suppress it // This looks like part of a JSON tool call, suppress it
"".to_string() "".to_string()