mirror of
https://git.datalinker.icu/vllm-project/vllm.git
synced 2025-12-11 01:55:21 +08:00
- **Add SPDX license headers to python source files**
- **Check for SPDX headers using pre-commit**
commit 9d7ef44c3cfb72ca4c32e1c677d99259d10d4745
Author: Russell Bryant <rbryant@redhat.com>
Date: Fri Jan 31 14:18:24 2025 -0500
Add SPDX license headers to python source files
This commit adds SPDX license headers to python source files as
recommended to
the project by the Linux Foundation. These headers provide a concise way
that is
both human and machine readable for communicating license information
for each
source file. It helps avoid any ambiguity about the license of the code
and can
also be easily used by tools to help manage license compliance.
The Linux Foundation runs license scans against the codebase to help
ensure
we are in compliance with the licenses of the code we use, including
dependencies. Having these headers in place helps that tool do its job.
More information can be found on the SPDX site:
- https://spdx.dev/learn/handling-license-info/
Signed-off-by: Russell Bryant <rbryant@redhat.com>
commit 5a1cf1cb3b80759131c73f6a9dddebccac039dea
Author: Russell Bryant <rbryant@redhat.com>
Date: Fri Jan 31 14:36:32 2025 -0500
Check for SPDX headers using pre-commit
Signed-off-by: Russell Bryant <rbryant@redhat.com>
---------
Signed-off-by: Russell Bryant <rbryant@redhat.com>
163 lines
6.3 KiB
Python
163 lines
6.3 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
from typing import List
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
from tests.entrypoints.openai.tool_parsers.utils import (
|
|
run_tool_extraction, run_tool_extraction_streaming)
|
|
from vllm.entrypoints.openai.protocol import FunctionCall
|
|
from vllm.entrypoints.openai.tool_parsers import ToolParser, ToolParserManager
|
|
|
|
# https://github.com/meta-llama/llama-models/blob/main/models/llama3_2/text_prompt_format.md#model-response-format-1
|
|
SIMPLE_FUNCTION_OUTPUT = "get_weather(city='San Francisco', metric='celsius')"
|
|
SIMPLE_FUNCTION_CALL = FunctionCall(
|
|
name="get_weather",
|
|
arguments='{"city": "San Francisco", "metric": "celsius"}',
|
|
)
|
|
MORE_TYPES_FUNCTION_OUTPUT = (
|
|
"register_user(name='John Doe', "
|
|
"age=37, "
|
|
"address={'city': 'San Francisco', 'state': 'CA'}, "
|
|
"role=None, "
|
|
"passed_test=True, "
|
|
"aliases=['John', 'Johnny'])")
|
|
MORE_TYPES_FUNCTION_CALL = FunctionCall(
|
|
name="register_user",
|
|
arguments='{"name": "John Doe", '
|
|
'"age": 37, '
|
|
'"address": {"city": "San Francisco", "state": "CA"}, '
|
|
'"role": null, '
|
|
'"passed_test": true, '
|
|
'"aliases": ["John", "Johnny"]}',
|
|
)
|
|
PARAMETERLESS_FUNCTION_OUTPUT = "get_weather()"
|
|
PARAMETERLESS_FUNCTION_CALL = FunctionCall(
|
|
name="get_weather",
|
|
arguments='{}',
|
|
)
|
|
EMPTY_DICT_FUNCTION_OUTPUT = "do_something_cool(additional_data={})"
|
|
EMPTY_DICT_FUNCTION_CALL = FunctionCall(
|
|
name="do_something_cool",
|
|
arguments='{"additional_data": {}}',
|
|
)
|
|
EMPTY_LIST_FUNCTION_OUTPUT = "do_something_cool(steps=[])"
|
|
EMPTY_LIST_FUNCTION_CALL = FunctionCall(
|
|
name="do_something_cool",
|
|
arguments='{"steps": []}',
|
|
)
|
|
ESCAPED_STRING_FUNCTION_OUTPUT = (
|
|
r"get_weather(city='Martha\'s Vineyard', metric='\"cool units\"')")
|
|
ESCAPED_STRING_FUNCTION_CALL = FunctionCall(
|
|
name="get_weather",
|
|
arguments='{"city": "Martha\'s Vineyard", "metric": "\\"cool units\\""}',
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize("streaming", [True, False])
|
|
def test_no_tool_call(streaming: bool):
|
|
mock_tokenizer = MagicMock()
|
|
tool_parser: ToolParser = ToolParserManager.get_tool_parser("pythonic")(
|
|
mock_tokenizer)
|
|
model_output = "How can I help you today?"
|
|
|
|
content, tool_calls = run_tool_extraction(tool_parser,
|
|
model_output,
|
|
streaming=streaming)
|
|
|
|
assert content == model_output
|
|
assert len(tool_calls) == 0
|
|
|
|
|
|
TEST_CASES = [
|
|
pytest.param(True,
|
|
f"[{SIMPLE_FUNCTION_OUTPUT}]", [SIMPLE_FUNCTION_CALL],
|
|
id="simple_streaming"),
|
|
pytest.param(False,
|
|
f"[{SIMPLE_FUNCTION_OUTPUT}]", [SIMPLE_FUNCTION_CALL],
|
|
id="simple_nonstreaming"),
|
|
pytest.param(True,
|
|
f"[{MORE_TYPES_FUNCTION_OUTPUT}]", [MORE_TYPES_FUNCTION_CALL],
|
|
id="more_types_streaming"),
|
|
pytest.param(False,
|
|
f"[{MORE_TYPES_FUNCTION_OUTPUT}]", [MORE_TYPES_FUNCTION_CALL],
|
|
id="more_types_nonstreaming"),
|
|
pytest.param(True,
|
|
f"[{PARAMETERLESS_FUNCTION_OUTPUT}]",
|
|
[PARAMETERLESS_FUNCTION_CALL],
|
|
id="parameterless_streaming"),
|
|
pytest.param(False,
|
|
f"[{PARAMETERLESS_FUNCTION_OUTPUT}]",
|
|
[PARAMETERLESS_FUNCTION_CALL],
|
|
id="parameterless_nonstreaming"),
|
|
pytest.param(True,
|
|
f"[{EMPTY_DICT_FUNCTION_OUTPUT}]", [EMPTY_DICT_FUNCTION_CALL],
|
|
id="empty_dict_streaming"),
|
|
pytest.param(False,
|
|
f"[{EMPTY_DICT_FUNCTION_OUTPUT}]", [EMPTY_DICT_FUNCTION_CALL],
|
|
id="empty_dict_nonstreaming"),
|
|
pytest.param(True,
|
|
f"[{EMPTY_LIST_FUNCTION_OUTPUT}]", [EMPTY_LIST_FUNCTION_CALL],
|
|
id="empty_list_streaming"),
|
|
pytest.param(False,
|
|
f"[{EMPTY_LIST_FUNCTION_OUTPUT}]", [EMPTY_LIST_FUNCTION_CALL],
|
|
id="empty_list_nonstreaming"),
|
|
pytest.param(True,
|
|
f"[{ESCAPED_STRING_FUNCTION_OUTPUT}]",
|
|
[ESCAPED_STRING_FUNCTION_CALL],
|
|
id="escaped_string_streaming"),
|
|
pytest.param(False,
|
|
f"[{ESCAPED_STRING_FUNCTION_OUTPUT}]",
|
|
[ESCAPED_STRING_FUNCTION_CALL],
|
|
id="escaped_string_nonstreaming"),
|
|
pytest.param(True,
|
|
f"[{SIMPLE_FUNCTION_OUTPUT}, {MORE_TYPES_FUNCTION_OUTPUT}]",
|
|
[SIMPLE_FUNCTION_CALL, MORE_TYPES_FUNCTION_CALL],
|
|
id="parallel_calls_streaming"),
|
|
pytest.param(False,
|
|
f"[{SIMPLE_FUNCTION_OUTPUT}, {MORE_TYPES_FUNCTION_OUTPUT}]",
|
|
[SIMPLE_FUNCTION_CALL, MORE_TYPES_FUNCTION_CALL],
|
|
id="parallel_calls_nonstreaming"),
|
|
]
|
|
|
|
|
|
@pytest.mark.parametrize("streaming, model_output, expected_tool_calls",
|
|
TEST_CASES)
|
|
def test_tool_call(streaming: bool, model_output: str,
|
|
expected_tool_calls: List[FunctionCall]):
|
|
mock_tokenizer = MagicMock()
|
|
tool_parser: ToolParser = ToolParserManager.get_tool_parser("pythonic")(
|
|
mock_tokenizer)
|
|
|
|
content, tool_calls = run_tool_extraction(tool_parser,
|
|
model_output,
|
|
streaming=streaming)
|
|
|
|
assert content is None
|
|
assert len(tool_calls) == len(expected_tool_calls)
|
|
for actual, expected in zip(tool_calls, expected_tool_calls):
|
|
assert actual.type == "function"
|
|
assert actual.function == expected
|
|
|
|
|
|
def test_streaming_tool_call_with_large_steps():
|
|
mock_tokenizer = MagicMock()
|
|
tool_parser: ToolParser = ToolParserManager.get_tool_parser("pythonic")(
|
|
mock_tokenizer)
|
|
model_output_deltas = [
|
|
"[get_weather(city='San",
|
|
" Francisco', metric='celsius'), "
|
|
f"{PARAMETERLESS_FUNCTION_OUTPUT}, "
|
|
f"{EMPTY_LIST_FUNCTION_OUTPUT}]",
|
|
]
|
|
|
|
reconstructor = run_tool_extraction_streaming(
|
|
tool_parser, model_output_deltas, assert_one_tool_per_delta=False)
|
|
|
|
assert reconstructor.other_content == ""
|
|
assert len(reconstructor.tool_calls) == 3
|
|
assert reconstructor.tool_calls[0].function == SIMPLE_FUNCTION_CALL
|
|
assert reconstructor.tool_calls[1].function == PARAMETERLESS_FUNCTION_CALL
|
|
assert reconstructor.tool_calls[2].function == EMPTY_LIST_FUNCTION_CALL
|