Skip to content

Commit cd8b405

Browse files
[Refactor] Consolidate sequence normalization and enc-dec parsing (vllm-project#33928)
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
1 parent 4707f7e commit cd8b405

38 files changed

Lines changed: 1256 additions & 848 deletions

tests/entrypoints/openai/test_chat_error.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class MockModelConfig:
5454
generation_config: str = "auto"
5555
media_io_kwargs: dict[str, dict[str, Any]] = field(default_factory=dict)
5656
skip_tokenizer_init = False
57+
is_encoder_decoder: bool = False
5758

5859
def get_diff_sampling_param(self):
5960
return self.diff_sampling_param or {}

tests/entrypoints/openai/test_completion_error.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class MockModelConfig:
5353
generation_config: str = "auto"
5454
media_io_kwargs: dict[str, dict[str, Any]] = field(default_factory=dict)
5555
skip_tokenizer_init = False
56+
is_encoder_decoder: bool = False
5657

5758
def get_diff_sampling_param(self):
5859
return self.diff_sampling_param or {}

tests/entrypoints/openai/test_lora_resolvers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class MockModelConfig:
5252
encoder_config = None
5353
generation_config: str = "auto"
5454
skip_tokenizer_init: bool = False
55+
is_encoder_decoder: bool = False
5556

5657
def get_diff_sampling_param(self):
5758
return self.diff_sampling_param or {}

tests/entrypoints/openai/test_serving_chat.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,7 @@ class MockModelConfig:
529529
generation_config: str = "auto"
530530
media_io_kwargs: dict[str, dict[str, Any]] = field(default_factory=dict)
531531
skip_tokenizer_init: bool = False
532+
is_encoder_decoder: bool = False
532533

533534
def get_diff_sampling_param(self):
534535
return self.diff_sampling_param or {}

tests/renderers/inputs/__init__.py

Whitespace-only changes.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
3+
from vllm.renderers.inputs.preprocess import prompt_to_seq
4+
5+
6+
def test_empty_input():
7+
assert prompt_to_seq([]) == []
8+
assert prompt_to_seq([[]]) == [[]]
9+
assert prompt_to_seq([[], []]) == [[], []]
10+
11+
12+
def test_text_input():
13+
assert prompt_to_seq("foo") == ["foo"]
14+
assert prompt_to_seq(["foo"]) == ["foo"]
15+
assert prompt_to_seq(["foo", "bar"]) == ["foo", "bar"]
16+
17+
18+
def test_token_input():
19+
assert prompt_to_seq([1, 2]) == [[1, 2]]
20+
assert prompt_to_seq([[1, 2]]) == [[1, 2]]
21+
assert prompt_to_seq([[1, 2], [3, 4]]) == [[1, 2], [3, 4]]
22+
23+
24+
def test_text_token_input():
25+
assert prompt_to_seq([[1, 2], "foo"]) == [[1, 2], "foo"]
26+
assert prompt_to_seq(["foo", [1, 2]]) == ["foo", [1, 2]]
27+
28+
29+
def test_bytes_input():
30+
assert prompt_to_seq(b"foo") == [b"foo"]
31+
assert prompt_to_seq([b"foo"]) == [b"foo"]
32+
assert prompt_to_seq([b"foo", b"bar"]) == [b"foo", b"bar"]
33+
34+
35+
def test_dict_input():
36+
assert prompt_to_seq({"prompt": "foo"}) == [{"prompt": "foo"}]
37+
assert prompt_to_seq([{"prompt": "foo"}]) == [{"prompt": "foo"}]
38+
assert prompt_to_seq([{"prompt": "foo"}, {"prompt_token_ids": [1, 2]}]) == [
39+
{"prompt": "foo"},
40+
{"prompt_token_ids": [1, 2]},
41+
]

0 commit comments

Comments
 (0)