Skip to content

fix(grpc): preserve GLM output across stream boundaries #1906

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.

Sign up for GitHub

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

Open
TongLing916 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(grpc): preserve GLM output across stream boundaries #1906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions crates/tool_parser/src/factory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ impl ParserRegistry {
/// Map a model name/pattern to a parser
pub fn map_model(&self, model: impl Into<String>, parser: impl Into<String>) {
let mut mapping = self.model_mapping.write();
mapping.insert(model.into(), parser.into());
mapping.insert(model.into().to_ascii_lowercase(), parser.into());
}

/// Get a pooled parser by exact name.
Expand Down Expand Up @@ -236,23 +236,33 @@ impl ParserRegistry {
/// Returns None if no mapping matches (caller decides fallback).
pub fn resolve_model_to_parser(&self, model: &str) -> Option<String> {
let mapping = self.model_mapping.read();
// Try exact match
if let Some(parser_name) = mapping.get(model) {
return Some(parser_name.clone());
}
// Case-insensitive substring matching (longest pattern wins) so namespaced
// and differently-cased ids (e.g. "org/Inkling-Chat") still resolve.
let model_lower = model.to_lowercase();
mapping
.iter()
.filter_map(|(pattern, parser_name)| {
let stem = pattern.strip_suffix('*')?;
model_lower
.contains(&stem.to_lowercase())
.then_some((stem, parser_name))
})
.max_by_key(|(stem, _)| stem.len())
.map(|(_, parser_name)| parser_name.clone())
// Case-insensitive resolution (longest pattern wins) so namespaced and
// differently-cased ids (e.g. "org/Inkling-Chat", "THUDM/GLM-5.2") still
// resolve. Match against both the full normalized id and the basename
// (last path segment) using prefix semantics — prefix (not substring)
// matching keeps resolution fail-closed and avoids false positives from
// a stem appearing mid-segment.
let normalized = model.to_ascii_lowercase();
let basename = normalized
.rsplit(['/', '\\'])
.find(|part| !part.is_empty())
.unwrap_or(normalized.as_str());

let resolved = std::iter::once(normalized.as_str())
.chain((basename != normalized.as_str()).then_some(basename))
.find_map(|candidate| {
mapping.get(candidate).cloned().or_else(|| {
mapping
.iter()
.filter(|(pattern, _)| {
pattern.ends_with('*')
&& candidate.starts_with(&pattern[..pattern.len() - 1])
})
.max_by_key(|(pattern, _)| pattern.len())
.map(|(_, parser_name)| parser_name.clone())
})
});
resolved
}

/// Check if a parser can be created for a specific model without actually creating it.
Expand Down Expand Up @@ -329,6 +339,8 @@ impl ParserFactory {
registry.register_parser("deepseek_v4", || Box::new(DeepSeekDsmlParser::v4()));
registry.register_parser("glm45_moe", || Box::new(Glm4MoeParser::glm45()));
registry.register_parser("glm47_moe", || Box::new(Glm4MoeParser::glm47()));
registry.register_parser("glm45", || Box::new(Glm4MoeParser::glm45()));
registry.register_parser("glm47", || Box::new(Glm4MoeParser::glm47()));
registry.register_parser("step3", || Box::new(Step3Parser::new()));
registry.register_parser("sarashina", || Box::new(SarashinaParser::new()));
registry.register_parser_with_structural_tag(
Expand Down
Loading