update naming for model to follow deploy()

Author: Raymond Liu

src/sagemaker/inference_recommender/inference_recommender_mixin.py

@@ -15,7 +15,6 @@
 
 import logging
 import re
-import uuid
 
 from typing import List, Dict, Optional
 import sagemaker
@@ -157,14 +156,20 @@ def right_size(
         if isinstance(self, sagemaker.model.Model) and not isinstance(
             self, sagemaker.model.ModelPackage
         ):
+            primary_container_def = self.prepare_container_def()
             if not self.name:
-                unique_tail = uuid.uuid4()
-                self.name = "SageMaker-Model-RightSized-" + str(unique_tail)
+                self._ensure_base_name_if_needed(
+                    image_uri=primary_container_def["Image"],
+                    script_uri=self.source_dir,
+                    model_uri=self.model_data,
+                )
+                self._set_model_name_if_needed()
+
             create_model_args = dict(
                 name=self.name,
                 role=self.role,
                 container_defs=None,
-                primary_container=self.prepare_container_def(),
+                primary_container=primary_container_def,
                 vpc_config=self.vpc_config,
                 enable_network_isolation=self.enable_network_isolation(),
             )

src/sagemaker/session.py

@@ -4974,14 +4974,10 @@ def create_inference_recommendations_job(
         """
 
         if model_name is None and model_package_version_arn is None:
-            raise ValueError(
-                "Please provide either model_name or model_package_version_arn, not both."
-            )
+            raise ValueError("Please provide either model_name or model_package_version_arn.")
 
         if model_name is not None and model_package_version_arn is not None:
-            raise ValueError(
-                "Please provide either model_name or model_package_version_arn, not both."
-            )
+            raise ValueError("Please provide either model_name or model_package_version_arn.")
 
         if not job_name:
             unique_tail = uuid.uuid4()

tests/unit/sagemaker/inference_recommender/test_inference_recommender_mixin.py

@@ -26,7 +26,6 @@
 IR_SUPPORTED_CONTENT_TYPES = ["text/csv"]
 IR_JOB_NAME = "SMPYTHONSDK-1234567891"
 IR_SAMPLE_INSTANCE_TYPE = "ml.c5.xlarge"
-IR_MODEL_NAME = "SageMaker-Model-RightSized-sample-unique-uuid"
 
 IR_SAMPLE_LIST_OF_INSTANCES_HYPERPARAMETER_RANGES = [
     {
@@ -187,7 +186,7 @@ def test_right_size_default_with_model_name_successful(sagemaker_session, model)
     )
 
     assert sagemaker_session.create_model.called_with(
-        name=IR_MODEL_NAME,
+        name=ANY,
         role=IR_ROLE_ARN,
         container_defs=None,
         primary_container={},
@@ -201,7 +200,7 @@ def test_right_size_default_with_model_name_successful(sagemaker_session, model)
         job_name=IR_JOB_NAME,
         job_type="Default",
         job_duration_in_seconds=None,
-        model_name=IR_MODEL_NAME,
+        model_name=ANY,
         model_package_version_arn=None,
         framework=IR_SAMPLE_FRAMEWORK,
         framework_version=None,
@@ -252,7 +251,7 @@ def test_right_size_advanced_list_instances_model_name_successful(sagemaker_sess
         job_name=IR_JOB_NAME,
         job_type="Advanced",
         job_duration_in_seconds=7200,
-        model_name=IR_MODEL_NAME,
+        model_name=ANY,
         model_package_version_arn=None,
         framework=IR_SAMPLE_FRAMEWORK,
         framework_version=None,
@@ -303,7 +302,7 @@ def test_right_size_advanced_single_instances_model_name_successful(sagemaker_se
         job_name=IR_JOB_NAME,
         job_type="Advanced",
         job_duration_in_seconds=7200,
-        model_name=IR_MODEL_NAME,
+        model_name=ANY,
         model_package_version_arn=None,
         framework=IR_SAMPLE_FRAMEWORK,
         framework_version=None,

tests/unit/test_session.py

@@ -3396,7 +3396,7 @@ def test_create_inference_recommendations_job_advanced_model_name_happy(sagemake
 def test_create_inference_recommendations_job_missing_model_name_and_pkg(sagemaker_session):
     with pytest.raises(
         ValueError,
-        match="Please provide either model_name or model_package_version_arn, not both.",
+        match="Please provide either model_name or model_package_version_arn.",
     ):
         sagemaker_session.create_inference_recommendations_job(
             role=IR_ROLE_ARN,
@@ -3415,7 +3415,7 @@ def test_create_inference_recommendations_job_missing_model_name_and_pkg(sagemak
 def test_create_inference_recommendations_job_provided_model_name_and_pkg(sagemaker_session):
     with pytest.raises(
         ValueError,
-        match="Please provide either model_name or model_package_version_arn, not both.",
+        match="Please provide either model_name or model_package_version_arn.",
     ):
         sagemaker_session.create_inference_recommendations_job(
             role=IR_ROLE_ARN,