[Reasoning + Structured Output] make reasoning compatible with structured output (#12551)

Signed-off-by: Xinyuan Tong <xinyuantong.cs@gmail.com>
Co-authored-by: Xinyuan Tong <xinyuantong.cs@gmail.com>
This commit is contained in:
Muqi Li
2025-12-08 01:28:39 -08:00
committed by GitHub
co-authored by Xinyuan Tong
parent f72a77038f
commit 06836ad02a
8 changed files with 72 additions and 33 deletions
@@ -46,6 +46,9 @@ class BaseGrammarObject:
self.grammar_stats = None
self.current_token = None
def maybe_init_reasoning(self, reasoning: bool):
pass
def accept_token(self, token: int) -> None:
"""
Accept a token in the grammar.
@@ -151,7 +154,9 @@ class BaseGrammarBackend:
def dispatch_structural_tag(self, key_string: str) -> Optional[BaseGrammarObject]:
return self._not_supported("structural_tag", key_string)
def _init_value_dispatch(self, key: Tuple[str, str]) -> Optional[BaseGrammarObject]:
def _init_value_dispatch(
self, key: Tuple[str, str], reasoning: bool
) -> Optional[BaseGrammarObject]:
s = time.perf_counter()
key_type, key_string = key
if key_type == "json":
@@ -174,12 +179,14 @@ class BaseGrammarBackend:
return grammar
def get_cached_or_future_value(
self, key: Tuple[str, str]
self, key: Tuple[str, str], reasoning: bool
) -> Optional[BaseGrammarObject]:
value = self.cache.get(key)
if value:
return value.copy(), True
value = self.executor.submit(self._init_value_dispatch, key)
copied_value = value.copy()
copied_value.maybe_init_reasoning(reasoning)
return copied_value, True
value = self.executor.submit(self._init_value_dispatch, key, reasoning)
return value, False
def set_cache(self, key: Tuple[str, str], value: BaseGrammarObject):