change load_artifact flag to download_artifact

Author: VipulMascarenhas

ads/model/generic_model.py

@@ -1521,7 +1521,7 @@ def from_model_catalog(
         bucket_uri: Optional[str] = None,
         remove_existing_artifact: Optional[bool] = True,
         ignore_conda_error: Optional[bool] = False,
-        load_artifact: Optional[bool] = True,
+        download_artifact: Optional[bool] = True,
         **kwargs,
     ) -> Self:
         """Loads model from model catalog.
@@ -1551,7 +1551,7 @@ def from_model_catalog(
             Wether artifacts uploaded to object storage bucket need to be removed or not.
         ignore_conda_error: (bool, optional). Defaults to False.
             Parameter to ignore error when collecting conda information.
-        load_artifact: (bool, optional). Defaults to True.
+        download_artifact: (bool, optional). Defaults to True.
             Whether to download the model pickle or checkpoints
         kwargs:
             compartment_id : (str, optional)
@@ -1594,7 +1594,7 @@ def from_model_catalog(
         )
         dsc_model = DataScienceModel.from_id(model_id)
 
-        if not load_artifact:
+        if not download_artifact:
             result_model = cls(
                 artifact_dir=artifact_dir,
                 bucket_uri=bucket_uri,
@@ -1692,7 +1692,7 @@ def from_model_deployment(
         bucket_uri: Optional[str] = None,
         remove_existing_artifact: Optional[bool] = True,
         ignore_conda_error: Optional[bool] = False,
-        load_artifact: Optional[bool] = True,
+        download_artifact: Optional[bool] = True,
         **kwargs,
     ) -> Self:
         """Loads model from model deployment.
@@ -1722,7 +1722,7 @@ def from_model_deployment(
             Wether artifacts uploaded to object storage bucket need to be removed or not.
         ignore_conda_error: (bool, optional). Defaults to False.
             Parameter to ignore error when collecting conda information.
-        load_artifact: (bool, optional). Defaults to True.
+        download_artifact: (bool, optional). Defaults to True.
             Whether to download the model pickle or checkpoints
         kwargs:
             compartment_id : (str, optional)
@@ -1767,7 +1767,7 @@ def from_model_deployment(
             bucket_uri=bucket_uri,
             remove_existing_artifact=remove_existing_artifact,
             ignore_conda_error=ignore_conda_error,
-            load_artifact=load_artifact,
+            download_artifact=download_artifact,
             **kwargs,
         )
         model._summary_status.update_status(
@@ -1890,7 +1890,7 @@ def from_id(
         bucket_uri: Optional[str] = None,
         remove_existing_artifact: Optional[bool] = True,
         ignore_conda_error: Optional[bool] = False,
-        load_artifact: Optional[bool] = True,
+        download_artifact: Optional[bool] = True,
         **kwargs,
     ) -> Self:
         """Loads model from model OCID or model deployment OCID.
@@ -1920,7 +1920,7 @@ def from_id(
             Wether artifacts uploaded to object storage bucket need to be removed or not.
         ignore_conda_error: (bool, optional). Defaults to False.
             Parameter to ignore error when collecting conda information.
-        load_artifact: (bool, optional). Defaults to True.
+        download_artifact: (bool, optional). Defaults to True.
             Whether to download the model pickle or checkpoints
         kwargs:
             compartment_id : (str, optional)
@@ -1945,7 +1945,7 @@ def from_id(
                 bucket_uri=bucket_uri,
                 remove_existing_artifact=remove_existing_artifact,
                 ignore_conda_error=ignore_conda_error,
-                load_artifact=load_artifact,
+                download_artifact=download_artifact,
                 **kwargs,
             )
         elif DataScienceModelType.MODEL in ocid:
@@ -1959,7 +1959,7 @@ def from_id(
                 bucket_uri=bucket_uri,
                 remove_existing_artifact=remove_existing_artifact,
                 ignore_conda_error=ignore_conda_error,
-                load_artifact=load_artifact,
+                download_artifact=download_artifact,
                 **kwargs,
             )
         else:

tests/unitary/with_extras/model/test_generic_model.py

@@ -1070,7 +1070,7 @@ def test_from_model_deployment(
             bucket_uri="test_bucket_uri",
             remove_existing_artifact=True,
             compartment_id="test_compartment_id",
-            load_artifact=True,
+            download_artifact=True,
         )
 
         mock_from_id.assert_called_with(test_model_deployment_id)
@@ -1085,7 +1085,7 @@ def test_from_model_deployment(
             remove_existing_artifact=True,
             compartment_id="test_compartment_id",
             ignore_conda_error=False,
-            load_artifact=True,
+            download_artifact=True,
         )
 
         assert test_result == test_model
@@ -1189,7 +1189,7 @@ def test_from_id_model_deployment(
             remove_existing_artifact=True,
             compartment_id="test_compartment_id",
             ignore_conda_error=True,
-            load_artifact=True,
+            download_artifact=True,
         )
 
         mock_from_model_deployment.assert_called_with(
@@ -1203,7 +1203,7 @@ def test_from_id_model_deployment(
             remove_existing_artifact=True,
             compartment_id="test_compartment_id",
             ignore_conda_error=True,
-            load_artifact=True,
+            download_artifact=True,
         )
 
         assert test_model_deployment_result == test_model
@@ -1239,7 +1239,7 @@ def test_from_id_model(self, mock_from_model_catalog):
             remove_existing_artifact=True,
             compartment_id="test_compartment_id",
             ignore_conda_error=True,
-            load_artifact=True,
+            download_artifact=True,
         )
 
         mock_from_model_catalog.assert_called_with(
@@ -1253,7 +1253,7 @@ def test_from_id_model(self, mock_from_model_catalog):
             remove_existing_artifact=True,
             compartment_id="test_compartment_id",
             ignore_conda_error=True,
-            load_artifact=True,
+            download_artifact=True,
         )
 
         assert test_model_result == mock_oci_model
@@ -1280,15 +1280,15 @@ def test_from_id_fail(self):
 
     @patch.object(GenericModel, "from_model_catalog")
     def test_from_id_model_without_artifact(self, mock_from_model_catalog):
-        """Test to check model artifact is not loaded when load_artifact is set to False"""
+        """Test to check model artifact is not loaded when download_artifact is set to False"""
         test_model_id = "xxxx.datasciencemodel.xxxx"
         mock_model = MagicMock(model_id=test_model_id, model_artifact=None)
         mock_from_model_catalog.return_value = mock_model
 
         test_model_result = GenericModel.from_id(
             ocid=test_model_id,
             compartment_id="test_compartment_id",
-            load_artifact=False,
+            download_artifact=False,
         )
         mock_from_model_catalog.assert_called_with(
             test_model_id,
@@ -1301,14 +1301,14 @@ def test_from_id_model_without_artifact(self, mock_from_model_catalog):
             remove_existing_artifact=True,
             compartment_id="test_compartment_id",
             ignore_conda_error=False,
-            load_artifact=False,
+            download_artifact=False,
         )
         assert test_model_result.model_artifact is None
         assert test_model_result == mock_model
 
     @patch.object(GenericModel, "from_model_catalog")
     def test_from_id_with_artifact(self, mock_from_model_catalog):
-        """Test to check model artifact is loaded when load_artifact is set to True"""
+        """Test to check model artifact is loaded when download_artifact is set to True"""
         test_model_id = "xxxx.datasciencemodel.xxxx"
         artifact_dir = "test_dir"
         model_artifact = MagicMock(artifact_dir=artifact_dir, reload=False)
@@ -1320,7 +1320,7 @@ def test_from_id_with_artifact(self, mock_from_model_catalog):
             ocid=test_model_id,
             compartment_id="test_compartment_id",
             remove_existing_artifact=True,
-            load_artifact=True,
+            download_artifact=True,
         )
 
         mock_from_model_catalog.assert_called_with(
@@ -1334,7 +1334,7 @@ def test_from_id_with_artifact(self, mock_from_model_catalog):
             remove_existing_artifact=True,
             compartment_id="test_compartment_id",
             ignore_conda_error=False,
-            load_artifact=True,
+            download_artifact=True,
         )
         assert test_model_result.model_artifact is not None
         assert test_model_result == mock_model