Merge branch 'main' of https://github.com/oracle/accelerated-data-science into ODSC-47079/fixed_pipeline_step_to_dict

Author: lu-ohai

README-development.md

@@ -58,7 +58,7 @@ Open the destination folder where you want to clone ADS library, and install dep
     python3 -m pip install -e .
 ```
 
-To which packages were installed and their version numbers, run:
+To view which packages were installed and their version numbers, run:
 
 ```bash
     python3 -m pip freeze

SECURITY.md

@@ -21,7 +21,7 @@ security features are welcome on GitHub Issues.
 
 Security updates will be released on a regular cadence. Many of our projects
 will typically release security fixes in conjunction with the
-[Oracle Critical Patch Update][3] program. Additional
+Oracle Critical Patch Update program. Additional
 information, including past advisories, is available on our [security alerts][4]
 page.
 

ads/model/deployment/model_deployment_infrastructure.py

@@ -223,6 +223,7 @@ def _load_default_properties(self) -> Dict:
         defaults[self.CONST_REPLICA] = DEFAULT_REPLICA
 
         if NB_SESSION_OCID:
+            nb_session = None
             try:
                 nb_session = DSCNotebookSession.from_ocid(NB_SESSION_OCID)
             except Exception as e:

build_spec.yaml

@@ -57,7 +57,7 @@ dependencies = [
   "asteval>=0.9.25",
   "cerberus>=1.3.4",
   "cloudpickle>=1.6.0",
-  "fsspec>=0.8.7",
+  "fsspec>=0.8.7,<2023.9.1",  # v2.9.1 introduced issues, releved by unit tests
   "gitpython>=3.1.2",
   "jinja2>=2.11.2",
   "matplotlib>=3.1.3",
@@ -109,7 +109,7 @@ onnx = [
   "lightgbm==3.3.1",
   "onnx>=1.12.0",
   "onnxmltools>=1.10.0",
-  "onnxruntime>=1.10.0",
+  "onnxruntime>=1.10.0,<1.16",  # v1.16 introduced issues https://github.com/microsoft/onnxruntime/issues/17631, releved by unit tests
   "oracle_ads[viz]",
   "protobuf<=3.20",
   "skl2onnx>=1.10.4",

pyproject.toml

@@ -138,10 +138,23 @@ def test_prepare_runtime_yaml_inference_training(
             (TrainingEnvInfo, mlcpu_path_cust, None, None, training_info_cust),
         ],
     )
+    @patch("ads.model.runtime.env_info.get_service_packs")
     def test__populate_env_info_inference(
-        self, env_info_class, conda_pack, bucketname, namespace, expected_env_info
+        self, mock_get_service_packs, env_info_class, conda_pack, bucketname, namespace, expected_env_info
     ):
         """test _populate_env_info."""
+        env_path = (
+            expected_env_info.inference_env_path if isinstance(expected_env_info, InferenceEnvInfo) 
+            else expected_env_info.training_env_path
+        )
+        mock_get_service_packs.return_value = (
+            {
+                env_path : ("mlcpuv1", "3.6")
+            },
+            {
+                "mlcpuv1" : (env_path, "3.6")
+            }
+        )
         env_info = self.artifact._populate_env_info(
             env_info_class,
             conda_pack=conda_pack,

tests/unitary/with_extras/model/test_artifact.py

@@ -177,7 +177,16 @@ def test_from_slug_prod_sp(self):
         info.training_env_type = "service_pack"
         info.training_python_version = "3.6"
 
-    def test_from_slug_not_exist(self):
+    @patch("ads.model.runtime.env_info.get_service_packs")
+    def test_from_slug_not_exist(self, mock_get_service_packs):
+        mock_get_service_packs.return_value = (
+            {
+                "test_path" : ("mlcpuv1", "3.6"),
+            },
+            {
+                "mlcpuv1" : ("test_path", "3.6"),
+            }
+        )
         with pytest.warns(UserWarning, match="not a service pack"):
             TrainingEnvInfo.from_slug(
                 "not_exist", namespace="ociodscdev", bucketname="service-conda-packs"
@@ -256,7 +265,16 @@ def test_from_slug_prod_sp(self):
         info.inference_env_type = "service_pack"
         info.inference_python_version = "3.6"
 
-    def test_from_slug_not_exist(self):
+    @patch("ads.model.runtime.env_info.get_service_packs")
+    def test_from_slug_not_exist(self, mock_get_service_packs):
+        mock_get_service_packs.return_value = (
+            {
+                "test_path" : ("mlcpuv1", "3.6"),
+            },
+            {
+                "mlcpuv1" : ("test_path", "3.6"),
+            }
+        )
         with pytest.warns(UserWarning, match="not a service pack"):
             InferenceEnvInfo.from_slug(
                 "not_exist", namespace="ociodscdev", bucketname="service-conda-packs"

tests/unitary/with_extras/model/test_env_info.py

@@ -279,14 +279,29 @@ def test_prepare_fail(self, mock_handle_model_file_name):
                 "oci://service-conda-packs@ociodscdev/service_pack/cpu/General_Machine_Learning_for_CPUs/1.0/mlcpuv1"
             )
 
+    @patch("ads.model.runtime.env_info.get_service_packs")
     @patch("ads.common.auth.default_signer")
-    def test_prepare_both_conda_env(self, mock_signer):
+    def test_prepare_both_conda_env(self, mock_signer, mock_get_service_packs):
         """prepare a model by only providing inference conda env."""
+        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"
+        mock_get_service_packs.return_value = (
+            {
+                inference_conda_env : ("mlcpuv1", inference_python_version),
+                training_conda_env : ("database_p37_cpu_v1", training_python_version)
+            },
+            {
+                "mlcpuv1" : (inference_conda_env, inference_python_version),
+                "database_p37_cpu_v1" : (training_conda_env, training_python_version)
+            }
+        )
         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",
+            inference_conda_env=inference_conda_env,
+            inference_python_version=inference_python_version,
+            training_conda_env=training_conda_env,
+            training_python_version=training_python_version,
             model_file_name="fake_model_name",
             force_overwrite=True,
         )
@@ -349,8 +364,19 @@ def test_reload(self):
 
     @patch.object(GenericModel, "_random_display_name", return_value="test_name")
     @patch.object(DataScienceModel, "create")
-    def test_save(self, mock_dsc_model_create, mock__random_display_name):
+    @patch("ads.model.runtime.env_info.get_service_packs")
+    def test_save(self, mock_get_service_packs, mock_dsc_model_create, mock__random_display_name):
         """test saving a model to artifact."""
+        inference_conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/Data_Exploration_and_Manipulation_for_CPU_Python_3.7/3.0/dataexpl_p37_cpu_v3"
+        inference_python_version="3.7"
+        mock_get_service_packs.return_value = (
+            {
+                inference_conda_env : ("dataexpl_p37_cpu_v3", inference_python_version),
+            },
+            {
+                "dataexpl_p37_cpu_v3" : (inference_conda_env, inference_python_version),
+            }
+        )
         mock_dsc_model_create.return_value = MagicMock(id="fake_id")
         self.generic_model.prepare(
             inference_conda_env="dataexpl_p37_cpu_v3",
@@ -360,7 +386,7 @@ def test_save(self, mock_dsc_model_create, mock__random_display_name):
             force_overwrite=True,
             training_id=None,
         )
-        self.generic_model.save()
+        self.generic_model.save(ignore_introspection=True)
         assert self.generic_model.model_id is not None and isinstance(
             self.generic_model.model_id, str
         )
@@ -371,8 +397,19 @@ def test_save(self, mock_dsc_model_create, mock__random_display_name):
             parallel_process_count=utils.DEFAULT_PARALLEL_PROCESS_COUNT,
         )
 
-    def test_save_not_implemented_error(self):
+    @patch("ads.model.runtime.env_info.get_service_packs")
+    def test_save_not_implemented_error(self, mock_get_service_packs):
         """test saving a model to artifact."""
+        inference_conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/Data_Exploration_and_Manipulation_for_CPU_Python_3.7/3.0/dataexpl_p37_cpu_v3"
+        inference_python_version="3.7"
+        mock_get_service_packs.return_value = (
+            {
+                inference_conda_env : ("dataexpl_p37_cpu_v3", inference_python_version),
+            },
+            {
+                "dataexpl_p37_cpu_v3" : (inference_conda_env, inference_python_version),
+            }
+        )
         self.generic_model._serialize = False
         self.generic_model.prepare(
             inference_conda_env="dataexpl_p37_cpu_v3",

tests/unitary/with_extras/model/test_generic_model.py

@@ -5,6 +5,7 @@
 
 import os
 from unittest import TestCase
+from unittest.mock import patch
 
 import yaml
 from ads.model.runtime.model_deployment_details import ModelDeploymentDetails
@@ -27,7 +28,18 @@ def setUpClass(cls):
         with open(os.path.join(curr_dir, "runtime_fail.yaml"), encoding="utf-8") as rt:
             cls.runtime_dict_fail = yaml.load(rt, loader)
 
-    def test_from_dict(self):
+    @patch("ads.model.runtime.env_info.get_service_packs")
+    def test_from_dict(self, mock_get_service_packs):
+        inference_conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/General_Machine_Learning_for_CPUs/1.0/mlcpuv1"
+        inference_python_version="3.6"
+        mock_get_service_packs.return_value = (
+            {
+                inference_conda_env : ("mlcpuv1", inference_python_version),
+            },
+            {
+                "mlcpuv1" : (inference_conda_env, inference_python_version),
+            }
+        )
         model_deployment = ModelDeploymentDetails.from_dict(
             self.runtime_dict["MODEL_DEPLOYMENT"]
         )

tests/unitary/with_extras/model/test_model_deployment_details.py

@@ -3,6 +3,7 @@
 # Copyright (c) 2022, 2023 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
+from unittest.mock import patch
 import numpy as np
 import pytest
 from sklearn import datasets, linear_model
@@ -104,7 +105,19 @@ def test_metadata_generic_model_container_runtime(self):
         )
         assert model.metadata_provenance.training_id is None
 
-    def test_metadata_sklearn_model(self):
+    @patch("ads.model.runtime.env_info.get_service_packs")
+    def test_metadata_sklearn_model(self, mock_get_service_packs):
+        conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/Data_Exploration_and_Manipulation_for_CPU_Python_3.7/3.0/dataexpl_p37_cpu_v3"
+        python_version="3.7"
+        mock_get_service_packs.return_value = (
+            {
+                conda_env : ("dataexpl_p37_cpu_v3", python_version),
+            },
+            {
+                "dataexpl_p37_cpu_v3" : (conda_env, python_version),
+
+            }
+        )
         model = SklearnModel(self.rgr, artifact_dir="./test_sklearn")
         model.prepare(
             inference_conda_env="dataexpl_p37_cpu_v3",
@@ -146,7 +159,19 @@ def test_metadata_sklearn_model(self):
         )
         assert model.metadata_provenance.training_id is None
 
-    def test_metadata_xgboost_model(self):
+    @patch("ads.model.runtime.env_info.get_service_packs")
+    def test_metadata_xgboost_model(self, mock_get_service_packs):
+        conda_env="oci://service-conda-packs@ociodscdev/service_pack/cpu/Data_Exploration_and_Manipulation_for_CPU_Python_3.7/3.0/dataexpl_p37_cpu_v3"
+        python_version="3.7"
+        mock_get_service_packs.return_value = (
+            {
+                conda_env : ("dataexpl_p37_cpu_v3", python_version),
+            },
+            {
+                "dataexpl_p37_cpu_v3" : (conda_env, python_version),
+
+            }
+        )
         model = XGBoostModel(self.xgb_rgr, artifact_dir="./test_xgboost")
         model.prepare(
             inference_conda_env="dataexpl_p37_cpu_v3",
@@ -192,7 +217,7 @@ def test_metadata_xgboost_model(self):
         assert model.metadata_provenance.training_id is None
         assert (
             model.runtime_info.model_deployment.inference_conda_env.inference_env_path
-            == "oci://service-conda-packs@id19sfcrra6z/service_pack/cpu/Data_Exploration_and_Manipulation_for_CPU_Python_3.7/3.0/dataexpl_p37_cpu_v3"
+            == "oci://service-conda-packs@ociodscdev/service_pack/cpu/Data_Exploration_and_Manipulation_for_CPU_Python_3.7/3.0/dataexpl_p37_cpu_v3"
         )
 
     def teardown_method(self):