diff --git a/tests/model_executor/model_loader/runai_streamer_loader/test_runai_model_streamer_loader.py b/tests/model_executor/model_loader/runai_streamer_loader/test_runai_model_streamer_loader.py index 82c0f8813e..e697415560 100644 --- a/tests/model_executor/model_loader/runai_streamer_loader/test_runai_model_streamer_loader.py +++ b/tests/model_executor/model_loader/runai_streamer_loader/test_runai_model_streamer_loader.py @@ -1,6 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project +import os import types from unittest.mock import patch @@ -78,3 +79,46 @@ def test_runai_passes_revision_by_name(): mock_idx.assert_called_once() assert mock_idx.call_args.kwargs.get("revision") == "myrev" assert "myrev" not in mock_idx.call_args.args + + +def _runai_loader(extra): + return rsl.RunaiModelStreamerLoader( + LoadConfig(load_format="runai_streamer", model_loader_extra_config=extra) + ) + + +@pytest.mark.parametrize( + "extra, match", + [ + ({"typo_key": 1}, "Unexpected extra config"), + ({"distributed": "yes"}, "distributed must be a bool"), + ({"concurrency": "16"}, "concurrency must be a positive integer"), + ({"concurrency": -1}, "concurrency must be a positive integer"), + ], +) +def test_runai_rejects_invalid_extra_config(extra, match): + # The loader used to silently drop unknown keys / wrong types / negatives. + with pytest.raises(ValueError, match=match): + _runai_loader(extra) + + +def test_runai_accepts_valid_extra_config(): + with patch.dict(os.environ, {}, clear=False): + os.environ.pop("RUNAI_STREAMER_CONCURRENCY", None) + os.environ.pop("RUNAI_STREAMER_MEMORY_LIMIT", None) + loader = _runai_loader( + {"distributed": True, "concurrency": 16, "memory_limit": 1024} + ) + assert loader._is_distributed is True + assert os.environ["RUNAI_STREAMER_CONCURRENCY"] == "16" + assert os.environ["RUNAI_STREAMER_MEMORY_LIMIT"] == "1024" + + +def test_runai_invalid_extra_config_leaves_environ_untouched(): + # A later invalid key must not leave an earlier valid key applied to + # os.environ (all values are validated before any global mutation). + with patch.dict(os.environ, {}, clear=False): + os.environ.pop("RUNAI_STREAMER_CONCURRENCY", None) + with pytest.raises(ValueError, match="memory_limit must be a positive integer"): + _runai_loader({"concurrency": 16, "memory_limit": -5}) + assert "RUNAI_STREAMER_CONCURRENCY" not in os.environ diff --git a/vllm/model_executor/model_loader/runai_streamer_loader.py b/vllm/model_executor/model_loader/runai_streamer_loader.py index 0df1422791..3ed6eab676 100644 --- a/vllm/model_executor/model_loader/runai_streamer_loader.py +++ b/vllm/model_executor/model_loader/runai_streamer_loader.py @@ -31,12 +31,38 @@ class RunaiModelStreamerLoader(BaseModelLoader): if load_config.model_loader_extra_config: extra_config = load_config.model_loader_extra_config - if isinstance(distributed := extra_config.get("distributed"), bool): + allowed_keys = {"distributed", "concurrency", "memory_limit"} + if unexpected_keys := set(extra_config) - allowed_keys: + raise ValueError( + "Unexpected extra config keys for runai_streamer: " + f"{unexpected_keys}" + ) + + if "distributed" in extra_config: + distributed = extra_config["distributed"] + if not isinstance(distributed, bool): + raise ValueError(f"distributed must be a bool, got {distributed!r}") self._is_distributed = distributed - if isinstance(concurrency := extra_config.get("concurrency"), int): - os.environ["RUNAI_STREAMER_CONCURRENCY"] = str(concurrency) - if isinstance(memory_limit := extra_config.get("memory_limit"), int): - os.environ["RUNAI_STREAMER_MEMORY_LIMIT"] = str(memory_limit) + + # Validate every value before mutating os.environ, so a later + # invalid key cannot leave an earlier one partially applied. + env_updates: dict[str, str] = {} + for key, env_var in ( + ("concurrency", "RUNAI_STREAMER_CONCURRENCY"), + ("memory_limit", "RUNAI_STREAMER_MEMORY_LIMIT"), + ): + if key in extra_config: + value = extra_config[key] + if ( + isinstance(value, bool) + or not isinstance(value, int) + or value <= 0 + ): + raise ValueError( + f"{key} must be a positive integer, got {value!r}" + ) + env_updates[env_var] = str(value) + os.environ.update(env_updates) runai_streamer_s3_endpoint = os.getenv("RUNAI_STREAMER_S3_ENDPOINT") aws_endpoint_url = os.getenv("AWS_ENDPOINT_URL")