Move server args config parser under utils (#36681)
This commit is contained in:
@@ -10829,7 +10829,7 @@ def prepare_server_args(argv: List[str]) -> ServerArgs:
|
|||||||
# Check for config file and merge arguments if present
|
# Check for config file and merge arguments if present
|
||||||
if "--config" in argv:
|
if "--config" in argv:
|
||||||
# Import here to avoid circular imports
|
# Import here to avoid circular imports
|
||||||
from sglang.srt.server_args_config_parser import ConfigArgumentMerger
|
from sglang.srt.utils.server_args_config_parser import ConfigArgumentMerger
|
||||||
|
|
||||||
# Extract boolean actions from the parser to handle them correctly
|
# Extract boolean actions from the parser to handle them correctly
|
||||||
config_merger = ConfigArgumentMerger(parser)
|
config_merger = ConfigArgumentMerger(parser)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import pytest
|
|||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from sglang.srt.server_args import ServerArgs, prepare_server_args
|
from sglang.srt.server_args import ServerArgs, prepare_server_args
|
||||||
from sglang.srt.server_args_config_parser import ConfigArgumentMerger
|
from sglang.srt.utils.server_args_config_parser import ConfigArgumentMerger
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ from sglang.srt.model_executor.cuda_graph_config import (
|
|||||||
)
|
)
|
||||||
from sglang.srt.runtime_context import get_context, get_serving
|
from sglang.srt.runtime_context import get_context, get_serving
|
||||||
from sglang.srt.server_args import PortArgs, ServerArgs, prepare_server_args
|
from sglang.srt.server_args import PortArgs, ServerArgs, prepare_server_args
|
||||||
from sglang.srt.server_args_config_parser import ConfigArgumentMerger
|
from sglang.srt.utils.server_args_config_parser import ConfigArgumentMerger
|
||||||
from sglang.test.ci.ci_register import register_cpu_ci
|
from sglang.test.ci.ci_register import register_cpu_ci
|
||||||
from sglang.test.test_utils import (
|
from sglang.test.test_utils import (
|
||||||
DEFAULT_SMALL_MODEL_NAME_FOR_TEST_QWEN,
|
DEFAULT_SMALL_MODEL_NAME_FOR_TEST_QWEN,
|
||||||
|
|||||||
Reference in New Issue
Block a user