xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2025-12-14 18:55:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[V1] Update structured output (#16812)

Browse Source 
Signed-off-by: reidliu41 <reid201711@gmail.com>
Co-authored-by: reidliu41 <reid201711@gmail.com>
This commit is contained in:
Reid 2025-04-24 14:57:17 +08:00 committed by GitHub
parent 6167c0e5d2
commit db2f8d915c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
benchmarks/benchmark_serving_structured_output.py
View File

@ -150,17 +150,17 @@ def sample_requests(tokenizer: PreTrainedTokenizerBase,
elif args.dataset == "grammar": elif args.dataset == "grammar":
schema = """ schema = """
?start: select_statement root ::= select_statement
?select_statement: "SELECT " column_list " FROM " table_name select_statement ::= "SELECT " column " from " table " where " condition
?column_list: column_name ("," column_name)* column ::= "col_1 " | "col_2 "
?table_name: identifier table ::= "table_1 " | "table_2 "
?column_name: identifier condition ::= column "= " number
?identifier: /[a-zA-Z_][a-zA-Z0-9_]*/ number ::= "1 " | "2 "
""" """
prompt = "Generate an SQL query to show the 'username' \ prompt = "Generate an SQL query to show the 'username' \
and 'email' from the 'users' table." and 'email' from the 'users' table."

14
docs/source/features/structured_outputs.md
View File

@ -50,7 +50,7 @@ completion = client.chat.completions.create(
"content": "Generate an example email address for Alan Turing, who works in Enigma. End in .com and new line. Example result: alan.turing@enigma.com\n", "content": "Generate an example email address for Alan Turing, who works in Enigma. End in .com and new line. Example result: alan.turing@enigma.com\n",
} }
], ],
extra_body={"guided_regex": "\w+@\w+\.com\n", "stop": ["\n"]}, extra_body={"guided_regex": r"\w+@\w+\.com\n", "stop": ["\n"]},
) )
print(completion.choices[0].message.content) print(completion.choices[0].message.content)
``` ```
@ -105,17 +105,17 @@ It works by using a context free EBNF grammar, which for example we can use to d
```python ```python
simplified_sql_grammar = """ simplified_sql_grammar = """
?start: select_statement root ::= select_statement
?select_statement: "SELECT " column_list " FROM " table_name select_statement ::= "SELECT " column " from " table " where " condition
?column_list: column_name ("," column_name)* column ::= "col_1 " | "col_2 "
?table_name: identifier table ::= "table_1 " | "table_2 "
?column_name: identifier condition ::= column "= " number
?identifier: /[a-zA-Z_][a-zA-Z0-9_]*/ number ::= "1 " | "2 "
""" """
completion = client.chat.completions.create( completion = client.chat.completions.create(

16
examples/online_serving/openai_chat_completion_structured_outputs.py
View File

@ -33,7 +33,7 @@ completion = client.chat.completions.create(
"content": prompt, "content": prompt,
}], }],
extra_body={ extra_body={
"guided_regex": "\w+@\w+\.com\n", "guided_regex": r"\w+@\w+\.com\n",
"stop": ["\n"] "stop": ["\n"]
}, },
) )
@ -70,17 +70,17 @@ print(completion.choices[0].message.content)
# Guided decoding by Grammar # Guided decoding by Grammar
simplified_sql_grammar = """ simplified_sql_grammar = """
?start: select_statement root ::= select_statement
?select_statement: "SELECT " column_list " FROM " table_name select_statement ::= "SELECT " column " from " table " where " condition
?column_list: column_name ("," column_name)* column ::= "col_1 " | "col_2 "
?table_name: identifier table ::= "table_1 " | "table_2 "
?column_name: identifier condition ::= column "= " number
?identifier: /[a-zA-Z_][a-zA-Z0-9_]*/ number ::= "1 " | "2 "
""" """
prompt = ("Generate an SQL query to show the 'username' and 'email'" prompt = ("Generate an SQL query to show the 'username' and 'email'"
@ -110,7 +110,7 @@ try:
"content": prompt, "content": prompt,
}], }],
extra_body={ extra_body={
"guided_regex": "\w+@\w+\.com\n", "guided_regex": r"\w+@\w+\.com\n",
"stop": ["\n"], "stop": ["\n"],
"guided_decoding_backend": "xgrammar:no-fallback" "guided_decoding_backend": "xgrammar:no-fallback"
}, },

12
examples/online_serving/openai_chat_completion_structured_outputs_with_reasoning.py
View File

@ -101,17 +101,17 @@ print("content: ", completion.choices[0].message.content)
# Guided decoding by Grammar # Guided decoding by Grammar
simplified_sql_grammar = """ simplified_sql_grammar = """
?start: select_statement root ::= select_statement
?select_statement: "SELECT " column_list " FROM " table_name select_statement ::= "SELECT " column " from " table " where " condition
?column_list: column_name ("," column_name)* column ::= "col_1 " | "col_2 "
?table_name: identifier table ::= "table_1 " | "table_2 "
?column_name: identifier condition ::= column "= " number
?identifier: /[a-zA-Z_][a-zA-Z0-9_]*/ number ::= "1 " | "2 "
""" """
# This may be very slow https://github.com/vllm-project/vllm/issues/12122 # This may be very slow https://github.com/vllm-project/vllm/issues/12122