(expressive mode): remove unconditional bracket stripping - #6590
Merged
Merged
Conversation
theomonnom
approved these changes
Jul 30, 2026
tinalenguyen
added a commit
that referenced
this pull request
Aug 4, 2026
Resolve four conflicts caused by two deliberate main-side reversals: bracket stripping (#6590) and prompt presets (#6406, #6632). Took main's design on both, preserving this branch's vanish_trail trailing-space fix: - markup_utils.py: main's XML-only extract_and_strip(text, *, xml_tags), dropping the branch's brackets= param; kept vanish_trail and the (?P<trail>[ \t]*) capture. - _provider_format.py: dropped the now-dead Instructions import (main removed the preset blocks using it); kept main's TimedString. _has_open_tag uses main's semantics (no bracket hold) via the branch's more precise _open_tag_fragment. - tests: main's split_all_markup / _strip helpers with the branch's single-space expectations; updated MIXED_CLEAN and test_square_brackets_are_never_markup, which hard-coded the leftover spaces this branch removes.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
also removes brackets for tts aligned transcripts, for providers like inworld that include them in their timed transcripts