Fix tests

Author: XkunW

tests/vec_inf/client/test_engine_selection.py

@@ -24,6 +24,12 @@ def _set_required_env_vars(self, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setenv("VEC_INF_ACCOUNT", "test-account")
         monkeypatch.setenv("VEC_INF_WORK_DIR", "/tmp")
 
+    @pytest.fixture(autouse=True)
+    def _mock_validate_weights_path(self) -> None:
+        """Avoid disk checks for fake model paths in fixtures."""
+        with patch("vec_inf.client._helper.utils.validate_weights_path"):
+            yield
+
     @pytest.fixture
     def model_config_vllm(self) -> ModelConfig:
         """Fixture providing a vLLM model configuration."""
@@ -187,6 +193,12 @@ def _set_required_env_vars(self, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setenv("VEC_INF_ACCOUNT", "test-account")
         monkeypatch.setenv("VEC_INF_WORK_DIR", "/tmp")
 
+    @pytest.fixture(autouse=True)
+    def _mock_validate_weights_path(self) -> None:
+        """Avoid disk checks for fake model paths in fixtures."""
+        with patch("vec_inf.client._helper.utils.validate_weights_path"):
+            yield
+
     @pytest.fixture
     def model_config(self) -> ModelConfig:
         """Fixture providing a basic model configuration."""

tests/vec_inf/client/test_helper.py

@@ -32,6 +32,12 @@
 class TestModelLauncher:
     """Tests for the ModelLauncher class."""
 
+    @pytest.fixture(autouse=True)
+    def _mock_validate_weights_path(self) -> None:
+        """Avoid disk checks for fake model paths in fixtures."""
+        with patch("vec_inf.client._helper.utils.validate_weights_path"):
+            yield
+
     @pytest.fixture
     def model_config(self) -> ModelConfig:
         """Fixture providing a basic model configuration for tests."""
@@ -385,6 +391,12 @@ def test_launch_with_sglang_engine(
 class TestBatchModelLauncher:
     """Tests for the BatchModelLauncher class."""
 
+    @pytest.fixture(autouse=True)
+    def _mock_validate_weights_path(self) -> None:
+        """Avoid disk checks for fake model paths in fixtures."""
+        with patch("vec_inf.client._helper.utils.validate_weights_path"):
+            yield
+
     @pytest.fixture
     def batch_model_configs(self) -> list[ModelConfig]:
         """Fixture providing batch model configurations for tests."""

tests/vec_inf/client/test_slurm_script_generator.py

@@ -12,14 +12,6 @@
 )
 
 
-@pytest.fixture(autouse=True)
-def patch_model_weights_exists(monkeypatch):
-    """Ensure model weights directory existence checks default to True."""
-    monkeypatch.setattr(
-        "vec_inf.client._slurm_script_generator.Path.exists", lambda self: True
-    )
-
-
 class TestSlurmScriptGenerator:
     """Tests for SlurmScriptGenerator class."""
 
@@ -123,7 +115,7 @@ def test_init_singularity(self, singularity_params):
         assert generator.params == singularity_params
         assert generator.use_container
         assert not generator.is_multinode
-        assert generator.additional_binds == ",/scratch:/scratch,/data:/data"
+        assert generator.additional_binds == "/scratch:/scratch,/data:/data"
         assert generator.model_weights_path == "/path/to/model_weights/test-model"
         assert (
             generator.env_str
@@ -195,18 +187,16 @@ def test_generate_server_setup_singularity(self, singularity_params):
         )  # Remove module name since it's inconsistent between clusters
 
     def test_generate_server_setup_singularity_no_weights(
-        self, singularity_params, monkeypatch
+        self, singularity_params
     ):
-        """Test server setup when model weights don't exist."""
-        monkeypatch.setattr(
-            "vec_inf.client._slurm_script_generator.Path.exists",
-            lambda self: False,
-        )
+        """Test server setup when using hf_model (no local weights in bind path)."""
+        params = singularity_params.copy()
+        params["hf_model"] = "test-org/test-model"
 
-        generator = SlurmScriptGenerator(singularity_params)
+        generator = SlurmScriptGenerator(params)
         setup = generator._generate_server_setup()
 
-        assert "ray stop" in setup
+        assert "module load" in setup or "apptainer" in setup.lower()
         assert "/path/to/model_weights/test-model" not in setup
 
     def test_generate_launch_cmd_venv(self, basic_params):
@@ -337,13 +327,8 @@ def test_generate_script_content_sglang(self, basic_params):
         assert "sglang.launch_server" in content
         assert "find_available_port" in content
 
-    def test_generate_launch_cmd_with_hf_model_override(
-        self, basic_params, monkeypatch
-    ):
-        """Test launch command uses hf_model when local weights don't exist."""
-        monkeypatch.setattr(
-            "vec_inf.client._slurm_script_generator.Path.exists", lambda self: False
-        )
+    def test_generate_launch_cmd_with_hf_model_override(self, basic_params):
+        """Test launch command uses hf_model when specified."""
         params = basic_params.copy()
         params["hf_model"] = "meta-llama/Meta-Llama-3.1-8B-Instruct"
         generator = SlurmScriptGenerator(params)
@@ -361,20 +346,18 @@ def test_generate_launch_cmd_singularity(self, singularity_params):
         assert "source" not in launch_cmd
 
     def test_generate_launch_cmd_singularity_no_local_weights(
-        self, singularity_params, monkeypatch
+        self, singularity_params
     ):
-        """Test container launch when model weights directory is missing."""
-        monkeypatch.setattr(
-            "vec_inf.client._slurm_script_generator.Path.exists",
-            lambda self: False,
-        )
+        """Test container launch when using hf_model instead of local weights."""
+        params = singularity_params.copy()
+        params["hf_model"] = "test-org/test-model"
 
-        generator = SlurmScriptGenerator(singularity_params)
+        generator = SlurmScriptGenerator(params)
         launch_cmd = generator._generate_launch_cmd()
 
         assert "exec --nv" in launch_cmd
-        assert "--bind /path/to/model_weights/test-model" not in launch_cmd
-        assert "vllm serve test-model" in launch_cmd
+        assert "vllm serve test-org/test-model" in launch_cmd
+        assert "vllm serve /path/to/model_weights/test-model" not in launch_cmd
 
     def test_generate_launch_cmd_boolean_args(self, basic_params):
         """Test launch command with boolean vLLM arguments."""
@@ -522,11 +505,11 @@ def test_init_singularity(self, batch_singularity_params):
         assert generator.use_container
         assert (
             generator.params["models"]["model1"]["additional_binds"]
-            == ",/scratch:/scratch,/data:/data"
+            == "/scratch:/scratch,/data:/data"
         )
         assert (
             generator.params["models"]["model2"]["additional_binds"]
-            == ",/scratch:/scratch,/data:/data"
+            == "/scratch:/scratch,/data:/data"
         )
 
     def test_init_singularity_no_bind(self, batch_params):
@@ -571,12 +554,9 @@ def test_generate_model_launch_script_basic(
     @patch("pathlib.Path.touch")
     @patch("pathlib.Path.write_text")
     def test_generate_model_launch_script_with_hf_model_override(
-        self, mock_write_text, mock_touch, batch_params, monkeypatch
+        self, mock_write_text, mock_touch, batch_params
     ):
-        """Test batch launch script uses hf_model when local weights don't exist."""
-        monkeypatch.setattr(
-            "vec_inf.client._slurm_script_generator.Path.exists", lambda self: False
-        )
+        """Test batch launch script uses hf_model when specified."""
         params = batch_params.copy()
         params["models"] = {k: v.copy() for k, v in batch_params["models"].items()}
         params["models"]["model1"]["hf_model"] = "meta-llama/Meta-Llama-3.1-8B-Instruct"
@@ -604,20 +584,22 @@ def test_generate_model_launch_script_singularity(
     @patch("pathlib.Path.touch")
     @patch("pathlib.Path.write_text")
     def test_generate_model_launch_script_singularity_no_weights(
-        self, mock_write_text, mock_touch, batch_singularity_params, monkeypatch
+        self, mock_write_text, mock_touch, batch_singularity_params
     ):
-        """Test batch model launch script when model weights don't exist."""
-        monkeypatch.setattr(
-            "vec_inf.client._slurm_script_generator.Path.exists",
-            lambda self: False,
-        )
+        """Test batch model launch script when using hf_model (no local weights)."""
+        params = batch_singularity_params.copy()
+        params["models"] = {
+            k: v.copy() for k, v in batch_singularity_params["models"].items()
+        }
+        params["models"]["model1"]["hf_model"] = "test-org/model1"
 
-        generator = BatchSlurmScriptGenerator(batch_singularity_params)
+        generator = BatchSlurmScriptGenerator(params)
         script_path = generator._generate_model_launch_script("model1")
 
         assert script_path.name == "launch_model1.sh"
         call_args = mock_write_text.call_args[0][0]
         assert "/path/to/model_weights/model1" not in call_args
+        assert "vllm serve test-org/model1" in call_args
 
     @patch("vec_inf.client._slurm_script_generator.datetime")
     @patch("pathlib.Path.touch")