resolve merge conflicts

Author: VipulMascarenhas

.github/workflows/run-unittests-default_setup.yml

@@ -4,6 +4,12 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [ "main" ]
+    paths:
+      - "ads/**"
+      - "!ads/opctl/operator/**"
+      - "!ads/feature_store/**"
+      - "pyproject.toml"
+
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value

.github/workflows/run-unittests-py38-cov-report.yml

@@ -4,6 +4,11 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [ "main" ]
+    paths:
+      - "ads/**"
+      - "!ads/opctl/operator/**"
+      - "!ads/feature_store/**"
+      - "pyproject.toml"
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value

.github/workflows/run-unittests-py39-py310.yml

@@ -3,6 +3,12 @@ name: "[Py3.9][Py3.10] - tests/unitary/**"
 on:
   workflow_dispatch:
   pull_request:
+    branches: [ "main" ]
+    paths:
+      - "ads/**"
+      - "!ads/opctl/operator/**"
+      - "!ads/feature_store/**"
+      - "pyproject.toml"
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value

ads/aqua/evaluation.py

@@ -833,13 +833,13 @@ def get(self, eval_id) -> AquaEvaluationDetail:
         logger.info(f"Fetching evaluation: {eval_id} details ...")
 
         resource = utils.query_resource(eval_id)
-        model_provenance = self.ds_client.get_model_provenance(eval_id).data
-
         if not resource:
             raise AquaRuntimeError(
                 f"Failed to retrieve evalution {eval_id}."
                 "Please check if the OCID is correct."
             )
+        model_provenance = self.ds_client.get_model_provenance(eval_id).data
+
         jobrun_id = model_provenance.training_id
         job_run_details = self._fetch_jobrun(
             resource, use_rqs=False, jobrun_id=jobrun_id
@@ -1038,14 +1038,14 @@ def get_status(self, eval_id: str) -> dict:
         """
         eval = utils.query_resource(eval_id)
 
-        # TODO: add job_run_id as input param to skip the query below
-        model_provenance = self.ds_client.get_model_provenance(eval_id).data
-
         if not eval:
             raise AquaRuntimeError(
                 f"Failed to retrieve evalution {eval_id}."
                 "Please check if the OCID is correct."
             )
+
+        model_provenance = self.ds_client.get_model_provenance(eval_id).data
+
         jobrun_id = model_provenance.training_id
         job_run_details = self._fetch_jobrun(eval, use_rqs=False, jobrun_id=jobrun_id)
 
@@ -1295,7 +1295,10 @@ def cancel(self, eval_id) -> dict:
             raise AquaRuntimeError(
                 f"Failed to get evaluation details for model {eval_id}"
             )
-        job_run_id = model.provenance_metadata.training_id
+
+        job_run_id = (
+            model.provenance_metadata.training_id if model.provenance_metadata else None
+        )
         if not job_run_id:
             raise AquaMissingKeyError(
                 "Model provenance is missing job run training_id key"
@@ -1358,7 +1361,7 @@ def delete(self, eval_id):
             job_id = model.custom_metadata_list.get(
                 EvaluationCustomMetadata.EVALUATION_JOB_ID.value
             ).value
-        except ValueError:
+        except Exception:
             raise AquaMissingKeyError(
                 f"Custom metadata is missing {EvaluationCustomMetadata.EVALUATION_JOB_ID.value} key"
             )
@@ -1390,7 +1393,7 @@ def _delete_job_and_model(job, model):
             )
 
     def load_evaluation_config(self, eval_id):
-        # TODO
+        """Loads evaluation config."""
         return {
             "model_params": {
                 "max_tokens": 500,
@@ -1568,20 +1571,6 @@ def _build_resource_identifier(
             )
             return AquaResourceIdentifier()
 
-    def _get_jobrun(
-        self, model: oci.resource_search.models.ResourceSummary, mapping: dict = {}
-    ) -> Union[
-        oci.resource_search.models.ResourceSummary, oci.data_science.models.JobRun
-    ]:
-        jobrun_id = self._get_attribute_from_model_metadata(
-            model, EvaluationCustomMetadata.EVALUATION_JOB_RUN_ID.value
-        )
-        job_run = mapping.get(jobrun_id)
-
-        if not job_run:
-            job_run = self._fetch_jobrun(model, use_rqs=True, jobrun_id=jobrun_id)
-        return job_run
-
     def _fetch_jobrun(
         self,
         resource: oci.resource_search.models.ResourceSummary,
@@ -1758,7 +1747,7 @@ def _extract_job_lifecycle_details(self, lifecycle_details: str) -> str:
         Examples
         --------
         >>> _extract_job_lifecycle_details("Job run artifact execution failed with exit code 16")
-        'The evaluation configuration is invalid due to content validation errors.'
+        'Validation errors in the evaluation config. Exit code: 16.'
 
         >>> _extract_job_lifecycle_details("Job completed successfully.")
         'Job completed successfully.'

ads/aqua/extension/common_handler.py

@@ -10,6 +10,7 @@
 from ads.aqua.decorator import handle_exceptions
 from ads.aqua.exception import AquaResourceAccessError
 from ads.aqua.extension.base_handler import AquaAPIhandler
+from ads.aqua.utils import known_realm
 
 
 class ADSVersionHandler(AquaAPIhandler):
@@ -25,8 +26,23 @@ class CompatibilityCheckHandler(AquaAPIhandler):
 
     @handle_exceptions
     def get(self):
+        """This method provides the availability status of Aqua. If ODSC_MODEL_COMPARTMENT_OCID environment variable
+        is set, then status `ok` is returned. For regions where Aqua is available but the environment variable is not
+        set due to accesses/policies, we return the `compatible` status to indicate that the extension can be enabled
+        for the selected notebook session.
+
+        Returns
+        -------
+            status dict:
+                ok or compatible
+        Raises:
+            AquaResourceAccessError: raised when aqua is not accessible in the given session/region.
+
+        """
         if ODSC_MODEL_COMPARTMENT_OCID:
             return self.finish(dict(status="ok"))
+        elif known_realm():
+            return self.finish(dict(status="compatible"))
         else:
             raise AquaResourceAccessError(
                 f"The AI Quick actions extension is not compatible in the given region."

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

ads/aqua/utils.py

@@ -79,6 +79,7 @@
 LIFECYCLE_DETAILS_MISSING_JOBRUN = "The asscociated JobRun resource has been deleted."
 READY_TO_DEPLOY_STATUS = "ACTIVE"
 READY_TO_FINE_TUNE_STATUS = "TRUE"
+AQUA_GA_LIST = ["id19sfcrra6z"]
 
 
 class LifecycleStatus(Enum):
@@ -733,3 +734,14 @@ def _is_valid_mvs(mvs: ModelVersionSet, target_tag: str) -> bool:
         return False
 
     return target_tag in mvs.freeform_tags
+
+
+def known_realm():
+    """This helper function returns True if the Aqua service is available by default in the given namespace.
+    Returns
+    -------
+    bool:
+        Return True if aqua service is available.
+
+    """
+    return os.environ.get("CONDA_BUCKET_NS") in AQUA_GA_LIST

docs/source/release_notes.rst

@@ -4,9 +4,10 @@ Release Notes
 
 2.11.7
 ------
-Release date: April 8, 2024
+Release date: April 18, 2024
 
-* Fixed bugs and introduced enhancements following our recent release, which included internal adjustments for future features and updates for the Jupyter Lab 3 upgrade.
+* Fixed the bug in ``ADSDataset.show_in_notebook()``.
+* Updated langchain version. 
 
 
 2.11.6

tests/unitary/with_extras/aqua/test_common_handler.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*--
+
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+import os
+import json
+from importlib import reload
+from tornado.web import Application
+from tornado.testing import AsyncHTTPTestCase
+
+import ads.config
+import ads.aqua
+from ads.aqua.utils import AQUA_GA_LIST
+from ads.aqua.extension.common_handler import CompatibilityCheckHandler
+
+
+class TestDataset:
+    SERVICE_COMPARTMENT_ID = "ocid1.compartment.oc1..<OCID>"
+
+
+class TestYourHandler(AsyncHTTPTestCase):
+    def get_app(self):
+        return Application([(r"/hello", CompatibilityCheckHandler)])
+
+    def setUp(self):
+        super().setUp()
+        os.environ["ODSC_MODEL_COMPARTMENT_OCID"] = TestDataset.SERVICE_COMPARTMENT_ID
+        reload(ads.config)
+        reload(ads.aqua)
+        reload(ads.aqua.extension.common_handler)
+
+    def tearDown(self):
+        super().tearDown()
+        os.environ.pop("ODSC_MODEL_COMPARTMENT_OCID", None)
+        reload(ads.config)
+        reload(ads.aqua)
+        reload(ads.aqua.extension.common_handler)
+
+    def test_get_ok(self):
+        response = self.fetch("/hello", method="GET")
+        assert json.loads(response.body)["status"] == "ok"
+
+    def test_get_compatible_status(self):
+        os.environ["ODSC_MODEL_COMPARTMENT_OCID"] = ""
+        os.environ["CONDA_BUCKET_NS"] = AQUA_GA_LIST[0]
+        reload(ads.common)
+        reload(ads.aqua)
+        reload(ads.aqua.extension.common_handler)
+        response = self.fetch("/hello", method="GET")
+        assert json.loads(response.body)["status"] == "compatible"
+
+    def test_raise_not_compatible_error(self):
+        os.environ["ODSC_MODEL_COMPARTMENT_OCID"] = ""
+        os.environ["CONDA_BUCKET_NS"] = "test-namespace"
+        reload(ads.common)
+        reload(ads.aqua)
+        reload(ads.aqua.extension.common_handler)
+        response = self.fetch("/hello", method="GET")
+        body = json.loads(response.body)
+        assert body["status"] == 404
+        assert (
+            body["reason"]
+            == "The AI Quick actions extension is not compatible in the given region."
+        )

tests/unitary/with_extras/aqua/test_data/valid_eval_artifact/report.html

@@ -1 +1,2 @@
 This is a sample evaluation report.html.
+Standard deviation (σ)