[Bugfix] Load reasoning parser plugins before headless engine config (#53124)
Signed-off-by: alexliluz <49665315+alexliluz@users.noreply.github.com> Co-authored-by: Jiangyun Zhu <riverclouds.zhu@qq.com>
This commit is contained in:
co-authored by
Jiangyun Zhu
parent
24bfbd5d4d
commit
5be911ee87
@@ -0,0 +1,42 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
"""Unit tests for the ``vllm serve`` CLI subcommand."""
|
||||
|
||||
import argparse
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
from vllm.entrypoints.cli.serve import run_headless
|
||||
|
||||
|
||||
class _StopAfterEngineConfig(Exception):
|
||||
pass
|
||||
|
||||
|
||||
def test_headless_imports_reasoning_parser_plugin_before_engine_config():
|
||||
plugin_path = "/tmp/custom_reasoning_parser.py"
|
||||
args = argparse.Namespace(
|
||||
api_server_count=0,
|
||||
reasoning_parser_plugin=plugin_path,
|
||||
)
|
||||
engine_args = MagicMock()
|
||||
|
||||
with (
|
||||
patch(
|
||||
"vllm.entrypoints.cli.serve.vllm.AsyncEngineArgs.from_cli_args",
|
||||
return_value=engine_args,
|
||||
),
|
||||
patch(
|
||||
"vllm.reasoning.ReasoningParserManager.import_reasoning_parser"
|
||||
) as import_plugin,
|
||||
):
|
||||
|
||||
def create_engine_config(**kwargs):
|
||||
import_plugin.assert_called_once_with(plugin_path)
|
||||
raise _StopAfterEngineConfig
|
||||
|
||||
engine_args.create_engine_config.side_effect = create_engine_config
|
||||
|
||||
with pytest.raises(_StopAfterEngineConfig):
|
||||
run_headless(args)
|
||||
@@ -18,6 +18,7 @@ from vllm.entrypoints.launchers.cli_args import (
|
||||
from vllm.entrypoints.launchers.dp_supervisor import run_dp_supervisor
|
||||
from vllm.entrypoints.serve.utils.api_utils import VLLM_SUBCMD_PARSER_EPILOG
|
||||
from vllm.logger import init_logger
|
||||
from vllm.reasoning import ReasoningParserManager
|
||||
from vllm.usage.usage_lib import UsageContext
|
||||
from vllm.utils.argparse_utils import FlexibleArgumentParser
|
||||
from vllm.utils.network_utils import get_tcp_uri
|
||||
@@ -179,6 +180,9 @@ def run_headless(args: argparse.Namespace):
|
||||
if args.api_server_count > 1:
|
||||
raise ValueError("api_server_count can't be set in headless mode")
|
||||
|
||||
if args.reasoning_parser_plugin and len(args.reasoning_parser_plugin) > 3:
|
||||
ReasoningParserManager.import_reasoning_parser(args.reasoning_parser_plugin)
|
||||
|
||||
# Create the EngineConfig.
|
||||
engine_args = vllm.AsyncEngineArgs.from_cli_args(args)
|
||||
usage_context = UsageContext.OPENAI_API_SERVER
|
||||
|
||||
Reference in New Issue
Block a user