From d281587989f25c452db31589b19f835f87c61500 Mon Sep 17 00:00:00 2001 From: Enrique Shockwave <33002121+qeternity@users.noreply.github.com> Date: Thu, 27 Feb 2025 16:42:54 +0000 Subject: [PATCH] Improve: Support xgrammar 0.1.14 (#3593) --- python/pyproject.toml | 2 +- python/sglang/srt/constrained/xgrammar_backend.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 0fa50c928..395108c41 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -35,7 +35,7 @@ runtime_common = [ "torchao>=0.7.0", "uvicorn", "uvloop", - "xgrammar==0.1.10", + "xgrammar==0.1.14", "ninja", "transformers==4.48.3", "llguidance>=0.6.15" diff --git a/python/sglang/srt/constrained/xgrammar_backend.py b/python/sglang/srt/constrained/xgrammar_backend.py index c423a567e..7bf14bfc2 100644 --- a/python/sglang/srt/constrained/xgrammar_backend.py +++ b/python/sglang/srt/constrained/xgrammar_backend.py @@ -19,7 +19,6 @@ from typing import List, Tuple import torch from xgrammar import ( CompiledGrammar, - Grammar, GrammarCompiler, GrammarMatcher, TokenizerInfo, @@ -135,9 +134,7 @@ class XGrammarGrammarBackend(BaseGrammarBackend): return None elif key_type == "regex": try: - ctx = self.grammar_compiler.compile_grammar( - Grammar.from_regex(key_string) - ) + ctx = self.grammar_compiler.compile_regex(key_string) except RuntimeError as e: logging.warning(f"Skip invalid regex: regex={key_string}, {e=}") return None