oracle-ads 2.11.3__py3-none-any.whl → 2.11.5__py3-none-any.whl

ads/aqua/__init__.py

@@ -6,7 +6,23 @@
 
 import logging
 import sys
+import os
+from ads.aqua.utils import fetch_service_compartment
+from ads.config import OCI_RESOURCE_PRINCIPAL_VERSION
+from ads import set_auth
 
 logger = logging.getLogger(__name__)
 handler = logging.StreamHandler(sys.stdout)
 logger.setLevel(logging.INFO)
+
+if OCI_RESOURCE_PRINCIPAL_VERSION:
+    set_auth("resource_principal")
+
+ODSC_MODEL_COMPARTMENT_OCID = os.environ.get("ODSC_MODEL_COMPARTMENT_OCID")
+if not ODSC_MODEL_COMPARTMENT_OCID:
+    try:
+        ODSC_MODEL_COMPARTMENT_OCID = fetch_service_compartment()
+    except Exception as e:
+        logger.error(
+            f"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua, due to {e}."
+        )

ads/aqua/extension/common_handler.py

@@ -7,6 +7,8 @@
 from importlib import metadata
 
 from ads.aqua.extension.base_handler import AquaAPIhandler
+from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID
+from ads.aqua.exception import AquaResourceAccessError
 
 
 class ADSVersionHandler(AquaAPIhandler):
@@ -16,6 +18,19 @@ class ADSVersionHandler(AquaAPIhandler):
         self.finish({"data": metadata.version("oracle_ads")})
 
 
+class CompatibilityCheckHandler(AquaAPIhandler):
+    """The handler to check if the extension is compatible."""
+
+    def get(self):
+        if ODSC_MODEL_COMPARTMENT_OCID:
+            return self.finish(dict(status="ok"))
+        else:
+            raise AquaResourceAccessError(
+                f"The AI Quick actions extension is not compatible in the given region."
+            )
+
+
 __handlers__ = [
     ("ads_version", ADSVersionHandler),
+    ("hello", CompatibilityCheckHandler),
 ]

ads/aqua/model.py

@@ -47,10 +47,10 @@ from ads.config import (
     AQUA_SERVICE_MODELS_BUCKET,
     COMPARTMENT_OCID,
     CONDA_BUCKET_NS,
-    ODSC_MODEL_COMPARTMENT_OCID,
     PROJECT_OCID,
     TENANCY_OCID,
 )
+from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID
 from ads.model import DataScienceModel
 from ads.model.model_metadata import MetadataTaxonomyKeys, ModelCustomMetadata
 from ads.telemetry import telemetry

ads/aqua/utils.py

@@ -29,7 +29,6 @@ from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
 from ads.common.utils import get_console_link, upload_to_os
 from ads.config import (
-    AQUA_CONFIG_FOLDER,
     AQUA_SERVICE_MODELS_BUCKET,
     CONDA_BUCKET_NS,
     TENANCY_OCID,
@@ -45,6 +44,7 @@ UNKNOWN_DICT = {}
 README = "README.md"
 LICENSE_TXT = "config/LICENSE.txt"
 DEPLOYMENT_CONFIG = "deployment_config.json"
+COMPARTMENT_MAPPING_KEY = "service-model-compartment"
 CONTAINER_INDEX = "container_index.json"
 EVALUATION_REPORT_JSON = "report.json"
 EVALUATION_REPORT_MD = "report.md"
@@ -574,6 +574,22 @@ def get_container_image(
     return container_image
 
 
+def fetch_service_compartment():
+    """Loads the compartment mapping json from service bucket"""
+    config_file_name = (
+        f"oci://{AQUA_SERVICE_MODELS_BUCKET}@{CONDA_BUCKET_NS}/service_models/config"
+    )
+
+    config = load_config(
+        file_path=config_file_name,
+        config_file_name=CONTAINER_INDEX,
+    )
+    compartment_mapping = config.get(COMPARTMENT_MAPPING_KEY)
+    if compartment_mapping:
+        return compartment_mapping.get(CONDA_BUCKET_NS)
+    return None
+
+
 def get_max_version(versions):
     """Takes in a list of versions and returns the higher version."""
     if not versions:

ads/config.py

@@ -83,17 +83,6 @@ DEBUG_TELEMETRY = os.environ.get("DEBUG_TELEMETRY", None)
 AQUA_SERVICE_NAME = "aqua"
 DATA_SCIENCE_SERVICE_NAME = "data-science"
 
-compartment_mapping = {
-    "idoaxnz5ar4s": "ocid1.compartment.oc1..aaaaaaaabxqyb6w4kj5y4fwwkc47auxdothlqc7jpm3zbah5aamflvp7th3q",
-    "id19sfcrra6z": "ocid1.compartment.oc1..aaaaaaaasdur4tm5apdm6qyapaba7apdiyv22n2mwt6zquyubqevk3uo7nha",
-}
-default_compartment = compartment_mapping.get(CONDA_BUCKET_NS)
-ODSC_MODEL_COMPARTMENT_OCID = (
-    default_compartment
-    if default_compartment
-    else os.environ.get("ODSC_MODEL_COMPARTMENT_OCID")
-)
-
 
 def export(
     uri: Optional[str] = DEFAULT_CONFIG_PATH,

{oracle_ads-2.11.3.dist-info → oracle_ads-2.11.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oracle_ads
-Version: 2.11.3
+Version: 2.11.5
 Summary: Oracle Accelerated Data Science SDK
 Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle
 Author: Oracle Data Science

{oracle_ads-2.11.3.dist-info → oracle_ads-2.11.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ads/__init__.py,sha256=OxHySbHbMqPgZ8sUj33Bxy-smSiNgRjtcSUV77oBL08,3787
 ads/cli.py,sha256=GVJOtlkeLYIyMEH_sqZ93aGb3j0XIcS4aiCyOVkf6So,2044
-ads/config.py,sha256=KxnvnTxA-xai-4yd6-Dfh6dVHC6hAmT__7IVEVdmPXE,8253
-ads/aqua/__init__.py,sha256=GvScTRi_de89ryqIsyCRQQEi6jbjOA7NojZYKYhCvqY,342
+ads/config.py,sha256=wbJTlAMYyKf92vqYb2je7R6ydK4Hl_YV0bSJHW1Tfvc,7809
+ads/aqua/__init__.py,sha256=ttZSrmvF4PSI-0WrgwFmkmYR6CbRfKVE3mSsYKurKpw,899
 ads/aqua/base.py,sha256=xxLdZPirDALBXSkSR6_amWNhnsDTpJcooF-pNS3rDic,11137
 ads/aqua/cli.py,sha256=GQUSeAOjD3aGK9VfRpj80_Pp1wZaOMC1xlVUVgUMMQ8,602
 ads/aqua/constants.py,sha256=ArlrOW6xGsXReKKVLSWNqhaFsAqlqCTEJAVGR-sqbNM,1463
@@ -12,9 +12,9 @@ ads/aqua/evaluation.py,sha256=DxHywtjZHxMmeZapT0APXX9iAM4gkJD6XF-SBa2dl-E,66710
 ads/aqua/exception.py,sha256=wV0XEZy9dlZfX7DQ_hLcEFW8tTEeL375qVuOQmjiRPs,2381
 ads/aqua/finetune.py,sha256=eMSyRwQuhbALmv7tPImSOD-Brjfb0WurGxmCY3siLNg,22912
 ads/aqua/job.py,sha256=QfFLRaCcaUh3qNd7ofMAvsB23mr2AAvE5JaPyBpCJpE,904
-ads/aqua/model.py,sha256=P90OwiAm3Aq1xtDPjsNiI0lregmB_qfe5MrslpnNvkw,29016
+ads/aqua/model.py,sha256=SYkwXPvn9arIx4WgtOTMJsmRdPtje-lEqtpjph0PO1s,29032
 ads/aqua/ui.py,sha256=zetpa_61X3SyMTuH_d3T3UieAp7H1MzRm6VR23PgYfc,17580
-ads/aqua/utils.py,sha256=Np8-Le7M39GbVEgp3RCva2NQJAP4pbtgI7GsH4lGVvI,22218
+ads/aqua/utils.py,sha256=_MmmomCxh-nohcggwQUaSIQyHsRR83ItOJEqES8YlFk,22738
 ads/aqua/config/deployment_config_defaults.json,sha256=SoGP0J3BChwhR7L0HHpgLfSxLi0DsDfuLSGwWnrh5Zk,121
 ads/aqua/config/resource_limit_names.json,sha256=Nsd_Ll5X09Wzhab7alAc2Utg8Bt2BSABK-E6JefUeA0,195
 ads/aqua/dummy_data/icon.txt,sha256=wlB79r3A4mUBbrK5yVVXrNEEKpvfZiwBx2sKlj7wzA4,6326
@@ -23,7 +23,7 @@ ads/aqua/dummy_data/oci_models.json,sha256=mxUU8o3plmAFfr06fQmIQuiGe2qFFBlUB7QNP
 ads/aqua/dummy_data/readme.md,sha256=AlBPt0HBSOFA5HbYVsFsdTm-BC3R5NRpcKrTxdjEnlI,1256
 ads/aqua/extension/__init__.py,sha256=dqjG8UDE2ORwVJN_V55WZqzymwLD9RfJzDhbo5eGwPY,1347
 ads/aqua/extension/base_handler.py,sha256=dKnzOlLnjleGM7Xl2E2p7v8G1wqCqPyWJftlHP8sJlk,5150
-ads/aqua/extension/common_handler.py,sha256=Ea5rKRH8xQOR7S7U_dHv6ygWV3Y_Gdpv0_b1AGnrMMY,542
+ads/aqua/extension/common_handler.py,sha256=nJpXK71-ks7ayEE-znkvVWuxEgz8MqkL_Q6RlvBF9CM,1072
 ads/aqua/extension/deployment_handler.py,sha256=UoVQsWVgnCjwTSy9EJTEpAey43z7Z-FpK2KUIub3aRc,7008
 ads/aqua/extension/evaluation_handler.py,sha256=V4HH08-Ryj9cjdwlPwM1oS_kHqroTW2CxRHY1FC7rN8,4542
 ads/aqua/extension/finetune_handler.py,sha256=g72irnRC6J-CAQV72jB24x_RH7dB0F6EFCr09HPuHDI,2187
@@ -758,8 +758,8 @@ ads/type_discovery/unknown_detector.py,sha256=yZuYQReO7PUyoWZE7onhhtYaOg6088wf1y
 ads/type_discovery/zipcode_detector.py,sha256=3AlETg_ZF4FT0u914WXvTT3F3Z6Vf51WiIt34yQMRbw,1421
 ads/vault/__init__.py,sha256=x9tMdDAOdF5iDHk9u2di_K-ze5Nq068x25EWOBoWwqY,245
 ads/vault/vault.py,sha256=hFBkpYE-Hfmzu1L0sQwUfYcGxpWmgG18JPndRl0NOXI,8624
-oracle_ads-2.11.3.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
-oracle_ads-2.11.3.dist-info/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
-oracle_ads-2.11.3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-oracle_ads-2.11.3.dist-info/METADATA,sha256=sdabg-gAdrPytrxbaHnHE5BCAVMuiaPnAtTwQjoho9Q,15876
-oracle_ads-2.11.3.dist-info/RECORD,,
+oracle_ads-2.11.5.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
+oracle_ads-2.11.5.dist-info/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
+oracle_ads-2.11.5.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+oracle_ads-2.11.5.dist-info/METADATA,sha256=qpJojNcJPUFlloOyxjBTzyR5TINuZQmMbJPSeLihBTs,15876
+oracle_ads-2.11.5.dist-info/RECORD,,