added attribute in predict() to allow for invoking predict in local

Author: mingkang111

ads/model/generic_model.py

@@ -2483,6 +2483,7 @@ def predict(
         self,
         data: Any = None,
         auto_serialize_data: bool = False,
+        local: bool = False,
         **kwargs,
     ) -> Dict[str, Any]:
         """Returns prediction of input data run against the model deployment endpoint.
@@ -2507,6 +2508,8 @@ def predict(
             Whether to auto serialize input data. Defauls to `False` for GenericModel, and `True` for other frameworks.
             `data` required to be json serializable if `auto_serialize_data=False`.
             If `auto_serialize_data` set to True, data will be serialized before sending to model deployment endpoint.
+        local: bool.
+            Whether to invoke the prediction locally. Default to False.
         kwargs:
             content_type: str, used to indicate the media type of the resource.
             image: PIL.Image Object or uri for the image.
@@ -2527,6 +2530,9 @@ def predict(
         ValueError
             If `data` is empty or not JSON serializable.
         """
+        if local:
+            return self.verify(data=data, auto_serialize_data=auto_serialize_data, **kwargs)
+
         if not self.model_deployment:
             raise ValueError("Use `deploy()` method to start model deployment.")
 

tests/unitary/with_extras/model/test_generic_model.py

@@ -168,7 +168,20 @@
     "training_script": None,
 }
 
-
+INFERENCE_CONDA_ENV= "oci://service-conda-packs@ociodscdev/service_pack/cpu/General_Machine_Learning_for_CPUs/1.0/mlcpuv1"
+TRAINING_CONDA_ENV="oci://service-conda-packs@ociodscdev/service_pack/cpu/Oracle_Database_for_CPU_Python_3.7/1.0/database_p37_cpu_v1"
+DEFAULT_PYTHON_VERSION = "3.8"
+MODEL_FILE_NAME = "fake_model_name"
+
+def _prepare(model):
+    model.prepare(
+        inference_conda_env=INFERENCE_CONDA_ENV,
+        inference_python_version=DEFAULT_PYTHON_VERSION,
+        training_conda_env=TRAINING_CONDA_ENV,
+        training_python_version=DEFAULT_PYTHON_VERSION,
+        model_file_name=MODEL_FILE_NAME,
+        force_overwrite=True,
+    )
 class TestEstimator:
     def predict(self, x):
         return x**2
@@ -300,14 +313,7 @@ def test_prepare_both_conda_env(self, mock_signer):
     @patch("ads.common.auth.default_signer")
     def test_verify_without_reload(self, mock_signer):
         """Test verify input data without reload artifacts."""
-        self.generic_model.prepare(
-            inference_conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/General_Machine_Learning_for_CPUs/1.0/mlcpuv1",
-            inference_python_version="3.6",
-            training_conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/Oracle_Database_for_CPU_Python_3.7/1.0/database_p37_cpu_v1",
-            training_python_version="3.7",
-            model_file_name="fake_model_name",
-            force_overwrite=True,
-        )
+        _prepare(self.generic_model)
         self.generic_model.verify(self.X_test.tolist())
 
         with patch("ads.model.artifact.ModelArtifact.reload") as mock_reload:
@@ -317,20 +323,10 @@ def test_verify_without_reload(self, mock_signer):
     @patch("ads.common.auth.default_signer")
     def test_verify(self, mock_signer):
         """Test verify input data"""
-        self.generic_model.prepare(
-            inference_conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/General_Machine_Learning_for_CPUs/1.0/mlcpuv1",
-            inference_python_version="3.6",
-            training_conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/Oracle_Database_for_CPU_Python_3.7/1.0/database_p37_cpu_v1",
-            training_python_version="3.7",
-            model_file_name="fake_model_name",
-            force_overwrite=True,
-        )
+        _prepare(self.generic_model)
         prediction_1 = self.generic_model.verify(self.X_test.tolist())
         assert isinstance(prediction_1, dict), "Failed to verify json payload."
 
-        prediction_2 = self.generic_model.verify(self.X_test.tolist())
-        assert isinstance(prediction_2, dict), "Failed to verify input data."
-
     def test_reload(self):
         """test the reload."""
         pass
@@ -622,6 +618,21 @@ def test_deploy_with_default_display_name(self, mock_deploy):
             == random_name[:-9]
         )
 
+    @pytest.mark.parametrize(
+        "input_data",
+        [(X_test.tolist())]
+    )
+    @patch("ads.common.auth.default_signer")
+    def test_predict_locally(self, mock_signer, input_data):
+        _prepare(self.generic_model)
+        test_result = self.generic_model.predict(data=input_data, local=True)
+        expected_result = self.generic_model.estimator.predict(input_data).tolist()
+        assert test_result['prediction'] == expected_result, "Failed to verify input data."
+
+        with patch("ads.model.artifact.ModelArtifact.reload") as mock_reload:
+            self.generic_model.predict(data=input_data, local=True, reload_artifacts=False)
+            mock_reload.assert_not_called()
+
     @patch.object(ModelDeployment, "predict")
     @patch("ads.common.auth.default_signer")
     @patch("ads.common.oci_client.OCIClientFactory")