[Feat][OmniVoice]Support Varlen Attn, Request-Batch and Step-Execution (#6408)
Signed-off-by: boatman <109857087+sphinxkkkbc@users.noreply.github.com>
This commit is contained in:
1 parent
d7678e2bb3
commit
cdf027874c
14 files changed
+1396
-610
No files matched your search
@@ -27,6 +27,9 @@ from pydantic import ValidationError
|
||||
from pytest_mock import MockerFixture
|
||||
from vllm.entrypoints.openai.engine.protocol import ErrorInfo, ErrorResponse
|
||||
|
||||
from vllm_omni.diffusion.request import OmniDiffusionRequest
|
||||
from vllm_omni.diffusion.sched.request_scheduler import RequestScheduler
|
||||
from vllm_omni.diffusion.sched.step_scheduler import StepScheduler
|
||||
from vllm_omni.entrypoints.omni_base import OmniEngineDeadError
|
||||
from vllm_omni.entrypoints.openai import api_server as api_server_module
|
||||
from vllm_omni.entrypoints.openai import serving_speech as serving_speech_module
|
||||
@@ -55,6 +58,7 @@ from vllm_omni.entrypoints.openai.tts_adapters.capabilities import load_supporte
|
||||
from vllm_omni.entrypoints.openai.tts_adapters.ming_tts import MingTTSAdapter
|
||||
from vllm_omni.entrypoints.openai.tts_adapters.qwen3_tts import Qwen3TTSAdapter, Qwen3TTSCodecLimitError
|
||||
from vllm_omni.entrypoints.openai.tts_adapters.voxtral import VoxtralTTSAdapter
|
||||
from vllm_omni.inputs.data import OmniDiffusionSamplingParams
|
||||
from vllm_omni.model_executor.models.fish_speech.prompt_utils import (
|
||||
FISH_TEXT_ONLY_SYSTEM_PROMPT,
|
||||
build_fish_voice_clone_prompt_ids,
|
||||
@@ -753,13 +757,12 @@ class TestSpeechAPI:
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_diffusion_speech_extra_params(self, mocker: MockerFixture):
|
||||
"""Test public diffusion speech success and extra_params propagation."""
|
||||
"""Test diffusion parameters reach StepScheduler as standard fields."""
|
||||
# Mock the engine client
|
||||
mock_engine = mocker.MagicMock()
|
||||
|
||||
# Mock default sampling params
|
||||
mock_sampling_param = mocker.MagicMock()
|
||||
mock_sampling_param.extra_args = {"existing_arg": "value"}
|
||||
mock_sampling_param = OmniDiffusionSamplingParams(extra_args={"existing_arg": "value"})
|
||||
mock_engine.default_sampling_params_list = [mock_sampling_param]
|
||||
|
||||
# Mock generate to yield a valid OmniRequestOutput
|
||||
@@ -775,7 +778,15 @@ class TestSpeechAPI:
|
||||
server, "create_audio", return_value=mocker.MagicMock(audio_data=b"dummy", media_type="audio/wav")
|
||||
)
|
||||
|
||||
req = OpenAICreateSpeechRequest(input="Hello", extra_params={"new_arg": 123, "existing_arg": "new_value"})
|
||||
req = OpenAICreateSpeechRequest(
|
||||
input="Hello",
|
||||
extra_params={
|
||||
"new_arg": 123,
|
||||
"existing_arg": "new_value",
|
||||
"num_inference_steps": 12,
|
||||
"guidance_scale": 7.0,
|
||||
},
|
||||
)
|
||||
|
||||
response = await server.create_speech(req)
|
||||
|
||||
@@ -792,7 +803,98 @@ class TestSpeechAPI:
|
||||
|
||||
# Verify it was deepcopied and updated
|
||||
assert passed_params is not mock_engine.default_sampling_params_list
|
||||
assert passed_params[0].extra_args == {"existing_arg": "new_value", "new_arg": 123}
|
||||
assert passed_params[0].extra_args == {
|
||||
"existing_arg": "new_value",
|
||||
"new_arg": 123,
|
||||
"num_inference_steps": 12,
|
||||
"guidance_scale": 7.0,
|
||||
}
|
||||
assert passed_params[0].num_inference_steps == 12
|
||||
assert passed_params[0].guidance_scale == 7.0
|
||||
|
||||
# Regression: StepScheduler.add_request() used to receive
|
||||
# num_inference_steps=None and fail while converting it to int.
|
||||
scheduler = StepScheduler()
|
||||
scheduler.add_request(
|
||||
OmniDiffusionRequest(
|
||||
prompt="Hello",
|
||||
sampling_params=passed_params[0],
|
||||
request_id="speech-test",
|
||||
)
|
||||
)
|
||||
assert scheduler._request_progress["speech-test"].total_steps == 12
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_diffusion_speech_guidance_promotion_controls_request_batch_admission(
|
||||
self,
|
||||
mocker: MockerFixture,
|
||||
) -> None:
|
||||
"""Different request guidance values must not enter one request batch."""
|
||||
mock_engine = mocker.MagicMock()
|
||||
mock_engine.default_sampling_params_list = [OmniDiffusionSamplingParams(num_inference_steps=12)]
|
||||
passed_sampling_params = []
|
||||
|
||||
async def mock_generate(*args, **kwargs):
|
||||
passed_sampling_params.append(kwargs["sampling_params_list"][0])
|
||||
yield create_mock_audio_output_for_test()
|
||||
|
||||
mock_engine.generate = mocker.MagicMock(side_effect=mock_generate)
|
||||
server = OmniOpenAIServingSpeech.for_diffusion(diffusion_engine=mock_engine, model_name="test-model")
|
||||
mocker.patch.object(
|
||||
server,
|
||||
"create_audio",
|
||||
return_value=mocker.MagicMock(audio_data=b"dummy", media_type="audio/wav"),
|
||||
)
|
||||
|
||||
for guidance_scale in (2.0, 7.0):
|
||||
response = await server.create_speech(
|
||||
OpenAICreateSpeechRequest(
|
||||
input="Hello",
|
||||
extra_params={"guidance_scale": guidance_scale},
|
||||
)
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
scheduler = RequestScheduler()
|
||||
scheduler.initialize(SimpleNamespace(max_num_seqs=2))
|
||||
for index, sampling_params in enumerate(passed_sampling_params):
|
||||
scheduler.add_request(
|
||||
OmniDiffusionRequest(
|
||||
prompt="Hello",
|
||||
sampling_params=sampling_params,
|
||||
request_id=f"speech-{index}",
|
||||
)
|
||||
)
|
||||
|
||||
first = scheduler.schedule()
|
||||
|
||||
assert [request.request_id for request in first.scheduled_new_reqs] == ["speech-0"]
|
||||
assert first.num_running_reqs == 1
|
||||
assert first.num_waiting_reqs == 1
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@pytest.mark.parametrize(
|
||||
("extra_params", "expected_message"),
|
||||
[
|
||||
({"num_inference_steps": "invalid"}, "num_inference_steps must be an integer"),
|
||||
({"guidance_scale": "invalid"}, "guidance_scale must be a number"),
|
||||
],
|
||||
)
|
||||
async def test_create_diffusion_speech_rejects_invalid_scheduler_params(
|
||||
self,
|
||||
mocker: MockerFixture,
|
||||
extra_params: dict[str, str],
|
||||
expected_message: str,
|
||||
) -> None:
|
||||
mock_engine = mocker.MagicMock()
|
||||
mock_engine.default_sampling_params_list = [OmniDiffusionSamplingParams()]
|
||||
server = OmniOpenAIServingSpeech.for_diffusion(diffusion_engine=mock_engine, model_name="test-model")
|
||||
|
||||
response = await server.create_speech(OpenAICreateSpeechRequest(input="Hello", extra_params=extra_params))
|
||||
|
||||
assert response.status_code == 400
|
||||
assert expected_message in response.body.decode()
|
||||
mock_engine.generate.assert_not_called()
|
||||
|
||||
|
||||
class TestTTSMethods:
|
||||
|
||||
Reference in new issue
Block a user