remove duplication of guided backends + add new options

Signed-off-by: Jannis Schönleber <[email protected]>

Author: joennlae

vllm/engine/arg_utils.py

@@ -28,6 +28,7 @@
 from vllm.transformers_utils.utils import check_gguf_file
 from vllm.usage.usage_lib import UsageContext
 from vllm.utils import FlexibleArgumentParser, StoreBoolean, is_in_ray_actor
+from vllm.v1.engine.processor import SUPPORTED_GUIDED_DECODING
 
 if TYPE_CHECKING:
     from vllm.transformers_utils.tokenizer_group import BaseTokenizerGroup
@@ -1379,11 +1380,6 @@ def _is_v1_supported_oracle(self, model_config: ModelConfig) -> bool:
                                recommend_to_remove=False)
             return False
 
-        # Xgrammar and Guidance are supported.
-        SUPPORTED_GUIDED_DECODING = [
-            "xgrammar", "xgrammar:disable-any-whitespace", "guidance",
-            "guidance:disable-any-whitespace", "auto"
-        ]
         if self.guided_decoding_backend not in SUPPORTED_GUIDED_DECODING:
             _raise_or_fallback(feature_name="--guided-decoding-backend",
                                recommend_to_remove=False)

vllm/v1/engine/processor.py

@@ -23,6 +23,14 @@
 from vllm.v1.structured_output.utils import (
     validate_structured_output_request_xgrammar)
 
+# Xgrammar and Guidance are supported.
+SUPPORTED_GUIDED_DECODING = [
+    "xgrammar", "xgrammar:disable-any-whitespace", "guidance",
+    "guidance:disable-any-whitespace", "guidance:no-additional-properties",
+    "guidance:no-additional-properties,disable-any-whitespace",
+    "guidance:disable-any-whitespace,no-additional-properties", "auto"
+]
+
 
 class Processor:
 
@@ -120,14 +128,11 @@ def _validate_structured_output(self, params: SamplingParams) -> None:
         if not params.guided_decoding or not self.decoding_config:
             return
 
-        supported_backends = [
-            "xgrammar", "xgrammar:disable-any-whitespace", "guidance",
-            "guidance:disable-any-whitespace", "auto"
-        ]
         engine_level_backend = self.decoding_config.guided_decoding_backend
-        if engine_level_backend not in supported_backends:
-            raise ValueError(f"Only {supported_backends} structured output is "
-                             "supported in V1.")
+        if engine_level_backend not in SUPPORTED_GUIDED_DECODING:
+            raise ValueError(
+                f"Only {SUPPORTED_GUIDED_DECODING} structured output is "
+                "supported in V1.")
         if params.guided_decoding.backend:
             if params.guided_decoding.backend != engine_level_backend:
                 raise ValueError("Request-level structured output backend "