chore: import upstream snapshot with attribution
PR Test (NPU) / check-changes (push) Has been cancelled
PR Test (NPU) / pr-gate (push) Has been cancelled
PR Test (NPU) / set-image-config (push) Has been cancelled
PR Test (NPU) / stage-b-test-1-npu-a2 (0) (push) Has been cancelled
PR Test (NPU) / stage-b-test-1-npu-a2 (1) (push) Has been cancelled
PR Test (NPU) / stage-b-test-2-npu-a2 (0) (push) Has been cancelled
PR Test (NPU) / stage-b-test-2-npu-a2 (1) (push) Has been cancelled
PR Test (NPU) / stage-b-test-4-npu-a3 (push) Has been cancelled
PR Test (NPU) / stage-b-test-16-npu-a3 (push) Has been cancelled
PR Test (NPU) / multimodal-gen-test-1-npu-a3 (push) Has been cancelled
PR Test (NPU) / multimodal-gen-test-2-npu-a3 (push) Has been cancelled
PR Test (Arm64) / pr-gate (push) Has been cancelled
PR Test (Arm64) / check-changes (push) Has been cancelled
PR Test (Arm64) / build-test (push) Has been cancelled
PR Test (sgl-router) / gate (push) Has been cancelled
PR Test (sgl-router) / tier-1 — lint (push) Has been cancelled
PR Test (sgl-router) / tier-2 — build + test (push) Has been cancelled
PR Test (sgl-router) / tier-3 — docker (placeholder) (push) Has been cancelled
PR Test (sgl-router) / tier-3 — k8s integration (push) Has been cancelled
PR Test (sgl-router) / tier-3 — e2e (push) Has been cancelled
PR Test (sgl-router) / finish (push) Has been cancelled
PR Test (NPU) / single-node-poc (map[name:qwen3_6_27b_w8a8_1p_in64k_out1k_50ms runner:linux-aarch64-a3-2 test_case:test/registered/ascend/performance/qwen3_6_27b/test_npu_qwen3_6_27b_w8a8_1p_in64k_out1k_50ms.py test_type:perf]) (push) Has been cancelled
PR Test (NPU) / pr-test-npu-finish (push) Has been cancelled
PR Test (Xeon) / pr-gate (push) Has been cancelled
PR Test (Xeon) / check-changes (push) Has been cancelled
PR Test (Xeon) / build-test (, xeon-gnr, base-b-test-cpu) (push) Has been cancelled
PR Test (XPU) / check-changes (push) Has been cancelled
PR Test (XPU) / pr-gate (push) Has been cancelled
PR Test (XPU) / stage-a-test-1-gpu-xpu (push) Has been cancelled
PR Test (XPU) / wait-for-stage-a (push) Has been cancelled
PR Test (XPU) / stage-b-test-1-gpu-xpu (push) Has been cancelled
PR Test (XPU) / finish (push) Has been cancelled
CI Model Inventory / build-inventory (push) Has been cancelled
Lint / lint (push) Has been cancelled
PR Benchmark (SMG Components) / Benchmark Compilation Check (push) Has been cancelled
PR Benchmark (SMG Components) / Benchmark - Manual Policy (push) Has been cancelled
PR Benchmark (SMG Components) / Benchmark - Request Processing (push) Has been cancelled
PR Benchmark (SMG Components) / Benchmark Summary (push) Has been cancelled
PR Test (SMG) / build-wheel (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on windows (x86_64 - auto) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on macos (x86_64 - auto) (push) Has been cancelled
PR Test (SMG) / python-unit-tests (push) Has been cancelled
PR Test (SMG) / unit-tests (push) Has been cancelled
PR Test (SMG) / benchmarks (push) Has been cancelled
PR Test (SMG) / chat-completions (push) Has been cancelled
PR Test (SMG) / chat-completions-4gpu (push) Has been cancelled
PR Test (SMG) / e2e (push) Has been cancelled
PR Test (SMG) / docker-build-test (push) Has been cancelled
PR Test (SMG) / k8s-integration (push) Has been cancelled
PR Test (SMG) / finish (push) Has been cancelled
PR Test (SMG) / summarize-benchmarks (push) Has been cancelled
Release SGLang Model Gateway Docker Image / publish (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on macos (aarch64 - auto) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on linux (aarch64 - auto) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on linux (x86_64 - auto) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on linux (aarch64 - musllinux_1_1) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on linux (x86_64 - musllinux_1_1) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / Build SDist (push) Has been cancelled
Release SGLang Model Gateway to PyPI / Upload to PyPI (push) Has been cancelled
Release SGLang Kernels / build-cu129-matrix (aarch64, 12.9, 3.10, arm-kernel-build-node) (push) Has been cancelled
Release SGLang Kernels / build-cu129-matrix (x86_64, 12.9, 3.10, x64-kernel-build-node) (push) Has been cancelled
Release SGLang Kernels / release-cu129 (push) Has been cancelled
Release SGLang Kernels / build-cu130-matrix (aarch64, 13.0, 3.10, arm-kernel-build-node) (push) Has been cancelled
Release SGLang Kernels / build-cu130-matrix (x86_64, 13.0, 3.10, x64-kernel-build-node) (push) Has been cancelled
Release SGLang Kernels / release-cu130 (push) Has been cancelled
Release SGLang Kernels / build-rocm-matrix (3.10, 700) (push) Has been cancelled
Release SGLang Kernels / build-rocm-matrix (3.10, 720) (push) Has been cancelled
Release SGLang Kernels / release-rocm700 (push) Has been cancelled
Release SGLang Kernels / release-rocm720 (push) Has been cancelled
Release SGLang Kernels / build-musa43 (43, 3.10) (push) Has been cancelled
Release SGLang Kernels / release-musa43 (push) Has been cancelled
PR Test (NPU) / check-changes (push) Has been cancelled
PR Test (NPU) / pr-gate (push) Has been cancelled
PR Test (NPU) / set-image-config (push) Has been cancelled
PR Test (NPU) / stage-b-test-1-npu-a2 (0) (push) Has been cancelled
PR Test (NPU) / stage-b-test-1-npu-a2 (1) (push) Has been cancelled
PR Test (NPU) / stage-b-test-2-npu-a2 (0) (push) Has been cancelled
PR Test (NPU) / stage-b-test-2-npu-a2 (1) (push) Has been cancelled
PR Test (NPU) / stage-b-test-4-npu-a3 (push) Has been cancelled
PR Test (NPU) / stage-b-test-16-npu-a3 (push) Has been cancelled
PR Test (NPU) / multimodal-gen-test-1-npu-a3 (push) Has been cancelled
PR Test (NPU) / multimodal-gen-test-2-npu-a3 (push) Has been cancelled
PR Test (Arm64) / pr-gate (push) Has been cancelled
PR Test (Arm64) / check-changes (push) Has been cancelled
PR Test (Arm64) / build-test (push) Has been cancelled
PR Test (sgl-router) / gate (push) Has been cancelled
PR Test (sgl-router) / tier-1 — lint (push) Has been cancelled
PR Test (sgl-router) / tier-2 — build + test (push) Has been cancelled
PR Test (sgl-router) / tier-3 — docker (placeholder) (push) Has been cancelled
PR Test (sgl-router) / tier-3 — k8s integration (push) Has been cancelled
PR Test (sgl-router) / tier-3 — e2e (push) Has been cancelled
PR Test (sgl-router) / finish (push) Has been cancelled
PR Test (NPU) / single-node-poc (map[name:qwen3_6_27b_w8a8_1p_in64k_out1k_50ms runner:linux-aarch64-a3-2 test_case:test/registered/ascend/performance/qwen3_6_27b/test_npu_qwen3_6_27b_w8a8_1p_in64k_out1k_50ms.py test_type:perf]) (push) Has been cancelled
PR Test (NPU) / pr-test-npu-finish (push) Has been cancelled
PR Test (Xeon) / pr-gate (push) Has been cancelled
PR Test (Xeon) / check-changes (push) Has been cancelled
PR Test (Xeon) / build-test (, xeon-gnr, base-b-test-cpu) (push) Has been cancelled
PR Test (XPU) / check-changes (push) Has been cancelled
PR Test (XPU) / pr-gate (push) Has been cancelled
PR Test (XPU) / stage-a-test-1-gpu-xpu (push) Has been cancelled
PR Test (XPU) / wait-for-stage-a (push) Has been cancelled
PR Test (XPU) / stage-b-test-1-gpu-xpu (push) Has been cancelled
PR Test (XPU) / finish (push) Has been cancelled
CI Model Inventory / build-inventory (push) Has been cancelled
Lint / lint (push) Has been cancelled
PR Benchmark (SMG Components) / Benchmark Compilation Check (push) Has been cancelled
PR Benchmark (SMG Components) / Benchmark - Manual Policy (push) Has been cancelled
PR Benchmark (SMG Components) / Benchmark - Request Processing (push) Has been cancelled
PR Benchmark (SMG Components) / Benchmark Summary (push) Has been cancelled
PR Test (SMG) / build-wheel (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on windows (x86_64 - auto) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on macos (x86_64 - auto) (push) Has been cancelled
PR Test (SMG) / python-unit-tests (push) Has been cancelled
PR Test (SMG) / unit-tests (push) Has been cancelled
PR Test (SMG) / benchmarks (push) Has been cancelled
PR Test (SMG) / chat-completions (push) Has been cancelled
PR Test (SMG) / chat-completions-4gpu (push) Has been cancelled
PR Test (SMG) / e2e (push) Has been cancelled
PR Test (SMG) / docker-build-test (push) Has been cancelled
PR Test (SMG) / k8s-integration (push) Has been cancelled
PR Test (SMG) / finish (push) Has been cancelled
PR Test (SMG) / summarize-benchmarks (push) Has been cancelled
Release SGLang Model Gateway Docker Image / publish (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on macos (aarch64 - auto) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on linux (aarch64 - auto) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on linux (x86_64 - auto) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on linux (aarch64 - musllinux_1_1) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / build on linux (x86_64 - musllinux_1_1) (push) Has been cancelled
Release SGLang Model Gateway to PyPI / Build SDist (push) Has been cancelled
Release SGLang Model Gateway to PyPI / Upload to PyPI (push) Has been cancelled
Release SGLang Kernels / build-cu129-matrix (aarch64, 12.9, 3.10, arm-kernel-build-node) (push) Has been cancelled
Release SGLang Kernels / build-cu129-matrix (x86_64, 12.9, 3.10, x64-kernel-build-node) (push) Has been cancelled
Release SGLang Kernels / release-cu129 (push) Has been cancelled
Release SGLang Kernels / build-cu130-matrix (aarch64, 13.0, 3.10, arm-kernel-build-node) (push) Has been cancelled
Release SGLang Kernels / build-cu130-matrix (x86_64, 13.0, 3.10, x64-kernel-build-node) (push) Has been cancelled
Release SGLang Kernels / release-cu130 (push) Has been cancelled
Release SGLang Kernels / build-rocm-matrix (3.10, 700) (push) Has been cancelled
Release SGLang Kernels / build-rocm-matrix (3.10, 720) (push) Has been cancelled
Release SGLang Kernels / release-rocm700 (push) Has been cancelled
Release SGLang Kernels / release-rocm720 (push) Has been cancelled
Release SGLang Kernels / build-musa43 (43, 3.10) (push) Has been cancelled
Release SGLang Kernels / release-musa43 (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,588 @@
|
||||
import re
|
||||
from dataclasses import dataclass
|
||||
from typing import Iterator, List, Optional, Tuple
|
||||
|
||||
|
||||
@dataclass
|
||||
class Event:
|
||||
"""Represents a parsed event from the Harmony stream."""
|
||||
|
||||
event_type: str
|
||||
content: str
|
||||
raw_text: str = None # Original text including structural markers
|
||||
|
||||
|
||||
@dataclass
|
||||
class Token:
|
||||
"""A structural token in the Harmony format."""
|
||||
|
||||
type: str
|
||||
start: int
|
||||
end: int
|
||||
|
||||
|
||||
def prefix_hold(text: str, tokens: List[str]) -> Tuple[str, str]:
|
||||
"""
|
||||
Holds back the longest suffix of `text` that could be a prefix of any token.
|
||||
Returns (emit_now, keep_for_later).
|
||||
"""
|
||||
if not text:
|
||||
return "", ""
|
||||
max_hold = 0
|
||||
for tok in tokens:
|
||||
if not tok:
|
||||
continue
|
||||
# Check for prefixes of tok in the suffix of text
|
||||
L = min(len(tok) - 1, len(text))
|
||||
for k in range(L, 0, -1):
|
||||
if tok.startswith(text[-k:]):
|
||||
max_hold = max(max_hold, k)
|
||||
break
|
||||
if max_hold == 0:
|
||||
return text, ""
|
||||
return text[:-max_hold], text[-max_hold:]
|
||||
|
||||
|
||||
def iter_tokens(text: str, start_pos: int = 0) -> Iterator[Token]:
|
||||
"""Iterate over structural tokens in left-to-right order."""
|
||||
TOKENS = {
|
||||
"<|start|>": "START",
|
||||
"<|channel|>": "CHANNEL",
|
||||
"<|message|>": "MESSAGE",
|
||||
"<|constrain|>": "CONSTRAIN",
|
||||
"<|end|>": "END",
|
||||
"<|call|>": "CALL",
|
||||
"<|return|>": "RETURN",
|
||||
}
|
||||
|
||||
pos = start_pos
|
||||
has_unknown_tokens = False
|
||||
while pos < len(text):
|
||||
# Find next "<|"
|
||||
marker_pos = text.find("<|", pos)
|
||||
if marker_pos == -1:
|
||||
break
|
||||
|
||||
# Emit any text before the marker
|
||||
if marker_pos > pos:
|
||||
yield Token("TEXT", pos, marker_pos)
|
||||
|
||||
# Check which token it is
|
||||
found_token = False
|
||||
|
||||
for literal, token_type in TOKENS.items():
|
||||
if text.startswith(literal, marker_pos):
|
||||
yield Token(token_type, marker_pos, marker_pos + len(literal))
|
||||
pos = marker_pos + len(literal)
|
||||
found_token = True
|
||||
break
|
||||
if not found_token:
|
||||
tail = text[marker_pos:]
|
||||
is_partial = any(lit.startswith(tail) for lit in TOKENS)
|
||||
if is_partial:
|
||||
# Hold whole tail (partial token)
|
||||
yield Token("TEXT", marker_pos, len(text))
|
||||
pos = len(text)
|
||||
break
|
||||
else:
|
||||
# Unknown token like <|weird|> ...
|
||||
has_unknown_tokens = True
|
||||
# Emit the "<|" as a TEXT token first
|
||||
yield Token("TEXT", marker_pos, marker_pos + 2)
|
||||
|
||||
# Try to find a closing "|>" for this unknown token
|
||||
close_pos = text.find("|>", marker_pos + 2)
|
||||
if close_pos != -1:
|
||||
# Look ahead to the next structural token after the unknown close
|
||||
next_marker = text.find("<|", close_pos + 2)
|
||||
if next_marker != -1:
|
||||
# Emit the unknown body + any following plain text up to next marker
|
||||
yield Token("TEXT", marker_pos + 2, next_marker)
|
||||
pos = next_marker
|
||||
else:
|
||||
# Emit until the end
|
||||
yield Token("TEXT", marker_pos + 2, len(text))
|
||||
pos = len(text)
|
||||
break
|
||||
else:
|
||||
# No closing; advance past "<|" and continue scanning
|
||||
pos = marker_pos + 2
|
||||
|
||||
# Emit any remaining text
|
||||
if pos < len(text):
|
||||
yield Token("TEXT", pos, len(text))
|
||||
elif pos == len(text) and has_unknown_tokens:
|
||||
# Add an empty trailing TEXT token only when we encountered unknown tokens
|
||||
# and the text ends with a known structural token. This matches expected tests.
|
||||
for literal in TOKENS.keys():
|
||||
if text.endswith(literal):
|
||||
yield Token("TEXT", pos, pos)
|
||||
break
|
||||
|
||||
|
||||
class CanonicalStrategy:
|
||||
"""Parses the canonical Harmony format with channel markers."""
|
||||
|
||||
def __init__(self):
|
||||
self.guard_tokens = [
|
||||
"<|start|>",
|
||||
"<|channel|>",
|
||||
"<|message|>",
|
||||
"<|constrain|>",
|
||||
"<|end|>",
|
||||
"<|call|>",
|
||||
"<|return|>",
|
||||
]
|
||||
|
||||
def parse(self, text: str) -> Tuple[List[Event], str]:
|
||||
events = []
|
||||
tokens = list(iter_tokens(text))
|
||||
|
||||
if not tokens:
|
||||
return events, ""
|
||||
|
||||
pos = 0
|
||||
while pos < len(tokens):
|
||||
token = tokens[pos]
|
||||
|
||||
if token.type == "TEXT":
|
||||
# Check if this might be incomplete
|
||||
if pos == len(tokens) - 1: # Last token
|
||||
emit, hold = prefix_hold(
|
||||
text[token.start : token.end], self.guard_tokens
|
||||
)
|
||||
if emit:
|
||||
events.append(Event("normal", emit))
|
||||
return events, hold
|
||||
else:
|
||||
# Check if this might be commentary filler between blocks
|
||||
if self._is_commentary_filler_between_blocks(text, tokens, pos):
|
||||
# Skip this filler text - don't emit as normal content
|
||||
pos += 1
|
||||
else:
|
||||
content = text[token.start : token.end]
|
||||
# Skip standalone structural tokens that shouldn't be emitted as normal text
|
||||
if not self._is_standalone_structural_token(content):
|
||||
events.append(Event("normal", content))
|
||||
pos += 1
|
||||
|
||||
elif token.type in ("START", "CHANNEL"):
|
||||
# Parse a channel block starting here
|
||||
block_result = self._parse_block(text, tokens, pos)
|
||||
if block_result is None:
|
||||
# Incomplete block - check if we can emit partial reasoning content
|
||||
partial_result = self._parse_partial_analysis(text, tokens, pos)
|
||||
if partial_result:
|
||||
event, remaining_text = partial_result
|
||||
events.append(event)
|
||||
return events, remaining_text
|
||||
# No partial content, hold entire remaining text
|
||||
remaining_start = tokens[pos].start
|
||||
return events, text[remaining_start:]
|
||||
event, new_pos = block_result
|
||||
if event:
|
||||
events.append(event)
|
||||
pos = new_pos
|
||||
|
||||
else:
|
||||
# Check if this might be commentary filler between blocks
|
||||
if self._is_commentary_filler_between_blocks(text, tokens, pos):
|
||||
# Skip this filler text - don't emit as normal content
|
||||
pos += 1
|
||||
else:
|
||||
# Unexpected token - only emit as text if it's not a standalone structural token
|
||||
content = text[token.start : token.end]
|
||||
if not self._is_standalone_structural_token(content):
|
||||
events.append(Event("normal", content))
|
||||
pos += 1
|
||||
|
||||
return events, ""
|
||||
|
||||
def _parse_partial_analysis(
|
||||
self, text: str, tokens: List[Token], start_pos: int
|
||||
) -> Optional[Tuple[Event, str]]:
|
||||
"""Try to parse partial analysis content for incremental streaming."""
|
||||
pos = start_pos
|
||||
|
||||
# Skip <|start|> if present
|
||||
if pos < len(tokens) and tokens[pos].type == "START":
|
||||
pos += 1
|
||||
|
||||
# Look for <|channel|> followed by analysis
|
||||
channel_pos = None
|
||||
message_pos = None
|
||||
|
||||
for i in range(pos, len(tokens)):
|
||||
if tokens[i].type == "CHANNEL" and channel_pos is None:
|
||||
channel_pos = i
|
||||
elif tokens[i].type == "MESSAGE":
|
||||
message_pos = i
|
||||
break
|
||||
|
||||
if channel_pos is None or message_pos is None:
|
||||
return None
|
||||
|
||||
# Extract channel type
|
||||
channel_start = (
|
||||
tokens[channel_pos + 1].start
|
||||
if channel_pos + 1 < len(tokens)
|
||||
else tokens[channel_pos].end
|
||||
)
|
||||
channel_end = tokens[message_pos].start
|
||||
channel_header = text[channel_start:channel_end]
|
||||
|
||||
channel_type = self._extract_channel_type(channel_header)
|
||||
if channel_type != "analysis":
|
||||
return None # Only stream analysis content - tool calls wait for completion
|
||||
|
||||
# Extract partial content after <|message|>
|
||||
content_start = tokens[message_pos].end
|
||||
content = text[content_start:]
|
||||
|
||||
# Return partial reasoning content and preserve the channel structure for next parse
|
||||
remaining_text = text[tokens[start_pos].start : content_start]
|
||||
return Event("reasoning", content), remaining_text
|
||||
|
||||
def _extract_channel_type(self, header_text: str) -> Optional[str]:
|
||||
"""Extract channel type from header, ignoring other attributes like to=... or <|constrain|>..."""
|
||||
# Look for channel type at the start of the header (case insensitive)
|
||||
header_clean = header_text.strip()
|
||||
|
||||
if header_clean.lower().startswith("analysis"):
|
||||
return "analysis"
|
||||
elif header_clean.lower().startswith("commentary"):
|
||||
return "commentary"
|
||||
elif header_clean.lower().startswith("final"):
|
||||
return "final"
|
||||
else:
|
||||
return None # Unknown channel type
|
||||
|
||||
def _parse_block(
|
||||
self, text: str, tokens: List[Token], start_pos: int
|
||||
) -> Optional[Tuple[Optional[Event], int]]:
|
||||
"""Parse a channel block. Returns (event, next_pos) or None if incomplete."""
|
||||
pos = start_pos
|
||||
|
||||
# Skip <|start|> if present
|
||||
if pos < len(tokens) and tokens[pos].type == "START":
|
||||
pos += 1
|
||||
|
||||
# Look for <|channel|> or <|message|> (tool responses go direct to message)
|
||||
channel_pos = None
|
||||
message_pos = None
|
||||
|
||||
for i in range(pos, len(tokens)):
|
||||
if tokens[i].type == "CHANNEL" and channel_pos is None:
|
||||
channel_pos = i
|
||||
elif tokens[i].type == "MESSAGE":
|
||||
message_pos = i
|
||||
break
|
||||
|
||||
if message_pos is None:
|
||||
return None # No message token found
|
||||
|
||||
# If no channel found, this is a tool response - treat as normal text
|
||||
if channel_pos is None:
|
||||
content_start = tokens[message_pos].end
|
||||
# Find end token after message
|
||||
end_token_pos = None
|
||||
for i in range(message_pos + 1, len(tokens)):
|
||||
if tokens[i].type in ("END", "CALL", "RETURN"):
|
||||
end_token_pos = i
|
||||
break
|
||||
if end_token_pos is None:
|
||||
return None # Incomplete
|
||||
content = text[content_start : tokens[end_token_pos].start]
|
||||
return Event("normal", content), end_token_pos + 1
|
||||
|
||||
# Standard channel block processing - message_pos is already found above
|
||||
pos = channel_pos + 1 # Skip CHANNEL token
|
||||
|
||||
# Extract channel type from header (ignoring other attributes like to=... or <|constrain|>...)
|
||||
channel_start = tokens[pos].start if pos < len(tokens) else tokens[pos - 1].end
|
||||
channel_end = tokens[message_pos].start
|
||||
channel_header = text[channel_start:channel_end]
|
||||
|
||||
channel_type = self._extract_channel_type(channel_header)
|
||||
if not channel_type:
|
||||
return None # Unknown or malformed channel
|
||||
|
||||
pos = message_pos + 1 # Skip MESSAGE token
|
||||
|
||||
# Find content and end token
|
||||
content_start = tokens[message_pos].end
|
||||
end_pos = pos
|
||||
|
||||
# Each channel type has specific valid end tokens
|
||||
if channel_type == "final":
|
||||
while end_pos < len(tokens) and tokens[end_pos].type != "RETURN":
|
||||
end_pos += 1
|
||||
elif channel_type == "analysis":
|
||||
while end_pos < len(tokens) and tokens[end_pos].type not in ("END", "CALL"):
|
||||
end_pos += 1
|
||||
else: # commentary
|
||||
while end_pos < len(tokens) and tokens[end_pos].type not in ("END", "CALL"):
|
||||
end_pos += 1
|
||||
|
||||
if end_pos >= len(tokens):
|
||||
# No end token found
|
||||
if channel_type == "final":
|
||||
# Final blocks can end at end of input without requiring <|return|>
|
||||
content = text[content_start:]
|
||||
return Event("normal", content), end_pos
|
||||
return None # Analysis and commentary need proper end tokens
|
||||
|
||||
end_token = tokens[end_pos]
|
||||
content = text[content_start : end_token.start]
|
||||
|
||||
# Create event based on channel and end token
|
||||
if channel_type == "analysis":
|
||||
if end_token.type == "CALL":
|
||||
# Built-in tools (browser, python) use analysis channel with <|call|>
|
||||
raw_text = text[tokens[start_pos].start : end_token.end]
|
||||
return Event("tool_call", content.strip(), raw_text), end_pos + 1
|
||||
else:
|
||||
return Event("reasoning", content), end_pos + 1
|
||||
elif channel_type == "commentary":
|
||||
if end_token.type == "CALL":
|
||||
raw_text = text[tokens[start_pos].start : end_token.end]
|
||||
return Event("tool_call", content.strip(), raw_text), end_pos + 1
|
||||
else:
|
||||
return Event("normal", content), end_pos + 1
|
||||
elif channel_type == "final":
|
||||
# For final blocks, include any trailing TEXT immediately after <|return|>
|
||||
final_content = content
|
||||
if end_token.type == "RETURN" and end_pos + 1 < len(tokens):
|
||||
next_token = tokens[end_pos + 1]
|
||||
if next_token.type == "TEXT":
|
||||
final_content += text[next_token.start : next_token.end]
|
||||
return Event("normal", final_content), end_pos + 2
|
||||
return Event("normal", final_content), end_pos + 1
|
||||
|
||||
return None, end_pos + 1
|
||||
|
||||
def _is_commentary_filler_between_blocks(
|
||||
self, text: str, tokens: List[Token], pos: int
|
||||
) -> bool:
|
||||
"""Check if this is commentary filler text or problematic structural tokens in malformed sequences."""
|
||||
current_token = tokens[pos]
|
||||
current_text = text[current_token.start : current_token.end].strip()
|
||||
|
||||
# Check for commentary filler between CALL and CHANNEL
|
||||
if pos > 0 and pos + 1 < len(tokens):
|
||||
prev_token = tokens[pos - 1]
|
||||
next_token = tokens[pos + 1]
|
||||
|
||||
# Check if we have CALL -> TEXT("commentary") -> CHANNEL pattern
|
||||
if (
|
||||
prev_token.type == "CALL"
|
||||
and next_token.type == "CHANNEL"
|
||||
and current_text.lower() == "commentary"
|
||||
):
|
||||
return True
|
||||
|
||||
# Check for problematic patterns after CALL tokens (malformed sequences)
|
||||
if pos > 0:
|
||||
prev_token = tokens[pos - 1]
|
||||
|
||||
# Only filter structural tokens that appear immediately after CALL in malformed sequences
|
||||
# These patterns indicate the content is malformed and the structural tokens are noise
|
||||
if prev_token.type == "CALL":
|
||||
# Filter MESSAGE tokens after CALL (should not happen in well-formed content)
|
||||
if current_token.type == "MESSAGE":
|
||||
return True
|
||||
|
||||
# Filter standalone "commentary" text after CALL
|
||||
if (
|
||||
current_token.type == "TEXT"
|
||||
and current_text.lower() == "commentary"
|
||||
):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def _is_standalone_structural_token(self, content: str) -> bool:
|
||||
"""Check if content is just a standalone structural token that should be filtered."""
|
||||
content_stripped = content.strip()
|
||||
structural_tokens = [
|
||||
"<|start|>",
|
||||
"<|channel|>",
|
||||
"<|message|>",
|
||||
"<|constrain|>",
|
||||
"<|end|>",
|
||||
"<|call|>",
|
||||
"<|return|>",
|
||||
]
|
||||
return content_stripped in structural_tokens
|
||||
|
||||
|
||||
class TextStrategy:
|
||||
"""Parses the text-based Harmony fallback format."""
|
||||
|
||||
def __init__(self):
|
||||
self.buffer_context = ""
|
||||
self.patterns = {
|
||||
"analysis_then_final": re.compile(
|
||||
r"^\s*(?:assistant)?\s*(analysis|commentary)(.*?)\s*assistantfinal\s*(.*)\s*$",
|
||||
re.IGNORECASE | re.DOTALL,
|
||||
),
|
||||
"final_only": re.compile(
|
||||
r"^\s*assistantfinal\s*(.*)\s*$", re.IGNORECASE | re.DOTALL
|
||||
),
|
||||
"analysis_only": re.compile(
|
||||
r"^\s*(?:assistant)?\s*(analysis|commentary)(.*)\s*$",
|
||||
re.IGNORECASE | re.DOTALL,
|
||||
),
|
||||
}
|
||||
|
||||
def set_buffer_context(self, buffer: str):
|
||||
self.buffer_context = buffer
|
||||
|
||||
def parse(self, text: str) -> Tuple[List[Event], str]:
|
||||
events = []
|
||||
|
||||
m = self.patterns["analysis_then_final"].match(text)
|
||||
if m:
|
||||
channel, reasoning, final = m.groups()
|
||||
if channel.lower() == "analysis" and reasoning.strip():
|
||||
events.append(Event("reasoning", reasoning.strip()))
|
||||
elif channel.lower() == "commentary" and reasoning.strip():
|
||||
events.append(Event("normal", reasoning.strip()))
|
||||
if final.strip():
|
||||
events.append(Event("normal", final.strip()))
|
||||
return events, ""
|
||||
|
||||
# If assistantfinal appears to be incomplete (e.g., 'assistantfin'), hold entire buffer
|
||||
if re.search(
|
||||
r"(?:^|\s)(?:assistant)?\s*(analysis|commentary)", text, re.IGNORECASE
|
||||
):
|
||||
low = text.lower()
|
||||
if "assistantfin" in low and "assistantfinal" not in low:
|
||||
return events, text
|
||||
|
||||
m = self.patterns["final_only"].match(text)
|
||||
if m:
|
||||
final = m.group(1)
|
||||
if final.strip():
|
||||
events.append(Event("normal", final.strip()))
|
||||
return events, ""
|
||||
|
||||
m = self.patterns["analysis_only"].match(text)
|
||||
if m:
|
||||
channel, content = m.groups()
|
||||
emit, hold = prefix_hold(content, ["assistantfinal"])
|
||||
if channel.lower() == "analysis" and emit:
|
||||
# Stream reasoning content as-is based on structural markers only.
|
||||
events.append(Event("reasoning", emit))
|
||||
# Keep the channel header in the remaining buffer to continue parsing
|
||||
# subsequent chunks in the text fallback format. Preserve any held
|
||||
# prefix that may complete into "assistantfinal".
|
||||
if hold:
|
||||
return events, text[: m.start(2)] + hold
|
||||
else:
|
||||
return events, channel
|
||||
elif channel.lower() == "commentary" and emit:
|
||||
# For commentary, stream as normal text. Preserve spaces unless holding.
|
||||
content_out = emit if hold else emit.strip()
|
||||
events.append(Event("normal", content_out))
|
||||
if hold:
|
||||
return events, text[: m.start(2)] + hold
|
||||
else:
|
||||
return events, ""
|
||||
# If no emit, just return the held content
|
||||
return events, text[: m.start(2)] + hold
|
||||
|
||||
emit, hold = prefix_hold(text, ["analysis", "commentary", "assistantfinal"])
|
||||
if emit:
|
||||
events.append(Event("normal", emit))
|
||||
return events, hold
|
||||
|
||||
|
||||
class HarmonyParser:
|
||||
"""Facade for parsing Harmony format, switching between strategies."""
|
||||
|
||||
def __init__(self):
|
||||
self.strategy = None
|
||||
self._buffer = ""
|
||||
self._should_filter_commentary = (
|
||||
False # Track if we should filter commentary in next chunks
|
||||
)
|
||||
self._partial_commentary = (
|
||||
"" # Track partial commentary being built across chunks
|
||||
)
|
||||
|
||||
def parse(self, chunk: str) -> List[Event]:
|
||||
self._buffer += chunk
|
||||
|
||||
if self.strategy is None:
|
||||
if "<|channel|>" in self._buffer or "<|start|>" in self._buffer:
|
||||
self.strategy = CanonicalStrategy()
|
||||
elif re.search(
|
||||
r"(?:^|\s)(?:assistant)?\s*(analysis|commentary|assistantfinal)",
|
||||
self._buffer,
|
||||
re.IGNORECASE,
|
||||
):
|
||||
self.strategy = TextStrategy()
|
||||
else:
|
||||
# Not yet determined, hold
|
||||
return []
|
||||
|
||||
if hasattr(self.strategy, "set_buffer_context"):
|
||||
# Provide full buffer context to strategy for smarter whitespace handling
|
||||
self.strategy.set_buffer_context(self._buffer)
|
||||
|
||||
events, remaining = self.strategy.parse(self._buffer)
|
||||
|
||||
# Check if we should start filtering commentary (after <|call|> token or tool_call event)
|
||||
buffer_has_call_token = self._buffer.rstrip().endswith("<|call|>")
|
||||
|
||||
self._buffer = remaining
|
||||
|
||||
# Filter events for streaming case
|
||||
filtered_events = []
|
||||
for event in events:
|
||||
should_filter = False
|
||||
|
||||
if event.event_type == "normal":
|
||||
# Check if we're in a commentary filtering state
|
||||
if self._should_filter_commentary or self._partial_commentary:
|
||||
# Try to build partial commentary
|
||||
potential_commentary = (
|
||||
self._partial_commentary + event.content.strip().lower()
|
||||
)
|
||||
|
||||
if potential_commentary == "commentary":
|
||||
# Complete commentary found - filter it
|
||||
should_filter = True
|
||||
self._partial_commentary = "" # Reset
|
||||
self._should_filter_commentary = False # Done filtering
|
||||
elif "commentary".startswith(potential_commentary):
|
||||
# Partial match - accumulate and filter this chunk
|
||||
should_filter = True
|
||||
self._partial_commentary = potential_commentary
|
||||
else:
|
||||
# Not commentary - reset and keep the event
|
||||
self._partial_commentary = ""
|
||||
self._should_filter_commentary = False
|
||||
else:
|
||||
# Not in commentary filtering state - reset partial state
|
||||
self._partial_commentary = ""
|
||||
|
||||
if should_filter:
|
||||
# Skip this commentary filler
|
||||
continue
|
||||
|
||||
# Update filtering state based on events and buffer state
|
||||
if event.event_type == "tool_call":
|
||||
self._should_filter_commentary = (
|
||||
True # Filter commentary after tool calls
|
||||
)
|
||||
self._partial_commentary = "" # Reset on tool call
|
||||
elif buffer_has_call_token:
|
||||
self._should_filter_commentary = (
|
||||
True # Filter commentary after <|call|> token
|
||||
)
|
||||
|
||||
filtered_events.append(event)
|
||||
|
||||
return filtered_events
|
||||
Reference in New Issue
Block a user