deployment params

ads/aqua/modeldeployment/deployment.py

@@ -28,7 +28,6 @@
     build_params_string,
     build_pydantic_error_message,
     find_restricted_params,
-    get_combined_params,
     get_container_env_type,
     get_container_params_type,
     get_ocid_substring,
@@ -918,10 +917,31 @@ def _create(
         # The values provided by user will override the ones provided by default config
         env_var = {**config_env, **env_var}
 
-        # validate user provided params
-        user_params = env_var.get("PARAMS", UNKNOWN)
+        # SMM Parameter Resolution Logic
+        # Check the raw user input from create_deployment_details to determine intent.
+        # We cannot use the merged 'env_var' here because it may already contain defaults.
+        user_input_env = create_deployment_details.env_var or {}
+        user_input_params = user_input_env.get("PARAMS")
+
+        deployment_params = ""
+
+        if user_input_params is None:
+            # Case 1: None (CLI default) -> Load full defaults from config
+            logger.info("No PARAMS provided (None). Loading default SMM parameters.")
+            deployment_params = config_params
+        elif str(user_input_params).strip() == "":
+            # Case 2: Empty String (UI Clear) -> Explicitly use no parameters
+            logger.info("Empty PARAMS provided. Clearing all parameters.")
+            deployment_params = ""
+        else:
+            # Case 3: Value Provided -> Use exact user value (No merging)
+            logger.info(
+                f"User provided PARAMS. Using exact user values: {user_input_params}"
+            )
+            deployment_params = user_input_params
 
-        if user_params:
+        # Validate the resolved parameters
+        if deployment_params:
             # todo: remove this check in the future version, logic to be moved to container_index
             if (
                 container_type_key.lower()
@@ -935,16 +955,14 @@ def _create(
                 )
 
             restricted_params = find_restricted_params(
-                params, user_params, container_type_key
+                params, deployment_params, container_type_key
             )
             if restricted_params:
                 raise AquaValueError(
                     f"Parameters {restricted_params} are set by Aqua "
                     f"and cannot be overridden or are invalid."
                 )
 
-        deployment_params = get_combined_params(config_params, user_params)
-
         params = f"{params} {deployment_params}".strip()
 
         if isinstance(aqua_model, DataScienceModelGroup):
@@ -1212,7 +1230,7 @@ def _create_deployment(
 
         # we arbitrarily choose last 8 characters of OCID to identify MD in telemetry
         deployment_short_ocid = get_ocid_substring(deployment_id, key_len=8)
-        
+
         # Prepare telemetry kwargs
         telemetry_kwargs = {"ocid": deployment_short_ocid}
 
@@ -2048,9 +2066,11 @@ def recommend_shape(self, **kwargs) -> Union[Table, ShapeRecommendationReport]:
         self.telemetry.record_event_async(
             category="aqua/deployment",
             action="recommend_shape",
-            detail=get_ocid_substring(model_id, key_len=8)
-            if is_valid_ocid(ocid=model_id)
-            else model_id,
+            detail=(
+                get_ocid_substring(model_id, key_len=8)
+                if is_valid_ocid(ocid=model_id)
+                else model_id
+            ),
             **kwargs,
         )
 

ads/aqua/modeldeployment/model_group_config.py

@@ -13,7 +13,6 @@
 from ads.aqua.common.utils import (
     build_params_string,
     find_restricted_params,
-    get_combined_params,
     get_container_params_type,
     get_params_dict,
 )
@@ -177,26 +176,35 @@ def _merge_gpu_count_params(
             model.model_id, AquaDeploymentConfig()
         ).configuration.get(deployment_details.instance_shape, ConfigurationItem())
 
+        final_model_params = user_params
         params_found = False
-        for item in deployment_config.multi_model_deployment:
-            if model.gpu_count and item.gpu_count and item.gpu_count == model.gpu_count:
-                config_parameters = item.parameters.get(
+
+        # If user DID NOT provide specific params (None or Empty), we look for defaults
+        if not user_params:
+            for item in deployment_config.multi_model_deployment:
+                if (
+                    model.gpu_count
+                    and item.gpu_count
+                    and item.gpu_count == model.gpu_count
+                ):
+                    config_parameters = item.parameters.get(
+                        get_container_params_type(container_type_key), UNKNOWN
+                    )
+                    if config_parameters:
+                        final_model_params = config_parameters
+                    params_found = True
+                    break
+
+            if not params_found and deployment_config.parameters:
+                config_parameters = deployment_config.parameters.get(
                     get_container_params_type(container_type_key), UNKNOWN
                 )
-                params = f"{params} {get_combined_params(config_parameters, user_params)}".strip()
+                if config_parameters:
+                    final_model_params = config_parameters
                 params_found = True
-                break
-
-        if not params_found and deployment_config.parameters:
-            config_parameters = deployment_config.parameters.get(
-                get_container_params_type(container_type_key), UNKNOWN
-            )
-            params = f"{params} {get_combined_params(config_parameters, user_params)}".strip()
-            params_found = True
 
-        # if no config parameters found, append user parameters directly.
-        if not params_found:
-            params = f"{params} {user_params}".strip()
+        # Combine Container System Defaults (params) + Model Params (final_model_params)
+        params = f"{params} {final_model_params}".strip()
 
         return params