Merge branch 'master' into doc_clarify_1.0.9

Author: ahsan-z-khan

src/sagemaker/estimator.py

@@ -2319,9 +2319,13 @@ def _model_source_dir(self):
             str: Either a local or an S3 path pointing to the ``source_dir`` to be
                 used for code by the model to be deployed
         """
-        return (
-            self.source_dir if self.sagemaker_session.local_mode else self.uploaded_code.s3_prefix
-        )
+        if self.sagemaker_session.local_mode:
+            return self.source_dir
+
+        if self.uploaded_code is not None:
+            return self.uploaded_code.s3_prefix
+
+        return None
 
     def _model_entry_point(self):
         """Get the appropriate value to pass as ``entry_point`` to a model constructor.
@@ -2333,7 +2337,10 @@ def _model_entry_point(self):
         if self.sagemaker_session.local_mode or (self._model_source_dir() is None):
             return self.entry_point
 
-        return self.uploaded_code.script_name
+        if self.uploaded_code is not None:
+            return self.uploaded_code.script_name
+
+        return None
 
     def hyperparameters(self):
         """Return the hyperparameters as a dictionary to use for training.

src/sagemaker/workflow/_utils.py

@@ -312,6 +312,9 @@ def arguments(self) -> RequestType:
                     model = self.estimator.create_model(**self.kwargs)
                     self.image_uri = model.image_uri
 
+                if self.model_data is None:
+                    self.model_data = model.model_data
+
                 # reset placeholder
                 self.estimator.output_path = output_path
 

src/sagemaker/workflow/step_collections.py

@@ -146,7 +146,7 @@ def __init__(
                 else:
                     sagemaker_session = model_entity.sagemaker_session
                     role = model_entity.role
-                if hasattr(model_entity, "entry_point"):
+                if hasattr(model_entity, "entry_point") and model_entity.entry_point is not None:
                     repack_model = True
                     entry_point = model_entity.entry_point
                     source_dir = model_entity.source_dir
@@ -169,6 +169,7 @@ def __init__(
                     model_entity.model_data = (
                         repack_model_step.properties.ModelArtifacts.S3ModelArtifacts
                     )
+
                     # remove kwargs consumed by model repacking step
                     kwargs.pop("output_kms_key", None)