review comments

Author: VipulMascarenhas

ads/aqua/common/utils.py

@@ -576,15 +576,13 @@ def get_container_image(
         A dict of allowed configs.
     """
 
+    container_image = UNKNOWN
     config = config_file_name or get_container_config()
     config_file_name = service_config_path()
 
     if container_type not in config:
-        raise AquaValueError(
-            f"{config_file_name} does not have config details for model: {container_type}"
-        )
+        return UNKNOWN
 
-    container_image = None
     mapping = config[container_type]
     versions = [obj["version"] for obj in mapping]
     # assumes numbered versions, update if `latest` is used
@@ -1149,7 +1147,7 @@ def validate_cmd_var(cmd_var: List[str], overrides: List[str]) -> List[str]:
     common_keys = set(cmd_dict.keys()) & set(overrides_dict.keys())
     if common_keys:
         raise AquaValueError(
-            f"The following keys cannot be overridden: {', '.join(common_keys)}"
+            f"The following CMD input cannot be overridden for model deployment: {', '.join(common_keys)}"
         )
 
     combined_cmd_var = cmd_var + overrides

ads/aqua/modeldeployment/deployment.py

@@ -246,41 +246,41 @@ def create(
             model=aqua_model, container_family=container_family
         )
 
-        # todo: revisit this when TEI is added to SMC list. Currently, container_image_uri is ignored if container
-        #   family is SMC.
-        if container_type_key == InferenceContainerTypeFamily.AQUA_TEI_CONTAINER_FAMILY:
-            if not container_image_uri:
-                try:
-                    container_image_uri = aqua_model.custom_metadata_list.get(
-                        AQUA_DEPLOYMENT_CONTAINER_URI_METADATA_NAME
-                    ).value
-                except ValueError as err:
-                    raise AquaValueError(
-                        f"{AQUA_DEPLOYMENT_CONTAINER_URI_METADATA_NAME} key is not available in the custom metadata "
-                        f"field. Either re-register the model with custom container URI, or set container_image_uri "
-                        f"parameter when creating this deployment."
-                    ) from err
-
+        container_image_uri = container_image_uri or get_container_image(
+            container_type=container_type_key
+        )
+        if not container_image_uri:
             try:
-                cmd_var_string = aqua_model.custom_metadata_list.get(
-                    AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME
+                container_image_uri = aqua_model.custom_metadata_list.get(
+                    AQUA_DEPLOYMENT_CONTAINER_URI_METADATA_NAME
                 ).value
             except ValueError as err:
                 raise AquaValueError(
-                    f"{AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME} key is not available in the custom metadata "
-                    f"field. Please check if the model was registered with {container_type_key} inference container."
+                    f"{AQUA_DEPLOYMENT_CONTAINER_URI_METADATA_NAME} key is not available in the custom metadata "
+                    f"field. Either re-register the model with custom container URI, or set container_image_uri "
+                    f"parameter when creating this deployment."
                 ) from err
+        logging.info(
+            f"Aqua Image used for deploying {aqua_model.id} : {container_image_uri}"
+        )
+
+        try:
+            cmd_var_string = aqua_model.custom_metadata_list.get(
+                AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME
+            ).value
             default_cmd_var = cmd_var_string.split(",")
             if default_cmd_var:
                 cmd_var = validate_cmd_var(default_cmd_var, cmd_var)
             logging.info(f"CMD used for deploying {aqua_model.id} :{cmd_var}")
-        else:
-            # fetch image name from config
-            container_image_uri = get_container_image(container_type=container_type_key)
-
-        logging.info(
-            f"Aqua Image used for deploying {aqua_model.id} : {container_image_uri}"
-        )
+        except ValueError:
+            logging.debug(
+                f"CMD will be ignored for this deployment as {AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME} "
+                f"key is not available in the custom metadata field for this model."
+            )
+        except Exception as e:
+            logging.error(
+                f"There was an issue processing CMD arguments. Error: {str(e)}"
+            )
 
         model_formats_str = aqua_model.freeform_tags.get(
             Tags.MODEL_FORMAT, ModelFormat.SAFETENSORS.value

tests/unitary/with_extras/aqua/test_deployment.py

@@ -716,7 +716,7 @@ def test_create_deployment_for_tei_byoc_embedding_model(
         mock_create.assert_called_with(
             model_id=TestDataset.MODEL_ID, compartment_id=None, project_id=None
         )
-        mock_get_container_image.assert_not_called()
+        mock_get_container_image.assert_called()
         mock_deploy.assert_called()
 
         expected_attributes = set(AquaDeployment.__annotations__.keys())