xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2025-12-09 20:34:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve output when failing json.loads() on structured output test (#25483)

Browse Source 
Signed-off-by: dougbtv <dosmith@redhat.com>
This commit is contained in:
Doug Smith 2025-09-23 20:03:31 -04:00 committed by GitHub
parent dc464a3d39
commit 7ad5e50adf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/v1/entrypoints/llm/test_struct_output_generate.py
View File

@ -81,16 +81,6 @@ class CarDescription(BaseModel):
car_type: CarType car_type: CarType
def _load_json(s: str, backend: str) -> str:
if backend != "xgrammar":
return json.loads(s)
# xgrammar specific workarounds
# https://github.com/mlc-ai/xgrammar/issues/286
s = re.sub(r'[\x00-\x1F\x7F-\xFF]', '', s)
return json.loads(s)
def test_guided_decoding_deprecated(): def test_guided_decoding_deprecated():
with pytest.warns(DeprecationWarning, with pytest.warns(DeprecationWarning,
match="GuidedDecodingParams is deprecated.*"): match="GuidedDecodingParams is deprecated.*"):
@ -177,7 +167,12 @@ def test_structured_output(
if backend != 'lm-format-enforcer': if backend != 'lm-format-enforcer':
assert "\n" not in generated_text assert "\n" not in generated_text
print(f"Prompt: {prompt!r}, Generated text: {generated_text!r}") print(f"Prompt: {prompt!r}, Generated text: {generated_text!r}")
output_json = json.loads(generated_text) try:
output_json = json.loads(generated_text)
except json.JSONDecodeError as e:
pytest.fail(
f"Invalid JSON from backend={backend}: {generated_text!r}\n"
f"Schema: {sample_json_schema}\nError: {e}")
jsonschema.validate(instance=output_json, schema=sample_json_schema) jsonschema.validate(instance=output_json, schema=sample_json_schema)
# #
@ -425,7 +420,12 @@ def test_structured_output(
generated_text = output.outputs[0].text generated_text = output.outputs[0].text
assert generated_text is not None assert generated_text is not None
print(f"Prompt: {prompt!r}, Generated text: {generated_text!r}") print(f"Prompt: {prompt!r}, Generated text: {generated_text!r}")
output_json = json.loads(generated_text) try:
output_json = json.loads(generated_text)
except json.JSONDecodeError as e:
pytest.fail(
f"Invalid JSON from backend={backend}: {generated_text!r}\n"
f"Schema: {json_schema}\nError: {e}")
jsonschema.validate(instance=output_json, schema=json_schema) jsonschema.validate(instance=output_json, schema=json_schema)
# #
@ -468,7 +468,12 @@ def test_structured_output(
generated_text = output.outputs[0].text generated_text = output.outputs[0].text
assert generated_text is not None assert generated_text is not None
print(f"Prompt: {prompt!r}, Generated text: {generated_text!r}") print(f"Prompt: {prompt!r}, Generated text: {generated_text!r}")
output_json = json.loads(generated_text) try:
output_json = json.loads(generated_text)
except json.JSONDecodeError as e:
pytest.fail(
f"Invalid JSON from backend={backend}: {generated_text!r}\n"
f"Schema: {json_schema}\nError: {e}")
jsonschema.validate(instance=output_json, schema=json_schema) jsonschema.validate(instance=output_json, schema=json_schema)
if backend not in ["outlines", "lm-format-enforcer"]: if backend not in ["outlines", "lm-format-enforcer"]: