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 e697415560..9164b8e4be 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 @@ -119,6 +119,6 @@ def test_runai_invalid_extra_config_leaves_environ_untouched(): # 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"): + with pytest.raises(ValueError, match="memory_limit must be an integer >= -1"): _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 3ed6eab676..3f30a42fe4 100644 --- a/vllm/model_executor/model_loader/runai_streamer_loader.py +++ b/vllm/model_executor/model_loader/runai_streamer_loader.py @@ -47,21 +47,29 @@ class RunaiModelStreamerLoader(BaseModelLoader): # 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) + if "concurrency" in extra_config: + concurrency = extra_config["concurrency"] + if ( + isinstance(concurrency, bool) + or not isinstance(concurrency, int) + or concurrency <= 0 + ): + raise ValueError( + f"concurrency must be a positive integer, got {concurrency!r}" + ) + env_updates["RUNAI_STREAMER_CONCURRENCY"] = str(concurrency) + + if "memory_limit" in extra_config: + memory_limit = extra_config["memory_limit"] + if ( + isinstance(memory_limit, bool) + or not isinstance(memory_limit, int) + or memory_limit < -1 + ): + raise ValueError( + f"memory_limit must be an integer >= -1, got {memory_limit!r}" + ) + env_updates["RUNAI_STREAMER_MEMORY_LIMIT"] = str(memory_limit) os.environ.update(env_updates) runai_streamer_s3_endpoint = os.getenv("RUNAI_STREAMER_S3_ENDPOINT")