added unit tests for SMM changes

Author: Aryanag2

tests/unitary/with_extras/aqua/test_deployment.py

@@ -1058,7 +1058,7 @@ class TestDataset:
     multi_model_deployment_model_attributes = [
         {
             "env_var": {"--test_key_one": "test_value_one"},
-            "params": {},
+            "params": None,
             "gpu_count": 1,
             "model_id": "ocid1.compartment.oc1..<OCID>",
             "model_name": "model_one",
@@ -1068,7 +1068,7 @@ class TestDataset:
         },
         {
             "env_var": {"--test_key_two": "test_value_two"},
-            "params": {},
+            "params": None,
             "gpu_count": 1,
             "model_id": "ocid1.compartment.oc1..<OCID>",
             "model_name": "model_two",
@@ -1078,7 +1078,7 @@ class TestDataset:
         },
         {
             "env_var": {"--test_key_three": "test_value_three"},
-            "params": {},
+            "params": None,
             "gpu_count": 1,
             "model_id": "ocid1.compartment.oc1..<OCID>",
             "model_name": "model_three",
@@ -2952,3 +2952,202 @@ def test_from_create_model_deployment_details(self):
             model_group_config_no_ft.model_dump()
             == TestDataset.multi_model_deployment_group_config_no_ft
         )
+
+
+# ... [Existing code in test_deployment.py] ...
+
+
+class TestSingleModelParamResolution(unittest.TestCase):
+    """Tests strictly for the SMM parameter resolution logic in Single Model."""
+
+    def setUp(self):
+        self.app = AquaDeploymentApp()
+        self.app.region = "us-ashburn-1"
+
+        # Mock internal helpers to avoid real API calls
+        self.app.get_container_config = MagicMock()
+        self.app.get_container_image = MagicMock(return_value="docker/image:latest")
+        self.app.list_shapes = MagicMock(return_value=[MagicMock(name="VM.GPU.A10.1")])
+
+        # Mock the SMM Defaults (What happens if user sends nothing)
+        self.mock_config = MagicMock()
+        # Assume default SMM config is "--default-param 100"
+        self.mock_config.configuration.get.return_value.parameters.get.return_value = (
+            "--default-param 100"
+        )
+        self.app.get_deployment_config = MagicMock(return_value=self.mock_config)
+
+        # Mock Container Defaults (The mandatory left-side params)
+        self.mock_container_item = MagicMock()
+        self.mock_container_item.spec.cli_param = "--mandatory-param 1"
+        # Mock restricted params to empty list to pass validation
+        self.mock_container_item.spec.restricted_params = []
+        self.app.get_container_config_item = MagicMock(
+            return_value=self.mock_container_item
+        )
+
+    @patch("ads.aqua.app.ModelDeployment")
+    @patch("ads.aqua.app.AquaModelApp")
+    def test_case_1_none_loads_defaults(self, mock_model_app, mock_deploy):
+        """Case 1: User input None -> Should load SMM defaults."""
+        details = CreateModelDeploymentDetails(
+            model_id="ocid1.model...",
+            instance_shape="VM.GPU.A10.1",
+            # PARAMS is missing (None)
+            env_var={},
+        )
+
+        # Mock the internal call to capture arguments
+        with patch.object(self.app, "_create_deployment") as mock_create_internal:
+            self.app.create(create_deployment_details=details)
+
+            call_args = mock_create_internal.call_args[1]
+            final_params = call_args["env_var"]["PARAMS"]
+
+            # Should have Mandatory + SMM Default
+            self.assertIn("--mandatory-param 1", final_params)
+            self.assertIn("--default-param 100", final_params)
+
+    @patch("ads.aqua.app.ModelDeployment")
+    @patch("ads.aqua.app.AquaModelApp")
+    def test_case_2_empty_clears_defaults(self, mock_model_app, mock_deploy):
+        """Case 2: User input Empty String -> Should clear SMM defaults."""
+        details = CreateModelDeploymentDetails(
+            model_id="ocid1.model...",
+            instance_shape="VM.GPU.A10.1",
+            # PARAMS is explicitly empty
+            env_var={"PARAMS": ""},
+        )
+
+        with patch.object(self.app, "_create_deployment") as mock_create_internal:
+            self.app.create(create_deployment_details=details)
+
+            call_args = mock_create_internal.call_args[1]
+            final_params = call_args["env_var"]["PARAMS"]
+
+            # Should have Mandatory ONLY
+            self.assertIn("--mandatory-param 1", final_params)
+            # SMM Default should be GONE
+            self.assertNotIn("--default-param 100", final_params)
+
+    @patch("ads.aqua.app.ModelDeployment")
+    @patch("ads.aqua.app.AquaModelApp")
+    def test_case_3_value_overrides_defaults(self, mock_model_app, mock_deploy):
+        """Case 3: User input Value -> Should use exact value (No Merge)."""
+        details = CreateModelDeploymentDetails(
+            model_id="ocid1.model...",
+            instance_shape="VM.GPU.A10.1",
+            # PARAMS is a custom value
+            env_var={"PARAMS": "--user-override 99"},
+        )
+
+        with patch.object(self.app, "_create_deployment") as mock_create_internal:
+            self.app.create(create_deployment_details=details)
+
+            call_args = mock_create_internal.call_args[1]
+            final_params = call_args["env_var"]["PARAMS"]
+
+            # Should have Mandatory + User Override
+            self.assertIn("--mandatory-param 1", final_params)
+            self.assertIn("--user-override 99", final_params)
+            # SMM Default should be GONE
+            self.assertNotIn("--default-param 100", final_params)
+
+    @patch("ads.aqua.app.ModelDeployment")
+    @patch("ads.aqua.app.AquaModelApp")
+    def test_validation_blocks_restricted_params(self, mock_model_app, mock_deploy):
+        """Test that restricted params cause error regardless of input source."""
+
+        # Setup: Container config has restricted params
+        self.mock_container_item.spec.restricted_params = ["--seed"]
+
+        # User tries to override restricted param
+        details = CreateModelDeploymentDetails(
+            model_id="ocid1.model...",
+            instance_shape="VM.GPU.A10.1",
+            env_var={"PARAMS": "--seed 999"},
+        )
+
+        with self.assertRaises(AquaValueError) as context:
+            self.app.create(create_deployment_details=details)
+
+        self.assertIn("Parameters ['--seed'] are set by Aqua", str(context.exception))
+
+
+class TestMultiModelParamResolution(unittest.TestCase):
+    """Tests strictly for the SMM parameter resolution logic in Multi-Model."""
+
+    def setUp(self):
+        # Mock Config Summary structure
+        self.mock_config_summary = MagicMock()
+        self.mock_deploy_config = MagicMock()
+
+        # Set SMM Default
+        self.mock_deploy_config.configuration.get.return_value.parameters.get.return_value = (
+            "--smm-default 500"
+        )
+        self.mock_config_summary.deployment_config.get.return_value = (
+            self.mock_deploy_config
+        )
+
+        self.mock_details = MagicMock()
+        self.mock_details.instance_shape = "VM.GPU.A10.2"
+
+        # Set Container Mandatory Params
+        self.container_params = "--mandatory 1"
+
+    def test_case_1_none_loads_defaults(self):
+        """Case 1: params=None -> Load Defaults"""
+        model = AquaMultiModelRef(
+            model_id="ocid1...", gpu_count=1, params=None  # User sent nothing
+        )
+
+        result = ModelGroupConfig._merge_gpu_count_params(
+            model,
+            self.mock_config_summary,
+            self.mock_details,
+            "container_key",
+            self.container_params,
+        )
+
+        self.assertIn("--mandatory 1", result)
+        self.assertIn("--smm-default 500", result)
+
+    def test_case_2_empty_clears_defaults(self):
+        """Case 2: params={} -> Clear Defaults"""
+        model = AquaMultiModelRef(
+            model_id="ocid1...", gpu_count=1, params={}  # User sent Empty Dict
+        )
+
+        result = ModelGroupConfig._merge_gpu_count_params(
+            model,
+            self.mock_config_summary,
+            self.mock_details,
+            "container_key",
+            self.container_params,
+        )
+
+        self.assertIn("--mandatory 1", result)
+        # SMM Default should be missing
+        self.assertNotIn("--smm-default 500", result)
+
+    def test_case_3_value_overrides_defaults(self):
+        """Case 3: params={val} -> Override Defaults"""
+        model = AquaMultiModelRef(
+            model_id="ocid1...",
+            gpu_count=1,
+            params={"--custom": "99"},  # User sent Value
+        )
+
+        result = ModelGroupConfig._merge_gpu_count_params(
+            model,
+            self.mock_config_summary,
+            self.mock_details,
+            "container_key",
+            self.container_params,
+        )
+
+        self.assertIn("--mandatory 1", result)
+        self.assertIn("--custom 99", result)
+        # SMM Default should be missing
+        self.assertNotIn("--smm-default 500", result)