vrr/goose
2
0
Fork 0
mirror of https://github.com/block/goose.git synced 2026-04-28 03:29:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Merge streamed reasoning suffixes for OpenAI-compatible tools

Browse source
This commit is contained in:
jh-block 2026-04-27 12:20:19 +02:00
parent fd13ad1937
commit 95a5facfa1
1 changed files with 82 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

87
crates/goose/src/providers/formats/openai.rs
View file

@ -41,6 +41,23 @@ pub struct OpenAiFormatOptions {
pub preserve_thinking_context: bool,
}
fn merge_reasoning_text(prefix: &str, suffix: &str) -> String {
if prefix.is_empty() {
return suffix.to_string();
}
if suffix.is_empty() {
return prefix.to_string();
}
if suffix.starts_with(prefix) {
return suffix.to_string();
}
if prefix.ends_with(suffix) {
return prefix.to_string();
}
format!("{prefix}{suffix}")
}
#[derive(Serialize, Deserialize, Debug, Default)]
struct DeltaToolCallFunction {
name: Option<String>,
@ -372,11 +389,9 @@ pub fn format_messages_with_options(
}
if !pending_assistant_reasoning.is_empty() {
if reasoning_text.is_empty() {
reasoning_text = std::mem::take(&mut pending_assistant_reasoning);
} else {
pending_assistant_reasoning.clear();
}
reasoning_text =
merge_reasoning_text(&pending_assistant_reasoning, &reasoning_text);
pending_assistant_reasoning.clear();
}
}
@ -2439,6 +2454,34 @@ data: [DONE]"#;
Ok(())
}
#[test]
fn test_format_messages_merges_pending_thinking_with_tool_call_suffix() -> anyhow::Result<()> {
let messages = vec![
Message::assistant().with_content(MessageContent::thinking("think ", "")),
Message::assistant()
.with_content(MessageContent::thinking("once", ""))
.with_tool_request(
"tool1",
Ok(CallToolRequestParams::new("test_tool")
.with_arguments(object!({"param": "value"}))),
),
];
let spec = format_messages_with_options(
&messages,
&ImageFormat::OpenAi,
OpenAiFormatOptions {
preserve_thinking_context: true,
},
);
assert_eq!(spec.len(), 1);
assert_eq!(spec[0]["reasoning_content"], "think once");
assert_eq!(spec[0]["tool_calls"][0]["function"]["name"], "test_tool");
Ok(())
}
#[test]
fn test_format_messages_does_not_carry_thinking_across_user_message() -> anyhow::Result<()> {
let messages = vec![
@ -2699,6 +2742,40 @@ data: [DONE]"#;
Ok(())
}
#[tokio::test]
async fn test_streaming_tool_call_merges_yielded_reasoning_with_suffix() -> anyhow::Result<()> {
let response_lines = concat!(
"data: {\"id\":\"x\",\"object\":\"chat.completion.chunk\",\"model\":\"m\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"think \"},\"finish_reason\":null}]}\n",
"data: {\"id\":\"x\",\"object\":\"chat.completion.chunk\",\"model\":\"m\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"once\",\"tool_calls\":[{\"index\":0,\"id\":\"call_1\",\"type\":\"function\",\"function\":{\"name\":\"test_tool\",\"arguments\":\"\"}}]},\"finish_reason\":null}]}\n",
"data: {\"id\":\"x\",\"object\":\"chat.completion.chunk\",\"model\":\"m\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"{}\"}}]},\"finish_reason\":\"tool_calls\"}]}\n",
"data: [DONE]"
);
let lines: Vec<String> = response_lines.lines().map(|s| s.to_string()).collect();
let response_stream = tokio_stream::iter(lines.into_iter().map(Ok));
let mut messages = std::pin::pin!(response_to_streaming_message(response_stream));
let mut history = Vec::new();
while let Some(result) = messages.next().await {
let (message, _usage) = result?;
if let Some(msg) = message {
history.push(msg);
}
}
let spec = format_messages_with_options(
&history,
&ImageFormat::OpenAi,
OpenAiFormatOptions {
preserve_thinking_context: true,
},
);
assert_eq!(spec.len(), 1);
assert_eq!(spec[0]["reasoning_content"], "think once");
assert_eq!(spec[0]["tool_calls"][0]["function"]["name"], "test_tool");
Ok(())
}
#[tokio::test]
async fn test_streaming_tool_call_preserves_unyielded_reasoning() -> anyhow::Result<()> {
let response_lines = concat!(