fix(utils): cover complete trailing think markers

Made-with: Cursor
This commit is contained in:
Xubin Ren
2026-05-01 20:09:59 +08:00
committed by Xubin Ren
parent 2c397ad442
commit 188e6df757
3 changed files with 25 additions and 2 deletions
+2 -2
View File
@@ -63,8 +63,8 @@ def strip_think(text: str) -> str:
# Stream chunks may end in the middle of a control tag. Strip only known
# control-token prefixes at the very end.
partial_control_tag = (
r"</?(?:t|th|thi|thin|think|tho|thou|thoug|though|thought)"
r"|<\|?(?:c|ch|cha|chan|chann|channe|channel|channel\|?)"
r"</?(?:t|th|thi|thin|think|tho|thou|thoug|though|thought)>?"
r"|<\|?(?:c|ch|cha|chan|chann|channe|channel)(?:\|?>?)?"
)
text = re.sub(rf"(?:{partial_control_tag})$", "", text)
text = re.sub(r"^\s*<\|?$", "", text)
+21
View File
@@ -993,6 +993,27 @@ async def test_loop_stream_filter_hides_partial_trailing_think_prefix(tmp_path):
assert deltas == ["Hello", " World"]
@pytest.mark.asyncio
async def test_loop_stream_filter_hides_complete_trailing_think_tag(tmp_path):
loop = _make_loop(tmp_path)
deltas: list[str] = []
async def chat_stream_with_retry(*, on_content_delta, **kwargs):
await on_content_delta("Hello <think>")
await on_content_delta("hidden</think>World")
return LLMResponse(content="Hello <think>hidden</think>World", tool_calls=[], usage={})
loop.provider.chat_stream_with_retry = chat_stream_with_retry
async def on_stream(delta: str) -> None:
deltas.append(delta)
final_content, _, _, _, _ = await loop._run_agent_loop([], on_stream=on_stream)
assert final_content == "Hello World"
assert deltas == ["Hello", " World"]
@pytest.mark.asyncio
async def test_loop_retries_think_only_final_response(tmp_path):
loop = _make_loop(tmp_path)
+2
View File
@@ -105,10 +105,12 @@ class TestStripThinkMalformedLeaks:
def test_partial_trailing_think_tag_after_visible_text(self):
assert strip_think("喷泉策略说明 <thin") == "喷泉策略说明"
assert strip_think("answer <thought") == "answer"
assert strip_think("answer <think>") == "answer"
def test_partial_trailing_channel_marker_after_visible_text(self):
assert strip_think("喷泉策略说明 <|chan") == "喷泉策略说明"
assert strip_think("answer <channel") == "answer"
assert strip_think("answer <|channel|>") == "answer"
class TestStripThinkConservativePreserve: