-
-
Notifications
You must be signed in to change notification settings - Fork 418
refactor(openai): remove text-form tool-call rescue #1145
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /// Removes hidden reasoning blocks from model-visible text. | ||
| /// | ||
| /// This is content hygiene only. Tool calls are parsed by the model runtime's | ||
| /// native chat parser and are never recovered from assistant text here. | ||
| pub fn strip_thinking_blocks(content: &str) -> String { | ||
| let stripped_html = strip_tag_pairs(content, "<think>", "</think>"); | ||
| let stripped_brackets = strip_tag_pairs(&stripped_html, "[THINK]", "[/THINK]"); | ||
| stripped_brackets.trim().to_owned() | ||
| } | ||
|
|
||
| fn strip_tag_pairs(content: &str, start_tag: &str, end_tag: &str) -> String { | ||
| let mut remainder = content; | ||
| let mut result = String::new(); | ||
| while let Some(start_index) = remainder.find(start_tag) { | ||
| result.push_str(&remainder[..start_index]); | ||
| let after_start = &remainder[start_index + start_tag.len()..]; | ||
| if let Some(end_index) = after_start.find(end_tag) { | ||
| remainder = &after_start[end_index + end_tag.len()..]; | ||
| } else { | ||
| return result; | ||
| } | ||
| } | ||
| result.push_str(remainder); | ||
| result | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn strips_supported_thinking_blocks() { | ||
| assert_eq!( | ||
| strip_thinking_blocks("<think>hidden</think>Visible answer"), | ||
| "Visible answer" | ||
| ); | ||
| assert_eq!( | ||
| strip_thinking_blocks("[THINK]hidden[/THINK]Visible answer"), | ||
| "Visible answer" | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn drops_unterminated_thinking_blocks_without_duplicating_prefix() { | ||
| assert_eq!(strip_thinking_blocks("hello <think>truncated"), "hello"); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.