Merge branch 'feature/aquav1.0.1' into fix-hello-reload

Author: VipulMascarenhas

ads/aqua/__init__.py

@@ -8,7 +8,7 @@
 import sys
 import os
 from ads.aqua.utils import fetch_service_compartment
-from ads.config import OCI_RESOURCE_PRINCIPAL_VERSION
+from ads.config import NB_SESSION_OCID, OCI_RESOURCE_PRINCIPAL_VERSION
 from ads import set_auth
 
 logger = logging.getLogger(__name__)
@@ -22,7 +22,15 @@
 if not ODSC_MODEL_COMPARTMENT_OCID:
     try:
         ODSC_MODEL_COMPARTMENT_OCID = fetch_service_compartment()
-    except Exception as e:
+    except:
+        pass
+
+if not ODSC_MODEL_COMPARTMENT_OCID:
+    logger.error(
+        f"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua."
+    )
+    if NB_SESSION_OCID:
         logger.error(
-            f"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua, due to {e}."
+            f"Aqua is not available for this notebook session {NB_SESSION_OCID}."
         )
+    exit()

ads/aqua/finetune.py

@@ -15,6 +15,7 @@
     UpdateModelProvenanceDetails,
 )
 
+from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID
 from ads.aqua.base import AquaApp
 from ads.aqua.data import AquaResourceIdentifier, Resource, Tags
 from ads.aqua.exception import AquaFileExistsError, AquaValueError
@@ -195,12 +196,11 @@ def create(
                 )
 
         source = self.get_source(create_fine_tuning_details.ft_source_id)
-        # TODO: add the following validation for fine tuning aqua service model. Revisit it when all service models are available
-        # if source.compartment_id != ODSC_MODEL_COMPARTMENT_OCID:
-        #     raise AquaValueError(
-        #         f"Fine tuning is only supported for Aqua service models in {ODSC_MODEL_COMPARTMENT_OCID}. "
-        #         "Use a valid Aqua service model id instead."
-        #     )
+        if source.compartment_id != ODSC_MODEL_COMPARTMENT_OCID:
+            raise AquaValueError(
+                f"Fine tuning is only supported for Aqua service models in {ODSC_MODEL_COMPARTMENT_OCID}. "
+                "Use a valid Aqua service model id instead."
+            )
 
         target_compartment = (
             create_fine_tuning_details.compartment_id or COMPARTMENT_OCID

tests/unitary/with_extras/aqua/test_finetuning.py

@@ -5,10 +5,15 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 from dataclasses import asdict
+from importlib import reload
+import os
 from unittest import TestCase
 from unittest.mock import MagicMock, PropertyMock
 
 from mock import patch
+import ads.config
+import ads.aqua
+import ads.aqua.finetune
 from ads.aqua.base import AquaApp
 from ads.aqua.finetune import AquaFineTuningApp, FineTuneCustomMetadata
 from ads.aqua.model import AquaFineTuneModel
@@ -18,9 +23,25 @@
 
 class FineTuningTestCase(TestCase):
 
+    SERVICE_COMPARTMENT_ID = "ocid1.compartment.oc1..<OCID>"
+
     def setUp(self):
         self.app = AquaFineTuningApp()
 
+    @classmethod
+    def setUpClass(cls):
+        os.environ["ODSC_MODEL_COMPARTMENT_OCID"] = cls.SERVICE_COMPARTMENT_ID
+        reload(ads.config)
+        reload(ads.aqua)
+        reload(ads.aqua.finetune)
+
+    @classmethod
+    def tearDownClass(cls):
+        os.environ.pop("ODSC_MODEL_COMPARTMENT_OCID", None)
+        reload(ads.config)
+        reload(ads.aqua)
+        reload(ads.aqua.finetune)
+
     @patch.object(Job, "run")
     @patch("ads.jobs.ads_job.Job.name", new_callable=PropertyMock)
     @patch("ads.jobs.ads_job.Job.id", new_callable=PropertyMock)
@@ -58,6 +79,7 @@ def test_create_fine_tuning(
 
         ft_source = MagicMock()
         ft_source.id = "test_ft_source_id"
+        ft_source.compartment_id = self.SERVICE_COMPARTMENT_ID
         ft_source.display_name = "test_ft_source_model"
         ft_source.custom_metadata_list = custom_metadata_list
         mock_get_source.return_value = ft_source