update comment and var names

Signed-off-by: Travis Johnson <[email protected]>

Author: tjohnson31415

vllm/config.py

@@ -26,8 +26,8 @@
 import vllm.envs as envs
 from vllm.compilation.inductor_pass import CallableInductorPass, InductorPass
 from vllm.logger import init_logger
-from vllm.model_executor.guided_decoding import (SUPPORTED_GUIDED_DECODING_V0,
-                                                 SUPPORTED_GUIDED_DECODING_V1)
+from vllm.model_executor.guided_decoding import (GUIDED_DECODING_BACKENDS_V0,
+                                                 GUIDED_DECODING_BACKENDS_V1)
 from vllm.model_executor.layers.quantization import (QUANTIZATION_METHODS,
                                                      get_quantization_config)
 from vllm.model_executor.models import ModelRegistry
@@ -2889,7 +2889,6 @@ class DecodingConfig:
     """Dataclass which contains the decoding strategy of the engine"""
 
     # Which guided decoding algo to use.
-    # See vllm.model_executor.guided_decoding.SUPPORTED_GUIDED_DECODING
     guided_decoding_backend: str = 'xgrammar'
 
     reasoning_backend: Optional[str] = None
@@ -2917,9 +2916,9 @@ def __post_init__(self):
         backend = GuidedDecodingParams(
             backend=self.guided_decoding_backend).backend_name
         if envs.VLLM_USE_V1:
-            valid_guided_backends = SUPPORTED_GUIDED_DECODING_V1
+            valid_guided_backends = GUIDED_DECODING_BACKENDS_V1
         else:
-            valid_guided_backends = SUPPORTED_GUIDED_DECODING_V0
+            valid_guided_backends = GUIDED_DECODING_BACKENDS_V0
         if backend not in valid_guided_backends:
             raise ValueError(f"Invalid guided_decoding_backend '{backend}',"
                              f" must be one of {valid_guided_backends}")

vllm/engine/arg_utils.py

@@ -22,7 +22,7 @@
                          TokenizerPoolConfig, VllmConfig)
 from vllm.executor.executor_base import ExecutorBase
 from vllm.logger import init_logger
-from vllm.model_executor.guided_decoding import SUPPORTED_GUIDED_DECODING_V1
+from vllm.model_executor.guided_decoding import GUIDED_DECODING_BACKENDS_V1
 from vllm.model_executor.layers.quantization import QUANTIZATION_METHODS
 from vllm.plugins import load_general_plugins
 from vllm.reasoning import ReasoningParserManager
@@ -1419,7 +1419,7 @@ def _is_v1_supported_oracle(self, model_config: ModelConfig) -> bool:
 
         # remove backend options when doing this check
         if self.guided_decoding_backend.split(':')[0] \
-            not in SUPPORTED_GUIDED_DECODING_V1:
+            not in GUIDED_DECODING_BACKENDS_V1:
             _raise_or_fallback(
                 feature_name=
                 f"--guided-decoding-backend={self.guided_decoding_backend}",

vllm/model_executor/guided_decoding/__init__.py

@@ -19,12 +19,10 @@
 
 logger = init_logger(__name__)
 
-SUPPORTED_GUIDED_DECODING_V0 = [
+GUIDED_DECODING_BACKENDS_V0 = [
     "outlines", "lm-format-enforcer", "xgrammar", "guidance"
 ]
-SUPPORTED_GUIDED_DECODING_V1 = ["xgrammar", "guidance", "auto"]
-SUPPORTED_GUIDED_DECODING = list(
-    set(SUPPORTED_GUIDED_DECODING_V0 + SUPPORTED_GUIDED_DECODING_V1))
+GUIDED_DECODING_BACKENDS_V1 = ["xgrammar", "guidance", "auto"]
 
 
 def maybe_backend_fallback(

vllm/model_executor/guided_decoding/guidance_decoding.py

@@ -24,9 +24,8 @@ def get_local_guidance_guided_decoding_logits_processor(
     any_whitespace = 'disable-any-whitespace' not in \
         guided_params.backend_options()
     if (guide_json := guided_params.json) is not None:
-        # Optionally set additionalProperties to False at the top-level
-        # By default, other backends do not allow additional top-level
-        # properties, so this makes guidance more similar to other backends
+        # Optionally set additionalProperties to False by default
+        # This makes guidance more similar to other supported backends
         if 'no-additional-properties' in guided_params.backend_options():
             if not isinstance(guide_json, str):
                 guide_json = json.dumps(guide_json)