remove redundant code

Author: VipulMascarenhas

ads/aqua/common/utils.py

@@ -42,6 +42,10 @@
     UNKNOWN_JSON_STR,
 )
 from ads.aqua.data import AquaResourceIdentifier
+from ads.aqua.modeldeployment.constants import (
+    TGIInferenceRestrictedParams,
+    VLLMInferenceRestrictedParams,
+)
 from ads.common.auth import default_signer
 from ads.common.decorator.threaded import threaded
 from ads.common.extended_enum import ExtendedEnumMeta
@@ -862,7 +866,7 @@ def copy_model_config(artifact_path: str, os_path: str, auth: dict = None):
         logger.debug(f"Failed to copy config folder from {artifact_path} to {os_path}.")
 
 
-def get_container_params_type(container_type_name: str):
+def get_container_params_type(container_type_name: str) -> str:
     """The utility function accepts the deployment container type name and returns the corresponding params name.
     Parameters
     ----------
@@ -875,9 +879,31 @@ def get_container_params_type(container_type_name: str):
 
     """
     # check substring instead of direct match in case container_type_name changes in the future
-    if InferenceContainerType.CONTAINER_TYPE_VLLM in container_type_name:
+    if InferenceContainerType.CONTAINER_TYPE_VLLM in container_type_name.lower():
         return InferenceContainerParamType.PARAM_TYPE_VLLM
-    elif InferenceContainerType.CONTAINER_TYPE_TGI in container_type_name:
+    elif InferenceContainerType.CONTAINER_TYPE_TGI in container_type_name.lower():
         return InferenceContainerParamType.PARAM_TYPE_TGI
     else:
         return UNKNOWN
+
+
+def get_restricted_params_by_container(container_type_name: str) -> set:
+    """The utility function accepts the deployment container type name and returns a set of restricted params
+        for that container.
+    Parameters
+    ----------
+    container_type_name: str
+        type of deployment container, like odsc-vllm-serving or odsc-tgi-serving.
+
+    Returns
+    -------
+        InferenceContainerParamType value
+
+    """
+    # check substring instead of direct match in case container_type_name changes in the future
+    if InferenceContainerType.CONTAINER_TYPE_VLLM in container_type_name.lower():
+        return VLLMInferenceRestrictedParams
+    elif InferenceContainerType.CONTAINER_TYPE_TGI in container_type_name.lower():
+        return TGIInferenceRestrictedParams
+    else:
+        return set()

ads/aqua/modeldeployment/deployment.py

@@ -7,7 +7,6 @@
 
 from ads.aqua.app import AquaApp, logger
 from ads.aqua.common.enums import (
-    InferenceContainerType,
     InferenceContainerTypeFamily,
     Tags,
 )
@@ -22,6 +21,7 @@
     get_params_dict,
     get_params_list,
     get_resource_name,
+    get_restricted_params_by_container,
     load_config,
 )
 from ads.aqua.constants import (
@@ -34,10 +34,6 @@
 from ads.aqua.data import AquaResourceIdentifier
 from ads.aqua.finetuning.finetuning import FineTuneCustomMetadata
 from ads.aqua.model import AquaModelApp
-from ads.aqua.modeldeployment.constants import (
-    TGIInferenceRestrictedParams,
-    VLLMInferenceRestrictedParams,
-)
 from ads.aqua.modeldeployment.entities import (
     AquaDeployment,
     AquaDeploymentDetail,
@@ -567,19 +563,27 @@ def get_deployment_default_params(
                 f"{AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME} key is not available in the custom metadata field for model {model_id}."
             )
 
-        if container_type_key:
-            container_type_key = container_type_key.lower()
-            if container_type_key in InferenceContainerTypeFamily.values():
-                deployment_config = self.get_deployment_config(model_id)
-                params = (
-                    deployment_config.get("configuration", UNKNOWN_DICT)
-                    .get(instance_shape, UNKNOWN_DICT)
-                    .get("parameters", UNKNOWN_DICT)
-                    .get(get_container_params_type(container_type_key))
+        if (
+            container_type_key
+            and container_type_key in InferenceContainerTypeFamily.values()
+        ):
+            deployment_config = self.get_deployment_config(model_id)
+            config_params = (
+                deployment_config.get("configuration", UNKNOWN_DICT)
+                .get(instance_shape, UNKNOWN_DICT)
+                .get("parameters", UNKNOWN_DICT)
+                .get(get_container_params_type(container_type_key), UNKNOWN)
+            )
+            if config_params:
+                params_list = get_params_list(config_params)
+                restricted_params_set = get_restricted_params_by_container(
+                    container_type_key
                 )
-                if params:
-                    # account for param that can have --arg but no values, e.g. --trust-remote-code
-                    default_params.extend(get_params_list(params))
+
+                # remove restricted params from the list as user cannot override them during deployment
+                for params in params_list:
+                    if params.split()[0] not in restricted_params_set:
+                        default_params.append(params)
 
         return default_params
 
@@ -651,8 +655,7 @@ def _find_restricted_params(
         container_family: str,
     ) -> List[str]:
         """Returns a list of restricted params that user chooses to override when creating an Aqua deployment.
-        The default parameters coming from the container index json file cannot be overridden. In addition to this,
-        a set of parameters maintained in
+        The default parameters coming from the container index json file cannot be overridden.
 
         Parameters
         ----------
@@ -673,18 +676,9 @@ def _find_restricted_params(
             default_params_dict = get_params_dict(default_params)
             user_params_dict = get_params_dict(user_params)
 
+            restricted_params_set = get_restricted_params_by_container(container_family)
             for key, _items in user_params_dict.items():
-                if (
-                    key in default_params_dict
-                    or (
-                        InferenceContainerType.CONTAINER_TYPE_VLLM in container_family
-                        and key in VLLMInferenceRestrictedParams
-                    )
-                    or (
-                        InferenceContainerType.CONTAINER_TYPE_TGI in container_family
-                        and key in TGIInferenceRestrictedParams
-                    )
-                ):
+                if key in default_params_dict or key in restricted_params_set:
                     restricted_params.append(key.lstrip("-"))
 
         return restricted_params